This is an automated email from the ASF dual-hosted git repository.
liuhongyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shenyu.git
The following commit(s) were added to refs/heads/master by this push:
new b18f4f98b7 [type:refactor] Optimize code style (#5878)
b18f4f98b7 is described below
commit b18f4f98b7b2dcb5c66895a99fe5d72f7cbedc9a
Author: po-168 <po...@foxmail.com>
AuthorDate: Tue Dec 31 15:52:09 2024 +0800
[type:refactor] Optimize code style (#5878)
Co-authored-by: likeguo <33576070+li-ke...@users.noreply.github.com>
---
.../java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java | 2 +-
.../main/java/org/apache/shenyu/disruptor/consumer/QueueConsumer.java | 4 ++--
.../src/main/java/org/apache/shenyu/loadbalancer/entity/Upstream.java | 2 +-
.../org/apache/shenyu/plugin/api/exception/ResponsiveException.java | 2 ++
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git
a/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java
b/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java
index a577b8ae64..f61cfcf436 100644
---
a/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java
+++
b/shenyu-discovery/shenyu-discovery-nacos/src/main/java/org/apache/shenyu/discovery/nacos/NacosDiscoveryService.java
@@ -69,7 +69,7 @@ public class NacosDiscoveryService implements
ShenyuDiscoveryService {
@Override
public void init(final DiscoveryConfig config) {
- if (this.namingService != null) {
+ if (Objects.nonNull(this.namingService)) {
LOGGER.info("Nacos naming service already registered");
return;
}
diff --git
a/shenyu-disruptor/src/main/java/org/apache/shenyu/disruptor/consumer/QueueConsumer.java
b/shenyu-disruptor/src/main/java/org/apache/shenyu/disruptor/consumer/QueueConsumer.java
index 1832dc12c7..1e031be60e 100644
---
a/shenyu-disruptor/src/main/java/org/apache/shenyu/disruptor/consumer/QueueConsumer.java
+++
b/shenyu-disruptor/src/main/java/org/apache/shenyu/disruptor/consumer/QueueConsumer.java
@@ -18,11 +18,11 @@
package org.apache.shenyu.disruptor.consumer;
import com.lmax.disruptor.WorkHandler;
-import java.util.Objects;
import org.apache.shenyu.disruptor.event.DataEvent;
import org.apache.shenyu.disruptor.event.OrderlyDataEvent;
import org.apache.shenyu.disruptor.thread.OrderlyExecutor;
+import java.util.Objects;
import java.util.concurrent.ThreadPoolExecutor;
/**
@@ -68,6 +68,6 @@ public class QueueConsumer<T> implements
WorkHandler<DataEvent<T>> {
}
private boolean isEmpty(final String t) {
- return t == null || t.isEmpty();
+ return Objects.isNull(t) || t.isEmpty();
}
}
diff --git
a/shenyu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/entity/Upstream.java
b/shenyu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/entity/Upstream.java
index a7f96f0d68..e8c367d854 100644
---
a/shenyu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/entity/Upstream.java
+++
b/shenyu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/entity/Upstream.java
@@ -437,7 +437,7 @@ public final class Upstream {
if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass()) {
+ if (Objects.isNull(o) || getClass() != o.getClass()) {
return false;
}
Upstream that = (Upstream) o;
diff --git
a/shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/exception/ResponsiveException.java
b/shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/exception/ResponsiveException.java
index ccb0da4f39..a0a204490e 100644
---
a/shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/exception/ResponsiveException.java
+++
b/shenyu-plugin/shenyu-plugin-api/src/main/java/org/apache/shenyu/plugin/api/exception/ResponsiveException.java
@@ -23,6 +23,8 @@ import org.springframework.web.server.ServerWebExchange;
public class ResponsiveException extends ShenyuException {
+ private static final long serialVersionUID = 3951601337229132230L;
+
private final int code;
private final ServerWebExchange webExchange;
