loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

[JAVA] java.net.http.HttpClient (java native) conditionally depend on apache (#14670)

Browse Source 
* JAVA-NATIVE conditionally depend on apache

* add hasFormParamsInSpec in abstract java codegen

* use hasFormParamsInSpec instead

* minor fix

---------

Co-authored-by: Sergey Prytkov <sergey@razz.team>
This commit is contained in:
William Cheng 2023-02-11 22:06:44 +08:00 committed by GitHub
parent 9a0aee90bd
commit b6abace9dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
26 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
View File

@ -1542,6 +1542,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
OperationMap operations = objs.getOperations();
List<CodegenOperation> operationList = operations.getOperation();
for (CodegenOperation op : operationList) {
// check if the operation has form parameters
if (op.getHasFormParams()) {
additionalProperties.put("hasFormParamsInSpec", true);
}
Collection<String> operationImports = new ConcurrentSkipListSet<>();
for (CodegenParameter p : op.allParams) {
if (importMapping.containsKey(p.dataType)) {
@ -1552,6 +1556,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
handleImplicitHeaders(op);
}
return objs;
}

3
modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache vendored
View File

@ -12,12 +12,15 @@ import {{import}};
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
{{#hasFormParamsInSpec}}
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
{{/hasFormParamsInSpec}}
import java.io.InputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;

4
modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache vendored
View File

@ -72,7 +72,9 @@ ext {
jackson_version = "2.14.1"
jakarta_annotation_version = "1.3.5"
junit_version = "4.13.2"
{{#hasFormParamsInSpec}}
httpmime_version = "4.5.13"
{{/hasFormParamsInSpec}}
}
dependencies {
@ -86,7 +88,9 @@ dependencies {
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
implementation "org.openapitools:jackson-databind-nullable:0.2.1"
implementation "jakarta.annotation:jakarta.annotation-api:$jakarta_annotation_version"
{{#hasFormParamsInSpec}}
implementation "org.apache.httpcomponents:httpmime:$httpmime_version"
{{/hasFormParamsInSpec}}
testImplementation "junit:junit:$junit_version"
}

4
modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache vendored
View File

@ -248,11 +248,13 @@
<version>${jakarta-annotation-version}</version>
<scope>provided</scope>
</dependency>
{{#hasFormParamsInSpec}}
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>${httpmime-version}</version>
</dependency>
{{/hasFormParamsInSpec}}
<!-- test dependencies -->
<dependency>
@ -278,7 +280,9 @@
{{^useJakartaEe}}
<jakarta-annotation-version>1.3.5</jakarta-annotation-version>
{{/useJakartaEe}}
{{#hasFormParamsInSpec}}
<httpmime-version>4.5.13</httpmime-version>
{{/hasFormParamsInSpec}}
<junit-version>4.13.2</junit-version>
<spotless.version>2.27.2</spotless.version>
</properties>

5
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/BodyApi.java
View File

@ -21,11 +21,6 @@ import org.openapitools.client.model.Pet;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.io.InputStream;
import java.io.ByteArrayInputStream;

1
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/FormApi.java
View File

@ -20,6 +20,7 @@ import org.openapitools.client.Pair;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/HeaderApi.java
View File

@ -20,6 +20,7 @@ import org.openapitools.client.Pair;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/PathApi.java
View File

@ -20,6 +20,7 @@ import org.openapitools.client.Pair;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/echo_api/java/native/src/main/java/org/openapitools/client/api/QueryApi.java
View File

@ -24,6 +24,7 @@ import org.openapitools.client.model.TestQueryStyleFormExplodeTrueArrayStringQue
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

5
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@ -21,11 +21,6 @@ import org.openapitools.client.model.Client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.io.InputStream;
import java.io.ByteArrayInputStream;

5
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/DefaultApi.java
View File

@ -21,11 +21,6 @@ import org.openapitools.client.model.FooGetDefaultResponse;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.io.InputStream;
import java.io.ByteArrayInputStream;

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -30,6 +30,7 @@ import org.openapitools.client.model.User;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@ -21,6 +21,7 @@ import org.openapitools.client.model.Client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -23,6 +23,7 @@ import org.openapitools.client.model.Pet;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -21,6 +21,7 @@ import org.openapitools.client.model.Order;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -22,6 +22,7 @@ import org.openapitools.client.model.User;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -23,6 +23,7 @@ import org.openapitools.client.model.Pet;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -21,6 +21,7 @@ import org.openapitools.client.model.Order;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -22,6 +22,7 @@ import org.openapitools.client.model.User;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

5
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
View File

@ -21,11 +21,6 @@ import org.openapitools.client.model.Client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.io.InputStream;
import java.io.ByteArrayInputStream;

5
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/DefaultApi.java
View File

@ -21,11 +21,6 @@ import org.openapitools.client.model.FooGetDefaultResponse;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import java.io.InputStream;
import java.io.ByteArrayInputStream;

1
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
View File

@ -30,6 +30,7 @@ import org.openapitools.client.model.User;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
View File

@ -21,6 +21,7 @@ import org.openapitools.client.model.Client;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
View File

@ -23,6 +23,7 @@ import org.openapitools.client.model.Pet;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
View File

@ -21,6 +21,7 @@ import org.openapitools.client.model.Order;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;

1
samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
View File

@ -22,6 +22,7 @@ import org.openapitools.client.model.User;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;
import org.apache.http.entity.mime.MultipartEntityBuilder;