1.并发问题修复

ymm-tech · Jan 26, 2021 · 843fcd4 · 843fcd4
1 parent 945afb9
commit 843fcd4
Show file tree

Hide file tree

Showing 15 changed files with 26 additions and 26 deletions.
diff --git a/ebatis-core/pom.xml b/ebatis-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ebatis-core</artifactId>

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/cluster/ClusterRouterLoader.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/cluster/ClusterRouterLoader.java
@@ -4,9 +4,9 @@
 import lombok.Synchronized;
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 路由器载入器，对名字缓存
@@ -16,7 +16,7 @@
  */
 @Slf4j
 public class ClusterRouterLoader {
-    private static final Map<String, ClusterRouter> CLUSTER_ROUTERS = new HashMap<>();
+    private static final Map<String, ClusterRouter> CLUSTER_ROUTERS = new ConcurrentHashMap<>();
 
     private ClusterRouterLoader() {
         throw new UnsupportedOperationException();

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/IntervalType.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/domain/IntervalType.java
@@ -2,7 +2,7 @@
 
 import org.elasticsearch.index.query.RangeQueryBuilder;
 
-public enum IntervalType {
+enum IntervalType {
     /**
      * 闭区间
      */

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/meta/CachedAnnotationMeta.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/meta/CachedAnnotationMeta.java
@@ -2,9 +2,9 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -13,7 +13,7 @@
  * @since 2020/6/3 14:11
  */
 class CachedAnnotationMeta implements AnnotationMeta {
-    private static final Map<Class<? extends Annotation>, AnnotationMeta> METAS = new HashMap<>();
+    private static final Map<Class<? extends Annotation>, AnnotationMeta> METAS = new ConcurrentHashMap<>();
 
     private final Class<? extends Annotation> annotationType;
     private final List<AnnotationAttribute> attributes;

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/meta/ResultType.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/meta/ResultType.java
@@ -4,11 +4,11 @@
 import lombok.extern.slf4j.Slf4j;
 
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author duoliang.zhang
@@ -62,7 +62,7 @@ public <T> Object adaptResult(CompletableFuture<T> futureResult) {
         }
     };
 
-    private static final Map<Class<?>, ResultType> METHOD_RETURN_TYPES = new HashMap<>();
+    private static final Map<Class<?>, ResultType> METHOD_RETURN_TYPES = new ConcurrentHashMap<>();
 
     static {
         for (ResultType type : values()) {

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/proxy/MapperRegistry.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/proxy/MapperRegistry.java
@@ -7,8 +7,8 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Proxy;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Mapper接口注解表，所有的接口的动态代理都存在在此
@@ -17,7 +17,7 @@
  * @since 2020/5/25 17:27
  */
 class MapperRegistry {
-    private static final Map<Class<?>, Object> PROXIES = new HashMap<>();
+    private static final Map<Class<?>, Object> PROXIES = new ConcurrentHashMap<>();
 
     private MapperRegistry() {
         throw new UnsupportedOperationException();

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/response/ResponseExtractorLoader.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/response/ResponseExtractorLoader.java
@@ -4,17 +4,17 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @author 章多亮
  * @since 2019/12/20 10:35
  */
 public class ResponseExtractorLoader {
-    private static final Map<MethodMeta, ResponseExtractor<?>> RESPONSE_EXTRACTORS = new HashMap<>();
+    private static final Map<MethodMeta, ResponseExtractor<?>> RESPONSE_EXTRACTORS = new ConcurrentHashMap<>();
     private static final List<ResponseExtractorProvider> RESPONSE_EXTRACTOR_PROVIDERS = new ArrayList<>();
 
     static {

diff --git a/ebatis-core/src/main/java/io/manbang/ebatis/core/session/CachedClusterSession.java b/ebatis-core/src/main/java/io/manbang/ebatis/core/session/CachedClusterSession.java
@@ -29,9 +29,9 @@
 import org.elasticsearch.index.reindex.DeleteByQueryRequest;
 import org.elasticsearch.index.reindex.UpdateByQueryRequest;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 集群亲和会话
@@ -40,7 +40,7 @@
  * @since 2020/5/23 17:14
  */
 class CachedClusterSession implements ClusterSession {
-    private static final Map<Cluster, ClusterSession> CLUSTER_SESSIONS = new HashMap<>();
+    private static final Map<Cluster, ClusterSession> CLUSTER_SESSIONS = new ConcurrentHashMap<>();
     private final Cluster cluster;
     private final Interceptor interceptor;
 

diff --git a/ebatis-sample/pom.xml b/ebatis-sample/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,7 +16,7 @@
         <dependency>
             <groupId>io.manbang</groupId>
             <artifactId>ebatis-spring</artifactId>
-            <version>7.5.1.6.RELEASE</version>
+            <version>7.5.1.7.RELEASE</version>
         </dependency>
 
         <dependency>

diff --git a/ebatis-spring-boot/ebatis-spring-boot-autoconfigure/pom.xml b/ebatis-spring-boot/ebatis-spring-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis-spring-boot</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ebatis-spring-boot/ebatis-spring-boot-starter/pom.xml b/ebatis-spring-boot/ebatis-spring-boot-starter/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis-spring-boot</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/ebatis-spring-boot/pom.xml b/ebatis-spring-boot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -30,17 +30,17 @@
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-spring</artifactId>
-                <version>7.5.1.6.RELEASE</version>
+                <version>7.5.1.7.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-core</artifactId>
-                <version>7.5.1.6.RELEASE</version>
+                <version>7.5.1.7.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>io.manbang</groupId>
                 <artifactId>ebatis-spring-boot-autoconfigure</artifactId>
-                <version>7.5.1.6.RELEASE</version>
+                <version>7.5.1.7.RELEASE</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

diff --git a/ebatis-spring/pom.xml b/ebatis-spring/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ebatis-spring</artifactId>
@@ -14,7 +14,7 @@
         <dependency>
             <artifactId>ebatis-core</artifactId>
             <groupId>io.manbang</groupId>
-            <version>7.5.1.6.RELEASE</version>
+            <version>7.5.1.7.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

diff --git a/ebatis-web/pom.xml b/ebatis-web/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>ebatis</artifactId>
         <groupId>io.manbang</groupId>
-        <version>7.5.1.6.RELEASE</version>
+        <version>7.5.1.7.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.manbang</groupId>
     <artifactId>ebatis</artifactId>
-    <version>7.5.1.6.RELEASE</version>
+    <version>7.5.1.7.RELEASE</version>
     <packaging>pom</packaging>
     <name>ebatis</name>
     <description>Elasticsearch ORM Framework</description>