From 14634726252aa8ecdc8f5af9c2b00729b2cdf73c Mon Sep 17 00:00:00 2001 From: Bhavesh Mistry Date: Thu, 27 Apr 2023 16:47:13 -0700 Subject: [PATCH] Fix NPE --- .../openapitools/openapidiff/core/compare/ParametersDiff.java | 4 +++- .../org/openapitools/openapidiff/core/output/HtmlRender.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java index c12eeaf94..b5cf4c030 100644 --- a/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java @@ -9,6 +9,8 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; + +import org.apache.commons.lang3.StringUtils; import org.openapitools.openapidiff.core.model.Changed; import org.openapitools.openapidiff.core.model.ChangedParameters; import org.openapitools.openapidiff.core.model.DiffContext; @@ -99,7 +101,7 @@ public boolean pathUnchangedParametersChanged( // Speedy Check. Use the map already created in changedParameters to check if missing param is // linked to newParam String newParameterName = context.getParameters().get(parameter.getName()); - if (newParameterName.isEmpty()) return false; + if (StringUtils.isBlank(newParameterName)) return false; Optional newParameter = changedParameters.getIncreased().stream() diff --git a/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java b/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java index 0513424cd..95f6c62d1 100644 --- a/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java +++ b/core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java @@ -403,7 +403,7 @@ private LiTag li_changedParam(ChangedParameter changeParam) { Parameter leftParam = changeParam.getNewParameter(); LiTag li = li().withText(changeParam.getName() + " in " + changeParam.getIn()); if (changeRequired) { - li.withText(" change into " + (rightParam.getRequired() ? "required" : "not required")); + li.withText(" change into " + (rightParam.getRequired() != null && rightParam.getRequired() ? "required" : "not required")); } if (changeDescription) { li.withText(" Notes ")