chore(java): move the source code to the correct folder (#429)

Author: millotp

.github/actions/cache/action.yml

@@ -400,8 +400,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/SearchClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/search/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/SearchClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/search/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -415,8 +415,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/RecommendClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/recommend/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/RecommendClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/recommend/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -430,8 +430,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PersonalizationClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/personalization/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/PersonalizationClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/personalization/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -445,8 +445,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AnalyticsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/analytics/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/AnalyticsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/analytics/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -460,8 +460,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/InsightsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/insights/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/InsightsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/insights/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -475,8 +475,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/AbtestingClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/abtesting/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/AbtestingClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/abtesting/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -490,8 +490,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/QuerySuggestionsClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/querySuggestions/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/QuerySuggestionsClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/querySuggestions/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(
@@ -505,8 +505,8 @@ runs:
       uses: actions/cache@v2
       with:
         path: |
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/api/PredictClient.java
-          clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/model/predict/**
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/api/PredictClient.java
+          clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/model/predict/**
         key: |
           ${{ env.CACHE_VERSION }}-${{
           hashFiles(

.github/workflows/check.yml

@@ -230,8 +230,8 @@ jobs:
         uses: actions/cache@v2
         with:
           path: |
-            ${{ format('{0}/algoliasearch-core/src/com/algolia/api/{1}.java', matrix.client.path, matrix.client.api) }}
-            ${{ format('{0}/algoliasearch-core/src/com/algolia/model/{1}/**', matrix.client.path, matrix.client.camelizedName) }}
+            ${{ format('{0}/algoliasearch-core/src/main/java/com/algolia/api/{1}.java', matrix.client.path, matrix.client.api) }}
+            ${{ format('{0}/algoliasearch-core/src/main/java/com/algolia/model/{1}/**', matrix.client.path, matrix.client.camelizedName) }}
           key: |
             ${{ env.CACHE_VERSION }}-${{
             hashFiles(

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

@@ -16,9 +16,9 @@ pom.xml
 gradlew.bat
 
 # Selective source file
-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
+algoliasearch-core/src/main/java/com/algolia/auth/**
+algoliasearch-core/src/main/java/com/algolia/ApiException.java
+algoliasearch-core/src/main/java/com/algolia/Configuration.java
+algoliasearch-core/src/main/java/com/algolia/Server*.java
+algoliasearch-core/src/main/java/com/algolia/StringUtil.java
+algoliasearch-core/src/main/java/com/algolia/GzipRequestInterceptor.java

clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle

@@ -22,11 +22,3 @@ dependencies {
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ["src"]
-        }
-    }
-}

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

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

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

@@ -13,10 +13,10 @@ module.exports = {
     '!clients/algoliasearch-client-java-2/*.gradle',
     '!clients/algoliasearch-client-java-2/.gitignore',
     '!clients/algoliasearch-client-java-2/algoliasearch-core/build.gradle',
-    '!clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/exceptions/*',
-    '!clients/algoliasearch-client-java-2/algoliasearch-core/src/com/algolia/utils/*',
-    'clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/utils/echo/EchoResponse*.java',
-    '!clients/algoliasearch-client-java-2/algoliasearch-core/com/algolia/utils/echo/EchoResponseInterface.java',
+    '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/exceptions/*',
+    '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/*',
+    'clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/echo/EchoResponse*.java',
+    '!clients/algoliasearch-client-java-2/algoliasearch-core/src/main/java/com/algolia/utils/echo/EchoResponseInterface.java',
 
     // JavaScript
     '!clients/algoliasearch-client-javascript/*',

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

@@ -224,7 +224,7 @@ public String getHelp() {
   public void processOpts() {
     // generator specific options
     setDateLibrary("java8");
-    setSourceFolder("algoliasearch-core/src");
+    setSourceFolder("algoliasearch-core/src/main/java");
     setInvokerPackage("com.algolia");
     setApiNameSuffix(Utils.API_SUFFIX);