[android] Regenerate samples

OpenAPITools · Jun 13, 2024 · 5b99f6f · 5b99f6f
1 parent a12807d
commit 5b99f6f
Show file tree

Hide file tree

Showing 15 changed files with 61 additions and 34 deletions.
diff --git a/samples/client/petstore/android/httpclient/.openapi-generator/VERSION b/samples/client/petstore/android/httpclient/.openapi-generator/VERSION
@@ -1 +1 @@
-6.0.0-SNAPSHOT
+7.7.0-SNAPSHOT
diff --git a/samples/client/petstore/android/httpclient/README.md b/samples/client/petstore/android/httpclient/README.md
@@ -117,13 +117,6 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 Authentication schemes defined for the API:
-### api_key
-
-- **Type**: API key
-
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ### petstore_auth
 
 
@@ -134,6 +127,13 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
+### api_key
+
+- **Type**: API key
+
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 
 ## Recommendation
 

diff --git a/samples/client/petstore/android/httpclient/build.gradle b/samples/client/petstore/android/httpclient/build.gradle
@@ -50,7 +50,7 @@ android {
 
 ext {
     swagger_annotations_version = "1.6.6"
-    gson_version = "2.8.9"
+    gson_version = "2.10.1"
     httpclient_version = "4.5.13"
     httpcore_version = "4.4.4"
     junit_version = "4.13"
@@ -75,9 +75,9 @@ afterEvaluate {
         def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
         task.description = "Create jar artifact for ${variant.name}"
         task.dependsOn variant.javaCompile
-        task.from variant.javaCompile.destinationDir
-        task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-        task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+        task.from variant.javaCompile.destinationDirectory
+        task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
+        task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
         artifacts.add('archives', task);
     }
 }

diff --git a/samples/client/petstore/android/httpclient/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/android/httpclient/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml
@@ -39,12 +39,12 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.12</version>
                 <configuration>
-                    <systemProperties>
+                    <systemPropertyVariables>
                         <property>
                             <name>loggerPath</name>
                             <value>conf/log4j.properties</value>
                         </property>
-                    </systemProperties>
+                    </systemPropertyVariables>
                     <argLine>-Xms512m -Xmx1500m</argLine>
                     <parallel>methods</parallel>
                     <forkMode>pertest</forkMode>
@@ -172,7 +172,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-core-version>1.6.6</swagger-core-version>
-        <gson-version>2.8.9</gson-version>
+        <gson-version>2.10.1</gson-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>
         <httpclient-version>4.5.13</httpclient-version>

diff --git a/...lient/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java b/...lient/petstore/android/httpclient/src/main/java/org/openapitools/client/ApiException.java
@@ -38,4 +38,12 @@ public String getMessage() {
   public void setMessage(String message) {
     this.message = message;
   }
+
+  @Override
+  public String toString() {
+    return "ApiException{" +
+           "code=" + code +
+           ", message=" + message +
+           '}';
+  }
 }
diff --git a/.../client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java b/.../client/petstore/android/httpclient/src/main/java/org/openapitools/client/api/PetApi.java
@@ -22,6 +22,7 @@
 
 import org.openapitools.client.model.ApiResponse;
 import java.io.File;
+import java.util.*;
 import org.openapitools.client.model.Pet;
 
 import org.apache.http.entity.mime.MultipartEntityBuilder;

diff --git a/samples/client/petstore/android/volley/.openapi-generator/VERSION b/samples/client/petstore/android/volley/.openapi-generator/VERSION
@@ -1 +1 @@
-6.0.0-SNAPSHOT
+7.7.0-SNAPSHOT
diff --git a/samples/client/petstore/android/volley/README.md b/samples/client/petstore/android/volley/README.md
@@ -117,13 +117,6 @@ Class | Method | HTTP request | Description
 ## Documentation for Authorization
 
 Authentication schemes defined for the API:
-### api_key
-
-- **Type**: API key
-
-- **API key parameter name**: api_key
-- **Location**: HTTP header
-
 ### petstore_auth
 
 
@@ -134,6 +127,13 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
+### api_key
+
+- **Type**: API key
+
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
 
 ## Recommendation
 

diff --git a/samples/client/petstore/android/volley/build.gradle b/samples/client/petstore/android/volley/build.gradle
@@ -41,6 +41,9 @@ android {
     lintOptions {
         abortOnError false
     }
+    packagingOptions {
+        resources.excludes += "META-INF/DEPENDENCIES"
+    }
 
     // Rename the aar correctly
     libraryVariants.all { variant ->
@@ -58,8 +61,9 @@ android {
 
 ext {
     swagger_annotations_version = "1.6.6"
-    gson_version = "2.8.9"
-    httpmime_version = "4.5.13"
+    gson_version = "2.10.1"
+    httpcore_version = "4.4.16"
+    httpmime_version = "4.5.14"
     volley_version = "1.2.1"
     junit_version = "4.13.2"
     robolectric_version = "4.5.1"
@@ -69,7 +73,12 @@ ext {
 dependencies {
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.gson:gson:$gson_version"
-    implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
+    implementation ("org.apache.httpcomponents:httpcore:$httpcore_version") {
+        exclude(group: "org.apache.httpcomponents", module: "httpclient")
+    }
+    implementation ("org.apache.httpcomponents:httpmime:$httpmime_version") {
+        exclude(group: "org.apache.httpcomponents", module: "httpclient")
+    }
     implementation "com.android.volley:volley:${volley_version}"
     testImplementation "junit:junit:$junit_version"
     testImplementation "org.robolectric:robolectric:${robolectric_version}"
@@ -81,9 +90,9 @@ afterEvaluate {
         def task = project.tasks.create "jar${variant.name.capitalize()}", Jar
         task.description = "Create jar artifact for ${variant.name}"
         task.dependsOn variant.javaCompile
-        task.from variant.javaCompile.destinationDir
-        task.destinationDir = project.file("${project.buildDir}/outputs/jar")
-        task.archiveName = "${project.name}-${variant.baseName}-${version}.jar"
+        task.from variant.javaCompile.destinationDirectory
+        task.destinationDirectory = project.file("${project.buildDir}/outputs/jar")
+        task.archiveFileName = "${project.name}-${variant.baseName}-${version}.jar"
         artifacts.add('archives', task);
     }
 }

diff --git a/samples/client/petstore/android/volley/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/android/volley/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/samples/client/petstore/android/volley/pom.xml b/samples/client/petstore/android/volley/pom.xml
@@ -54,8 +54,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <swagger-annotations-version>1.6.6</swagger-annotations-version>
-    <httpcomponents-httpmime-version>4.5.13</httpcomponents-httpmime-version>
-    <google-code-gson-version>2.8.9</google-code-gson-version>
+    <httpcomponents-httpmime-version>4.5.14</httpcomponents-httpmime-version>
+    <google-code-gson-version>2.10.1</google-code-gson-version>
     <volley-library-version>1.2.1</volley-library-version>
     <android-platform-version>4.1.1.4</android-platform-version>
   </properties>

diff --git a/...es/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiException.java b/...es/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiException.java
@@ -58,4 +58,12 @@ public String getMessage() {
   public void setMessage(String message) {
     this.message = message;
   }
+
+  @Override
+  public String toString() {
+    return "ApiException{" +
+           "code=" + code +
+           ", message=" + message +
+           '}';
+  }
 }
diff --git a/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiInvoker.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/ApiInvoker.java
@@ -203,9 +203,9 @@ public static void initializeInstance(Cache cache, Network network, int threadPo
 
     // Setup authentications (key: authentication name, value: authentication).
     INSTANCE.authentications = new HashMap<String, Authentication>();
-    INSTANCE.authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     // TODO: comment out below as OAuth does not exist
     //INSTANCE.authentications.put("petstore_auth", new OAuth());
+    INSTANCE.authentications.put("api_key", new ApiKeyAuth("header", "api_key"));
     // Prevent the authentications from being modified.
     INSTANCE.authentications = Collections.unmodifiableMap(INSTANCE.authentications);
   }

diff --git a/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/android/volley/src/main/java/org/openapitools/client/api/PetApi.java
@@ -25,6 +25,7 @@
 
 import org.openapitools.client.model.ApiResponse;
 import java.io.File;
+import java.util.*;
 import org.openapitools.client.model.Pet;
 
 import org.apache.http.HttpEntity;