Improve Apache Httpclient support

modules/openapi-generator/src/main/resources/Java/ApiClient.mustache

@@ -280,6 +280,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set access token for the first Bearer authentication.
    * @param bearerToken Bearer token
+   * @return API client
    */
   public void setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {

modules/openapi-generator/src/main/resources/Java/libraries/apache/ApiClient.mustache → modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache

@@ -199,6 +199,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return objectMapper;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setObjectMapper(ObjectMapper objectMapper) {
     this.objectMapper = objectMapper;
     return this;
@@ -208,6 +211,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return httpClient;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setHttpClient(CloseableHttpClient httpClient) {
     this.httpClient = httpClient;
     return this;
@@ -217,6 +223,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return basePath;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setBasePath(String basePath) {
     this.basePath = basePath;
     return this;
@@ -226,6 +235,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return servers;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setServers(List<ServerConfiguration> servers) {
     this.servers = servers;
     return this;
@@ -235,6 +247,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return serverIndex;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setServerIndex(Integer serverIndex) {
     this.serverIndex = serverIndex;
     return this;
@@ -244,6 +259,9 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
     return serverVariables;
   }
 
+  /**
+   * @return API client
+   */
   public ApiClient setServerVariables(Map<String, String> serverVariables) {
     this.serverVariables = serverVariables;
     return this;
@@ -298,6 +316,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set access token for the first Bearer authentication.
    * @param bearerToken Bearer token
+   * @return API client
    */
   public ApiClient setBearerToken(String bearerToken) {
     for (Authentication auth : authentications.values()) {
@@ -315,6 +334,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set username for the first HTTP basic authentication.
    * @param username Username
+   * @return API client
    */
   public ApiClient setUsername(String username) {
     for (Authentication auth : authentications.values()) {
@@ -329,6 +349,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set password for the first HTTP basic authentication.
    * @param password Password
+   * @return API client
    */
   public ApiClient setPassword(String password) {
     for (Authentication auth : authentications.values()) {
@@ -346,6 +367,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set API key value for the first API key authentication.
    * @param apiKey the API key
+   * @return API client
    */
   public ApiClient setApiKey(String apiKey) {
     for (Authentication auth : authentications.values()) {
@@ -360,6 +382,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set API key prefix for the first API key authentication.
    * @param apiKeyPrefix API key prefix
+   * @return API client
    */
   public ApiClient setApiKeyPrefix(String apiKeyPrefix) {
     for (Authentication auth : authentications.values()) {
@@ -377,6 +400,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
   /**
    * Helper method to set access token for the first OAuth2 authentication.
    * @param accessToken Access token
+   * @return API client
    */
   public ApiClient setAccessToken(String accessToken) {
     for (Authentication auth : authentications.values()) {
@@ -948,6 +972,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
    * @param accept The request's Accept header
    * @param contentType The request's Content-Type header
    * @param authNames The authentications to apply
+   * @param returnType Return type
    * @return The response body in type of string
    * @throws ApiException API exception
    */

modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/build.gradle.mustache

@@ -0,0 +1,169 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = '{{groupId}}'
+version = '{{artifactVersion}}'
+
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:2.3.+'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
+if(hasProperty('target') && target == 'android') {
+
+    apply plugin: 'com.android.library'
+    apply plugin: 'com.github.dcendents.android-maven'
+
+    android {
+        compileSdkVersion 25
+        buildToolsVersion '25.0.2'
+        defaultConfig {
+            minSdkVersion 14
+            targetSdkVersion 25
+        }
+
+        compileOptions {
+            {{#java8}}
+            sourceCompatibility JavaVersion.VERSION_1_8
+            targetCompatibility JavaVersion.VERSION_1_8
+            {{/java8}}
+            {{^java8}}
+            sourceCompatibility JavaVersion.VERSION_1_7
+            targetCompatibility JavaVersion.VERSION_1_7
+            {{/java8}}
+        }
+
+        // Rename the aar correctly
+        libraryVariants.all { variant ->
+            variant.outputs.each { output ->
+                def outputFile = output.outputFile
+                if (outputFile != null && outputFile.name.endsWith('.aar')) {
+                    def fileName = "${project.name}-${variant.baseName}-${version}.aar"
+                    output.outputFile = new File(outputFile.parent, fileName)
+                }
+            }
+        }
+
+        dependencies {
+            provided "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+        }
+    }
+
+    afterEvaluate {
+        android.libraryVariants.all { variant ->
+            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"
+            artifacts.add('archives', task);
+        }
+    }
+
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
+
+    artifacts {
+        archives sourcesJar
+    }
+
+} else {
+
+    apply plugin: 'java'
+    apply plugin: 'maven-publish'
+
+    {{#java8}}
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+    {{/java8}}
+    {{^java8}}
+    sourceCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_1_7
+    {{/java8}}
+
+    publishing {
+        publications {
+            maven(MavenPublication) {
+               artifactId = '{{artifactId}}'
+
+               from components.java
+            }
+        }
+    }
+
+    task execute(type:JavaExec) {
+       main = System.getProperty('mainClass')
+       classpath = sourceSets.main.runtimeClasspath
+    }
+
+    task sourcesJar(type: Jar, dependsOn: classes) {
+        classifier = 'sources'
+        from sourceSets.main.allSource
+    }
+
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
+
+    artifacts {
+        archives sourcesJar
+        archives javadocJar
+    }
+}
+
+ext {
+    swagger_annotations_version = "1.5.22"
+    jackson_version = "2.12.1"
+    jackson_databind_version = "2.10.5.1"
+    {{#openApiNullable}}
+    jackson_databind_nullable_version = "0.2.1"
+    {{/openApiNullable}}
+    jakarta_annotation_version = "1.3.5"
+    {{#threetenbp}}
+    jackson_threetenbp_version = "2.9.10"
+    {{/threetenbp}}
+    httpclient_version = "4.5.13"
+    jodatime_version = "2.9.9"
+    junit_version = "4.13.1"
+}
+
+dependencies {
+    implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
+    implementation "com.google.code.findbugs:jsr305:3.0.2"
+    implementation "org.apache.httpcomponents:httpclient:$httpclient_version"
+    implementation "org.apache.httpcomponents:httpmime:$httpclient_version"
+    implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
+    implementation "com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:$jackson_version"
+    {{#openApiNullable}}
+    implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
+    {{/openApiNullable}}
+    {{#joda}}
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
+    {{/joda}}
+    {{#java8}}
+    implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    {{/java8}}
+    {{#threetenbp}}
+    implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$jackson_threetenbp_version"
+    {{/threetenbp}}
+    {{^java8}}
+    implementation "com.brsanthu:migbase64:2.2"
+    {{/java8}}
+    implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
+    testImplementation "junit:junit:$junit_version"
+}

samples/client/petstore/java/apache-httpclient/README.md

@@ -50,14 +50,7 @@ Add this dependency to your project's POM:
 Add this dependency to your project's build file:
 
 ```groovy
-  repositories {
-    mavenCentral()     // Needed if the 'petstore-apache-httpclient' jar has been published to maven central.
-    mavenLocal()       // Needed if the 'petstore-apache-httpclient' jar has been published to the local maven repo.
-  }
-
-  dependencies {
-     implementation "org.openapitools:petstore-apache-httpclient:1.0.0"
-  }
+compile "org.openapitools:petstore-apache-httpclient:1.0.0"
 ```
 
 ### Others

samples/client/petstore/java/apache-httpclient/build.gradle

@@ -119,16 +119,16 @@ ext {
     jackson_databind_nullable_version = "0.2.1"
     jakarta_annotation_version = "1.3.5"
     jackson_threetenbp_version = "2.9.10"
-    jersey_version = "1.19.4"
+    httpclient_version = "4.5.13"
     jodatime_version = "2.9.9"
     junit_version = "4.13.1"
 }
 
 dependencies {
     implementation "io.swagger:swagger-annotations:$swagger_annotations_version"
     implementation "com.google.code.findbugs:jsr305:3.0.2"
-    implementation "com.sun.jersey:jersey-client:$jersey_version"
-    implementation "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
+    implementation "org.apache.httpcomponents:httpclient:$httpclient_version"
+    implementation "org.apache.httpcomponents:httpmime:$httpclient_version"
     implementation "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
     implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"

samples/client/petstore/java/apache-httpclient/pom.xml

@@ -228,16 +228,16 @@
         </dependency>
 
 
-        <!-- HTTP client: jersey-client -->
+        <!-- HTTP client: apache client -->
         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>${httpclient-version}</version>
         </dependency>
         <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>${jersey-version}</version>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpmime</artifactId>
+            <version>${httpclient-version}</version>
         </dependency>
 
         <!-- JSON processing: jackson -->
@@ -288,7 +288,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <swagger-annotations-version>1.5.21</swagger-annotations-version>
-        <jersey-version>1.19.4</jersey-version>
+        <httpclient-version>4.5.13</httpclient-version>
         <jackson-version>2.12.1</jackson-version>
         <jackson-threetenbp-version>2.9.10</jackson-threetenbp-version>
         <jakarta-annotation-version>1.3.5</jakarta-annotation-version>