Merge branch 'master' into dev-testCollapseSlashesFilter

apache · Jan 18, 2025 · 5c4a1af · 5c4a1af
2 parents ba79a41 + 1b15819
commit 5c4a1af
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/...enyu-sync-data-http/src/main/java/org/apache/shenyu/sync/data/http/config/HttpConfig.java b/...enyu-sync-data-http/src/main/java/org/apache/shenyu/sync/data/http/config/HttpConfig.java
@@ -205,7 +205,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         HttpConfig that = (HttpConfig) o;

diff --git a/...ync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosACMConfig.java b/...ync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosACMConfig.java
@@ -126,7 +126,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         NacosACMConfig that = (NacosACMConfig) o;

diff --git a/...u-sync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosConfig.java b/...u-sync-data-nacos/src/main/java/org/apache/shenyu/sync/data/nacos/config/NacosConfig.java
@@ -146,7 +146,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         NacosConfig that = (NacosConfig) o;

diff --git a/...et/src/main/java/org/apache/shenyu/plugin/sync/data/websocket/config/WebsocketConfig.java b/...et/src/main/java/org/apache/shenyu/plugin/sync/data/websocket/config/WebsocketConfig.java
@@ -72,7 +72,7 @@ public boolean equals(final Object o) {
         if (this == o) {
             return true;
         }
-        if (o == null || getClass() != o.getClass()) {
+        if (Objects.isNull(o) || getClass() != o.getClass()) {
             return false;
         }
         WebsocketConfig that = (WebsocketConfig) o;