fix(java): escape oneOf naming (#268)

algolia · Mar 21, 2022 · c536c3e · c536c3e
1 parent d91c069
commit c536c3e
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 14 deletions.
diff --git a/.github/actions/cache/action.yml b/.github/actions/cache/action.yml
@@ -326,6 +326,7 @@ runs:
           hashFiles(
             'clients/algoliasearch-client-java-2/**',
             '!clients/algoliasearch-client-java-2/target',
+            'templates/java/**',
             'specs/bundled/search.yml'
           )}}
 

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -202,6 +202,7 @@ jobs:
             hashFiles(
               format('{0}/**', matrix.client.folder),
               format('!{0}/target', matrix.client.folder),
+              'templates/java/**',
               format('specs/bundled/{0}.yml', matrix.client.name)
             )}}
 

diff --git a/.gitignore b/.gitignore
@@ -23,3 +23,5 @@ dist
 .openapi-generator
 
 tests/output/*/.openapi-generator-ignore
+
+generators/bin
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java
@@ -115,7 +115,19 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
       CodegenModel model = ((Map<String, List<Map<String, CodegenModel>>>) modelContainer).get("models").get(0)
           .get("model");
       if (!model.oneOf.isEmpty()) {
+        List<HashMap<String, String>> listOneOf = new ArrayList();
+
+        for (String iterateModel : model.oneOf) {
+          HashMap<String, String> hashMapOneOf = new HashMap();
+
+          hashMapOneOf.put("type", iterateModel);
+          hashMapOneOf.put("name", iterateModel.replace("<", "").replace(">", ""));
+
+          listOneOf.add(hashMapOneOf);
+        }
+
         model.vendorExtensions.put("x-is-one-of-interface", true);
+        model.vendorExtensions.put("x-is-one-of-list", listOneOf);
       }
     }
 

diff --git a/generators/src/main/java/com/algolia/codegen/cts/ParametersWithDataType.java b/generators/src/main/java/com/algolia/codegen/cts/ParametersWithDataType.java
@@ -165,7 +165,14 @@ private void handleModel(String paramName, Object param, Map<String, Object> tes
       IJsonSchemaValidationProperties match = findMatchingOneOf(param, model);
       testOutput.clear();
       testOutput.putAll(traverseParams(paramName, param, match, parent, suffix));
-      testOutput.put("oneOfModel", baseType);
+
+      HashMap<String, String> hashMapOneOfModel = new HashMap();
+
+      hashMapOneOfModel.put("classname", baseType);
+      hashMapOneOfModel.put("name", getTypeName(match).replace("<", "").replace(">", ""));
+
+      testOutput.put("oneOfModel", hashMapOneOfModel);
+
       return;
     }
 

diff --git a/templates/java/oneof_interface.mustache b/templates/java/oneof_interface.mustache
@@ -11,12 +11,12 @@ import java.io.IOException;
 @JsonAdapter({{classname}}.Adapter.class)
 {{>additionalModelTypeAnnotations}}
 public abstract class {{classname}} implements CompoundType {
-    {{#oneOf}}
-    public static {{classname}} of({{.}} inside) {
-        return new {{classname}}{{.}}(inside);
+    {{#vendorExtensions.x-is-one-of-list}}
+    public static {{classname}} of{{name}}({{{type}}} inside) {
+        return new {{classname}}{{name}}(inside);
     }
 
-    {{/oneOf}}
+    {{/vendorExtensions.x-is-one-of-list}}
     public abstract Object getInsideValue();
 
     public static class Adapter extends TypeAdapter<{{classname}}> {
@@ -37,18 +37,18 @@ public abstract class {{classname}} implements CompoundType {
     }
 }
 
-{{#oneOf}}
+{{#vendorExtensions.x-is-one-of-list}}
 @JsonAdapter({{classname}}.Adapter.class)
-class {{classname}}{{.}} extends {{classname}} {
-    private final {{.}} insideValue;
+class {{classname}}{{name}} extends {{classname}} {
+    private final {{{type}}} insideValue;
 
-    {{classname}}{{.}}({{.}} insideValue) {
+    {{classname}}{{name}}({{{type}}} insideValue) {
         this.insideValue = insideValue;
     }
 
     @Override
-    public {{.}} getInsideValue() {
+    public {{{type}}} getInsideValue() {
         return insideValue;
     }
 }
-{{/oneOf}}
+{{/vendorExtensions.x-is-one-of-list}}
diff --git a/tests/CTS/methods/requests/templates/java/requests.mustache b/tests/CTS/methods/requests/templates/java/requests.mustache
@@ -36,7 +36,7 @@ class {{client}}Tests {
         {{#parametersWithDataType}}{{> generateParams}}{{/parametersWithDataType}}
 
         EchoResponseInterface req = (EchoResponseInterface) assertDoesNotThrow(() -> {
-            return client.{{method}}({{#parametersWithDataType}}{{#oneOfModel}}{{{.}}}.of({{{key}}}{{suffix}}){{/oneOfModel}}{{^oneOfModel}}{{{key}}}{{suffix}}{{/oneOfModel}}{{^-last}},{{/-last}}{{/parametersWithDataType}});
+            return client.{{method}}({{#parametersWithDataType}}{{#oneOfModel}}{{{classname}}}.of{{{name}}}({{{key}}}{{suffix}}){{/oneOfModel}}{{^oneOfModel}}{{{key}}}{{suffix}}{{/oneOfModel}}{{^-last}},{{/-last}}{{/parametersWithDataType}});
         });
 
         assertEquals(req.getPath(), "{{{request.path}}}");

diff --git a/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java b/tests/output/java/src/test/java/com/algolia/methods/requests/search.test.java
@@ -723,7 +723,10 @@ void deleteByTest0() {
     }
 
     EchoResponseInterface req = (EchoResponseInterface) assertDoesNotThrow(() -> {
-        return client.deleteBy(indexName0, SearchParams.of(searchParams0));
+        return client.deleteBy(
+          indexName0,
+          SearchParams.ofSearchParamsObject(searchParams0)
+        );
       }
     );
 
@@ -1722,7 +1725,10 @@ void searchTest0() {
     }
 
     EchoResponseInterface req = (EchoResponseInterface) assertDoesNotThrow(() -> {
-        return client.search(indexName0, SearchParams.of(searchParams0));
+        return client.search(
+          indexName0,
+          SearchParams.ofSearchParamsObject(searchParams0)
+        );
       }
     );