code review

Author: bnasslahsen

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/utils/SpringDocDataRestUtils.java

@@ -78,6 +78,7 @@ public void enhanceResponseContent(OpenAPI openAPI, ResourceMetadata resourceMet
 					if (!key.endsWith(RESPONSE) && key.toLowerCase().contains(returnType.getSimpleName().toLowerCase())) {
 						String newKey = key + RESPONSE;
 						Schema newSchema = new ObjectSchema();
+						newSchema.setRequired(existingSchema.getRequired());
 						Map<String, Schema> properties = existingSchema.getProperties();
 						properties.forEach((propId, val) -> updateResponseSchema(newSchema, returnType, ignoredFields, propId, val));
 						if (key.equals(returnType.getSimpleName()))
@@ -111,6 +112,7 @@ public void enhanceRequestBodyContent(OpenAPI openAPI, ResourceMetadata resource
 				if (!key.endsWith(REQUEST_BODY) && returnType.getSimpleName().equals(key)) {
 					String newKey = key + REQUEST_BODY;
 					Schema newSchema = new ObjectSchema();
+					newSchema.setRequired(existingSchema.getRequired());
 					Map<String, Schema> properties = existingSchema.getProperties();
 					properties.forEach((propId, val) -> updateRequestBodySchema(associationsFields, newSchema, propId, val));
 					schemas.put(newKey, newSchema);

springdoc-openapi-data-rest/src/test/resources/results/app23.json

@@ -853,66 +853,58 @@
           }
         }
       },
-      "CollectionModelEntityModelClinic": {
+      "DoctorRequestBody": {
         "type": "object",
         "properties": {
-          "_embedded": {
-            "type": "object",
-            "properties": {
-              "clinics": {
-                "type": "array",
-                "items": {
-                  "$ref": "#/components/schemas/EntityModelClinic"
-                }
-              }
-            }
+          "id": {
+            "type": "integer",
+            "format": "int64"
           },
-          "_links": {
-            "$ref": "#/components/schemas/Links"
+          "clinics": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
           }
         }
       },
-      "EntityModelClinic": {
+      "EntityModelDoctor": {
         "type": "object",
         "properties": {
-          "name": {
-            "type": "string"
-          },
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "ClinicResponse": {
-        "type": "object",
-        "properties": {
-          "name": {
-            "type": "string"
-          }
-        }
-      },
-      "ClinicRequestBody": {
+      "CollectionModelEntityModelDoctor": {
         "type": "object",
         "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int64"
+          "_embedded": {
+            "type": "object",
+            "properties": {
+              "doctors": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/EntityModelDoctor"
+                }
+              }
+            }
           },
-          "name": {
-            "type": "string"
+          "_links": {
+            "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "CollectionModelEntityModelDoctor": {
+      "CollectionModelClinic": {
         "type": "object",
         "properties": {
           "_embedded": {
             "type": "object",
             "properties": {
-              "doctors": {
+              "clinics": {
                 "type": "array",
                 "items": {
-                  "$ref": "#/components/schemas/EntityModelDoctor"
+                  "$ref": "#/components/schemas/ClinicResponse"
                 }
               }
             }
@@ -922,49 +914,63 @@
           }
         }
       },
-      "EntityModelDoctor": {
+      "CollectionModelObject": {
         "type": "object",
         "properties": {
+          "_embedded": {
+            "type": "object",
+            "properties": {
+              "objects": {
+                "type": "array",
+                "items": {
+                  "type": "object"
+                }
+              }
+            }
+          },
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "DoctorRequestBody": {
+      "ClinicRequestBody": {
+        "required": [
+          "name"
+        ],
         "type": "object",
         "properties": {
           "id": {
             "type": "integer",
             "format": "int64"
           },
-          "clinics": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
+          "name": {
+            "type": "string"
           }
         }
       },
-      "CollectionModelObject": {
+      "EntityModelClinic": {
         "type": "object",
         "properties": {
-          "_embedded": {
-            "type": "object",
-            "properties": {
-              "objects": {
-                "type": "array",
-                "items": {
-                  "type": "object"
-                }
-              }
-            }
+          "name": {
+            "type": "string"
           },
           "_links": {
             "$ref": "#/components/schemas/Links"
           }
         }
       },
-      "CollectionModelClinic": {
+      "ClinicResponse": {
+        "required": [
+          "name"
+        ],
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "CollectionModelEntityModelClinic": {
         "type": "object",
         "properties": {
           "_embedded": {
@@ -973,7 +979,7 @@
               "clinics": {
                 "type": "array",
                 "items": {
-                  "$ref": "#/components/schemas/ClinicResponse"
+                  "$ref": "#/components/schemas/EntityModelClinic"
                 }
               }
             }