Skip to content

Commit 4f784ab

Browse files
committed
[java][okhttp] Route the Jackson 3 JsonTypeName import through model.imports
The previous fix emitted the JsonTypeName import from pojo.mustache whenever useJackson3 was set. AbstractJavaCodegen already adds that import for any model whose classname was sanitized, regardless of Jackson version, so models such as Apple, Banana and EnumTest ended up importing it twice. Contribute it from JavaClientCodegen.postProcessModelProperty instead. Because model.imports is a Set, the import is emitted exactly once whichever path asks for it, and the template no longer hardcodes it. Jackson-annotation duplicate imports across the okhttp samples drop from 19 to 1. The remaining one is JsonIgnore on a model that hits both the additionalProperties template path and the shared nullable addImports path, which appends to a List without de-duplicating - the same pre-existing mechanism that leaves five duplicate imports in okhttp-gson-nullable-required on master.
1 parent a268fb0 commit 4f784ab

72 files changed

Lines changed: 60 additions & 72 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,11 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
11531153
model.imports.add("JsonProperty");
11541154
model.imports.add("JsonValue");
11551155
model.imports.add("JsonInclude");
1156-
if (!useJackson3) {
1156+
// The okhttp pojo template emits @JsonTypeName for Jackson 3 too, so it needs the
1157+
// import on every model. Routing it through model.imports (a Set) rather than
1158+
// hardcoding it in the template keeps it from being emitted twice on the models
1159+
// that AbstractJavaCodegen already imports it for.
1160+
if (!useJackson3 || isLibrary(OKHTTP)) {
11571161
model.imports.add("JsonTypeName");
11581162
}
11591163
}

‎modules/openapi-generator/src/main/resources/Java/libraries/okhttp/pojo.mustache‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,9 @@ import com.google.gson.annotations.JsonAdapter;
1616
import com.google.gson.annotations.SerializedName;
1717
{{/isGson}}
1818
{{#isJackson}}
19-
{{! JsonCreator, JsonInclude, JsonProperty and JsonValue are already contributed via model.imports
20-
by JavaClientCodegen.postProcessModelProperty; emitting them here too produced duplicate
21-
import lines. JsonTypeName is only contributed there for Jackson 2, so Jackson 3 still needs
22-
it from the template. }}
23-
{{#useJackson3}}
24-
import com.fasterxml.jackson.annotation.JsonTypeName;
25-
{{/useJackson3}}
19+
{{! JsonCreator, JsonInclude, JsonProperty, JsonValue and JsonTypeName are contributed via
20+
model.imports by JavaClientCodegen.postProcessModelProperty; emitting them here as well
21+
produced duplicate import lines. }}
2622
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2723
{{#isAdditionalPropertiesTrue}}
2824
import com.fasterxml.jackson.annotation.JsonAnyGetter;

‎samples/client/petstore/java/okhttp-jackson3-jspecify/src/main/java/org/openapitools/client/model/Foo.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.fasterxml.jackson.annotation.JsonInclude;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
2223
import com.fasterxml.jackson.annotation.JsonValue;
2324
import java.io.File;
2425
import java.math.BigDecimal;
@@ -28,7 +29,6 @@
2829
import java.util.List;
2930
import org.jspecify.annotations.Nullable;
3031

31-
import com.fasterxml.jackson.annotation.JsonTypeName;
3232
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
3333
import java.io.IOException;
3434
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import com.fasterxml.jackson.annotation.JsonInclude;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
2223
import com.fasterxml.jackson.annotation.JsonValue;
2324
import java.util.HashMap;
2425
import java.util.Map;
2526

26-
import com.fasterxml.jackson.annotation.JsonTypeName;
2727
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2828
import java.io.IOException;
2929
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/AllOfRefToDouble.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.fasterxml.jackson.annotation.JsonInclude;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
2223
import com.fasterxml.jackson.annotation.JsonValue;
2324

24-
import com.fasterxml.jackson.annotation.JsonTypeName;
2525
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2626
import java.io.IOException;
2727
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/AllOfRefToFloat.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.fasterxml.jackson.annotation.JsonInclude;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
2223
import com.fasterxml.jackson.annotation.JsonValue;
2324

24-
import com.fasterxml.jackson.annotation.JsonTypeName;
2525
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2626
import java.io.IOException;
2727
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/AllOfRefToLong.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.fasterxml.jackson.annotation.JsonInclude;
2020
import com.fasterxml.jackson.annotation.JsonProperty;
2121
import com.fasterxml.jackson.annotation.JsonCreator;
22+
import com.fasterxml.jackson.annotation.JsonTypeName;
2223
import com.fasterxml.jackson.annotation.JsonValue;
2324

24-
import com.fasterxml.jackson.annotation.JsonTypeName;
2525
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2626
import java.io.IOException;
2727
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/Animal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
import com.fasterxml.jackson.annotation.JsonCreator;
2323
import com.fasterxml.jackson.annotation.JsonSubTypes;
2424
import com.fasterxml.jackson.annotation.JsonTypeInfo;
25+
import com.fasterxml.jackson.annotation.JsonTypeName;
2526
import com.fasterxml.jackson.annotation.JsonValue;
2627

27-
import com.fasterxml.jackson.annotation.JsonTypeName;
2828
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2929
import java.io.IOException;
3030
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/Apple.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.fasterxml.jackson.annotation.JsonTypeName;
2323
import com.fasterxml.jackson.annotation.JsonValue;
2424

25-
import com.fasterxml.jackson.annotation.JsonTypeName;
2625
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2726
import java.io.IOException;
2827
import java.util.Arrays;

‎samples/client/petstore/java/okhttp-jackson3/src/main/java/org/openapitools/client/model/AppleReq.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import com.fasterxml.jackson.annotation.JsonTypeName;
2323
import com.fasterxml.jackson.annotation.JsonValue;
2424

25-
import com.fasterxml.jackson.annotation.JsonTypeName;
2625
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
2726
import java.io.IOException;
2827
import java.util.Arrays;

0 commit comments

Comments
 (0)