Add changed classes for read/write only attributes

Author: quen2404

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

@@ -89,23 +89,7 @@ protected Optional<ChangedSchema> computeDiff(HashSet<String> refSet, Schema lef
 
         //If schema type is same then get specific SchemaDiffResult and compare the properties
         SchemaDiffResult result = SchemaDiff.getSchemaDiffResult(right.getClass(), openApiDiff);
-        Optional<ChangedSchema> schema = result.diff(refSet, leftComponents, rightComponents, left, right, context);
-        if (schema.isPresent()) {
-            if (context.isResponse()) {
-                if (Boolean.TRUE.equals(schema.get().getNewSchema().getWriteOnly())) {
-                    if (!schema.get().isChangeWriteOnly()) {
-                        schema = Optional.empty();
-                    }
-                }
-            } else if (context.isRequest()) {
-                if (Boolean.TRUE.equals(schema.get().getNewSchema().getReadOnly())) {
-                    if (!schema.get().isChangeReadOnly()) {
-                        schema = Optional.empty();
-                    }
-                }
-            }
-        }
-        return schema;
+        return result.diff(refSet, leftComponents, rightComponents, left, right, context);
     }
 
     protected static Schema resolveComposedSchema(Components components, Schema schema) {

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

@@ -5,6 +5,8 @@
 import com.qdesrame.openapi.diff.model.ChangedSchema;
 import com.qdesrame.openapi.diff.model.DiffContext;
 import com.qdesrame.openapi.diff.model.ListDiff;
+import com.qdesrame.openapi.diff.model.schema.ChangedReadOnly;
+import com.qdesrame.openapi.diff.model.schema.ChangedWriteOnly;
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.media.Schema;
 import lombok.Getter;
@@ -42,8 +44,8 @@ public Optional<ChangedSchema> diff(HashSet<String> refSet, Components leftCompo
         changedSchema.setChangeDefault(!Objects.equals(left.getDefault(), right.getDefault()));
         changedSchema.setChangeEnum(ListDiff.diff(left.getEnum(), right.getEnum()));
         changedSchema.setChangeFormat(!Objects.equals(left.getFormat(), right.getFormat()));
-        changedSchema.setChangeReadOnly(!Boolean.TRUE.equals(left.getReadOnly()) && Boolean.TRUE.equals(right.getReadOnly()));
-        changedSchema.setChangeWriteOnly(!Boolean.TRUE.equals(left.getWriteOnly()) && Boolean.TRUE.equals(right.getWriteOnly()));
+        changedSchema.setChangedReadOnly(new ChangedReadOnly(context, left.getReadOnly(), right.getReadOnly()));
+        changedSchema.setChangedWriteOnly(new ChangedWriteOnly(context, left.getWriteOnly(), right.getWriteOnly()));
         changedSchema.setChangedMaxLength(!Objects.equals(left.getMaxLength(), right.getMaxLength()));
 
         Map<String, Schema> leftProperties = null == left ? null : left.getProperties();

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

@@ -1,5 +1,7 @@
 package com.qdesrame.openapi.diff.model;
 
+import com.qdesrame.openapi.diff.model.schema.ChangedReadOnly;
+import com.qdesrame.openapi.diff.model.schema.ChangedWriteOnly;
 import com.qdesrame.openapi.diff.utils.ChangedUtils;
 import io.swagger.v3.oas.models.media.Schema;
 import lombok.Getter;
@@ -29,8 +31,8 @@ public class ChangedSchema implements Changed {
     protected boolean changeDefault;
     protected ListDiff changeEnum;
     protected boolean changeFormat;
-    protected boolean changeReadOnly;
-    protected boolean changeWriteOnly;
+    protected ChangedReadOnly changedReadOnly;
+    protected ChangedWriteOnly changedWriteOnly;
     protected boolean changedType;
     protected boolean changedMaxLength;
     protected boolean discriminatorPropertyChanged;
@@ -46,8 +48,8 @@ public ChangedSchema() {
     @Override
     public DiffResult isChanged() {
         if (!changedType && (oldSchema == null && newSchema == null || oldSchema != null && newSchema != null)
-                && !changeWriteOnly && !changedMaxLength && !changeReadOnly
-                && (changeEnum == null || changeEnum.isUnchanged())
+                && ChangedUtils.isUnchanged(changedWriteOnly) && ChangedUtils.isUnchanged(changedReadOnly)
+                && !changedMaxLength && (changeEnum == null || changeEnum.isUnchanged())
                 && !changeFormat && increasedProperties.size() == 0 && missingProperties.size() == 0
                 && changedProperties.values().size() == 0 && !changeDeprecated
                 && (changeRequired == null || changeRequired.isUnchanged()) && !discriminatorPropertyChanged

src/main/java/com/qdesrame/openapi/diff/model/schema/ChangedReadOnly.java

@@ -0,0 +1,40 @@
+package com.qdesrame.openapi.diff.model.schema;
+
+import com.qdesrame.openapi.diff.model.Changed;
+import com.qdesrame.openapi.diff.model.DiffContext;
+import com.qdesrame.openapi.diff.model.DiffResult;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public class ChangedReadOnly implements Changed {
+    private final DiffContext context;
+    private final boolean oldValue;
+    private final boolean newValue;
+//    private final boolean required;
+
+    public ChangedReadOnly(DiffContext context, Boolean oldValue, Boolean newValue) {
+        this.context = context;
+        this.oldValue = Optional.ofNullable(oldValue).orElse(false);
+        this.newValue = Optional.ofNullable(newValue).orElse(false);
+//        this.required = required;
+    }
+
+    @Override
+    public DiffResult isChanged() {
+        if (Objects.equals(oldValue, newValue)) {
+            return DiffResult.NO_CHANGES;
+        }
+        if (context.isResponse()) {
+            return DiffResult.COMPATIBLE;
+        }
+        if (context.isRequest()) {
+            if (Boolean.TRUE.equals(newValue)) {
+                return DiffResult.COMPATIBLE;
+            } else {
+                return DiffResult.INCOMPATIBLE;
+            }
+        }
+        return DiffResult.UNKNOWN;
+    }
+}

src/main/java/com/qdesrame/openapi/diff/model/schema/ChangedWriteOnly.java

@@ -0,0 +1,40 @@
+package com.qdesrame.openapi.diff.model.schema;
+
+import com.qdesrame.openapi.diff.model.Changed;
+import com.qdesrame.openapi.diff.model.DiffContext;
+import com.qdesrame.openapi.diff.model.DiffResult;
+
+import java.util.Objects;
+import java.util.Optional;
+
+public class ChangedWriteOnly implements Changed {
+    private final DiffContext context;
+    private final boolean oldValue;
+    private final boolean newValue;
+//    private final boolean required;
+
+    public ChangedWriteOnly(DiffContext context, Boolean oldValue, Boolean newValue) {
+        this.context = context;
+        this.oldValue = Optional.ofNullable(oldValue).orElse(false);
+        this.newValue = Optional.ofNullable(newValue).orElse(false);
+//        this.required = required;
+    }
+
+    @Override
+    public DiffResult isChanged() {
+        if (Objects.equals(oldValue, newValue)) {
+            return DiffResult.NO_CHANGES;
+        }
+        if (context.isRequest()) {
+            return DiffResult.COMPATIBLE;
+        }
+        if (context.isResponse()) {
+            if (Boolean.TRUE.equals(newValue)) {
+                return DiffResult.INCOMPATIBLE;
+            } else {
+                return DiffResult.COMPATIBLE;
+            }
+        }
+        return DiffResult.UNKNOWN;
+    }
+}