Error Prone Fixes (#139)

* Apply fixes from Error Prone via https://lift.sonatype.com * Error Prone Fixes #139 * Update examples/ehcache/src/main/java/com/giffing/bucket4j/spring/boot/starter/examples/ehcache/config/security/SecurityService.java Co-authored-by: sonatype-lift[bot] <37194012+sonatype-lift[bot]@users.noreply.github.com> * Error Prone Fixes #139 --------- Co-authored-by: Sonatype Lift Bot <[email protected]> Co-authored-by: Marc Giffing <[email protected]> Co-authored-by: MarcGiffing <[email protected]> Co-authored-by: sonatype-lift[bot] <37194012+sonatype-lift[bot]@users.noreply.github.com>
MarcGiffing · Feb 21, 2023 · 9a5021b · 9a5021b
1 parent 79407b8
commit 9a5021b
Show file tree

Hide file tree

Showing 19 changed files with 91 additions and 106 deletions.
diff --git a/.../main/java/com/giffing/bucket4j/spring/boot/starter/config/Bucket4JBaseConfiguration.java b/.../main/java/com/giffing/bucket4j/spring/boot/starter/config/Bucket4JBaseConfiguration.java
@@ -2,22 +2,6 @@
 
 import static java.util.stream.Collectors.toList;
 
-import java.time.Duration;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.BeanFactory;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.util.StringUtils;
-
 import com.giffing.bucket4j.spring.boot.starter.config.cache.ProxyManagerWrapper;
 import com.giffing.bucket4j.spring.boot.starter.config.gateway.Bucket4JAutoConfigurationSpringCloudGatewayFilter;
 import com.giffing.bucket4j.spring.boot.starter.config.servlet.Bucket4JAutoConfigurationServletFilter;
@@ -37,12 +21,27 @@
 import com.giffing.bucket4j.spring.boot.starter.exception.FilterURLInvalidException;
 import com.giffing.bucket4j.spring.boot.starter.exception.MissingKeyFilterExpressionException;
 import com.giffing.bucket4j.spring.boot.starter.exception.MissingMetricTagExpressionException;
-
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.BucketConfiguration;
 import io.github.bucket4j.ConfigurationBuilder;
 import io.github.bucket4j.Refill;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.StringUtils;
 
 /**
  * Holds helper Methods which are reused by the 

diff --git a/...ring/boot/starter/config/cache/hazelcast/HazelcastReactiveBucket4jCacheConfiguration.java b/...ring/boot/starter/config/cache/hazelcast/HazelcastReactiveBucket4jCacheConfiguration.java
@@ -1,26 +1,24 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.hazelcast;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.config.cache.jcache.JCacheBucket4jConfiguration;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import com.hazelcast.core.HazelcastInstance;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.config.cache.jcache.JCacheBucket4jConfiguration;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-import com.hazelcast.core.HazelcastInstance;
-
 /**
  * Configures the asynchronous support for Hazelcast. The synchronous support of Hazelcast
  * is already provided by the {@link JCacheBucket4jConfiguration}. It uses the {@link HazelcastInstance}
  * to access the {@link HazelcastInstance} to retrieve the cache.
  */
 @Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass({ HazelcastInstance.class })
 @ConditionalOnBean(HazelcastInstance.class)
 @ConditionalOnMissingBean(AsyncCacheResolver.class)

diff --git a/...spring/boot/starter/config/cache/hazelcast/HazelcastSpringBucket4jCacheConfiguration.java b/...spring/boot/starter/config/cache/hazelcast/HazelcastSpringBucket4jCacheConfiguration.java
@@ -1,28 +1,26 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.hazelcast;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.config.cache.jcache.JCacheBucket4jConfiguration;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import com.hazelcast.core.HazelcastInstance;
+import com.hazelcast.spring.cache.HazelcastCacheManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.config.cache.jcache.JCacheBucket4jConfiguration;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-import com.hazelcast.core.HazelcastInstance;
-import com.hazelcast.spring.cache.HazelcastCacheManager;
-
 /**
  * Configures the asynchronous support for Hazelcast. The synchronous support of Hazelcast
  * is already provided by the {@link JCacheBucket4jConfiguration}. It uses the {@link HazelcastInstance}
  * to access the {@link HazelcastInstance} to retrieve the cache.
  */
 @Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass({ HazelcastCacheManager.class })
 @ConditionalOnBean(HazelcastCacheManager.class)
 @ConditionalOnMissingBean(SyncCacheResolver.class)

diff --git a/...ng/bucket4j/spring/boot/starter/config/cache/ignite/IgniteBucket4jCacheConfiguration.java b/...ng/bucket4j/spring/boot/starter/config/cache/ignite/IgniteBucket4jCacheConfiguration.java
@@ -6,15 +6,14 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
 
 @Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass({ Ignite.class })
 @ConditionalOnBean(Ignite.class)
 @ConditionalOnMissingBean(AsyncCacheResolver.class)

diff --git a/...t4j/spring/boot/starter/config/cache/infinispan/InfinispanBucket4jCacheConfiguration.java b/...t4j/spring/boot/starter/config/cache/infinispan/InfinispanBucket4jCacheConfiguration.java
@@ -6,15 +6,14 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
 
 @Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass({ CacheContainer.class })
 @ConditionalOnBean(CacheContainer.class)
 @ConditionalOnMissingBean(AsyncCacheResolver.class)

diff --git a/...cket4j/spring/boot/starter/config/cache/jcache/InfinispanJCacheBucket4jConfiguration.java b/...cket4j/spring/boot/starter/config/cache/jcache/InfinispanJCacheBucket4jConfiguration.java
@@ -8,7 +8,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.cache.jcache.JCacheCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -22,7 +21,7 @@
  * bucket4j. See {@link InfinispanCacheResolver} for more informations.
  */
 @Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass({ CacheContainer.class, Caching.class, JCacheCacheManager.class })
 @ConditionalOnBean(CacheContainer.class)
 @ConditionalOnMissingBean(SyncCacheResolver.class)

diff --git a/...giffing/bucket4j/spring/boot/starter/config/cache/jcache/JCacheBucket4jConfiguration.java b/...giffing/bucket4j/spring/boot/starter/config/cache/jcache/JCacheBucket4jConfiguration.java
@@ -8,7 +8,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.cache.jcache.JCacheCacheManager;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -17,7 +16,7 @@
 import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
 
 @Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass({ Caching.class, JCacheCacheManager.class })
 @ConditionalOnBean(CacheManager.class)
 @ConditionalOnMissingBean(SyncCacheResolver.class)

diff --git a/...ing/bucket4j/spring/boot/starter/config/cache/redis/jedis/JedisBucket4jConfiguration.java b/...ing/bucket4j/spring/boot/starter/config/cache/redis/jedis/JedisBucket4jConfiguration.java
@@ -1,21 +1,18 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.jedis;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import io.github.bucket4j.redis.jedis.cas.JedisBasedProxyManager.JedisBasedProxyManagerBuilder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-
-import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-
-import io.github.bucket4j.redis.jedis.cas.JedisBasedProxyManager.JedisBasedProxyManagerBuilder;
 import redis.clients.jedis.JedisPool;
 
 @Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass(JedisBasedProxyManagerBuilder.class)
 @ConditionalOnBean(JedisPool.class)
 @ConditionalOnProperty(prefix = Bucket4JBootProperties.PROPERTY_PREFIX, name = "cache-to-use", havingValue = "redis-jedis", matchIfMissing = true)

diff --git a/...com/giffing/bucket4j/spring/boot/starter/config/cache/redis/jedis/JedisCacheResolver.java b/...com/giffing/bucket4j/spring/boot/starter/config/cache/redis/jedis/JedisCacheResolver.java
@@ -1,16 +1,16 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.jedis;
 
-import java.time.Duration;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.giffing.bucket4j.spring.boot.starter.config.cache.CacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.config.cache.ProxyManagerWrapper;
 import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.context.ConsumptionProbeHolder;
-
 import io.github.bucket4j.Bucket;
 import io.github.bucket4j.distributed.ExpirationAfterWriteStrategy;
 import io.github.bucket4j.distributed.proxy.ProxyManager;
 import io.github.bucket4j.redis.jedis.cas.JedisBasedProxyManager;
+import java.time.Duration;
 import redis.clients.jedis.JedisPool;
 
 /**
@@ -25,13 +25,14 @@ public JedisCacheResolver(JedisPool pool) {
 		this.pool = pool;
 	}
 
+	@Override 
 	public ProxyManagerWrapper resolve(String cacheName) {
 		final ProxyManager<byte[]> proxyManager =  JedisBasedProxyManager.builderFor(pool)
 				.withExpirationStrategy(ExpirationAfterWriteStrategy.basedOnTimeForRefillingBucketUpToMax(Duration.ofSeconds(10)))
 				.build();
 
 		return (key, numTokens, bucketConfiguration, metricsListener) -> {
-			Bucket bucket = proxyManager.builder().build(key.getBytes(), bucketConfiguration).toListenable(metricsListener);
+			Bucket bucket = proxyManager.builder().build(key.getBytes(UTF_8), bucketConfiguration).toListenable(metricsListener);
 			return new ConsumptionProbeHolder(bucket.tryConsumeAndReturnRemaining(numTokens));
 		};
 

diff --git a/...bucket4j/spring/boot/starter/config/cache/redis/lettuce/LettuceBucket4jConfiguration.java b/...bucket4j/spring/boot/starter/config/cache/redis/lettuce/LettuceBucket4jConfiguration.java
@@ -1,21 +1,18 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.lettuce;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import io.github.bucket4j.redis.lettuce.cas.LettuceBasedProxyManager;
+import io.lettuce.core.RedisClient;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-
-import io.github.bucket4j.redis.lettuce.cas.LettuceBasedProxyManager;
-import io.lettuce.core.RedisClient;
-
 @Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass(LettuceBasedProxyManager.class)
 @ConditionalOnBean(RedisClient.class)
 @ConditionalOnProperty(prefix = Bucket4JBootProperties.PROPERTY_PREFIX, name = "cache-to-use", havingValue = "redis-lettuce", matchIfMissing = true)

diff --git a/...giffing/bucket4j/spring/boot/starter/config/cache/redis/lettuce/LettuceCacheResolver.java b/...giffing/bucket4j/spring/boot/starter/config/cache/redis/lettuce/LettuceCacheResolver.java
@@ -1,17 +1,17 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.lettuce;
 
-import java.time.Duration;
+import static java.nio.charset.StandardCharsets.UTF_8;
 
 import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.config.cache.CacheResolver;
 import com.giffing.bucket4j.spring.boot.starter.config.cache.ProxyManagerWrapper;
 import com.giffing.bucket4j.spring.boot.starter.context.ConsumptionProbeHolder;
-
 import io.github.bucket4j.distributed.AsyncBucketProxy;
 import io.github.bucket4j.distributed.ExpirationAfterWriteStrategy;
 import io.github.bucket4j.distributed.proxy.ProxyManager;
 import io.github.bucket4j.redis.lettuce.cas.LettuceBasedProxyManager;
 import io.lettuce.core.RedisClient;
+import java.time.Duration;
 
 /**
  * This class is the Redis implementation of the {@link CacheResolver}.
@@ -25,13 +25,14 @@ public LettuceCacheResolver(RedisClient redisClient) {
 		this.redisClient = redisClient;
 	}
 
+	@Override 
 	public ProxyManagerWrapper resolve(String cacheName) {
 		final ProxyManager<byte[]> proxyManager =  LettuceBasedProxyManager.builderFor(redisClient)
 				.withExpirationStrategy(ExpirationAfterWriteStrategy.basedOnTimeForRefillingBucketUpToMax(Duration.ofSeconds(10)))
 				.build();
 
 		return (key, numTokens, bucketConfiguration, metricsListener) -> {
-			AsyncBucketProxy bucket = proxyManager.asAsync().builder().build(key.getBytes(), bucketConfiguration).toListenable(metricsListener);
+			AsyncBucketProxy bucket = proxyManager.asAsync().builder().build(key.getBytes(UTF_8), bucketConfiguration).toListenable(metricsListener);
 			return new ConsumptionProbeHolder(bucket.tryConsumeAndReturnRemaining(numTokens));
 		};
 

diff --git a/...cket4j/spring/boot/starter/config/cache/redis/redisson/RedissonBucket4jConfiguration.java b/...cket4j/spring/boot/starter/config/cache/redis/redisson/RedissonBucket4jConfiguration.java
@@ -1,21 +1,18 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.redisson;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import io.github.bucket4j.redis.redisson.cas.RedissonBasedProxyManager;
 import org.redisson.command.CommandExecutor;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
-import com.giffing.bucket4j.spring.boot.starter.config.cache.AsyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-
-import io.github.bucket4j.redis.redisson.cas.RedissonBasedProxyManager;
-
 @Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnClass(RedissonBasedProxyManager.class)
 @ConditionalOnBean(CommandExecutor.class)
 @ConditionalOnProperty(prefix = Bucket4JBootProperties.PROPERTY_PREFIX, name = "cache-to-use", havingValue = "redis-redisson", matchIfMissing = true)

diff --git a/...ffing/bucket4j/spring/boot/starter/config/cache/redis/redisson/RedissonCacheResolver.java b/...ffing/bucket4j/spring/boot/starter/config/cache/redis/redisson/RedissonCacheResolver.java
@@ -26,6 +26,7 @@ public RedissonCacheResolver(CommandExecutor commandExecutor) {
 		this.commandExecutor = commandExecutor;
 	}
 
+	@Override 
 	public ProxyManagerWrapper resolve(String cacheName) {
 		final ProxyManager<String> proxyManager =  RedissonBasedProxyManager.builderFor(commandExecutor)
 				.withExpirationStrategy(ExpirationAfterWriteStrategy.basedOnTimeForRefillingBucketUpToMax(Duration.ofSeconds(10)))

diff --git a/...ring/boot/starter/config/cache/redis/springdata/RedisSpringDataBucket4jConfiguration.java b/...ring/boot/starter/config/cache/redis/springdata/RedisSpringDataBucket4jConfiguration.java
@@ -1,21 +1,18 @@
 package com.giffing.bucket4j.spring.boot.starter.config.cache.redis.springdata;
 
+import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
+import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
+import io.github.bucket4j.redis.spring.cas.SpringDataRedisBasedProxyManager;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisCommands;
 
-import com.giffing.bucket4j.spring.boot.starter.config.cache.SyncCacheResolver;
-import com.giffing.bucket4j.spring.boot.starter.context.properties.Bucket4JBootProperties;
-
-import io.github.bucket4j.redis.spring.cas.SpringDataRedisBasedProxyManager;
-
 @Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass(SpringDataRedisBasedProxyManager.class)
 @ConditionalOnBean(RedisCommands.class)
 @ConditionalOnProperty(prefix = Bucket4JBootProperties.PROPERTY_PREFIX, name = "cache-to-use", havingValue = "redis-springdata", matchIfMissing = true)