fix: recursive missingRequiredFields

jhannes · Oct 24, 2024 · d95247d · d95247d
1 parent 6bdccdc
commit d95247d
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 20 deletions.
diff --git a/.../java/io/github/jhannes/openapi/conversations/model/AddMessageToConversationDeltaDto.java b/.../java/io/github/jhannes/openapi/conversations/model/AddMessageToConversationDeltaDto.java
@@ -34,7 +34,11 @@ public List<String> missingRequiredFields(String prefix) {
         if (getDelta() == null) fields.add(prefix + "delta");
         if (getConversationId() == null) fields.add(prefix + "conversationId");
         if (getMessageId() == null) fields.add(prefix + "messageId");
-        if (getMessage() == null) fields.add(prefix + "message");
+        if (getMessage() != null) {
+            fields.addAll(getMessage().missingRequiredFields(prefix + "message."));
+        } else {
+            fields.add(prefix + "message");
+        }
         return fields;
     }
 

diff --git a/...tions/src/main/java/io/github/jhannes/openapi/conversations/model/CommandToServerDto.java b/...tions/src/main/java/io/github/jhannes/openapi/conversations/model/CommandToServerDto.java
@@ -32,7 +32,11 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getId() == null) fields.add(prefix + "id");
         if (getClientTime() == null) fields.add(prefix + "clientTime");
-        if (getDelta() == null) fields.add(prefix + "delta");
+        if (getDelta() != null) {
+            fields.addAll(getDelta().missingRequiredFields(prefix + "delta."));
+        } else {
+            fields.add(prefix + "delta");
+        }
         return fields;
     }
 

diff --git a/.../src/main/java/io/github/jhannes/openapi/conversations/model/ConversationSnapshotDto.java b/.../src/main/java/io/github/jhannes/openapi/conversations/model/ConversationSnapshotDto.java
@@ -47,7 +47,11 @@ public ConversationSnapshotDto removeWhereEqual(ConversationSnapshotDto o) {
     public List<String> missingRequiredFields(String prefix) {
         List<String> fields = super.missingRequiredFields(prefix);
         if (getId() == null) fields.add(prefix + "id");
-        if (getInfo() == null) fields.add(prefix + "info");
+        if (getInfo() != null) {
+            fields.addAll(getInfo().missingRequiredFields(prefix + "info."));
+        } else {
+            fields.add(prefix + "info");
+        }
         if (getMessages() == null) fields.add(prefix + "messages");
         return fields;
     }

diff --git a/...c/main/java/io/github/jhannes/openapi/conversations/model/CreateConversationDeltaDto.java b/...c/main/java/io/github/jhannes/openapi/conversations/model/CreateConversationDeltaDto.java
@@ -31,7 +31,11 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getDelta() == null) fields.add(prefix + "delta");
         if (getConversationId() == null) fields.add(prefix + "conversationId");
-        if (getInfo() == null) fields.add(prefix + "info");
+        if (getInfo() != null) {
+            fields.addAll(getInfo().missingRequiredFields(prefix + "info."));
+        } else {
+            fields.add(prefix + "info");
+        }
         return fields;
     }
 

diff --git a/...c/main/java/io/github/jhannes/openapi/conversations/model/UpdateConversationDeltaDto.java b/...c/main/java/io/github/jhannes/openapi/conversations/model/UpdateConversationDeltaDto.java
@@ -31,7 +31,11 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getDelta() == null) fields.add(prefix + "delta");
         if (getConversationId() == null) fields.add(prefix + "conversationId");
-        if (getInfo() == null) fields.add(prefix + "info");
+        if (getInfo() != null) {
+            fields.addAll(getInfo().missingRequiredFields(prefix + "info."));
+        } else {
+            fields.add(prefix + "info");
+        }
         return fields;
     }
 

diff --git a/...nTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/model/InfectionDto.java b/...nTracker/src/main/java/io/github/jhannes/openapi/infectionTracker/model/InfectionDto.java
@@ -30,7 +30,11 @@ public InfectionDto removeWhereEqual(InfectionDto o) {
     public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getId() == null) fields.add(prefix + "id");
-        if (getInformation() == null) fields.add(prefix + "information");
+        if (getInformation() != null) {
+            fields.addAll(getInformation().missingRequiredFields(prefix + "information."));
+        } else {
+            fields.add(prefix + "information");
+        }
         if (getRegisteredExposures() == null) fields.add(prefix + "registeredExposures");
         return fields;
     }

diff --git a/...ests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/model/PetDto.java b/...ests/snapshot/petstore/src/main/java/io/github/jhannes/openapi/petstore/model/PetDto.java
@@ -67,7 +67,7 @@ public PetDto removeWhereEqual(PetDto o) {
     public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getCategory() != null) {
-            fields.addAll(getCategory().missingRequiredFields(prefix + ".category"));
+            fields.addAll(getCategory().missingRequiredFields(prefix + "category."));
         }
         if (getName() == null) fields.add(prefix + "name");
         if (getPhotoUrls() == null) fields.add(prefix + "photoUrls");

diff --git a/...rc/main/java/io/github/jhannes/openapi/serverHealth/model/DataSourceHealthDetailsDto.java b/...rc/main/java/io/github/jhannes/openapi/serverHealth/model/DataSourceHealthDetailsDto.java
@@ -39,7 +39,7 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getType() == null) fields.add(prefix + "type");
         if (getLastFailureException() != null) {
-            fields.addAll(getLastFailureException().missingRequiredFields(prefix + ".lastFailureException"));
+            fields.addAll(getLastFailureException().missingRequiredFields(prefix + "lastFailureException."));
         }
         return fields;
     }

diff --git a/...Health/src/main/java/io/github/jhannes/openapi/serverHealth/model/HealthComponentDto.java b/...Health/src/main/java/io/github/jhannes/openapi/serverHealth/model/HealthComponentDto.java
@@ -34,7 +34,11 @@ public HealthComponentDto removeWhereEqual(HealthComponentDto o) {
     public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getStatus() == null) fields.add(prefix + "status");
-        if (getDetails() == null) fields.add(prefix + "details");
+        if (getDetails() != null) {
+            fields.addAll(getDetails().missingRequiredFields(prefix + "details."));
+        } else {
+            fields.add(prefix + "details");
+        }
         return fields;
     }
 

diff --git a/...n/java/io/github/jhannes/openapi/serverHealth/model/HealthComponentFailureDetailsDto.java b/...n/java/io/github/jhannes/openapi/serverHealth/model/HealthComponentFailureDetailsDto.java
@@ -30,7 +30,7 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getType() == null) fields.add(prefix + "type");
         if (getException() != null) {
-            fields.addAll(getException().missingRequiredFields(prefix + ".exception"));
+            fields.addAll(getException().missingRequiredFields(prefix + "exception."));
         }
         return fields;
     }

diff --git a/...th/src/main/java/io/github/jhannes/openapi/serverHealth/model/ThreadHealthDetailsDto.java b/...th/src/main/java/io/github/jhannes/openapi/serverHealth/model/ThreadHealthDetailsDto.java
@@ -70,7 +70,7 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getType() == null) fields.add(prefix + "type");
         if (getLastFailureException() != null) {
-            fields.addAll(getLastFailureException().missingRequiredFields(prefix + ".lastFailureException"));
+            fields.addAll(getLastFailureException().missingRequiredFields(prefix + "lastFailureException."));
         }
         return fields;
     }

diff --git a/...typeHierarchy/src/main/java/io/github/jhannes/openapi/typeHierarchy/model/PetBaseDto.java b/...typeHierarchy/src/main/java/io/github/jhannes/openapi/typeHierarchy/model/PetBaseDto.java
@@ -39,7 +39,7 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getName() == null) fields.add(prefix + "name");
         if (getOwnerAddress() != null) {
-            fields.addAll(getOwnerAddress().missingRequiredFields(prefix + ".ownerAddress"));
+            fields.addAll(getOwnerAddress().missingRequiredFields(prefix + "ownerAddress."));
         }
         return fields;
     }

diff --git a/...kets/src/main/java/io/github/jhannes/openapi/websockets/model/CreatePersonCommandDto.java b/...kets/src/main/java/io/github/jhannes/openapi/websockets/model/CreatePersonCommandDto.java
@@ -31,7 +31,11 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getCommand() == null) fields.add(prefix + "command");
         if (getId() == null) fields.add(prefix + "id");
-        if (getPerson() == null) fields.add(prefix + "person");
+        if (getPerson() != null) {
+            fields.addAll(getPerson().missingRequiredFields(prefix + "person."));
+        } else {
+            fields.add(prefix + "person");
+        }
         return fields;
     }
 

diff --git a/...ebsockets/src/main/java/io/github/jhannes/openapi/websockets/model/PersonSnapshotDto.java b/...ebsockets/src/main/java/io/github/jhannes/openapi/websockets/model/PersonSnapshotDto.java
@@ -82,7 +82,7 @@ public List<String> missingRequiredFields(String prefix) {
         if (getCreatedAt() == null) fields.add(prefix + "createdAt");
         if (getCreatedBy() == null) fields.add(prefix + "createdBy");
         if (getName() != null) {
-            fields.addAll(getName().missingRequiredFields(prefix + ".name"));
+            fields.addAll(getName().missingRequiredFields(prefix + "name."));
         }
         return fields;
     }

diff --git a/...kets/src/main/java/io/github/jhannes/openapi/websockets/model/UpdatePersonCommandDto.java b/...kets/src/main/java/io/github/jhannes/openapi/websockets/model/UpdatePersonCommandDto.java
@@ -31,7 +31,11 @@ public List<String> missingRequiredFields(String prefix) {
         List<String> fields = new ArrayList<>();
         if (getCommand() == null) fields.add(prefix + "command");
         if (getId() == null) fields.add(prefix + "id");
-        if (getPerson() == null) fields.add(prefix + "person");
+        if (getPerson() != null) {
+            fields.addAll(getPerson().missingRequiredFields(prefix + "person."));
+        } else {
+            fields.add(prefix + "person");
+        }
         return fields;
     }
 

diff --git a/src/main/resources/JavaLombok/modelGeneric.handlebars b/src/main/resources/JavaLombok/modelGeneric.handlebars
@@ -161,15 +161,19 @@ public {{#if children}}sealed{{else}}final{{/if}} class {{classname}}
         List<String> fields = new ArrayList<>();
 {{/if}}
 {{#vars}}
-{{#if required}}
 {{#unless isInherited}}
-        if ({{getter}}() == null) fields.add(prefix + "{{name}}");
-{{/unless}}
-{{else if isModel}}
+{{#if isModel}}
         if ({{getter}}() != null) {
-            fields.addAll({{getter}}().missingRequiredFields(prefix + ".{{name}}"));
+            fields.addAll({{getter}}().missingRequiredFields(prefix + "{{name}}."));
+{{#if required}}
+        } else {
+            fields.add(prefix + "{{name}}");
+{{/if}}
         }
+{{else if required}}
+        if ({{getter}}() == null) fields.add(prefix + "{{name}}");
 {{/if}}
+{{/unless}}
 {{/vars}}
         return fields;
 {{else}}