Skip to content

Commit 5b5b820

Browse files
bmistry13Bhavesh Mistry
and
Bhavesh Mistry
authored
Fix potential NPEs in ParametersDiff and HtmlRender (#517)
Co-authored-by: Bhavesh Mistry <[email protected]>
1 parent 830a887 commit 5b5b820

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

core/src/main/java/org/openapitools/openapidiff/core/compare/ParametersDiff.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
import java.util.Optional;
1010
import java.util.regex.Matcher;
1111
import java.util.regex.Pattern;
12+
13+
import org.apache.commons.lang3.StringUtils;
1214
import org.openapitools.openapidiff.core.model.Changed;
1315
import org.openapitools.openapidiff.core.model.ChangedParameters;
1416
import org.openapitools.openapidiff.core.model.DiffContext;
@@ -99,7 +101,7 @@ public boolean pathUnchangedParametersChanged(
99101
// Speedy Check. Use the map already created in changedParameters to check if missing param is
100102
// linked to newParam
101103
String newParameterName = context.getParameters().get(parameter.getName());
102-
if (newParameterName.isEmpty()) return false;
104+
if (StringUtils.isBlank(newParameterName)) return false;
103105

104106
Optional<Parameter> newParameter =
105107
changedParameters.getIncreased().stream()

core/src/main/java/org/openapitools/openapidiff/core/output/HtmlRender.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ private LiTag li_changedParam(ChangedParameter changeParam) {
420420
Parameter leftParam = changeParam.getOldParameter();
421421
LiTag li = li().withText(changeParam.getName() + " in " + changeParam.getIn());
422422
if (changeRequired) {
423-
li.withText(" change into " + (rightParam.getRequired() ? "required" : "not required"));
423+
li.withText(" change into " + (rightParam.getRequired() != null && rightParam.getRequired() ? "required" : "not required"));
424424
}
425425
if (changeDescription) {
426426
li.withText(" Notes ")

0 commit comments

Comments
 (0)