Update one of diff with reference resolution in discriminator

quen2404 · quen2404 · commit c034cfca661c · 2018-04-23T13:55:45.000+02:00
diff --git a/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java b/src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ComposedSchemaDiffResult.java
@@ -31,7 +31,7 @@ public ComposedSchemaDiffResult(OpenApiDiff openApiDiff) {
 
     @Override
     public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftComponents, Components rightComponents, Schema left, Schema right, DiffContext context) {
-        if(left instanceof ComposedSchema) {
+        if (left instanceof ComposedSchema) {
             ComposedSchema leftComposedSchema = (ComposedSchema) left;
             ComposedSchema rightComposedSchema = (ComposedSchema) right;
             if (CollectionUtils.isNotEmpty(leftComposedSchema.getOneOf())
@@ -53,7 +53,8 @@ public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftCompo
                 Map<String, String> rightMapping = getMapping(rightComposedSchema);
 
                 ChangedOneOfSchema changedOneOfSchema = new ChangedOneOfSchema(leftMapping, rightMapping, context);
-                MapKeyDiff<String, String> mappingDiff = MapKeyDiff.diff(leftMapping, rightMapping);
+                MapKeyDiff<String, Schema> mappingDiff = MapKeyDiff.diff(getSchema(leftComponents, leftMapping),
+                        getSchema(rightComponents, rightMapping));
                 changedOneOfSchema.setIncreasedMapping(mappingDiff.getIncreased());
                 changedOneOfSchema.setMissingMapping(mappingDiff.getMissing());
 
@@ -76,6 +77,12 @@ public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftCompo
         }
     }
 
+    private Map<String, Schema> getSchema(Components components, Map<String, String> mapping) {
+        Map<String, Schema> result = new HashMap<>();
+        mapping.forEach((key, value) -> result.put(key, refPointer.resolveRef(components, new Schema(), value)));
+        return result;
+    }
+
     private Map<String, String> getMapping(ComposedSchema composedSchema) {
         Map<String, String> reverseMapping = new HashMap<>();
         for (Schema schema : composedSchema.getOneOf()) {
diff --git a/src/main/java/com/qdesrame/openapi/diff/model/ChangedOneOfSchema.java b/src/main/java/com/qdesrame/openapi/diff/model/ChangedOneOfSchema.java
@@ -1,5 +1,6 @@
 package com.qdesrame.openapi.diff.model;
 
+import io.swagger.v3.oas.models.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -15,8 +16,8 @@ public class ChangedOneOfSchema implements Changed {
     private final Map<String, String> newMapping;
     private final DiffContext context;
 
-    private Map<String, String> increasedMapping;
-    private Map<String, String> missingMapping;
+    private Map<String, Schema> increasedMapping;
+    private Map<String, Schema> missingMapping;
     private Map<String, ChangedSchema> changedMapping;
 
     public ChangedOneOfSchema(Map<String, String> oldMapping, Map<String, String> newMapping, DiffContext context) {
diff --git a/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java b/src/main/java/com/qdesrame/openapi/diff/output/MarkdownRender.java
@@ -239,6 +239,13 @@ private String schema(int deepness, ComposedSchema schema) {
                     .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(this::resolve)
+                    .forEach(composedChild -> sb.append(schema(deepness + 1, composedChild)));
+        }
         return sb.toString();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -239,6 +239,13 @@ private String schema(int deepness, ComposedSchema schema) {`
`239`	`239`	`.map(this::resolve)`
`240`	`240`	`.forEach(composedChild -> sb.append(schema(deepness, composedChild)));`
`241`	`241`	`}`
	`242`	`+ if (schema.getOneOf() != null && schema.getOneOf() != null) {`
	`243`	`+ LOGGER.debug("One of schema");`
	`244`	`+ sb.append(format("%sOne of:\n\n", indent(deepness)));`
	`245`	`+ schema.getOneOf().stream()`
	`246`	`+ .map(this::resolve)`
	`247`	`+ .forEach(composedChild -> sb.append(schema(deepness + 1, composedChild)));`
	`248`	`+ }`
`242`	`249`	`return sb.toString();`
`243`	`250`	`}`
`244`	`251`