[shardingsphere] branch master updated: Remove useless equals and hashcode on StorageUnitNodeMapper (#28611)

[totalo]

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

totalo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new ff79177d0b3 Remove useless equals and hashcode on 
StorageUnitNodeMapper (#28611)
ff79177d0b3 is described below

commit ff79177d0b3dcdf2889f294fcfebecbac848cdcd
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Thu Sep 28 00:56:27 2023 +0800

    Remove useless equals and hashcode on StorageUnitNodeMapper (#28611)
---
 .../resource/unit/StorageUnitNodeMapper.java       | 25 +++-------------------
 .../resource/unit/StorageUnitNodeMapperUtils.java  |  2 +-
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapper.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapper.java
index cce0b4490bb..97f6b4d6d3b 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapper.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapper.java
@@ -17,7 +17,6 @@
 
 package org.apache.shardingsphere.infra.metadata.database.resource.unit;
 
-import com.google.common.base.Objects;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import 
org.apache.shardingsphere.infra.metadata.database.resource.node.StorageNode;
@@ -33,29 +32,11 @@ public final class StorageUnitNodeMapper {
     
     private final StorageNode storageNode;
     
-    private final String catalog;
-    
     private final String url;
     
-    public StorageUnitNodeMapper(final String name, final StorageNode 
storageNode, final String url) {
-        this(name, storageNode, null, url);
-    }
-    
-    @Override
-    public boolean equals(final Object obj) {
-        if (obj instanceof StorageUnitNodeMapper) {
-            StorageUnitNodeMapper storageUnitNodeMapper = 
(StorageUnitNodeMapper) obj;
-            return storageUnitNodeMapper.name.equalsIgnoreCase(name) && 
storageUnitNodeMapper.storageNode.equals(storageNode) && 
isSameCatalog(storageUnitNodeMapper);
-        }
-        return false;
-    }
-    
-    private boolean isSameCatalog(final StorageUnitNodeMapper 
storageUnitNodeMapper) {
-        return null == catalog ? null == storageUnitNodeMapper : 
catalog.equalsIgnoreCase(storageUnitNodeMapper.getCatalog());
-    }
+    private final String catalog;
     
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(name.toUpperCase(), 
storageNode.getName().toUpperCase(), null == catalog ? null : 
catalog.toUpperCase());
+    public StorageUnitNodeMapper(final String name, final StorageNode 
storageNode, final String url) {
+        this(name, storageNode, url, null);
     }
 }
diff --git 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapperUtils.java
 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapperUtils.java
index f016401f34c..14a7790a888 100644
--- 
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapperUtils.java
+++ 
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/resource/unit/StorageUnitNodeMapperUtils.java
@@ -95,7 +95,7 @@ public final class StorageUnitNodeMapperUtils {
     
     private static StorageUnitNodeMapper createStorageUnitNodeMapper(final 
StorageNode storageNode, final String storageUnitName, final String url, final 
boolean isInstanceConnectionAvailable) {
         return isInstanceConnectionAvailable
-                ? new StorageUnitNodeMapper(storageUnitName, storageNode, new 
StandardJdbcUrlParser().parse(url).getDatabase(), url)
+                ? new StorageUnitNodeMapper(storageUnitName, storageNode, url, 
new StandardJdbcUrlParser().parse(url).getDatabase())
                 : new StorageUnitNodeMapper(storageUnitName, storageNode, url);
     }