Fix so that the oneOfAnyOf normalizer retains the read/write only attribute

Author: Mattias-Sehlstedt

modules/openapi-generator/src/main/java/org/openapitools/codegen/OpenAPINormalizer.java

@@ -33,12 +33,11 @@
 import org.slf4j.LoggerFactory;
 
 import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.openapitools.codegen.utils.ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema;
+import static org.openapitools.codegen.utils.ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema;
 import static org.openapitools.codegen.utils.StringUtils.getUniqueString;
 
 public class OpenAPINormalizer {
@@ -1318,7 +1317,7 @@ protected Schema processSimplifyOneOf(Schema schema) {
                 }
             }
 
-            schema = simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, oneOfSchemas);
+            schema = simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, oneOfSchemas);
 
             if (ModelUtils.isIntegerSchema(schema) || ModelUtils.isNumberSchema(schema) || ModelUtils.isStringSchema(schema)) {
                 // TODO convert oneOf const to enum
@@ -1445,7 +1444,7 @@ protected Schema processSimplifyAnyOf(Schema schema) {
                 }
             }
 
-            schema = simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, anyOfSchemas);
+            schema = simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, schema, anyOfSchemas);
         }
 
         return schema;

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java

@@ -2227,17 +2227,24 @@ public static Schema cloneSchema(Schema schema, boolean openapi31) {
      * @param subSchemas The oneOf or AnyOf schemas
      * @return The simplified schema
      */
-    public static Schema simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(OpenAPI openAPI, Schema schema, List<Schema> subSchemas) {
+    public static Schema simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(OpenAPI openAPI, Schema schema, List<Schema> subSchemas) {
         if (subSchemas.removeIf(subSchema -> isNullTypeSchema(openAPI, subSchema))) {
             schema.setNullable(true);
         }
 
         // if only one element left, simplify to just the element (schema)
         if (subSchemas.size() == 1) {
+            Schema<?> subSchema = subSchemas.get(0);
             if (Boolean.TRUE.equals(schema.getNullable())) { // retain nullable setting
-                subSchemas.get(0).setNullable(true);
+                subSchema.setNullable(true);
             }
-            return subSchemas.get(0);
+            if (Boolean.TRUE.equals(schema.getReadOnly())) {
+                subSchema.setReadOnly(true);
+            }
+            if (Boolean.TRUE.equals(schema.getWriteOnly())) {
+                subSchema.setWriteOnly(true);
+            }
+            return subSchema;
         }
 
         return schema;

modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java

@@ -476,46 +476,52 @@ public void testGetSchemaItemsWith31Spec() {
     }
 
     @Test
-    public void simplyOneOfAnyOfWithOnlyOneNonNullSubSchema() {
+    public void simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema() {
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml");
         Schema schema;
         List<Schema> subSchemas;
 
         Schema anyOfWithSeveralSubSchemasButSingleNonNull = ModelUtils.getSchema(openAPI, "AnyOfTest");
         subSchemas = anyOfWithSeveralSubSchemasButSingleNonNull.getAnyOf();
-        schema = ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, anyOfWithSeveralSubSchemasButSingleNonNull, subSchemas);
+        schema = ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, anyOfWithSeveralSubSchemasButSingleNonNull, subSchemas);
         assertNull(schema.getOneOf());
         assertNull(schema.getAnyOf());
         assertTrue(schema.getNullable());
+        assertTrue(schema.getReadOnly());
+        assertNull(schema.getWriteOnly());
         assertEquals("string", schema.getType());
 
         Schema anyOfWithSingleNonNullSubSchema = ModelUtils.getSchema(openAPI, "Parent");
         subSchemas = ((Schema) anyOfWithSingleNonNullSubSchema.getProperties().get("number")).getAnyOf();
-        schema = ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, anyOfWithSingleNonNullSubSchema, subSchemas);
+        schema = ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, anyOfWithSingleNonNullSubSchema, subSchemas);
         assertNull(schema.getOneOf());
         assertNull(schema.getAnyOf());
         assertNull(schema.getNullable());
+        assertNull(schema.getReadOnly());
+        assertNull(schema.getWriteOnly());
         assertEquals(schema.get$ref(), "#/components/schemas/Number");
 
         Schema oneOfWithSeveralSubSchemasButSingleNonNull = ModelUtils.getSchema(openAPI, "OneOfTest");
         subSchemas = oneOfWithSeveralSubSchemasButSingleNonNull.getOneOf();
-        schema = ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSeveralSubSchemasButSingleNonNull, subSchemas);
+        schema = ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSeveralSubSchemasButSingleNonNull, subSchemas);
         assertNull(schema.getOneOf());
         assertNull(schema.getAnyOf());
         assertTrue(schema.getNullable());
+        assertNull(schema.getReadOnly());
+        assertTrue(schema.getWriteOnly());
         assertEquals("integer", schema.getType());
 
         Schema oneOfWithSingleNonNullSubSchema = ModelUtils.getSchema(openAPI, "ParentWithOneOfProperty");
         subSchemas = ((Schema) oneOfWithSingleNonNullSubSchema.getProperties().get("number")).getOneOf();
-        schema = ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSingleNonNullSubSchema, subSchemas);
+        schema = ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSingleNonNullSubSchema, subSchemas);
         assertNull(schema.getOneOf());
         assertNull(schema.getAnyOf());
         assertNull(schema.getNullable());
         assertEquals(schema.get$ref(), "#/components/schemas/Number");
 
         Schema oneOfWithSeveralSubSchemas = ModelUtils.getSchema(openAPI, "ParentWithPluralOneOfProperty");
         subSchemas = ((Schema) oneOfWithSeveralSubSchemas.getProperties().get("number")).getOneOf();
-        schema = ModelUtils.simplyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSeveralSubSchemas, subSchemas);
+        schema = ModelUtils.simplifyOneOfAnyOfWithOnlyOneNonNullSubSchema(openAPI, oneOfWithSeveralSubSchemas, subSchemas);
         assertNull(schema.getOneOf());
         assertNotNull(oneOfWithSeveralSubSchemas.getProperties().get("number"));
         assertNull(schema.getAnyOf());

modules/openapi-generator/src/test/resources/3_0/simplifyOneOfAnyOf_test.yaml

@@ -33,13 +33,15 @@ components:
         - type: 'null'
         - type: null
         - $ref: null
+      readOnly: true
     OneOfTest:
       description: to test oneOf
       oneOf:
         - type: integer
         - type: 'null'
         - type: null
         - $ref: null
+      writeOnly: true
     OneOfTest2:
       description: to test oneOf
       oneOf: