Merge pull request #735 from OpenAPITools/fix-sonar-issues

Fix sonar issues to pass quality gate
OpenAPITools · Jan 30, 2025 · 49eaec9 · 49eaec9
2 parents ebab734 + d2e50d6
commit 49eaec9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 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
@@ -114,7 +114,9 @@ public boolean pathUnchangedParametersChanged(
       boolean samePathDifferentParameter = !newParameterRealized.equals(parameter);
       newParameterRealized.setName(
           newParameterName); // Important:: MUST Reset the name as this is not a copy
-      return samePathDifferentParameter;
+      if (samePathDifferentParameter) {
+        return true;
+      }
     }
     return false;
   }

diff --git a/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedNumericRange.java b/core/src/main/java/org/openapitools/openapidiff/core/model/schema/ChangedNumericRange.java
@@ -1,5 +1,6 @@
 package org.openapitools.openapidiff.core.model.schema;
 
+import static org.apache.commons.lang3.BooleanUtils.isTrue;
 import static org.openapitools.openapidiff.core.model.BackwardIncompatibleProp.REQUEST_NUMERIC_RANGE_DECREASED;
 import static org.openapitools.openapidiff.core.model.BackwardIncompatibleProp.RESPONSE_NUMERIC_RANGE_INCREASED;
 
@@ -34,10 +35,10 @@ public DiffResult isChanged() {
       return DiffResult.COMPATIBLE;
     }
 
-    boolean exclusiveMaxOld = oldMaximumExclusiveValue != null && oldMaximumExclusiveValue;
-    boolean exclusiveMinOld = oldMinimumExclusiveValue != null && oldMinimumExclusiveValue;
-    boolean exclusiveMaxNew = newMaximumExclusiveValue != null && newMaximumExclusiveValue;
-    boolean exclusiveMinNew = newMinimumExclusiveValue != null && newMinimumExclusiveValue;
+    boolean exclusiveMaxOld = isTrue(oldMaximumExclusiveValue);
+    boolean exclusiveMinOld = isTrue(oldMinimumExclusiveValue);
+    boolean exclusiveMaxNew = isTrue(newMaximumExclusiveValue);
+    boolean exclusiveMinNew = isTrue(newMinimumExclusiveValue);
     int diffMax = compare(oldMaximumValue, newMaximumValue, false);
     int diffMin = compare(oldMinimumValue, newMinimumValue, true);