Skip to content

Commit 96c0cef

Browse files
committed
updated openfeign depedency to support java 11.
1 parent ccec47c commit 96c0cef

File tree

2 files changed

+27
-6
lines changed

2 files changed

+27
-6
lines changed

modules/swagger-codegen/src/main/resources/Java/libraries/feign/auth/OAuth.mustache

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,19 +80,19 @@ public class OAuth implements RequestInterceptor {
8080
}
8181
// If first time, get the token
8282
if (expirationTimeMillis == null || System.currentTimeMillis() >= expirationTimeMillis) {
83-
updateAccessToken();
83+
updateAccessToken(template);
8484
}
8585
if (getAccessToken() != null) {
8686
template.header("Authorization", "Bearer " + getAccessToken());
8787
}
8888
}
8989

90-
public synchronized void updateAccessToken() {
90+
public synchronized void updateAccessToken(RequestTemplate template) {
9191
OAuthJSONAccessTokenResponse accessTokenResponse;
9292
try {
9393
accessTokenResponse = oauthClient.accessToken(tokenRequestBuilder.buildBodyMessage());
9494
} catch (Exception e) {
95-
throw new RetryableException(e.getMessage(), e,null);
95+
throw new RetryableException(400, e.getMessage(), template.request().httpMethod(), e, null, template.request());
9696
}
9797
if (accessTokenResponse != null && accessTokenResponse.getAccessToken() != null) {
9898
setAccessToken(accessTokenResponse.getAccessToken(), accessTokenResponse.getExpiresIn());

modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,27 @@
185185
</plugins>
186186
</build>
187187
</profile>
188+
{{#java11}}
189+
<profile>
190+
<id>jdk11</id>
191+
<activation>
192+
<jdk>[11,)</jdk>
193+
</activation>
194+
<dependencies>
195+
<dependency>
196+
<groupId>com.sun.xml.ws</groupId>
197+
<artifactId>jaxws-rt</artifactId>
198+
<version>2.3.3</version>
199+
<type>pom</type>
200+
</dependency>
201+
<dependency>
202+
<groupId>com.sun.xml.ws</groupId>
203+
<artifactId>rt</artifactId>
204+
<version>2.3.3</version>
205+
</dependency>
206+
</dependencies>
207+
</profile>
208+
{{/java11}}
188209
</profiles>
189210

190211
<dependencies>
@@ -291,12 +312,12 @@
291312
</dependencies>
292313
<properties>
293314
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
294-
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
315+
<java.version>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</java.version>
295316
<maven.compiler.source>${java.version}</maven.compiler.source>
296317
<maven.compiler.target>${java.version}</maven.compiler.target>
297318
<swagger-core-version>1.5.24</swagger-core-version>
298-
<feign-version>9.4.0</feign-version>
299-
<feign-form-version>2.1.0</feign-form-version>
319+
<feign-version>11.6</feign-version>
320+
<feign-form-version>3.8.0</feign-form-version>
300321
<jackson-version>2.11.4</jackson-version>
301322
{{#threetenbp}}
302323
<jackson-threetenbp-version>2.6.4</jackson-threetenbp-version>

0 commit comments

Comments
 (0)