Merge c360af7 into 8bd91c3

marcosbarbero · Mar 5, 2020 · 2d07916 · 2d07916
2 parents 8bd91c3 + c360af7
commit 2d07916
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/README.adoc b/README.adoc
@@ -271,7 +271,7 @@ There are eight implementations provided:
 Bucket4j implementations require the relevant bean with `@Qualifier("RateLimit")`:
 
  * `JCache` - javax.cache.Cache
- * `Hazelcast` - com.hazelcast.core.IMap
+ * `Hazelcast` - com.hazelcast.map.IMap
  * `Ignite` - org.apache.ignite.IgniteCache
  * `Infinispan` - org.infinispan.functional.ReadWriteMap
 

diff --git a/spring-cloud-zuul-ratelimit-core/pom.xml b/spring-cloud-zuul-ratelimit-core/pom.xml
@@ -21,8 +21,8 @@
 
     <properties>
         <main.basedir>${basedir}/..</main.basedir>
-        <bucket4j.version>4.8.0</bucket4j.version>
-        <hazelcast.version>3.12.6</hazelcast.version>
+        <bucket4j.version>4.9.0</bucket4j.version>
+        <hazelcast.version>4.0</hazelcast.version>
         <ignite.version>2.8.0</ignite.version>
         <infinispan.version>10.1.3.Final</infinispan.version>
     </properties>

diff --git a/...java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/RateLimitAutoConfiguration.java b/...java/com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/RateLimitAutoConfiguration.java
@@ -18,7 +18,7 @@
 
 import com.ecwid.consul.v1.ConsulClient;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitKeyGenerator;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitUtils;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimiter;

diff --git a/...autoconfigure/zuul/ratelimit/config/repository/bucket4j/Bucket4jHazelcastRateLimiter.java b/...autoconfigure/zuul/ratelimit/config/repository/bucket4j/Bucket4jHazelcastRateLimiter.java
@@ -16,7 +16,7 @@
 
 package com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.repository.bucket4j;
 
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import io.github.bucket4j.grid.GridBucketState;
 import io.github.bucket4j.grid.ProxyManager;
 import io.github.bucket4j.grid.hazelcast.Hazelcast;

diff --git a/.../com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/RateLimitAutoConfigurationTest.java b/.../com/marcosbarbero/cloud/autoconfigure/zuul/ratelimit/RateLimitAutoConfigurationTest.java
@@ -6,7 +6,7 @@
 
 import com.ecwid.consul.v1.ConsulClient;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitKeyGenerator;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimitUtils;
 import com.marcosbarbero.cloud.autoconfigure.zuul.ratelimit.config.RateLimiter;

diff --git a/spring-cloud-zuul-ratelimit-tests/bucket4j-hazelcast/pom.xml b/spring-cloud-zuul-ratelimit-tests/bucket4j-hazelcast/pom.xml
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-hazelcast</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>3.12.6</version>
+            <version>4.0</version>
         </dependency>
     </dependencies>
 

diff --git a/...ucket4j-hazelcast/src/main/java/com/marcosbarbero/tests/Bucket4jHazelcastApplication.java b/...ucket4j-hazelcast/src/main/java/com/marcosbarbero/tests/Bucket4jHazelcastApplication.java
@@ -1,7 +1,7 @@
 package com.marcosbarbero.tests;
 
 import com.hazelcast.core.Hazelcast;
-import com.hazelcast.core.IMap;
+import com.hazelcast.map.IMap;
 import io.github.bucket4j.grid.GridBucketState;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.SpringApplication;

diff --git a/spring-cloud-zuul-ratelimit-tests/bucket4j-ignite/pom.xml b/spring-cloud-zuul-ratelimit-tests/bucket4j-ignite/pom.xml
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-ignite</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>

diff --git a/spring-cloud-zuul-ratelimit-tests/bucket4j-infinispan/pom.xml b/spring-cloud-zuul-ratelimit-tests/bucket4j-infinispan/pom.xml
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-infinispan</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>

diff --git a/spring-cloud-zuul-ratelimit-tests/bucket4j-jcache/pom.xml b/spring-cloud-zuul-ratelimit-tests/bucket4j-jcache/pom.xml
@@ -34,19 +34,19 @@
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-core</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-jcache</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>
             <groupId>com.github.vladimir-bukhtoyarov</groupId>
             <artifactId>bucket4j-ignite</artifactId>
-            <version>4.8.0</version>
+            <version>4.9.0</version>
         </dependency>
 
         <dependency>