change shit

Author: gsdatta

README.md

@@ -76,7 +76,6 @@ usage: openapi-diff <old> <new>
     --query <property=value>    use query param for authorisation
     --state                     Only output diff state: no_changes,
                                 incompatible, compatible
-    --fail-on-incompatible      Fail only if API changes broke backward compatibility
     --trace                     be extra verbose
     --version                   print the version information and exit
     --warn                      Print warning information

build.gradle

@@ -0,0 +1,9 @@
+dependencies {
+    implementation 'io.swagger.parser.v3:swagger-parser-v3:2.0.13'
+    implementation 'com.j2html:j2html:1.2.0'
+    implementation 'org.apache.commons:commons-collections4:4.4'
+    implementation 'commons-cli:commons-cli:1.4'
+    implementation 'commons-httpclient:commons-httpclient:3.1'
+
+    testImplementation 'org.assertj:assertj-core:3.13.2'
+}

src/main/java/com/qdesrame/openapi/diff/OpenApiCompare.java

@@ -6,6 +6,7 @@
 import io.swagger.v3.parser.OpenAPIV3Parser;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
 import io.swagger.v3.parser.core.models.ParseOptions;
+
 import java.io.File;
 import java.util.List;
 

src/main/java/com/qdesrame/openapi/diff/compare/ApiResponseDiff.kt

@@ -0,0 +1,35 @@
+package com.qdesrame.openapi.diff.compare
+
+import com.qdesrame.openapi.diff.model.ChangedApiResponse
+import com.qdesrame.openapi.diff.model.ChangedExtensions
+import com.qdesrame.openapi.diff.model.ChangedResponse
+import com.qdesrame.openapi.diff.model.DiffContext
+import com.qdesrame.openapi.diff.utils.ChangedUtils
+import io.swagger.v3.oas.models.responses.ApiResponses
+import java.util.Optional
+
+/** Created by adarsh.sharma on 04/01/18.  */
+class ApiResponseDiff(private val openApiDiff: OpenApiDiff) {
+    fun diff(left: ApiResponses?, right: ApiResponses?, context: DiffContext): Optional<ChangedApiResponse> {
+        val responseMapKeyDiff = MapKeyDiff.diff(left, right)
+        val sharedResponseCodes = responseMapKeyDiff.sharedKey
+        val resps: MutableMap<String, ChangedResponse> = mutableMapOf()
+
+        for (responseCode in sharedResponseCodes) {
+            openApiDiff
+                    .responseDiff
+                    .diff(left?.get(responseCode), right?.get(responseCode), context)
+                    .ifPresent { changedResponse: ChangedResponse -> resps[responseCode] = changedResponse }
+        }
+        val changedApiResponse = ChangedApiResponse(left, right, context)
+                .setIncreased(responseMapKeyDiff.increased)
+                .setMissing(responseMapKeyDiff.missing)
+                .setChanged(resps)
+
+        openApiDiff
+                .extensionsDiff
+                .diff(left?.extensions, right?.extensions, context)
+                .ifPresent { extensions: ChangedExtensions? -> changedApiResponse.extensions = extensions }
+        return ChangedUtils.isChanged(changedApiResponse)
+    }
+}

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

@@ -1,11 +1,9 @@
 package com.qdesrame.openapi.diff.compare;
 
 import com.qdesrame.openapi.diff.model.DiffContext;
-import lombok.Getter;
 import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.apache.commons.lang3.builder.HashCodeBuilder;
 
-@Getter
 public final class CacheKey {
   private final String left;
   private final String right;
@@ -36,4 +34,16 @@ public boolean equals(Object o) {
   public int hashCode() {
     return new HashCodeBuilder(17, 37).append(left).append(right).append(context).toHashCode();
   }
+
+    public String getLeft() {
+        return this.left;
+    }
+
+    public String getRight() {
+        return this.right;
+    }
+
+    public DiffContext getContext() {
+        return this.context;
+    }
 }

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

@@ -1,14 +1,19 @@
 package com.qdesrame.openapi.diff.compare;
 
-import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
-import static com.qdesrame.openapi.diff.utils.ChangedUtils.isUnchanged;
-
 import com.qdesrame.openapi.diff.model.ChangedContent;
 import com.qdesrame.openapi.diff.model.ChangedMediaType;
 import com.qdesrame.openapi.diff.model.DiffContext;
 import io.swagger.v3.oas.models.media.Content;
 import io.swagger.v3.oas.models.media.MediaType;
-import java.util.*;
+
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+
+import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
+import static com.qdesrame.openapi.diff.utils.ChangedUtils.isUnchanged;
 
 public class ContentDiff implements Comparable<Content> {
 

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

@@ -1,15 +1,20 @@
 package com.qdesrame.openapi.diff.compare;
 
-import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
-import static com.qdesrame.openapi.diff.utils.Copy.copyMap;
-
 import com.qdesrame.openapi.diff.model.Change;
 import com.qdesrame.openapi.diff.model.Changed;
 import com.qdesrame.openapi.diff.model.ChangedExtensions;
 import com.qdesrame.openapi.diff.model.DiffContext;
-import java.util.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.ServiceLoader;
 import java.util.function.Function;
 
+import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
+import static com.qdesrame.openapi.diff.utils.Copy.copyMap;
+
 public class ExtensionsDiff {
   private final OpenApiDiff openApiDiff;
 

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

@@ -1,17 +1,18 @@
 package com.qdesrame.openapi.diff.compare;
 
-import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
-
 import com.qdesrame.openapi.diff.model.ChangedHeader;
 import com.qdesrame.openapi.diff.model.DiffContext;
 import com.qdesrame.openapi.diff.utils.RefPointer;
 import com.qdesrame.openapi.diff.utils.RefType;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.headers.Header;
+
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Optional;
 
+import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
+
 /** Created by adarsh.sharma on 28/12/17. */
 public class HeaderDiff extends ReferenceDiffCache<Header, ChangedHeader> {
   private static RefPointer<Header> refPointer = new RefPointer<>(RefType.HEADERS);

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

@@ -1,16 +1,17 @@
 package com.qdesrame.openapi.diff.compare;
 
-import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
-
 import com.qdesrame.openapi.diff.model.ChangedHeader;
 import com.qdesrame.openapi.diff.model.ChangedHeaders;
 import com.qdesrame.openapi.diff.model.DiffContext;
 import io.swagger.v3.oas.models.headers.Header;
+
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 
+import static com.qdesrame.openapi.diff.utils.ChangedUtils.isChanged;
+
 /** Created by adarsh.sharma on 28/12/17. */
 public class HeadersDiff {
   private OpenApiDiff openApiDiff;

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

@@ -1,9 +1,7 @@
 package com.qdesrame.openapi.diff.compare;
 
 import com.qdesrame.openapi.diff.model.ChangedList;
-import lombok.Getter;
 
-@Getter
 public class ListDiff {
 
   public static <K extends ChangedList<X>, X> K diff(K instance) {