Skip to content

Commit 459f359

Browse files
sushma3690Sri Sushma Karra
sushma3690
and
Sri Sushma Karra
authored
[JAVA][FEIGN] Put back hardcoded HTTP Client but without the performance issue created in 8484. This is fix for 21187 (#22905)
* BUG:21187 put back hardcoded client without the issue created in 8484 * BUG:21187 put back hardcoded client without the issue created in 8484 --------- Co-authored-by: Sri Sushma Karra <srisushmakarra@Sris-MacBook-Air.local>
1 parent 07d60e0 commit 459f359

5 files changed

Lines changed: 36 additions & 0 deletions

File tree

  • modules/openapi-generator/src/main/resources/Java/libraries/feign
  • samples/client

‎modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ import feign.jackson.JacksonEncoder;
3434
import feign.gson.GsonDecoder;
3535
import feign.gson.GsonEncoder;
3636
{{/gson}}
37+
{{#feign-okhttp}}
38+
import feign.okhttp.OkHttpClient;
39+
{{/feign-okhttp}}
40+
{{#feign-hc5}}
41+
import feign.hc5.ApacheHttp5Client;
42+
{{/feign-hc5}}
3743
import feign.slf4j.Slf4jLogger;
3844
import {{invokerPackage}}.auth.HttpBasicAuth;
3945
import {{invokerPackage}}.auth.HttpBearerAuth;
@@ -65,12 +71,24 @@ public class ApiClient {
6571
protected String basePath = "{{{basePath}}}";
6672
protected Map<String, RequestInterceptor> apiAuthorizations;
6773
protected Feign.Builder feignBuilder;
74+
{{#feign-okhttp}}
75+
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
76+
{{/feign-okhttp}}
77+
{{#feign-hc5}}
78+
private static final ApacheHttp5Client APACHE_HTTP5_CLIENT = new ApacheHttp5Client();
79+
{{/feign-hc5}}
6880

6981
public ApiClient() {
7082
apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
7183
{{#jackson}}
7284
objectMapper = createObjectMapper();
7385
feignBuilder = Feign.builder()
86+
{{#feign-okhttp}}
87+
.client(OK_HTTP_CLIENT)
88+
{{/feign-okhttp}}
89+
{{#feign-hc5}}
90+
.client(APACHE_HTTP5_CLIENT)
91+
{{/feign-hc5}}
7492
.encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
7593
.decoder(new ApiResponseDecoder(objectMapper))
7694
{{#hasOAuthMethods}}
@@ -81,6 +99,12 @@ public class ApiClient {
8199
{{/jackson}}
82100
{{#gson}}
83101
feignBuilder = Feign.builder()
102+
{{#feign-okhttp}}
103+
.client(OK_HTTP_CLIENT)
104+
{{/feign-okhttp}}
105+
{{#feign-hc5}}
106+
.client(APACHE_HTTP5_CLIENT)
107+
{{/feign-hc5}}
84108
.encoder(new FormEncoder(new GsonEncoder()))
85109
.decoder(new GsonDecoder())
86110
{{#hasOAuthMethods}}

‎samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import feign.form.FormEncoder;
2626
import feign.gson.GsonDecoder;
2727
import feign.gson.GsonEncoder;
28+
import feign.okhttp.OkHttpClient;
2829
import feign.slf4j.Slf4jLogger;
2930
import org.openapitools.client.auth.HttpBasicAuth;
3031
import org.openapitools.client.auth.HttpBearerAuth;
@@ -40,10 +41,12 @@ public interface Api {}
4041
protected String basePath = "http://localhost:3000";
4142
protected Map<String, RequestInterceptor> apiAuthorizations;
4243
protected Feign.Builder feignBuilder;
44+
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
4345

4446
public ApiClient() {
4547
apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
4648
feignBuilder = Feign.builder()
49+
.client(OK_HTTP_CLIENT)
4750
.encoder(new FormEncoder(new GsonEncoder()))
4851
.decoder(new GsonDecoder())
4952
.logger(new Slf4jLogger());

‎samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import feign.form.FormEncoder;
3131
import feign.jackson.JacksonDecoder;
3232
import feign.jackson.JacksonEncoder;
33+
import feign.hc5.ApacheHttp5Client;
3334
import feign.slf4j.Slf4jLogger;
3435
import org.openapitools.client.auth.HttpBasicAuth;
3536
import org.openapitools.client.auth.HttpBearerAuth;
@@ -54,11 +55,13 @@ public interface Api {}
5455
protected String basePath = "http://petstore.swagger.io:80/v2";
5556
protected Map<String, RequestInterceptor> apiAuthorizations;
5657
protected Feign.Builder feignBuilder;
58+
private static final ApacheHttp5Client APACHE_HTTP5_CLIENT = new ApacheHttp5Client();
5759

5860
public ApiClient() {
5961
apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
6062
objectMapper = createObjectMapper();
6163
feignBuilder = Feign.builder()
64+
.client(APACHE_HTTP5_CLIENT)
6265
.encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
6366
.decoder(new ApiResponseDecoder(objectMapper))
6467
.errorDecoder(new ApiErrorDecoder())

‎samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import feign.form.FormEncoder;
3030
import feign.jackson.JacksonDecoder;
3131
import feign.jackson.JacksonEncoder;
32+
import feign.okhttp.OkHttpClient;
3233
import feign.slf4j.Slf4jLogger;
3334
import org.openapitools.client.auth.HttpBasicAuth;
3435
import org.openapitools.client.auth.HttpBearerAuth;
@@ -53,11 +54,13 @@ public interface Api {}
5354
protected String basePath = "http://petstore.swagger.io:80/v2";
5455
protected Map<String, RequestInterceptor> apiAuthorizations;
5556
protected Feign.Builder feignBuilder;
57+
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
5658

5759
public ApiClient() {
5860
apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
5961
objectMapper = createObjectMapper();
6062
feignBuilder = Feign.builder()
63+
.client(OK_HTTP_CLIENT)
6164
.encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
6265
.decoder(new ApiResponseDecoder(objectMapper))
6366
.errorDecoder(new ApiErrorDecoder())

‎samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import feign.form.FormEncoder;
3131
import feign.jackson.JacksonDecoder;
3232
import feign.jackson.JacksonEncoder;
33+
import feign.okhttp.OkHttpClient;
3334
import feign.slf4j.Slf4jLogger;
3435
import org.openapitools.client.auth.HttpBasicAuth;
3536
import org.openapitools.client.auth.HttpBearerAuth;
@@ -54,11 +55,13 @@ public interface Api {}
5455
protected String basePath = "http://petstore.swagger.io:80/v2";
5556
protected Map<String, RequestInterceptor> apiAuthorizations;
5657
protected Feign.Builder feignBuilder;
58+
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
5759

5860
public ApiClient() {
5961
apiAuthorizations = new LinkedHashMap<String, RequestInterceptor>();
6062
objectMapper = createObjectMapper();
6163
feignBuilder = Feign.builder()
64+
.client(OK_HTTP_CLIENT)
6265
.encoder(new FormEncoder(new JacksonEncoder(objectMapper)))
6366
.decoder(new ApiResponseDecoder(objectMapper))
6467
.errorDecoder(new ApiErrorDecoder())

0 commit comments

Comments
 (0)