add to all

millotp · millotp · commit ae3d35d568d8 · 2024-07-29T22:24:14.000+02:00
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaCSharpGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaCSharpGenerator.java
@@ -2,7 +2,6 @@
 
 import com.algolia.codegen.exceptions.*;
 import com.algolia.codegen.utils.*;
-import com.algolia.codegen.utils.OneOf;
 import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -142,6 +141,7 @@ public void processOpenAPI(OpenAPI openAPI) {
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaGoGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaGoGenerator.java
@@ -3,7 +3,6 @@
 import com.algolia.codegen.exceptions.*;
 import com.algolia.codegen.lambda.ScreamingSnakeCaseLambda;
 import com.algolia.codegen.utils.*;
-import com.algolia.codegen.utils.OneOf;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Iterables;
 import com.samskivert.mustache.Mustache;
@@ -132,6 +131,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models, true);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaJavaGenerator.java
@@ -95,9 +95,9 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
-    OrphanDestroyer.removeOrphans(this, operations, models);
     return operations;
   }
 
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaKotlinGenerator.java
@@ -1,7 +1,6 @@
 package com.algolia.codegen;
 
 import com.algolia.codegen.utils.*;
-import com.algolia.codegen.utils.OneOf;
 import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -188,6 +187,7 @@ private static void jsonParent(Map<String, ModelsMap> models) {
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaPhpGenerator.java
@@ -77,6 +77,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     return operations;
   }
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaPythonGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaPythonGenerator.java
@@ -120,6 +120,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
 
     List<Map<String, String>> imports = operations.getImports();
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaRubyGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaRubyGenerator.java
@@ -82,6 +82,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     return operations;
   }
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaScalaGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaScalaGenerator.java
@@ -140,6 +140,7 @@ public Map<String, ModelsMap> postProcessAllModels(Map<String, ModelsMap> objs)
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
diff --git a/generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java b/generators/src/main/java/com/algolia/codegen/AlgoliaSwiftGenerator.java
@@ -4,9 +4,7 @@
 import static org.openapitools.codegen.utils.StringUtils.camelize;
 
 import com.algolia.codegen.exceptions.*;
-import com.algolia.codegen.utils.GenericPropagator;
-import com.algolia.codegen.utils.Helpers;
-import com.algolia.codegen.utils.OneOf;
+import com.algolia.codegen.utils.*;
 import com.samskivert.mustache.Mustache;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -288,6 +286,7 @@ public void processOpenAPI(OpenAPI openAPI) {
   @Override
   public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {
     OperationsMap operations = super.postProcessOperationsWithModels(objs, models);
+    OrphanDestroyer.removeOrphans(this, operations, models);
     Helpers.removeHelpers(operations);
     GenericPropagator.propagateGenericsToOperations(operations, models);
     return operations;
diff --git a/generators/src/main/java/com/algolia/codegen/utils/GenericPropagator.java b/generators/src/main/java/com/algolia/codegen/utils/GenericPropagator.java
@@ -9,8 +9,6 @@
 
 public class GenericPropagator {
 
-  public String language;
-
   private static Set<String> primitiveModels = new HashSet<>(Arrays.asList("object", "array", "string", "boolean", "integer"));
 
   // Only static use of this class
diff --git a/generators/src/main/java/com/algolia/codegen/utils/OrphanDestroyer.java b/generators/src/main/java/com/algolia/codegen/utils/OrphanDestroyer.java
@@ -9,9 +9,6 @@
 public class OrphanDestroyer {
 
   private static Set<String> primitiveModels = new HashSet<>(Arrays.asList("object", "array", "string", "boolean", "integer"));
-  private static Set<String> helperModels = new HashSet<>(
-    Arrays.asList("apiKeyOperation", "securedApiKeyRestrictions", "replaceAllObjectsResponse")
-  );
 
   private Map<String, CodegenModel> models;
   private HashSet<String> visitedModels;
@@ -21,23 +18,14 @@ private OrphanDestroyer(Map<String, CodegenModel> models) {
     this.models = models;
   }
 
-  private String stripType(String type) {
-    if (type.startsWith("List<")) {
-      return stripType(type.substring(5, type.length() - 1)).trim();
-    } else if (type.startsWith("Map<")) {
-      return stripType(type.substring(4, type.length() - 1).split(",", 2)[1].trim());
-    }
-    return type.trim();
-  }
-
   private CodegenModel getModel(String name) {
     // openapi generator returns some weird error when looking for primitive type, so we filter them
     // by hand
     if (primitiveModels.contains(name)) {
       return null;
     }
 
-    return models.get(stripType(name));
+    return models.get(name);
   }
 
   private CodegenModel propertyToModel(CodegenProperty prop) {
@@ -84,13 +72,13 @@ private void exploreGraph(OperationsMap operations) {
 
     for (CodegenOperation ope : operations.getOperations().getOperation()) {
       if (ope.returnType != null) {
-        CodegenModel returnType = getModel(ope.returnType);
+        CodegenModel returnType = getModel(ope.returnBaseType);
         if (returnType != null) {
           visitedModels.add(returnType.name);
         }
       }
       for (CodegenParameter param : ope.allParams) {
-        CodegenModel paramType = getModel(param.dataType);
+        CodegenModel paramType = getModel(param.baseType != null ? param.baseType : param.dataType);
         if (paramType != null) {
           visitedModels.add(paramType.name);
         }
@@ -103,21 +91,22 @@ private void exploreGraph(OperationsMap operations) {
   }
 
   /** remove all the unused models, most likely the sub models of allOf */
-  public static void removeOrphans(CodegenConfig config, OperationsMap operations, List<ModelMap> allModels) {
+  public static void removeOrphans(CodegenConfig config, OperationsMap operations, List<ModelMap> allModels, boolean keepError) {
     // visit all the models that are accessible from:
     // - the properties of a model (needs recursive search)
     // - the return type of an operation
     // - the parameters of an operation
 
     OrphanDestroyer orphanDestroyer = new OrphanDestroyer(convertToMap(allModels));
 
-    Helpers.prettyPrint("Models: " + orphanDestroyer.models.keySet());
-
     orphanDestroyer.exploreGraph(operations);
 
     List<String> toRemove = new ArrayList<>();
     for (String modelName : orphanDestroyer.models.keySet()) {
-      if (!helperModels.contains(modelName) && !orphanDestroyer.visitedModels.contains(modelName)) {
+      if (keepError && modelName.equals("ErrorBase")) {
+        continue;
+      }
+      if (!orphanDestroyer.visitedModels.contains(modelName)) {
         toRemove.add(modelName);
       }
     }
@@ -133,4 +122,8 @@ public static void removeOrphans(CodegenConfig config, OperationsMap operations,
       }
     }
   }
+
+  public static void removeOrphans(CodegenConfig config, OperationsMap operations, List<ModelMap> allModels) {
+    removeOrphans(config, operations, allModels, false);
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -77,6 +77,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`77`	`77`	`@Override`
`78`	`78`	`public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {`
`79`	`79`	`OperationsMap operations = super.postProcessOperationsWithModels(objs, models);`
	`80`	`+ OrphanDestroyer.removeOrphans(this, operations, models);`
`80`	`81`	`Helpers.removeHelpers(operations);`
`81`	`82`	`return operations;`
`82`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation`
`82`	`82`	`@Override`
`83`	`83`	`public OperationsMap postProcessOperationsWithModels(OperationsMap objs, List<ModelMap> models) {`
`84`	`84`	`OperationsMap operations = super.postProcessOperationsWithModels(objs, models);`
	`85`	`+ OrphanDestroyer.removeOrphans(this, operations, models);`
`85`	`86`	`Helpers.removeHelpers(operations);`
`86`	`87`	`return operations;`
`87`	`88`	`}`