Merge branch 'develop'

chenggangpro · Aug 18, 2023 · 906975e · 906975e
2 parents c9933ca + 554a2e9
commit 906975e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@
 ```java
 ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
                 .withMaxWaitingDuration(Duration.ofSeconds(5))
-                .withInmemoryReactiveCacheLock()
                 .build();
 ```
 
@@ -34,7 +33,6 @@ ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmem
 ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(
                         reactiveRedisTemplate)
                 .withMaxWaitingDuration(Duration.ofSeconds(5))
-                .withRedisReactiveCacheLock()
                 .build();
 ```
 
@@ -61,6 +59,7 @@ ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newCusto
     cache:
       enabled: true
       type: inmemory
+      maxWaitingDuration: PT5S
   ```
 
   * Using with spring auto-injection

diff --git a/...henggang/project/reactive/cache/support/configuration/ReactiveCacheAutoConfiguration.java b/...henggang/project/reactive/cache/support/configuration/ReactiveCacheAutoConfiguration.java
@@ -42,7 +42,6 @@ public ReactiveCacheSupportProperties reactiveCacheSupportProperties() {
     public ReactiveCacheManager inmemoryReactiveCacheManager(ReactiveCacheSupportProperties reactiveCacheSupportProperties) {
         return ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
                 .withMaxWaitingDuration(reactiveCacheSupportProperties.getMaxWaitingDuration())
-                .withInmemoryReactiveCacheLock()
                 .build();
     }
 
@@ -55,7 +54,6 @@ public ReactiveCacheManager redisReactiveCacheManager(ReactiveCacheSupportProper
                                                           ReactiveRedisTemplate reactiveRedisTemplate) {
         return ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(reactiveRedisTemplate)
                 .withMaxWaitingDuration(reactiveCacheSupportProperties.getMaxWaitingDuration())
-                .withRedisReactiveCacheLock()
                 .build();
     }
 }
diff --git a/...ro/chenggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilder.java b/...ro/chenggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilder.java
@@ -3,7 +3,6 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import org.springframework.data.redis.core.ReactiveRedisTemplate;
 import pro.chenggang.project.reactive.cache.support.core.ReactiveCacheLock;
 import pro.chenggang.project.reactive.cache.support.core.ReactiveCacheManager;
@@ -158,18 +157,6 @@ public ReactiveCacheManager build() {
     @NoArgsConstructor(access = AccessLevel.PRIVATE)
     public static class InmemoryReactiveManagerBuilder extends BaseReactiveManagerBuilder<InmemoryReactiveManagerBuilder> {
 
-        private InmemoryReactiveCacheLock inmemoryReactiveCacheLock;
-
-        /**
-         * With inmemory reactive cache lock.
-         *
-         * @return the inmemory reactive manager builder
-         */
-        public InmemoryReactiveManagerBuilder withInmemoryReactiveCacheLock() {
-            inmemoryReactiveCacheLock = new InmemoryReactiveCacheLock();
-            return this;
-        }
-
         @Override
         public InmemoryReactiveManagerBuilder self() {
             return this;
@@ -178,29 +165,24 @@ public InmemoryReactiveManagerBuilder self() {
         @Override
         public ReactiveCacheManager build() {
             return new DefaultReactiveCacheManager(new InmemoryReactiveCacheManagerAdapter(maxWaitingDuration,
-                    inmemoryReactiveCacheLock
+                    new InmemoryReactiveCacheLock()
             ));
         }
     }
 
     /**
      * The redis reactive manager builder.
      */
-    @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
     public static class RedisReactiveManagerBuilder extends BaseReactiveManagerBuilder<RedisReactiveManagerBuilder> {
 
         @NonNull
         private final ReactiveRedisTemplate<String, Object> reactiveRedisTemplate;
-        private RedisReactiveCacheLock redisReactiveCacheLock;
+        @NonNull
+        private final RedisReactiveCacheLock redisReactiveCacheLock;
 
-        /**
-         * With redis reactive cache lock.
-         *
-         * @return the redis reactive manager builder
-         */
-        public RedisReactiveManagerBuilder withRedisReactiveCacheLock() {
-            redisReactiveCacheLock = new RedisReactiveCacheLock(reactiveRedisTemplate);
-            return this;
+        private RedisReactiveManagerBuilder(@NonNull ReactiveRedisTemplate<String, Object> reactiveRedisTemplate) {
+            this.reactiveRedisTemplate = reactiveRedisTemplate;
+            this.redisReactiveCacheLock = new RedisReactiveCacheLock(reactiveRedisTemplate);
         }
 
         @Override

diff --git a/...a/pro/chenggang/project/reactive/cache/support/configuration/RedisConfigurationTests.java b/...a/pro/chenggang/project/reactive/cache/support/configuration/RedisConfigurationTests.java
@@ -93,7 +93,7 @@ public void testProperties() {
                 ReactiveCacheSupportProperties.ReactiveCacheType.redis
         );
         Assertions.assertEquals(reactiveCacheSupportProperties.getMaxWaitingDuration(),
-                Duration.ofSeconds(3)
+                Duration.ofSeconds(5)
         );
     }
 

diff --git a/...henggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilderTest.java b/...henggang/project/reactive/cache/support/core/builder/ReactiveCacheManagerBuilderTest.java
@@ -73,7 +73,6 @@ void newCustomReactiveManagerBuilder() {
     void testNewInmemoryReactiveManagerBuilder() {
         ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newInmemoryReactiveManagerBuilder()
                 .withMaxWaitingDuration(Duration.ofSeconds(5))
-                .withInmemoryReactiveCacheLock()
                 .build();
         Assertions.assertNotNull(reactiveCacheManager);
     }
@@ -83,7 +82,6 @@ void testNewRedisReactiveManagerBuilder() {
         ReactiveCacheManager reactiveCacheManager = ReactiveCacheManagerBuilder.newRedisReactiveManagerBuilder(
                         reactiveRedisTemplate)
                 .withMaxWaitingDuration(Duration.ofSeconds(5))
-                .withRedisReactiveCacheLock()
                 .build();
         Assertions.assertNotNull(reactiveCacheManager);
     }

diff --git a/src/test/resources/application-inmemory.yml b/src/test/resources/application-inmemory.yml
@@ -1,4 +1,5 @@
 reactive:
   cache:
     enabled: true
-    type: inmemory
+    type: inmemory
+    maxWaitingDuration: PT5S
diff --git a/src/test/resources/application-redis.yml b/src/test/resources/application-redis.yml
@@ -2,13 +2,4 @@ reactive:
   cache:
     enabled: true
     type: redis
-spring:
-  redis:
-    lettuce:
-      pool:
-        max-active: ${redis.pool.maxActive:100}
-        max-idle: ${redis.pool.maxIdle:10}
-        max-wait: ${redis.pool.maxWait:5000}
-        min-idle: ${redis.pool.minIdle:3}
-        time-between-eviction-runs: ${redis.pool.timeBetweenEviction:5000}
-      shutdown-timeout: PT30S
+    maxWaitingDuration: PT5S