Skip to content

Commit 4185782

Browse files
authored
[#20125] Remove unnecessary model package import to avoid ambiguous class references (#20124)
* Remove unnecessary model package import to avoid ambiguous class references * Regenerate JSON files
1 parent 51a0bd0 commit 4185782

File tree

12 files changed

+0
-16
lines changed
  • modules/openapi-generator/src/main/resources/Java/libraries
  • samples
    • client
      • others/java
        • jersey2-oneOf-Mixed/src/main/java/org/openapitools/client
        • jersey2-oneOf-duplicates/src/main/java/org/openapitools/client
      • petstore/java
        • jersey2-java8-localdatetime/src/main/java/org/openapitools/client
        • jersey2-java8/src/main/java/org/openapitools/client
        • jersey3-oneOf/src/main/java/org/openapitools/client
        • jersey3/src/main/java/org/openapitools/client
    • openapi3/client/petstore/java
      • jersey2-java8-special-characters/src/main/java/org/openapitools/client
      • jersey2-java8-swagger1/src/main/java/org/openapitools/client
      • jersey2-java8-swagger2/src/main/java/org/openapitools/client
      • jersey2-java8/src/main/java/org/openapitools/client

12 files changed

+0
-16
lines changed

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/JSON.mustache

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1212
{{#joda}}
1313
import com.fasterxml.jackson.datatype.joda.JodaModule;
1414
{{/joda}}
15-
{{#models.0}}
16-
import {{modelPackage}}.*;
17-
{{/models.0}}
1815

1916
import java.text.DateFormat;
2017
import java.util.HashMap;

modules/openapi-generator/src/main/resources/Java/libraries/jersey3/JSON.mustache

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
1212
{{#joda}}
1313
import com.fasterxml.jackson.datatype.joda.JodaModule;
1414
{{/joda}}
15-
{{#models.0}}
16-
import {{modelPackage}}.*;
17-
{{/models.0}}
1815

1916
import java.text.DateFormat;
2017
import java.util.HashMap;

samples/client/others/java/jersey2-oneOf-Mixed/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/client/others/java/jersey2-oneOf-duplicates/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/client/petstore/java/jersey3-oneOf/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/JSON.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.databind.json.JsonMapper;
1919
import org.openapitools.jackson.nullable.JsonNullableModule;
2020
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
21-
import org.openapitools.client.model.*;
2221

2322
import java.text.DateFormat;
2423
import java.util.HashMap;

0 commit comments

Comments
 (0)