fix class names in builder functions

algolia · May 2, 2023 · ca1f41d · ca1f41d
1 parent 0549175
commit ca1f41d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java
@@ -190,7 +190,7 @@ private static void jsonParent(Map<String, ModelsMap> models) {
     }
   }
 
-  private static void modelsOneOf(Map<String, ModelsMap> models) {
+  private void modelsOneOf(Map<String, ModelsMap> models) {
     for (ModelsMap modelContainer : models.values()) {
       // modelContainers always have 1 and only 1 model in our specs
       CodegenModel model = modelContainer.getModels().get(0).getModel();
@@ -228,6 +228,8 @@ private static void modelsOneOf(Map<String, ModelsMap> models) {
         if (modelsMap != null) {
           CodegenModel compoundModel = modelsMap.getModels().get(0).getModel();
           compoundModel.vendorExtensions.put("x-one-of-explicit-name", compoundModel.classname);
+          compoundModel.vendorExtensions.put("x-fully-qualified-classname", modelPackage + "." + compoundModel.classname);
+          compoundModel.vendorExtensions.put("x-classname-or-alias", compoundModel.classname + "Impl");
           sealedChilds.add(compoundModel);
         } else {
           CodegenModel newModel = new CodegenModel();
@@ -239,6 +241,7 @@ private static void modelsOneOf(Map<String, ModelsMap> models) {
           property.setDatatypeWithEnum(oneOf);
           newModel.setVars(Collections.singletonList(property));
           newModel.vendorExtensions.put("x-one-of-explicit-name", oneOf.replace("<", "Of").replace(">", ""));
+          newModel.vendorExtensions.put("x-fully-qualified-classname", newModel.classname);
           sealedChilds.add(newModel);
         }
       }

diff --git a/templates/kotlin/builder_function.mustache b/templates/kotlin/builder_function.mustache
@@ -10,7 +10,7 @@
         {{#vars}}
         {{{name}}}: {{>data_class_field_type}}{{^required}}? = null{{/required}},
         {{/vars}}
-    ): {{classname}}  = {{classname}} (
+    ): {{classname}}  = {{vendorExtensions.x-fully-qualified-classname}} (
         {{#vars}}
         {{{name}}} = {{{name}}},
         {{/vars}}

diff --git a/templates/kotlin/oneof_imports_alias.mustache b/templates/kotlin/oneof_imports_alias.mustache
@@ -0,0 +1,3 @@
+{{#vendorExtensions.x-sealed-childs}}
+{{#vendorExtensions.x-fully-qualified-classname}}import {{.}} as {{vendorExtensions.x-classname-or-alias}}{{/vendorExtensions.x-fully-qualified-classname}}
+{{/vendorExtensions.x-sealed-childs}}