From 47b12b1c3ef636d44a4e885b3e480567da253553 Mon Sep 17 00:00:00 2001 From: jlamaille Date: Mon, 6 Jul 2020 10:38:01 +0200 Subject: [PATCH 1/2] Fix NPE when description is empty --- .../java/com/qdesrame/openapi/diff/output/HtmlRender.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java b/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java index 756bc045a..3f96d5209 100644 --- a/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java +++ b/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java @@ -12,6 +12,8 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.responses.ApiResponse; import j2html.tags.ContainerTag; +import org.apache.commons.lang3.StringUtils; + import java.util.List; import java.util.Map; import java.util.Optional; @@ -347,7 +349,7 @@ private ContainerTag li_changedParam(ChangedParameter changeParam) { return li_deprecatedParam(changeParam); } boolean changeRequired = changeParam.isChangeRequired(); - boolean changeDescription = changeParam.getDescription().isDifferent(); + boolean changeDescription = Optional.ofNullable(changeParam.getDescription()).map(ChangedMetadata::isDifferent).orElse(false); Parameter rightParam = changeParam.getNewParameter(); Parameter leftParam = changeParam.getNewParameter(); ContainerTag li = li().withText(changeParam.getName() + " in " + changeParam.getIn()); From e735f78ab5b4c088c61f86d66a25caef048de0a5 Mon Sep 17 00:00:00 2001 From: jlamaille Date: Mon, 6 Jul 2020 10:39:41 +0200 Subject: [PATCH 2/2] Clean imports --- .../com/qdesrame/openapi/diff/output/HtmlRender.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java b/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java index 3f96d5209..df56f3764 100644 --- a/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java +++ b/src/main/java/com/qdesrame/openapi/diff/output/HtmlRender.java @@ -1,8 +1,5 @@ package com.qdesrame.openapi.diff.output; -import static com.qdesrame.openapi.diff.model.Changed.result; -import static j2html.TagCreator.*; - import com.qdesrame.openapi.diff.model.*; import com.qdesrame.openapi.diff.utils.RefPointer; import com.qdesrame.openapi.diff.utils.RefType; @@ -12,12 +9,14 @@ import io.swagger.v3.oas.models.parameters.Parameter; import io.swagger.v3.oas.models.responses.ApiResponse; import j2html.tags.ContainerTag; -import org.apache.commons.lang3.StringUtils; import java.util.List; import java.util.Map; import java.util.Optional; +import static com.qdesrame.openapi.diff.model.Changed.result; +import static j2html.TagCreator.*; + public class HtmlRender implements Render { private String title; @@ -349,7 +348,10 @@ private ContainerTag li_changedParam(ChangedParameter changeParam) { return li_deprecatedParam(changeParam); } boolean changeRequired = changeParam.isChangeRequired(); - boolean changeDescription = Optional.ofNullable(changeParam.getDescription()).map(ChangedMetadata::isDifferent).orElse(false); + boolean changeDescription = + Optional.ofNullable(changeParam.getDescription()) + .map(ChangedMetadata::isDifferent) + .orElse(false); Parameter rightParam = changeParam.getNewParameter(); Parameter leftParam = changeParam.getNewParameter(); ContainerTag li = li().withText(changeParam.getName() + " in " + changeParam.getIn());