You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by zh...@apache.org on 2022/06/25 06:17:43 UTC

[incubator-shenyu] branch master updated: [ISSUE 3570] @ConditionalOnProperty trans camelcase to lower case with “-” (#3616)

This is an automated email from the ASF dual-hosted git repository.

zhangzicheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu.git


The following commit(s) were added to refs/heads/master by this push:
     new 099690aff [ISSUE 3570] @ConditionalOnProperty trans camelcase to lower case with “-” (#3616)
099690aff is described below

commit 099690affba83df6556d229207b52d7eda5d2214
Author: sunshujie1990 <tj...@163.com>
AuthorDate: Sat Jun 25 14:17:38 2022 +0800

    [ISSUE 3570] @ConditionalOnProperty trans camelcase to lower case with “-” (#3616)
---
 .../springboot/starter/netty/ShenyuNettyWebServerConfiguration.java     | 2 +-
 .../springboot/starter/netty/ShenyuNettyWebServerConfigurationTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfiguration.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfiguration.java
index f49fbbe39..ce1a1683b 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfiguration.java
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/main/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfiguration.java
@@ -55,7 +55,7 @@ public class ShenyuNettyWebServerConfiguration {
      * @return the netty reactive web server factory
      */
     @Bean
-    @ConditionalOnProperty(value = "shenyu.netty.http.webServerFactoryEnabled", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnProperty(value = "shenyu.netty.http.web-server-factory-enabled", havingValue = "true", matchIfMissing = true)
     public NettyReactiveWebServerFactory nettyReactiveWebServerFactory(final ObjectProvider<NettyHttpProperties> properties) {
         NettyReactiveWebServerFactory webServerFactory = new NettyReactiveWebServerFactory();
         NettyHttpProperties nettyHttpProperties = Optional.ofNullable(properties.getIfAvailable()).orElse(new NettyHttpProperties());
diff --git a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfigurationTest.java b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfigurationTest.java
index 66ad9a94f..e8395bec9 100644
--- a/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfigurationTest.java
+++ b/shenyu-spring-boot-starter/shenyu-spring-boot-starter-gateway/src/test/java/org/apache/shenyu/springboot/starter/netty/ShenyuNettyWebServerConfigurationTest.java
@@ -50,7 +50,7 @@ public class ShenyuNettyWebServerConfigurationTest {
             .withPropertyValues(
                 "debug=true",
                 "shenyu.netty.http.accessLog=false",
-                "shenyu.netty.http.webServerFactoryEnabled=false",
+                "shenyu.netty.http.web-server-factory-enabled=false",
                 "shenyu.netty.http.selectCount=10",
                 "shenyu.netty.http.workerCount=2",
                 "shenyu.netty.http.serverSocketChannel.soBacklog=64",