From c19bd515843a94b415539bde9cc3be5ed646faf0 Mon Sep 17 00:00:00 2001 From: eden-yuan <916928826@qq.com> Date: Mon, 7 Dec 2020 17:17:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=BA=94=E8=AF=A5=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=B1=BB=E5=AE=9E=E4=BE=8B=E8=AE=BF=E9=97=AE=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=88=90=E5=91=98\=E4=B8=8D=E5=BA=94=E8=AF=A5=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E4=BD=BF=E7=94=A8=E4=B8=8D=E7=A1=AE=E5=AE=9A=E7=9A=84?= =?UTF-8?q?=E5=80=BC=E8=B0=83=E7=94=A8equals=E5=AE=B9=E6=98=93=E7=A9=BA?= =?UTF-8?q?=E6=8C=87=E9=92=88\final=20static=E5=BA=94=E8=AF=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=A4=A7=E5=86=99=E5=91=BD=E5=90=8D=E5=B9=B6=E4=B8=94?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=B8=8B=E5=88=92=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alibaba/cloud/examples/RocketMQProduceApplication.java | 4 ++-- .../java/com/alibaba/cloud/examples/ZuulConfiguration.java | 4 ++-- .../com/alibaba/cloud/sentinel/gateway/ConfigConstants.java | 2 +- .../gateway/zuul/SentinelZuulAutoConfiguration.java | 2 +- .../cloud/sentinel/gateway/zuul/SentinelZuulProperties.java | 2 +- .../alibaba/cloud/nacos/registry/NacosServiceRegistry.java | 4 ++-- .../cloud/dubbo/registry/AbstractSpringCloudRegistry.java | 6 +++--- .../alibaba/cloud/dubbo/registry/DubboCloudRegistry.java | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java index eaf4b47ee..d63349d16 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java @@ -83,7 +83,7 @@ public class RocketMQProduceApplication { @Override public void run(String... args) throws Exception { - if (this.bindingName.equals("output1")) { + if ("output1".equals(this.bindingName)) { int count = 5; for (int index = 1; index <= count; index++) { String msgContent = "msg-" + index; @@ -98,7 +98,7 @@ public class RocketMQProduceApplication { } } } - else if (this.bindingName.equals("output3")) { + else if ("output3".equals(this.bindingName)) { int count = 20; for (int index = 1; index <= count; index++) { String msgContent = "pullMsg-" + index; diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java index d3e1ffea7..9dccb6b2e 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java @@ -41,10 +41,10 @@ public class ZuulConfiguration { @Override public BlockResponse fallbackResponse(String route, Throwable cause) { - if (route.equals("my-service3")) { + if ("my-service3".equals(route)) { return new BlockResponse(433, "Sentinel Block3", route); } - else if (route.equals("my-service4")) { + else if ("my-service4".equals(route)) { return new BlockResponse(444, "my-service4", route); } else { diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java index 9cf273319..8158fdefd 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java @@ -37,7 +37,7 @@ public final class ConfigConstants { /** * ConfigurationProperties for {@link SentinelZuulProperties}. */ - public static final String ZUUl_PREFIX = "spring.cloud.sentinel.zuul"; + public static final String ZUUL_PREFIX = "spring.cloud.sentinel.zuul"; /** * ConfigurationProperties for {@link SentinelGatewayProperties}. diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java index a7b7fcf3b..3f6cbd6c4 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java @@ -47,7 +47,7 @@ import org.springframework.context.annotation.Configuration; */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(ZuulServlet.class) -@ConditionalOnProperty(prefix = ConfigConstants.ZUUl_PREFIX, name = "enabled", +@ConditionalOnProperty(prefix = ConfigConstants.ZUUL_PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true) @EnableConfigurationProperties(SentinelZuulProperties.class) public class SentinelZuulAutoConfiguration { diff --git a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java index cd7bade8e..f1ab8da78 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java +++ b/spring-cloud-alibaba-starters/spring-cloud-alibaba-sentinel-gateway/src/main/java/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java @@ -28,7 +28,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty; /** * @author Jim */ -@ConfigurationProperties(prefix = ConfigConstants.ZUUl_PREFIX) +@ConfigurationProperties(prefix = ConfigConstants.ZUUL_PREFIX) public class SentinelZuulProperties { @NestedConfigurationProperty diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java index 0efd86420..ad5f1a120 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-nacos-discovery/src/main/java/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java @@ -119,7 +119,7 @@ public class NacosServiceRegistry implements ServiceRegistry { @Override public void setStatus(Registration registration, String status) { - if (!status.equalsIgnoreCase("UP") && !status.equalsIgnoreCase("DOWN")) { + if (!"UP".equalsIgnoreCase(status) && !"DOWN".equalsIgnoreCase(status)) { log.warn("can't support status {},please choose UP or DOWN", status); return; } @@ -128,7 +128,7 @@ public class NacosServiceRegistry implements ServiceRegistry { Instance instance = getNacosInstanceFromRegistration(registration); - if (status.equalsIgnoreCase("DOWN")) { + if ("DOWN".equalsIgnoreCase(status)) { instance.setEnabled(false); } else { diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java index f6434f3c7..40d3bc688 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java @@ -77,7 +77,7 @@ public abstract class AbstractSpringCloudRegistry extends FailbackRegistry { /** * Caches the IDs of {@link ApplicationListener}. */ - private static final Set registerListeners = new HashSet<>(); + private static final Set REGISTER_LISTENERS = new HashSet<>(); protected final Logger logger = LoggerFactory.getLogger(getClass()); @@ -193,7 +193,7 @@ public abstract class AbstractSpringCloudRegistry extends FailbackRegistry { private void registerServiceInstancesChangedEventListener(URL url, NotifyListener listener) { String listenerId = generateId(url); - if (registerListeners.add(listenerId)) { + if (REGISTER_LISTENERS.add(listenerId)) { applicationContext.addApplicationListener( new ApplicationListener() { @Override @@ -261,7 +261,7 @@ public abstract class AbstractSpringCloudRegistry extends FailbackRegistry { String listenerId = generateId(url); // The metaservice will restart the new listener. It needs to be optimized // to see whether the original listener can be reused. - this.registerListeners.remove(listenerId); + REGISTER_LISTENERS.remove(listenerId); } /** diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java index dbede6986..7639e21aa 100644 --- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java +++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/registry/DubboCloudRegistry.java @@ -83,7 +83,7 @@ public class DubboCloudRegistry extends FailbackRegistry { /** * Caches the IDs of {@link ApplicationListener}. */ - private static final Set registerListeners = new HashSet<>(); + private static final Set REGISTER_LISTENERS = new HashSet<>(); protected final Logger logger = LoggerFactory.getLogger(getClass()); @@ -215,7 +215,7 @@ public class DubboCloudRegistry extends FailbackRegistry { private void registerServiceInstancesChangedListener(URL url, ApplicationListener listener) { String listenerId = generateId(url); - if (registerListeners.add(listenerId)) { + if (REGISTER_LISTENERS.add(listenerId)) { applicationContext.addApplicationListener(listener); } }