Fix problems when schema of type array

Author: quen2404

src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/ArraySchemaDiffResult.java

@@ -22,6 +22,9 @@ public ArraySchemaDiffResult(OpenApiDiff openApiDiff) {
     public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftComponents, Components rightComponents, Schema left, Schema right, DiffContext context) {
         ArraySchema leftArraySchema = (ArraySchema) left;
         ArraySchema rightArraySchema = (ArraySchema) right;
-        return openApiDiff.getSchemaDiff().diff(refSet, leftArraySchema.getItems(), rightArraySchema.getItems(), context.copyWithRequired(true));
+        super.diff(refSet, leftComponents, rightComponents, left, right, context);
+        openApiDiff.getSchemaDiff().diff(refSet, leftArraySchema.getItems(), rightArraySchema.getItems(), context.copyWithRequired(true))
+                .ifPresent(changedSchema::setChangedItems);
+        return isApplicable(context);
     }
 }

src/main/java/com/qdesrame/openapi/diff/compare/schemadiffresult/SchemaDiffResult.java

@@ -62,6 +62,14 @@ public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftCompo
 
         changedSchema.getIncreasedProperties().putAll(filterProperties(propertyDiff.getIncreased(), context));
         changedSchema.getMissingProperties().putAll(filterProperties(propertyDiff.getMissing(), context));
+        return isApplicable(context);
+    }
+
+    protected Optional<ChangedSchema> isApplicable(DiffContext context) {
+        if (changedSchema.getChangedReadOnly().isUnchanged() && changedSchema.getChangedWriteOnly().isUnchanged()
+                && !isPropertyApplicable(changedSchema.getNewSchema(), context)) {
+            return Optional.empty();
+        }
         return isChanged(changedSchema);
     }
 

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

@@ -37,6 +37,7 @@ public class ChangedSchema implements Changed {
     protected boolean changedType;
     protected boolean changedMaxLength;
     protected boolean discriminatorPropertyChanged;
+    protected ChangedSchema changedItems;
     protected ChangedOneOfSchema changedOneOfSchema;
     protected ChangedSchema addPropChangedSchema;
     protected ChangedExtensions changedExtensions;
@@ -56,7 +57,7 @@ public DiffResult isChanged() {
                 && changedProperties.values().size() == 0 && !changeDeprecated
                 && (changeRequired == null || changeRequired.isUnchanged()) && !discriminatorPropertyChanged
                 && ChangedUtils.isUnchanged(addPropChangedSchema) && ChangedUtils.isUnchanged(changedOneOfSchema)
-                && ChangedUtils.isUnchanged(changedExtensions)) {
+                && ChangedUtils.isUnchanged(changedItems) && ChangedUtils.isUnchanged(changedExtensions)) {
             return DiffResult.NO_CHANGES;
         }
         boolean backwardCompatibleForRequest = (changeEnum == null || changeEnum.getMissing().isEmpty()) &&
@@ -76,7 +77,7 @@ public DiffResult isChanged() {
                 && !changedType && !discriminatorPropertyChanged && ChangedUtils.isCompatible(changedOneOfSchema)
                 && ChangedUtils.isCompatible(addPropChangedSchema)
                 && changedProperties.values().stream().allMatch(Changed::isCompatible)
-                && ChangedUtils.isCompatible(changedExtensions)) {
+                && ChangedUtils.isCompatible(changedItems) && ChangedUtils.isCompatible(changedExtensions)) {
             return DiffResult.COMPATIBLE;
         }
 

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

@@ -15,7 +15,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -234,6 +233,9 @@ protected String schema(int deepness, ChangedSchema schema) {
             sb.append(required(deepness, "New required properties", schema.getChangeRequired().getIncreased()));
             sb.append(required(deepness, "New optional properties", schema.getChangeRequired().getMissing()));
         }
+        if (schema.getChangedItems() != null) {
+            sb.append(items(deepness, schema.getChangedItems()));
+        }
         sb.append(listDiff(deepness, "enum", schema.getChangeEnum()));
         sb.append(properties(deepness, "Added property", schema.getIncreasedProperties(), true, schema.getContext()));
         sb.append(properties(deepness, "Deleted property", schema.getMissingProperties(), false, schema.getContext()));
@@ -271,14 +273,27 @@ protected String schema(int deepness, Schema schema, DiffContext context) {
         return sb.toString();
     }
 
-    protected String items(int deepness, Schema schema, DiffContext context) {
+    protected String items(int deepness, ChangedSchema schema) {
         StringBuilder sb = new StringBuilder("");
-        sb.append(format("%sItems (%s)%s\n", indent(deepness), type(schema), Arrays.asList("object", "array").contains(type(schema)) ? " :\n" : ""));
-        description(indent(deepness + 1), schema.getDescription());
-        sb.append(schema(deepness, schema, context));
+        String type = type(schema.getNewSchema());
+        if (schema.isChangedType()) {
+            type = type(schema.getOldSchema()) + " -> " + type(schema.getNewSchema());
+        }
+        sb.append(items(deepness, "Changed items", type, schema.getNewSchema().getDescription()));
+        sb.append(schema(deepness, schema));
         return sb.toString();
     }
 
+    protected String items(int deepness, Schema schema, DiffContext context) {
+        return items(deepness, "Items", type(schema), schema.getDescription()) +
+                schema(deepness, schema, context);
+    }
+
+    protected String items(int deepness, String title, String type, String description) {
+        return format("%s%s (%s):" +
+                "\n%s\n", indent(deepness), title, type, description(indent(deepness + 1), description));
+    }
+
     protected String properties(final int deepness, String title, Map<String, Schema> properties, boolean showContent, DiffContext context) {
         StringBuilder sb = new StringBuilder("");
         if (properties != null) {