Merge branch 'main' into chore/keep-co-authors-spread

Author: shortcuts

.github/.cache_version

@@ -1 +1 @@
-8.0.4.3
+8.0.5

clients/algoliasearch-client-java-2/.openapi-generator-ignore

@@ -18,9 +18,9 @@ pom.xml
 gradle*
 
 # Selective source file
-algoliasearch-core/com/algolia/auth/**
-algoliasearch-core/com/algolia/ApiException.java
-algoliasearch-core/com/algolia/Configuration.java
-algoliasearch-core/com/algolia/Server*.java
-algoliasearch-core/com/algolia/StringUtil.java
-algoliasearch-core/com/algolia/GzipRequestInterceptor.java
+algoliasearch-core/src/com/algolia/auth/**
+algoliasearch-core/src/com/algolia/ApiException.java
+algoliasearch-core/src/com/algolia/Configuration.java
+algoliasearch-core/src/com/algolia/Server*.java
+algoliasearch-core/src/com/algolia/StringUtil.java
+algoliasearch-core/src/com/algolia/GzipRequestInterceptor.java

clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/ApiCallback.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiCallback.java

@@ -35,7 +35,7 @@ tasks.withType(JavaCompile) {
 sourceSets {
     main {
         java {
-            srcDirs = ["algoliasearch-core"]
+            srcDirs = ["algoliasearch-core/src"]
         }
     }
 }

clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/ApiClient.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiClient.java

@@ -2,8 +2,8 @@
   "java": {
     "folder": "clients/algoliasearch-client-java-2",
     "mainPackage": "java-search",
-    "modelFolder": "algoliasearch-core/com/algolia/model",
-    "apiFolder": "algoliasearch-core/com/algolia/api",
+    "modelFolder": "algoliasearch-core/src/com/algolia/model",
+    "apiFolder": "algoliasearch-core/src/com/algolia/api",
     "customGenerator": "algolia-java",
     "tests": {
       "extension": ".test.java",

clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/ApiResponse.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/ApiResponse.java

@@ -155,15 +155,15 @@ public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
         List<HashMap<String, String>> listOneOf = new ArrayList();
 
         for (String iterateModel : model.oneOf) {
-          HashMap<String, String> hashMapOneOf = new HashMap();
+          HashMap<String, String> oneOfModel = new HashMap();
 
-          hashMapOneOf.put("type", iterateModel);
-          hashMapOneOf.put(
+          oneOfModel.put("type", iterateModel);
+          oneOfModel.put(
             "name",
             iterateModel.replace("<", "").replace(">", "")
           );
 
-          listOneOf.add(hashMapOneOf);
+          listOneOf.add(oneOfModel);
         }
 
         model.vendorExtensions.put("x-is-one-of-interface", true);
@@ -189,7 +189,7 @@ public Map<String, Object> postProcessSupportingFileData(
       supportingFiles.add(
         new SupportingFile(
           "EchoResponse.mustache",
-          "algoliasearch-core/com/algolia/utils/echo",
+          sourceFolder + "/com/algolia/utils/echo",
           "EchoResponse" + clientName + ".java"
         )
       );
@@ -222,16 +222,13 @@ public String getHelp() {
 
   @Override
   public void processOpts() {
-    super.processOpts();
-
     // generator specific options
     setDateLibrary("java8");
-    setSourceFolder("algoliasearch-core");
+    setSourceFolder("algoliasearch-core/src");
+    setInvokerPackage("com.algolia");
     setApiNameSuffix(Utils.API_SUFFIX);
 
-    additionalProperties.put("apiNameSuffix", Utils.API_SUFFIX);
-    additionalProperties.put("java8", true);
-    additionalProperties.put("sourceFolder", "algoliasearch-core");
+    super.processOpts();
 
     // Prevent all useless file to generate
     apiTestTemplateFiles.clear();

clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/JSON.java renamed to clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/JSON.java

@@ -62,12 +62,11 @@ public Map<String, Object> postProcessOperationsWithModels(
 
   @Override
   public void processOpts() {
-    super.processOpts();
-
     // generator specific options
     setApiNameSuffix(Utils.API_SUFFIX);
     setParameterNamingConvention("camelCase");
-    additionalProperties.put("apiNameSuffix", Utils.API_SUFFIX);
+
+    super.processOpts();
 
     // Remove base template as we want to change its path
     supportingFiles.removeIf(file ->