1.2.3-SNAPSHOT

drtrang · May 28, 2018 · d11a227 · d11a227
1 parent fa6bed1
commit d11a227
Show file tree

Hide file tree

Showing 11 changed files with 53 additions and 245 deletions.
diff --git a/README.md b/README.md
@@ -10,43 +10,16 @@ Redisson Spring Boot Starter 将帮助你在 Spring Boot 中使用 Redisson，
 ## 依赖
 ```xml
 <!-- spring boot 1.x -->
-<<<<<<< HEAD
-=======
 <dependency>
     <groupId>com.github.drtrang</groupId>
     <artifactId>redisson-spring-boot-starter</artifactId>
     <version>1.2.2</version>
 </dependency>
 
-<!-- spring boot 2.x -->
->>>>>>> 1.2.0
-<dependency>
-    <groupId>com.github.drtrang</groupId>
-<<<<<<< HEAD
-    <artifactId>redisson-spring-boot-starter</artifactId>
-    <version>1.2.1</version>
-=======
-    <artifactId>redisson-spring-boot2-starter</artifactId>
-<<<<<<< HEAD
-    <version>1.1.1</version>
->>>>>>> README
-</dependency>
-
 <!-- spring boot 2.x -->
 <dependency>
     <groupId>com.github.drtrang</groupId>
     <artifactId>redisson-spring-boot2-starter</artifactId>
-<<<<<<< HEAD
-    <version>1.2.1</version>
-<<<<<<< HEAD
-</dependency>
-=======
-    <version>1.2.0</version>
-=======
->>>>>>> 1.2.1
-=======
     <version>1.2.2</version>
->>>>>>> replace with lambda
 </dependency>
->>>>>>> 1.2.0
 ```
diff --git a/pom.xml b/pom.xml
@@ -5,61 +5,15 @@
 
     <parent>
         <groupId>com.github.drtrang</groupId>
-<<<<<<< HEAD
         <artifactId>parent</artifactId>
-        <version>1.2.1</version>
-=======
-        <artifactId>parent2</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <version>1.1.2</version>
->>>>>>> 1.1.1
-=======
-        <version>1.2.0</version>
->>>>>>> 1.2.0
-=======
-        <version>1.2.1</version>
->>>>>>> 1.2.1
-=======
         <version>1.2.2</version>
->>>>>>> replace with lambda
     </parent>
 
-<<<<<<< HEAD
     <artifactId>redisson-spring-boot</artifactId>
-    <version>1.2.2.SNAPSHOT</version>
-=======
-    <artifactId>redisson-spring-boot2</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-    <version>1.1.1</version>
->>>>>>> 1.1.1
-=======
-    <version>1.2.0</version>
->>>>>>> 1.2.0
-=======
-    <version>1.2.1-SNAPSHOT</version>
->>>>>>> 1.2.1-SNAPSHOT
-=======
-    <version>1.2.1</version>
->>>>>>> 1.2.1
-=======
-    <version>1.2.2-SNAPSHOT</version>
->>>>>>> 1.2.2-SNAPSHOT
-=======
     <version>1.2.2</version>
->>>>>>> replace with lambda
     <packaging>pom</packaging>
 
-<<<<<<< HEAD
     <name>redisson-spring-boot</name>
-=======
-    <name>redisson-spring-boot2</name>
->>>>>>> 1.1.1
     <description>Spring Boot Starter for Redisson</description>
     <url>https://github.com/drtrang/redisson-spring-boot</url>
 
@@ -104,25 +58,14 @@
         <dependencies>
             <dependency>
                 <groupId>com.github.drtrang</groupId>
-                <artifactId>redisson-spring-boot2-autoconfigure</artifactId>
+                <artifactId>redisson-spring-boot-autoconfigure</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.github.drtrang</groupId>
-                <artifactId>redisson-spring-boot2-starter</artifactId>
+                <artifactId>redisson-spring-boot-starter</artifactId>
                 <version>${project.version}</version>
             </dependency>
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
-            <dependency>
-                <groupId>com.github.drtrang</groupId>
-                <artifactId>spring-boot2-autoconfigure</artifactId>
-                <version>${trang.spring-boot-autoconfigure.version}</version>
-            </dependency>
->>>>>>> 1.1.1
-=======
->>>>>>> 1.2.0
         </dependencies>
     </dependencyManagement>
 

diff --git a/redisson-spring-boot-autoconfigure/pom.xml b/redisson-spring-boot-autoconfigure/pom.xml
@@ -5,41 +5,16 @@
 
     <parent>
         <groupId>com.github.drtrang</groupId>
-<<<<<<< HEAD
         <artifactId>redisson-spring-boot</artifactId>
-        <version>1.2.2.SNAPSHOT</version>
-=======
-        <artifactId>redisson-spring-boot2</artifactId>
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-        <version>1.1.1</version>
->>>>>>> 1.1.1
-=======
-        <version>1.2.0</version>
->>>>>>> 1.2.0
-=======
-        <version>1.2.1-SNAPSHOT</version>
->>>>>>> 1.2.1-SNAPSHOT
-=======
-        <version>1.2.1</version>
->>>>>>> 1.2.1
-=======
-        <version>1.2.2-SNAPSHOT</version>
->>>>>>> 1.2.2-SNAPSHOT
-=======
         <version>1.2.2</version>
->>>>>>> replace with lambda
     </parent>
 
-    <artifactId>redisson-spring-boot2-autoconfigure</artifactId>
+    <artifactId>redisson-spring-boot-autoconfigure</artifactId>
 
     <dependencies>
         <dependency>
             <groupId>com.github.drtrang</groupId>
-            <artifactId>spring-boot2-autoconfigure</artifactId>
+            <artifactId>spring-boot-autoconfigure</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/.../java/com/github/trang/redisson/autoconfigure/CompositeCacheManagerAutoConfiguration.java b/.../java/com/github/trang/redisson/autoconfigure/CompositeCacheManagerAutoConfiguration.java
diff --git a/...gure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonAutoConfiguration.java b/...gure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonAutoConfiguration.java
@@ -1,8 +1,7 @@
 package com.github.trang.redisson.autoconfigure;
 
-import com.github.trang.autoconfigure.Customizer;
-import com.github.trang.redisson.autoconfigure.RedissonProperties.*;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.config.Config;
@@ -16,8 +15,14 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import java.util.ArrayList;
-import java.util.List;
+import com.github.trang.autoconfigure.Customizer;
+import com.github.trang.redisson.autoconfigure.RedissonProperties.ClusterServersConfig;
+import com.github.trang.redisson.autoconfigure.RedissonProperties.MasterSlaveServersConfig;
+import com.github.trang.redisson.autoconfigure.RedissonProperties.ReplicatedServersConfig;
+import com.github.trang.redisson.autoconfigure.RedissonProperties.SentinelServersConfig;
+import com.github.trang.redisson.autoconfigure.RedissonProperties.SingleServerConfig;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Redisson 自动配置
@@ -38,7 +43,7 @@ public class RedissonAutoConfiguration {
     public RedissonAutoConfiguration(RedissonProperties redissonProperties,
                                      ObjectProvider<List<Customizer<Config>>> customizersProvider) {
         this.redissonProperties = redissonProperties;
-        this.redissonCustomizers = customizersProvider.getIfAvailable(ArrayList::new);
+        this.redissonCustomizers = customizersProvider.getIfAvailable();
     }
 
     @Bean(destroyMethod = "shutdown")

diff --git a/...toconfigure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonProperties.java b/...toconfigure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonProperties.java
@@ -1,12 +1,8 @@
 package com.github.trang.redisson.autoconfigure;
 
-import com.github.trang.redisson.autoconfigure.enums.AddressResolverGroupFactoryType;
-import com.github.trang.redisson.autoconfigure.enums.CodecType;
-import com.github.trang.redisson.autoconfigure.enums.LoadBalancerType;
-import com.github.trang.redisson.autoconfigure.enums.RedissonType;
-import io.netty.channel.EventLoopGroup;
-import lombok.Getter;
-import lombok.Setter;
+import java.net.URI;
+import java.util.concurrent.ExecutorService;
+
 import org.redisson.codec.DefaultReferenceCodecProvider;
 import org.redisson.codec.ReferenceCodecProvider;
 import org.redisson.config.ReadMode;
@@ -16,8 +12,14 @@
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
-import java.net.URI;
-import java.util.concurrent.ExecutorService;
+import com.github.trang.redisson.autoconfigure.enums.AddressResolverGroupFactoryType;
+import com.github.trang.redisson.autoconfigure.enums.CodecType;
+import com.github.trang.redisson.autoconfigure.enums.LoadBalancerType;
+import com.github.trang.redisson.autoconfigure.enums.RedissonType;
+
+import io.netty.channel.EventLoopGroup;
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Redisson 自动配置属性

diff --git a/...rc/main/java/com/github/trang/redisson/autoconfigure/RedissonSpringAutoConfiguration.java b/...rc/main/java/com/github/trang/redisson/autoconfigure/RedissonSpringAutoConfiguration.java
@@ -1,8 +1,8 @@
 package com.github.trang.redisson.autoconfigure;
 
-import com.github.trang.autoconfigure.Customizer;
-import com.github.trang.redisson.autoconfigure.RedissonSpringProperties.RedissonCacheManagerProperties;
-import lombok.extern.slf4j.Slf4j;
+import java.util.List;
+import java.util.Map;
+
 import org.redisson.Redisson;
 import org.redisson.api.RedissonClient;
 import org.redisson.spring.cache.CacheConfig;
@@ -27,9 +27,10 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Primary;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import com.github.trang.autoconfigure.Customizer;
+import com.github.trang.redisson.autoconfigure.RedissonSpringProperties.RedissonCacheManagerProperties;
+
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Redisson Spring 自动配置
@@ -50,7 +51,7 @@ public class RedissonSpringAutoConfiguration {
     public RedissonSpringAutoConfiguration(RedissonSpringProperties redissonSpringProperties,
                                            ObjectProvider<List<Customizer<RedissonSpringCacheManager>>> customizersProvider) {
         this.redissonSpringProperties = redissonSpringProperties;
-        this.redissonSpringCacheManagerCustomizers = customizersProvider.getIfAvailable(ArrayList::new);
+        this.redissonSpringCacheManagerCustomizers = customizersProvider.getIfAvailable();
     }
 
     /**

diff --git a/...igure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonSpringProperties.java b/...igure/src/main/java/com/github/trang/redisson/autoconfigure/RedissonSpringProperties.java
@@ -1,14 +1,16 @@
 package com.github.trang.redisson.autoconfigure;
 
-import com.github.trang.redisson.autoconfigure.enums.CodecType;
-import lombok.Getter;
-import lombok.Setter;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.redisson.spring.cache.CacheConfig;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.NestedConfigurationProperty;
 
-import java.util.HashMap;
-import java.util.Map;
+import com.github.trang.redisson.autoconfigure.enums.CodecType;
+
+import lombok.Getter;
+import lombok.Setter;
 
 /**
  * Redisson Spring 自动配置属性