优化代码

Lionhjw · Oct 10, 2018 · 0d5167c · 0d5167c
1 parent 6bf9cac
commit 0d5167c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/...ava/org/hswebframework/web/datasource/strategy/CachedDataSourceSwitchStrategyMatcher.java b/...ava/org/hswebframework/web/datasource/strategy/CachedDataSourceSwitchStrategyMatcher.java
@@ -44,19 +44,19 @@ public Strategy getStrategy(MethodInterceptorContext context) {
     @AllArgsConstructor
     public static class CacheKey {
 
-        private Class target;
+        private Class<?> target;
 
         private Method method;
 
         @Override
-        public boolean equals(Object obj) {
-            if (!(obj instanceof CacheKey)) {
+        public boolean equals(Object targetObject) {
+            if (!(targetObject instanceof CacheKey)) {
                 return false;
             }
-            CacheKey target = ((CacheKey) obj);
-            return target.target.getName().equals(this.target.getName())
-                    && target.method.getName().equals(method.getName())
-                    && target.method.getParameterCount() == method.getParameterCount();
+            CacheKey targetCacheKey = ((CacheKey) targetObject);
+            return targetCacheKey.target.isAssignableFrom(this.target)
+                    && targetCacheKey.method.getName().equals(method.getName())
+                    && targetCacheKey.method.getParameterCount() == method.getParameterCount();
         }
 
         public int hashCode() {

diff --git a/...c/test/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcherTest.java b/...c/test/java/org/hswebframework/web/datasource/switcher/DefaultDataSourceSwitcherTest.java
@@ -59,14 +59,6 @@ public void testChangeSwitcher2() {
         assertEquals(switcher.currentDataSourceId(), "test");
     }
 
-    @SneakyThrows
-    public static void main(String[] args) {
-        Method method = Test2.class.getMethod("test");
-
-        System.out.println(method);
-        System.out.println(method.getDeclaringClass());
-    }
-
     public class Test2 extends TestClass {
 
     }

diff --git a/...ava/org/hswebframework/web/service/datasource/simple/InDBJtaDynamicDataSourceService.java b/...ava/org/hswebframework/web/service/datasource/simple/InDBJtaDynamicDataSourceService.java
@@ -44,6 +44,11 @@ static AtomikosDataSourceConfig convert(InDBDynamicDataSourceConfig entity) {
             public int hashCode() {
                 return entity.hashCode();
             }
+
+            @Override
+            public boolean equals(Object o) {
+                return o instanceof AtomikosDataSourceConfig && hashCode() == o.hashCode();
+            }
         });
         target.setId(entity.getId());
         target.setName(entity.getName());