Adds JsonPathPieceMethod

Author: spacether

src/main/java/org/openapijsonschematools/codegen/generators/DefaultGenerator.java

@@ -2981,7 +2981,7 @@ public CodegenOperation fromOperation(Operation operation, String jsonPath, Link
             );
     }
 
-    protected List<MapBuilder<?>> getOperationBuilders(String jsonSchema, CodegenRequestBody requestBody, CodegenParametersInfo parametersInfo, CodegenList<CodegenServer> servers, CodegenList<CodegenSecurityRequirementObject> security) {
+    protected List<MapBuilder<?>> getOperationBuilders(String jsonPath, CodegenRequestBody requestBody, CodegenParametersInfo parametersInfo, CodegenList<CodegenServer> servers, CodegenList<CodegenSecurityRequirementObject> security) {
         return null;
     }
 

src/main/java/org/openapijsonschematools/codegen/generators/JavaClientGenerator.java

@@ -52,6 +52,7 @@
 import org.openapijsonschematools.codegen.generators.openapimodels.CodegenServer;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumInfo;
 import org.openapijsonschematools.codegen.generators.openapimodels.EnumValue;
+import org.openapijsonschematools.codegen.generators.openapimodels.JsonPathPieceMethod;
 import org.openapijsonschematools.codegen.generators.openapimodels.MapBuilder;
 import org.openapijsonschematools.codegen.templating.HandlebarsEngineAdapter;
 import org.openapijsonschematools.codegen.templating.SupportingFile;
@@ -2413,16 +2414,16 @@ private void addDoubleEnum(LinkedHashMap<String, LinkedHashMap<EnumValue, String
         }
     }
 
-    protected List<MapBuilder<?>> getOperationBuilders(String jsonSchema, CodegenRequestBody requestBody, CodegenParametersInfo parametersInfo, CodegenList<CodegenServer> servers, CodegenList<CodegenSecurityRequirementObject> security) {
+    protected List<MapBuilder<?>> getOperationBuilders(String jsonPath, CodegenRequestBody requestBody, CodegenParametersInfo parametersInfo, CodegenList<CodegenServer> servers, CodegenList<CodegenSecurityRequirementObject> security) {
         if (requestBody == null && parametersInfo == null && servers == null && security == null) {
             return null;
         }
         int qtyBuilders = 1;
         int reqPropsSize = 0;
         boolean requestBodyExists = requestBody != null;
         boolean parametersExist = parametersInfo != null;
-        List<Object> requiredProperties = new ArrayList<>();
-        List<Object> optionalProperties = new ArrayList<>();
+        List<JsonPathPieceMethod> requiredProperties = new ArrayList<>();
+        List<JsonPathPieceMethod> optionalProperties = new ArrayList<>();
         if (requestBodyExists) {
             if (Boolean.TRUE.equals(requestBody.getSelfOrDeepestRef().required)) {
                 qtyBuilders += 1;
@@ -2476,8 +2477,60 @@ protected List<MapBuilder<?>> getOperationBuilders(String jsonSchema, CodegenReq
         if (security != null) {
             optionalProperties.add(security);
         }
-        // todo pass in and use path/root servers + security here if they are used
-        return List.of();
+
+        Map<String, MapBuilder<Object>> bitStrToBuilder = new HashMap<>();
+        MapBuilder<Object> lastBuilder = null;
+        // builders are built last to first, last builder has build method
+        String[] pathPieces = jsonPath.split("/");
+        CodegenKey operationKey = getKey(pathPieces[pathPieces.length-1], "misc", jsonPath);
+        String builderName = operationKey.pascalCase;
+        List<MapBuilder<?>> builders = new ArrayList<>();
+        for (int i=0; i < qtyBuilders; i++) {
+            String bitStr = "";
+            if (reqPropsSize != 0) {
+                bitStr = String.format("%"+reqPropsSize+"s", Integer.toBinaryString(i)).replace(' ', '0');
+            }
+            CodegenKey builderClassName;
+            if (i == qtyBuilders - 1) {
+                // first invoked builder has the simplest name with no bitStr
+                builderClassName = getKey(builderName + "RequestBuilder", "schemas", jsonPath);
+            } else {
+                builderClassName = getKey(builderName + bitStr + "RequestBuilder", "schemas", jsonPath);
+            }
+            MapBuilder<Object> builder;
+            if (i == 0) {
+                builder = new MapBuilder<>(builderClassName, new LinkedHashMap<>());
+                lastBuilder = builder;
+            } else {
+                LinkedHashMap<CodegenKey, MapBuilder.BuilderPropertyPair<Object>> keyToBuilder = new LinkedHashMap<>();
+                for (int c=0; c < reqPropsSize; c++) {
+                    if (bitStr.charAt(c) == '1') {
+                        StringBuilder nextBuilderBitStr = new StringBuilder(bitStr);
+                        nextBuilderBitStr.setCharAt(c, '0');
+                        CodegenKey key = requiredProperties.get(c).jsonPathPiece();
+                        if (key == null) {
+                            throw new RuntimeException("key must exist at c="+c);
+                        }
+                        MapBuilder<Object> nextBuilder = bitStrToBuilder.get(nextBuilderBitStr.toString());
+                        if (nextBuilder == null) {
+                            throw new RuntimeException("Next builder must exist for bitStr="+ nextBuilderBitStr);
+                        }
+                        var pair = new MapBuilder.BuilderPropertyPair<>(nextBuilder, requiredProperties.get(c));
+                        keyToBuilder.put(key, pair);
+                    }
+                }
+                builder = new MapBuilder<>(builderClassName, keyToBuilder);
+            }
+            bitStrToBuilder.put(bitStr, builder);
+            builders.add(builder);
+        }
+        if (!optionalProperties.isEmpty()) {
+            for (JsonPathPieceMethod property: optionalProperties) {
+                var pair = new MapBuilder.BuilderPropertyPair<>(lastBuilder, property);
+                lastBuilder.keyToBuilder.put(property.jsonPathPiece(), pair);
+            }
+        }
+        return builders;
     }
 
     protected List<MapBuilder<CodegenSchema>> getMapBuilders(CodegenSchema schema, String currentJsonPath, String sourceJsonPath) {

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenList.java

@@ -6,7 +6,7 @@
 /**
  * A class to store inline codegenschema definitions
  */
-public class CodegenList <T> extends AbstractList<T> {
+public class CodegenList <T> extends AbstractList<T> implements JsonPathPieceMethod {
     public final List<T> items;
     public final CodegenKey jsonPathPiece;
     public final String subpackage;
@@ -28,4 +28,9 @@ public T get(int index) {
     public int size() {
         return this.items.size();
     }
+
+    @Override
+    public CodegenKey jsonPathPiece() {
+        return jsonPathPiece;
+    }
 }

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenRequestBody.java

@@ -12,7 +12,7 @@
  * A unique parameter is defined by a combination of a name and location.
  * Parameters may be located in a path, query, header or cookie.
  */
-public class CodegenRequestBody {
+public class CodegenRequestBody implements JsonPathPieceMethod {
     public final CodegenText description;
     public final Map<String, Object> vendorExtensions;
     public final Boolean required;
@@ -138,5 +138,10 @@ public CodegenRequestBody getDeepestRef() {
         }
         return refObject;
     }
+
+    @Override
+    public CodegenKey jsonPathPiece() {
+        return jsonPathPiece;
+    }
 }
 

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java

@@ -30,7 +30,7 @@
 import java.util.TreeSet;
 import java.util.function.Function;
 
-public class CodegenSchema {
+public class CodegenSchema implements JsonPathPieceMethod {
     // 3.0.0
     public String title;
     public Number multipleOf;
@@ -1020,4 +1020,9 @@ public int hashCode() {
                 properties, optionalProperties, requiredProperties, externalDocumentation,
                 discriminator, imports, componentModule, testCases, refInfo);
     }
+
+    @Override
+    public CodegenKey jsonPathPiece() {
+        return jsonPathPiece;
+    }
 }

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/JsonPathPieceMethod.java

@@ -0,0 +1,5 @@
+package org.openapijsonschematools.codegen.generators.openapimodels;
+
+public interface JsonPathPieceMethod {
+    CodegenKey jsonPathPiece();
+}