Merge branch 'master' into dubbo-example

moremind · Oct 16, 2023 · 10ff60a · 10ff60a
2 parents 68780c5 + e6ec95b
commit 10ff60a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 10 deletions.
diff --git a/shenyu-bootstrap/src/main/resources/application.yml b/shenyu-bootstrap/src/main/resources/application.yml
@@ -152,7 +152,7 @@ shenyu:
 #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
 #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
 #  httpclient:
-#    strategy: webClient # netty
+#    strategy: netty # webClient
 #    connectTimeout: 45000
 #    responseTimeout: 3000
 #    readerIdleTime: 3000

diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/resources/bootstrap-application.yml b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-brpc/src/test/resources/bootstrap-application.yml
@@ -152,7 +152,7 @@ shenyu:
   #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
   #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
   #  httpclient:
-  #    strategy: webClient # netty
+  #    strategy: netty # webClient
   #    connectTimeout: 45000
   #    responseTimeout: 3000
   #    readerIdleTime: 3000

diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/resources/bootstrap-application.yml b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-grpc/src/test/resources/bootstrap-application.yml
@@ -152,7 +152,7 @@ shenyu:
   #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
   #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
   #  httpclient:
-  #    strategy: webClient # netty
+  #    strategy: netty # webClient
   #    connectTimeout: 45000
   #    responseTimeout: 3000
   #    readerIdleTime: 3000

diff --git a/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/resources/bootstrap-application.yml b/shenyu-e2e/shenyu-e2e-case/shenyu-e2e-case-sofa/src/test/resources/bootstrap-application.yml
@@ -152,7 +152,7 @@ shenyu:
   #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
   #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
   #  httpclient:
-  #    strategy: webClient # netty
+  #    strategy: netty # webClient
   #    connectTimeout: 45000
   #    responseTimeout: 3000
   #    readerIdleTime: 3000

diff --git a/...tegrated-test/shenyu-integrated-test-k8s-ingress-motan/src/main/resources/application.yml b/...tegrated-test/shenyu-integrated-test-k8s-ingress-motan/src/main/resources/application.yml
@@ -152,7 +152,7 @@ shenyu:
   #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
   #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
   #  httpclient:
-  #    strategy: webClient # netty
+  #    strategy: netty # webClient
   #    connectTimeout: 45000
   #    responseTimeout: 3000
   #    readerIdleTime: 3000

diff --git a/...d-test/shenyu-integrated-test-k8s-ingress-spring-cloud/src/main/resources/application.yml b/...d-test/shenyu-integrated-test-k8s-ingress-spring-cloud/src/main/resources/application.yml
@@ -152,7 +152,7 @@ shenyu:
   #            keyCertChainFile: '/Users/zhukunshuai/Desktop/cert/example.com+1.pem'
   #            keyFile: '/Users/zhukunshuai/Desktop/cert/example.com+1-key.pem'
   #  httpclient:
-  #    strategy: webClient # netty
+  #    strategy: netty # webClient
   #    connectTimeout: 45000
   #    responseTimeout: 3000
   #    readerIdleTime: 3000

diff --git a/...gin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/result/ShenyuResult.java b/...gin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/result/ShenyuResult.java
@@ -21,10 +21,12 @@
 import org.apache.shenyu.common.utils.JsonUtils;
 import org.apache.shenyu.common.utils.ObjectTypeUtils;
 import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.server.ServerWebExchange;
 import reactor.core.publisher.Flux;
+import reactor.netty.http.client.HttpClientResponse;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -69,6 +71,13 @@ default Object format(ServerWebExchange exchange, Object origin) {
      * @return the context type
      */
     default MediaType contentType(ServerWebExchange exchange, Object formatted) {
+        final Object webHandlerClientResponse = exchange.getAttribute(Constants.CLIENT_RESPONSE_ATTR);
+        if (Objects.nonNull(webHandlerClientResponse) && webHandlerClientResponse instanceof HttpClientResponse) {
+            final HttpClientResponse httpClientResponse = (HttpClientResponse) webHandlerClientResponse;
+            final String contentType = httpClientResponse.responseHeaders().get(HttpHeaders.CONTENT_TYPE);
+            return Optional.ofNullable(contentType).map(MediaType::parseMediaType).orElse(MediaType.APPLICATION_JSON);
+        }
+
         final ResponseEntity<Flux<DataBuffer>> fluxResponseEntity = exchange.getAttribute(Constants.CLIENT_RESPONSE_ATTR);
         if (Objects.nonNull(fluxResponseEntity) && Optional.ofNullable(fluxResponseEntity.getHeaders().getContentType()).isPresent()) {
             return fluxResponseEntity.getHeaders().getContentType();

diff --git a/...org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java b/...org/apache/shenyu/springboot/starter/plugin/httpclient/HttpClientPluginConfiguration.java
@@ -100,7 +100,7 @@ public HttpClientFactory httpClient(final HttpClientProperties properties,
      * The type Web client configuration.
      */
     @Configuration
-    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "webClient", matchIfMissing = true)
+    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "webClient")
     static class WebClientConfiguration {
 
         /**
@@ -130,7 +130,7 @@ public ShenyuPlugin webClientPlugin(
      * The type Netty http client configuration.
      */
     @Configuration
-    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "netty")
+    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "netty", matchIfMissing = true)
     static class NettyHttpClientConfiguration {
 
         /**

diff --git a/...ava/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfiguration.java b/...ava/org/apache/shenyu/springboot/starter/plugin/response/ResponsePluginConfiguration.java
@@ -74,7 +74,7 @@ public MessageWriter rpcMessageWriter() {
      * The type Web client message writer configuration.
      */
     @Configuration
-    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "webClient", matchIfMissing = true)
+    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "webClient")
     static class WebClientMessageWriterConfiguration {
 
         /**
@@ -92,7 +92,7 @@ public MessageWriter webClientMessageWriter() {
      * The type Netty client message writer configuration.
      */
     @Configuration
-    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "netty")
+    @ConditionalOnProperty(name = "shenyu.httpclient.strategy", havingValue = "netty", matchIfMissing = true)
     static class NettyClientMessageWriterConfiguration {
 
         /**