Merge branch 'master' into swagger-snapshot

# Conflicts:
#	pom.xml

Author: quen2404

README.md

@@ -22,7 +22,7 @@ Available on [Maven Central](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%2
 <dependency>
     <groupId>com.qdesrame</groupId>
     <artifactId>openapi-diff</artifactId>
-    <version>1.1.1</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 
@@ -47,6 +47,8 @@ usage: openapi-diff <old> <new>
                                 output in file
     --off                       No information printed
     --query <property=value>    use query param for authorisation
+    --state                     Only output diff state: no_changes,
+                                incompatible, compatible
     --trace                     be extra verbose
     --version                   print the version information and exit
     --warn                      Print warning information

pom.xml

@@ -9,7 +9,7 @@
 
     <groupId>com.qdesrame</groupId>
     <artifactId>openapi-diff</artifactId>
-    <version>1.1.2-SNAPSHOT</version>
+    <version>1.2.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>openapi-diff</name>

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

@@ -23,6 +23,7 @@ public static void main(String... args) {
         Options options = new Options();
         options.addOption(Option.builder("h").longOpt("help").desc("print this message").build());
         options.addOption(Option.builder().longOpt("version").desc("print the version information and exit").build());
+        options.addOption(Option.builder().longOpt("state").desc("Only output diff state: no_changes, incompatible, compatible").build());
         options.addOption(Option.builder().longOpt("trace").desc("be extra verbose").build());
         options.addOption(Option.builder().longOpt("debug").desc("Print debugging information").build());
         options.addOption(Option.builder().longOpt("info").desc("Print additional information").build());
@@ -81,6 +82,9 @@ public static void main(String... args) {
                                     logLevel));
                 }
             }
+            if (line.hasOption("state")) {
+                logLevel = "OFF";
+            }
             LogManager.getRootLogger().setLevel(Level.toLevel(logLevel));
 
             if (line.getArgList().size() < 2) {
@@ -126,7 +130,12 @@ public static void main(String... args) {
                     System.exit(2);
                 }
             }
-            System.exit(result.isDiff() ? 1 : 0);
+            if (line.hasOption("state")) {
+                System.out.println(result.isDiff() ? result.isDiffBackwardCompatible() ? "compatible" : "incompatible" : "no_changes");
+                System.exit(0);
+            } else {
+                System.exit(result.isDiff() ? 1 : 0);
+            }
         } catch (ParseException e) {
             // oops, something went wrong
             System.err.println("Parsing failed. Reason: " + e.getMessage());

src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java

@@ -236,16 +236,9 @@ private String schema(int deepness, ComposedSchema schema) {
         if (schema.getAllOf() != null && schema.getAllOf() != null) {
             LOGGER.debug("All of schema");
             schema.getAllOf().stream()
-                    .map(schema1 -> refPointer.resolveRef(diff.getNewSpecOpenApi().getComponents(), schema1, schema1.get$ref()))
+                    .map(this::resolve)
                     .forEach(composedChild -> sb.append(schema(deepness, composedChild)));
         }
-//        if (schema.getOneOf() != null && schema.getOneOf() != null) {
-//            LOGGER.debug("One of schema");
-//            sb.append(format("%sOne of:\n\n", indent(deepness)));
-//            schema.getOneOf().stream()
-//                    .map(schema1 -> refPointer.resolveRef(diff.getNewSpecOpenApi().getComponents(), schema1, schema1.get$ref()))
-//                    .forEach(composedChild -> sb.append(schema(deepness + 1, composedChild)));
-//        }
         return sb.toString();
     }
 
@@ -256,7 +249,7 @@ private String schema(int deepness, Schema schema) {
         if (schema instanceof ComposedSchema) {
             sb.append(schema(deepness, (ComposedSchema) schema));
         } else if (schema instanceof ArraySchema) {
-            sb.append(items(deepness, ((ArraySchema) schema).getItems()));
+            sb.append(items(deepness, resolve(((ArraySchema) schema).getItems())));
         }
         return sb.toString();
     }
@@ -273,9 +266,9 @@ private String properties(final int deepness, String title, Map<String, Schema>
         StringBuilder sb = new StringBuilder("");
         if (properties != null) {
             properties.forEach((key, value) -> {
-                sb.append(property(deepness, title, key, value));
+                sb.append(property(deepness, title, key, resolve(value)));
                 if (showContent) {
-                    sb.append(schema(deepness + 1, value));
+                    sb.append(schema(deepness + 1, resolve(value)));
                 }
             });
         }
@@ -386,4 +379,8 @@ private String indent(int deepness) {
         }
         return sb.toString();
     }
+
+    private Schema resolve(Schema schema) {
+        return refPointer.resolveRef(diff.getNewSpecOpenApi().getComponents(), schema, schema.get$ref());
+    }
 }