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

Fixes incorrect Jackson imports in Java templates used in ApiClient.java when useJakartaEe=true (#18507)

Browse Source 
* Adds useJakartaEe condition to select the appropriate Jackson package to import.

This also removes the import on the apache-httpclient template where it doesn't actually get used, requiring users to declare additional dependencies for compilation that aren't actually required by the generated code other than for import.

* Ran generate-samples.sh
This commit is contained in:
Jochem Kuijpers 2024-05-13 10:48:59 +02:00 committed by GitHub
parent cefeded745
commit 2f9b487779
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openapi-generator/src/main/resources/Java/ApiClient.mustache vendored
View File

@ -8,7 +8,12 @@ import com.fasterxml.jackson.datatype.joda.JodaModule;
{{/joda}}
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.time.OffsetDateTime;
{{#useJakartaEe}}
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
{{/useJakartaEe}}
{{^useJakartaEe}}
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
{{/useJakartaEe}}
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;

1
modules/openapi-generator/src/main/resources/Java/libraries/apache-httpclient/ApiClient.mustache vendored
View File

@ -8,7 +8,6 @@ import com.fasterxml.jackson.datatype.joda.JodaModule;
{{/joda}}
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.time.OffsetDateTime;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;

6
modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/api_test.mustache vendored
View File

@ -23,8 +23,14 @@ import org.apache.cxf.transport.common.gzip.GZIPOutInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
{{/useLoggingFeature}}
{{#useJakartaEe}}
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
import com.fasterxml.jackson.jakarta.rs.xml.JacksonXMLProvider;
{{/useJakartaEe}}
{{^useJakartaEe}}
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.fasterxml.jackson.jaxrs.xml.JacksonXMLProvider;
{{/useJakartaEe}}
import org.apache.cxf.jaxrs.provider.MultipartProvider;
import java.util.Arrays;

5
modules/openapi-generator/src/test/resources/2_0/templates/Java/ApiClient.mustache vendored
View File

@ -19,7 +19,12 @@ import java.time.OffsetDateTime;
{{#threetenbp}}
import com.fasterxml.jackson.datatype.threetenbp.ThreeTenModule;
{{/threetenbp}}
{{#useJakartaEe}}
import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
{{/useJakartaEe}}
{{^useJakartaEe}}
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
{{/useJakartaEe}}
import com.sun.jersey.api.client.Client;
import com.sun.jersey.api.client.ClientResponse;

1
samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.time.OffsetDateTime;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;

1
samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/ApiClient.java
View File

@ -16,7 +16,6 @@ import com.fasterxml.jackson.annotation.*;
import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.time.OffsetDateTime;
import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JavaType;