From e10e3941ebb8a17df50c2a6b8dfadfd63bf0af9a Mon Sep 17 00:00:00 2001 From: Sri Sushma Karra Date: Sun, 13 Apr 2025 22:15:12 +0800 Subject: [PATCH 1/3] [JAVA][FEIGN] Removing hardcoded HTTP Client Fixing performance issues --- .../Java/libraries/feign/ApiClient.mustache | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache index e010befdc0fb..a10c3f3a115b 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/ApiClient.mustache @@ -9,12 +9,6 @@ import java.util.logging.Level; import java.util.logging.Logger; {{#jackson}} -{{#feign-okhttp}} -import feign.okhttp.OkHttpClient; -{{/feign-okhttp}} -{{#feign-hc5}} -import feign.hc5.ApacheHttp5Client; -{{/feign-hc5}} import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -76,12 +70,6 @@ public class ApiClient { {{#jackson}} objectMapper = createObjectMapper(); feignBuilder = Feign.builder() - {{#feign-okhttp}} - .client(new OkHttpClient()) - {{/feign-okhttp}} - {{#feign-hc5}} - .client(new ApacheHttp5Client()) - {{/feign-hc5}} .encoder(new FormEncoder(new JacksonEncoder(objectMapper))) .decoder(new ApiResponseDecoder(objectMapper)) {{#hasOAuthMethods}} From c9ac3d5ca3ac472e9ee0eef86af965d7de18b9f3 Mon Sep 17 00:00:00 2001 From: karras Date: Sun, 13 Apr 2025 23:08:42 +0800 Subject: [PATCH 2/3] Updating samples for Java Feign performance betterment changes --- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- .../feign/src/main/java/org/openapitools/client/ApiClient.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java index c2937e93f0bc..4379c5b237a6 100644 --- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/ApiClient.java @@ -19,7 +19,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import feign.okhttp.OkHttpClient; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -59,7 +58,6 @@ public ApiClient() { apiAuthorizations = new LinkedHashMap(); objectMapper = createObjectMapper(); feignBuilder = Feign.builder() - .client(new OkHttpClient()) .encoder(new FormEncoder(new JacksonEncoder(objectMapper))) .decoder(new ApiResponseDecoder(objectMapper)) .errorDecoder(new ApiErrorDecoder()) diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java index 8353d63b90ce..cd9607c766da 100644 --- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/ApiClient.java @@ -19,7 +19,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import feign.okhttp.OkHttpClient; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -60,7 +59,6 @@ public ApiClient() { apiAuthorizations = new LinkedHashMap(); objectMapper = createObjectMapper(); feignBuilder = Feign.builder() - .client(new OkHttpClient()) .encoder(new FormEncoder(new JacksonEncoder(objectMapper))) .decoder(new ApiResponseDecoder(objectMapper)) .errorDecoder(new ApiErrorDecoder()) From 94499a9f37339ec23ef2a6fb24149a20529c24f3 Mon Sep 17 00:00:00 2001 From: karras Date: Thu, 17 Apr 2025 15:05:34 +0800 Subject: [PATCH 3/3] added APIClient.java for feign-hc5 --- .../src/main/java/org/openapitools/client/ApiClient.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/ApiClient.java index 15c1779d2276..cd9607c766da 100644 --- a/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/feign-hc5/src/main/java/org/openapitools/client/ApiClient.java @@ -19,7 +19,6 @@ import java.util.logging.Level; import java.util.logging.Logger; -import feign.hc5.ApacheHttp5Client; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -60,7 +59,6 @@ public ApiClient() { apiAuthorizations = new LinkedHashMap(); objectMapper = createObjectMapper(); feignBuilder = Feign.builder() - .client(new ApacheHttp5Client()) .encoder(new FormEncoder(new JacksonEncoder(objectMapper))) .decoder(new ApiResponseDecoder(objectMapper)) .errorDecoder(new ApiErrorDecoder())