[GO] Fix exception in constructExampleCode with oneOf primitive type (O…

…penAPITools#12357)
okhowang · May 13, 2022 · d39a7c3 · d39a7c3
1 parent 02f1626
commit d39a7c3
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/...s/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java b/...s/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientCodegen.java
@@ -255,16 +255,7 @@ public void processOpts() {
 
         // add lambda for mustache templates to handle oneOf/anyOf naming
         // e.g. []string => ArrayOfString
-        additionalProperties.put("lambda.type-to-name", new Mustache.Lambda() {
-            @Override
-            public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-                String content = fragment.execute();
-                content = content.trim().replace("[]", "array_of_");
-                content = content.trim().replace("[", "map_of_");
-                content = content.trim().replace("]", "");
-                writer.write(camelize(content));
-            }
-        });
+        additionalProperties.put("lambda.type-to-name", (Mustache.Lambda) (fragment, writer) -> writer.write(typeToName(fragment.execute())));
 
         supportingFiles.add(new SupportingFile("openapi.mustache", "api", "openapi.yaml"));
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
@@ -658,8 +649,13 @@ private String constructExampleCode(CodegenModel codegenModel, HashMap<String, C
             return goImportAlias + "." + model + "(" + example + ")";
         } else if (codegenModel.oneOf != null && !codegenModel.oneOf.isEmpty()) {
             String subModel = (String) codegenModel.oneOf.toArray()[0];
-            String oneOf = constructExampleCode(modelMaps.get(subModel), modelMaps, processedModelMap, depth+1).substring(1);
-            return goImportAlias + "." + model + "{" + subModel + ": " + oneOf + "}";
+            String oneOf;
+            if (modelMaps.get(subModel) == null) {
+                oneOf = "new(" + subModel + ")";// a primitive type
+            } else {
+                oneOf = constructExampleCode(modelMaps.get(subModel), modelMaps, processedModelMap, depth + 1).substring(1);
+            }
+            return goImportAlias + "." + model + "{" + typeToName(subModel) + ": " + oneOf + "}";
         } else {
             ArrayList<Integer> v = new ArrayList<>();
             v.add(depth);
@@ -672,4 +668,11 @@ private String constructExampleCode(CodegenModel codegenModel, HashMap<String, C
         }
         return "*" + goImportAlias + ".New" + toModelName(model) + "(" + StringUtils.join(propertyExamples, ", ") + ")";
     }
+
+    private String typeToName(String content) {
+        content = content.trim().replace("[]", "array_of_");
+        content = content.trim().replace("[", "map_of_");
+        content = content.trim().replace("]", "");
+        return camelize(content);
+    }
 }