Skip to content

Commit cce0d0a

Browse files
wing328wing328
authored
update resteasy dependencies (#9729)
1 parent 0e93e79 commit cce0d0a

24 files changed

+77
-176
lines changed

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

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -539,12 +539,7 @@ public void processOpts() {
539539
importMapping.put("com.fasterxml.jackson.annotation.JsonProperty", "com.fasterxml.jackson.annotation.JsonCreator");
540540

541541
if (additionalProperties.containsKey(JAVA8_MODE)) {
542-
setJava8Mode(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
543-
if (java8Mode) {
544-
additionalProperties.put("java8", true);
545-
} else {
546-
additionalProperties.put("java8", false);
547-
}
542+
setJava8ModeAndAdditionalProperties(Boolean.parseBoolean(additionalProperties.get(JAVA8_MODE).toString()));
548543
}
549544

550545
if (additionalProperties.containsKey(SUPPORT_ASYNC)) {
@@ -1692,6 +1687,15 @@ public void setJava8Mode(boolean enabled) {
16921687
this.java8Mode = enabled;
16931688
}
16941689

1690+
public void setJava8ModeAndAdditionalProperties(boolean enabled) {
1691+
this.java8Mode = enabled;
1692+
if (this.java8Mode) {
1693+
this.additionalProperties.put("java8", true);
1694+
} else {
1695+
this.additionalProperties.put("java8", false);
1696+
}
1697+
}
1698+
16951699
public void setSupportAsync(boolean enabled) {
16961700
this.supportAsync = enabled;
16971701
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -436,13 +436,13 @@ public void processOpts() {
436436
supportsAdditionalPropertiesWithComposedSchema = true;
437437

438438
} else if (NATIVE.equals(getLibrary())) {
439-
setJava8Mode(true);
440-
additionalProperties.put("java8", "true");
439+
setJava8ModeAndAdditionalProperties(true);
441440
supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
442441
supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
443442
supportingFiles.add(new SupportingFile("AbstractOpenApiSchema.mustache", (sourceFolder + File.separator + modelPackage().replace('.', File.separatorChar)).replace('/', File.separatorChar), "AbstractOpenApiSchema.java"));
444443
forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
445444
} else if (RESTEASY.equals(getLibrary())) {
445+
setJava8ModeAndAdditionalProperties(true);
446446
supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
447447
forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
448448
} else if (JERSEY1.equals(getLibrary())) {
@@ -451,14 +451,12 @@ public void processOpts() {
451451
forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
452452
supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
453453
} else if (WEBCLIENT.equals(getLibrary())) {
454-
setJava8Mode(true);
455-
additionalProperties.put("java8", "true");
454+
setJava8ModeAndAdditionalProperties(true);
456455
forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
457456
} else if (VERTX.equals(getLibrary())) {
458457
typeMapping.put("file", "AsyncFile");
459458
importMapping.put("AsyncFile", "io.vertx.core.file.AsyncFile");
460-
setJava8Mode(true);
461-
additionalProperties.put("java8", "true");
459+
setJava8ModeAndAdditionalProperties(true);
462460
forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
463461
apiTemplateFiles.put("apiImpl.mustache", "Impl.java");
464462
apiTemplateFiles.put("rxApiImpl.mustache", ".java");
@@ -531,7 +529,7 @@ public void processOpts() {
531529
supportingFiles.add(new SupportingFile("play25/Play25CallFactory.mustache", invokerFolder, "Play25CallFactory.java"));
532530
supportingFiles.add(new SupportingFile("play25/Play25CallAdapterFactory.mustache", invokerFolder,
533531
"Play25CallAdapterFactory.java"));
534-
additionalProperties.put("java8", "true");
532+
setJava8ModeAndAdditionalProperties(true);
535533
}
536534

537535
if (PLAY_26.equals(playVersion)) {
@@ -542,7 +540,7 @@ public void processOpts() {
542540
supportingFiles.add(new SupportingFile("play26/Play26CallFactory.mustache", invokerFolder, "Play26CallFactory.java"));
543541
supportingFiles.add(new SupportingFile("play26/Play26CallAdapterFactory.mustache", invokerFolder,
544542
"Play26CallAdapterFactory.java"));
545-
additionalProperties.put("java8", "true");
543+
setJava8ModeAndAdditionalProperties(true);
546544
}
547545

548546
supportingFiles.add(new SupportingFile("play-common/auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ import com.fasterxml.jackson.databind.*;
55
{{#openApiNullable}}
66
import org.openapitools.jackson.nullable.JsonNullableModule;
77
{{/openApiNullable}}
8-
{{#java8}}
98
import com.fasterxml.jackson.datatype.jsr310.*;
10-
{{/java8}}
11-
{{^java8}}
12-
import com.fasterxml.jackson.datatype.joda.*;
13-
{{/java8}}
149

1510
import java.text.DateFormat;
1611

@@ -33,12 +28,7 @@ public class JSON implements ContextResolver<ObjectMapper> {
3328
JsonNullableModule jnm = new JsonNullableModule();
3429
mapper.registerModule(jnm);
3530
{{/openApiNullable}}
36-
{{#java8}}
3731
mapper.registerModule(new JavaTimeModule());
38-
{{/java8}}
39-
{{^java8}}
40-
mapper.registerModule(new JodaModule());
41-
{{/java8}}
4232
}
4333

4434
/**

‎modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,8 @@ if(hasProperty('target') && target == 'android') {
3333
targetSdkVersion 23
3434
}
3535
compileOptions {
36-
{{#java8}}
3736
sourceCompatibility JavaVersion.VERSION_1_8
3837
targetCompatibility JavaVersion.VERSION_1_8
39-
{{/java8}}
40-
{{^java8}}
41-
sourceCompatibility JavaVersion.VERSION_1_7
42-
targetCompatibility JavaVersion.VERSION_1_7
43-
{{/java8}}
4438
}
4539

4640
// Rename the aar correctly
@@ -84,14 +78,8 @@ if(hasProperty('target') && target == 'android') {
8478
8579
apply plugin: 'java'
8680
apply plugin: 'maven'
87-
{{#java8}}
8881
sourceCompatibility = JavaVersion.VERSION_1_8
8982
targetCompatibility = JavaVersion.VERSION_1_8
90-
{{/java8}}
91-
{{^java8}}
92-
sourceCompatibility = JavaVersion.VERSION_1_7
93-
targetCompatibility = JavaVersion.VERSION_1_7
94-
{{/java8}}
9583
9684
install {
9785
repositories.mavenInstaller {
@@ -113,10 +101,7 @@ ext {
113101
jackson_databind_nullable_version = "0.2.1"
114102
{{/openApiNullable}}
115103
threetenbp_version = "2.9.10"
116-
resteasy_version = "3.1.3.Final"
117-
{{^java8}}
118-
jodatime_version = "2.9.9"
119-
{{/java8}}
104+
resteasy_version = "4.5.11.Final"
120105
junit_version = "4.13"
121106
}
122107

@@ -133,14 +118,7 @@ dependencies {
133118
{{#openApiNullable}}
134119
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
135120
{{/openApiNullable}}
136-
{{#java8}}
137121
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
138-
{{/java8}}
139-
{{^java8}}
140-
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
141-
implementation "joda-time:joda-time:$jodatime_version"
142-
implementation "com.brsanthu:migbase64:2.2"
143-
{{/java8}}
144122
implementation 'javax.annotation:javax.annotation-api:1.3.2'
145123
testImplementation "junit:junit:$junit_version"
146124
}

‎modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.sbt.mustache

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,13 @@ lazy val root = (project in file(".")).
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
1313
"org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile",
14-
"org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final" % "compile",
15-
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final" % "compile",
14+
"org.jboss.resteasy" % "resteasy-multipart-provider" % "4.5.11.Final" % "compile",
15+
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile",
1616
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile",
1919
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
20-
{{#java8}}
2120
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
22-
{{/java8}}
23-
{{^java8}}
24-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
25-
"joda-time" % "joda-time" % "2.9.9" % "compile",
26-
"com.brsanthu" % "migbase64" % "2.2" % "compile",
27-
{{/java8}}
2821
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
2922
"junit" % "junit" % "4.13" % "test",
3023
"com.novocode" % "junit-interface" % "0.10" % "test"

‎modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -142,14 +142,8 @@
142142
<artifactId>maven-compiler-plugin</artifactId>
143143
<version>2.5.1</version>
144144
<configuration>
145-
{{#java8}}
146-
<source>1.8</source>
147-
<target>1.8</target>
148-
{{/java8}}
149-
{{^java8}}
150-
<source>1.7</source>
151-
<target>1.7</target>
152-
{{/java8}}
145+
<source>1.8</source>
146+
<target>1.8</target>
153147
</configuration>
154148
</plugin>
155149
<plugin>
@@ -158,12 +152,7 @@
158152
<version>3.1.1</version>
159153
<configuration>
160154
<doclint>none</doclint>
161-
{{#java8}}
162-
<source>1.8</source>
163-
{{/java8}}
164-
{{^java8}}
165-
<source>1.7</source>
166-
{{/java8}}
155+
<source>1.8</source>
167156
</configuration>
168157
<executions>
169158
<execution>
@@ -232,30 +221,10 @@
232221
</dependency>
233222

234223
{{/withXml}}
235-
{{^java8}}
236-
<dependency>
237-
<groupId>com.fasterxml.jackson.datatype</groupId>
238-
<artifactId>jackson-datatype-joda</artifactId>
239-
<version>${jackson-version}</version>
240-
</dependency>
241-
<dependency>
242-
<groupId>joda-time</groupId>
243-
<artifactId>joda-time</artifactId>
244-
<version>${jodatime-version}</version>
245-
</dependency>
246-
247-
<!-- Base64 encoding that works in both JVM and Android -->
248-
<dependency>
249-
<groupId>com.brsanthu</groupId>
250-
<artifactId>migbase64</artifactId>
251-
<version>2.2</version>
252-
</dependency>
253-
{{/java8}}
254-
255224
<dependency>
256225
<groupId>org.jboss.resteasy</groupId>
257226
<artifactId>resteasy-jackson2-provider</artifactId>
258-
<version>3.1.3.Final</version>
227+
<version>${resteasy-version}</version>
259228
</dependency>
260229
<dependency>
261230
<groupId>com.fasterxml.jackson.datatype</groupId>
@@ -284,15 +253,12 @@
284253
<properties>
285254
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
286255
<swagger-annotations-version>1.5.22</swagger-annotations-version>
287-
<resteasy-version>3.1.3.Final</resteasy-version>
256+
<resteasy-version>4.5.11.Final</resteasy-version>
288257
<jackson-version>2.10.5</jackson-version>
289258
<jackson-databind-version>2.10.5.1</jackson-databind-version>
290259
<jackson-databind-nullable-version>0.2.1</jackson-databind-nullable-version>
291260
<javax-annotation-version>1.3.2</javax-annotation-version>
292261
<threetenbp-version>2.9.10</threetenbp-version>
293-
{{^java8}}
294-
<jodatime-version>2.9.9</jodatime-version>
295-
{{/java8}}
296262
<maven-plugin-version>1.0.0</maven-plugin-version>
297263
<junit-version>4.13</junit-version>
298264
</properties>

‎samples/client/petstore/java/resteasy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This spec is mainly for testing Petstore server and contains fake endpoints, mod
1313

1414
Building the API client library requires:
1515

16-
1. Java 1.7+
16+
1. Java 1.8+
1717
2. Maven/Gradle
1818

1919
## Installation

‎samples/client/petstore/java/resteasy/build.gradle

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ if(hasProperty('target') && target == 'android') {
3333
targetSdkVersion 23
3434
}
3535
compileOptions {
36-
sourceCompatibility JavaVersion.VERSION_1_7
37-
targetCompatibility JavaVersion.VERSION_1_7
36+
sourceCompatibility JavaVersion.VERSION_1_8
37+
targetCompatibility JavaVersion.VERSION_1_8
3838
}
3939

4040
// Rename the aar correctly
@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
7878

7979
apply plugin: 'java'
8080
apply plugin: 'maven'
81-
sourceCompatibility = JavaVersion.VERSION_1_7
82-
targetCompatibility = JavaVersion.VERSION_1_7
81+
sourceCompatibility = JavaVersion.VERSION_1_8
82+
targetCompatibility = JavaVersion.VERSION_1_8
8383

8484
install {
8585
repositories.mavenInstaller {
@@ -99,8 +99,7 @@ ext {
9999
jackson_databind_version = "2.10.5.1"
100100
jackson_databind_nullable_version = "0.2.1"
101101
threetenbp_version = "2.9.10"
102-
resteasy_version = "3.1.3.Final"
103-
jodatime_version = "2.9.9"
102+
resteasy_version = "4.5.11.Final"
104103
junit_version = "4.13"
105104
}
106105

@@ -115,9 +114,7 @@ dependencies {
115114
implementation "com.fasterxml.jackson.core:jackson-databind:$jackson_databind_version"
116115
implementation "com.github.joschi.jackson:jackson-datatype-threetenbp:$threetenbp_version"
117116
implementation "org.openapitools:jackson-databind-nullable:$jackson_databind_nullable_version"
118-
implementation "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
119-
implementation "joda-time:joda-time:$jodatime_version"
120-
implementation "com.brsanthu:migbase64:2.2"
117+
implementation "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
121118
implementation 'javax.annotation:javax.annotation-api:1.3.2'
122119
testImplementation "junit:junit:$junit_version"
123120
}

‎samples/client/petstore/java/resteasy/build.sbt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ lazy val root = (project in file(".")).
1111
libraryDependencies ++= Seq(
1212
"io.swagger" % "swagger-annotations" % "1.5.22" % "compile",
1313
"org.jboss.resteasy" % "resteasy-client" % "3.1.3.Final" % "compile",
14-
"org.jboss.resteasy" % "resteasy-multipart-provider" % "3.1.3.Final" % "compile",
15-
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "3.1.3.Final" % "compile",
14+
"org.jboss.resteasy" % "resteasy-multipart-provider" % "4.5.11.Final" % "compile",
15+
"org.jboss.resteasy" % "resteasy-jackson2-provider" % "4.5.11.Final" % "compile",
1616
"com.fasterxml.jackson.core" % "jackson-core" % "2.10.5" % "compile",
1717
"com.fasterxml.jackson.core" % "jackson-annotations" % "2.10.5" % "compile",
1818
"com.fasterxml.jackson.core" % "jackson-databind" % "2.10.5.1" % "compile",
1919
"com.github.joschi.jackson" % "jackson-datatype-threetenbp" % "2.9.10" % "compile",
20-
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.9.10" % "compile",
21-
"joda-time" % "joda-time" % "2.9.9" % "compile",
22-
"com.brsanthu" % "migbase64" % "2.2" % "compile",
20+
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % "2.9.10" % "compile",
2321
"javax.annotation" % "javax.annotation-api" % "1.3.2" % "compile",
2422
"junit" % "junit" % "4.13" % "test",
2523
"com.novocode" % "junit-interface" % "0.10" % "test"

0 commit comments

Comments
 (0)