Extension are now supported by PathItem, Operation, Parameter & Request Body

Author: quen2404

src/main/java/com/qdesrame/openapi/diff/compare/OperationDiff.java

@@ -49,6 +49,9 @@ public Optional<ChangedOperation> diff(Operation oldOperation, Operation newOper
                     .ifPresent(changedOperation::setChangedSecurityRequirements);
         }
 
+        openApiDiff.getExtensionsDiff().diff(oldOperation.getExtensions(), newOperation.getExtensions(), context)
+                .ifPresent(changedOperation::setChangedExtensions);
+
         return isChanged(changedOperation);
     }
 

src/main/java/com/qdesrame/openapi/diff/compare/ParameterDiff.java

@@ -52,7 +52,8 @@ protected Optional<ChangedParameter> computeDiff(HashSet<String> refSet, Paramet
         }
         openApiDiff.getContentDiff().diff(left.getContent(), right.getContent(), context)
                 .ifPresent(changedParameter::setChangedContent);
-
+        openApiDiff.getExtensionsDiff().diff(left.getExtensions(), right.getExtensions(), context)
+                .ifPresent(changedParameter::setChangedExtensions);
         return isChanged(changedParameter);
     }
 

src/main/java/com/qdesrame/openapi/diff/compare/PathDiff.java

@@ -33,6 +33,8 @@ public Optional<ChangedPath> diff(PathItem left, PathItem right, DiffContext con
             Operation newOperation = newOperationMap.get(method);
             openApiDiff.getOperationDiff().diff(oldOperation, newOperation, context.copyWithMethod(method)).ifPresent(changedPath.getChanged()::add);
         }
+        openApiDiff.getExtensionsDiff().diff(left.getExtensions(), right.getExtensions(), context)
+                .ifPresent(changedPath::setChangedExtensions);
         return isChanged(changedPath);
     }
 }

src/main/java/com/qdesrame/openapi/diff/compare/RequestBodyDiff.java

@@ -8,10 +8,12 @@
 import io.swagger.v3.oas.models.parameters.RequestBody;
 
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
 
 import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
+import static java.util.Optional.ofNullable;
 
 /**
  * Created by adarsh.sharma on 28/12/17.
@@ -30,6 +32,10 @@ public Optional<ChangedRequestBody> diff(RequestBody left, RequestBody right, Di
         return cachedDiff(new HashSet<>(), left, right, leftRef, rightRef, context);
     }
 
+    private static Map<String, Object> getExtensions(RequestBody body) {
+        return ofNullable(body).map(RequestBody::getExtensions).orElse(null);
+    }
+
     @Override
     protected Optional<ChangedRequestBody> computeDiff(HashSet<String> refSet, RequestBody left, RequestBody right, DiffContext context) {
         Content oldRequestContent = new Content();
@@ -59,6 +65,8 @@ protected Optional<ChangedRequestBody> computeDiff(HashSet<String> refSet, Reque
         changedRequestBody.setChangeDescription(!Objects.equals(leftDescription, rightDescription));
 
         openApiDiff.getContentDiff().diff(oldRequestContent, newRequestContent, context).ifPresent(changedRequestBody::setChangedContent);
+        openApiDiff.getExtensionsDiff().diff(getExtensions(left), getExtensions(right), context)
+                .ifPresent(changedRequestBody::setChangedExtensions);
 
         return isChanged(changedRequestBody);
     }

src/main/java/com/qdesrame/openapi/diff/model/ChangedOperation.java

@@ -1,5 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
+import com.qdesrame.openapi.diff.model.schema.ChangedExtensions;
+import com.qdesrame.openapi.diff.utils.ChangedUtils;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import lombok.Getter;
@@ -18,6 +20,7 @@ public class ChangedOperation implements Changed {
     private ChangedRequestBody changedRequestBody;
     private ChangedApiResponse changedApiResponse;
     private ChangedSecurityRequirements changedSecurityRequirements;
+    private ChangedExtensions changedExtensions;
 
     public ChangedOperation(String pathUrl, PathItem.HttpMethod httpMethod, Operation oldOperation, Operation newOperation) {
         this.httpMethod = httpMethod;
@@ -30,11 +33,13 @@ public ChangedOperation(String pathUrl, PathItem.HttpMethod httpMethod, Operatio
     public DiffResult isChanged() {
         //TODO BETTER HANDLING FOR DEPRECIATION
         if (!deprecated && isChangedParam().isUnchanged() && isChangedRequest().isUnchanged()
-                && isChangedResponse().isUnchanged() && isChangedSecurity().isUnchanged()) {
+                && isChangedResponse().isUnchanged() && isChangedSecurity().isUnchanged()
+                && ChangedUtils.isUnchanged(changedExtensions)) {
             return DiffResult.NO_CHANGES;
         }
         if (isChangedParam().isCompatible() && isChangedRequest().isCompatible()
-                && isChangedResponse().isCompatible() && isChangedSecurity().isCompatible()) {
+                && isChangedResponse().isCompatible() && isChangedSecurity().isCompatible()
+                && ChangedUtils.isCompatible(changedExtensions)) {
             return DiffResult.COMPATIBLE;
         }
         return DiffResult.INCOMPATIBLE;

src/main/java/com/qdesrame/openapi/diff/model/ChangedParameter.java

@@ -1,5 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
+import com.qdesrame.openapi.diff.model.schema.ChangedExtensions;
+import com.qdesrame.openapi.diff.utils.ChangedUtils;
 import io.swagger.v3.oas.models.parameters.Parameter;
 import lombok.Getter;
 import lombok.Setter;
@@ -22,6 +24,7 @@ public class ChangedParameter implements Changed {
     private boolean changeAllowEmptyValue;
     private ChangedSchema changedSchema;
     private ChangedContent changedContent;
+    private ChangedExtensions changedExtensions;
 
     public ChangedParameter(String name, String in, DiffContext context) {
         this.name = name;
@@ -37,16 +40,18 @@ public DiffResult isChanged() {
                 && !changeAllowEmptyValue
                 && !changeStyle
                 && !changeExplode
-                && (changedSchema == null || changedSchema.isUnchanged())
-                && (changedContent == null || changedContent.isUnchanged())) {
+                && ChangedUtils.isUnchanged(changedSchema)
+                && ChangedUtils.isUnchanged(changedContent)
+                && ChangedUtils.isUnchanged(changedExtensions)) {
             return DiffResult.NO_CHANGES;
         }
         if ((!changeRequired || Boolean.TRUE.equals(oldParameter.getRequired()))
                 && (!changeAllowEmptyValue || Boolean.TRUE.equals(newParameter.getAllowEmptyValue()))
                 && !changeStyle
                 && !changeExplode
-                && (changedSchema == null || changedSchema.isCompatible())
-                && (changedContent == null || changedContent.isCompatible())) {
+                && ChangedUtils.isCompatible(changedSchema)
+                && ChangedUtils.isCompatible(changedContent)
+                && ChangedUtils.isCompatible(changedExtensions)) {
             return DiffResult.COMPATIBLE;
         }
         return DiffResult.INCOMPATIBLE;

src/main/java/com/qdesrame/openapi/diff/model/ChangedPath.java

@@ -1,5 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
+import com.qdesrame.openapi.diff.model.schema.ChangedExtensions;
+import com.qdesrame.openapi.diff.utils.ChangedUtils;
 import io.swagger.v3.oas.models.Operation;
 import io.swagger.v3.oas.models.PathItem;
 import lombok.Getter;
@@ -21,6 +23,7 @@ public class ChangedPath implements Changed {
     Map<PathItem.HttpMethod, Operation> increased;
     Map<PathItem.HttpMethod, Operation> missing;
     List<ChangedOperation> changed;
+    private ChangedExtensions changedExtensions;
 
     public ChangedPath(String pathUrl, PathItem oldPath, PathItem newPath, DiffContext context) {
         this.pathUrl = pathUrl;
@@ -34,10 +37,11 @@ public ChangedPath(String pathUrl, PathItem oldPath, PathItem newPath, DiffConte
 
     @Override
     public DiffResult isChanged() {
-        if (increased.isEmpty() && missing.isEmpty() && changed.isEmpty()) {
+        if (increased.isEmpty() && missing.isEmpty() && changed.isEmpty() && ChangedUtils.isUnchanged(changedExtensions)) {
             return DiffResult.NO_CHANGES;
         }
-        if (missing.isEmpty() && changed.stream().allMatch(Changed::isCompatible)) {
+        if (missing.isEmpty() && changed.stream().allMatch(Changed::isCompatible)
+                && ChangedUtils.isCompatible(changedExtensions)) {
             return DiffResult.COMPATIBLE;
         }
         return DiffResult.INCOMPATIBLE;

src/main/java/com/qdesrame/openapi/diff/model/ChangedRequestBody.java

@@ -1,5 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
+import com.qdesrame.openapi.diff.model.schema.ChangedExtensions;
+import com.qdesrame.openapi.diff.utils.ChangedUtils;
 import io.swagger.v3.oas.models.parameters.RequestBody;
 import lombok.Getter;
 import lombok.Setter;
@@ -17,6 +19,7 @@ public class ChangedRequestBody implements Changed {
     private boolean changeDescription;
     private boolean changeRequired;
     private ChangedContent changedContent;
+    private ChangedExtensions changedExtensions;
 
     public ChangedRequestBody(RequestBody oldRequestBody, RequestBody newRequestBody, DiffContext context) {
         this.oldRequestBody = oldRequestBody;
@@ -26,10 +29,14 @@ public ChangedRequestBody(RequestBody oldRequestBody, RequestBody newRequestBody
 
     @Override
     public DiffResult isChanged() {
-        if (!changeDescription && !changeRequired && (changedContent == null || changedContent.isUnchanged())) {
+        if (!changeDescription && !changeRequired
+                && ChangedUtils.isUnchanged(changedContent)
+                && ChangedUtils.isUnchanged(changedExtensions)) {
             return DiffResult.NO_CHANGES;
         }
-        if (!changeRequired && (changedContent == null || changedContent.isCompatible())) {
+        if (!changeRequired
+                && ChangedUtils.isCompatible(changedContent)
+                && ChangedUtils.isCompatible(changedExtensions)) {
             return DiffResult.COMPATIBLE;
         }
         return DiffResult.INCOMPATIBLE;