Makes policies optional for each route

Author: marcosbarbero

README.md

@@ -7,7 +7,17 @@ There are four built-in rate limit approachs:
  - Authenticated User and Request Origin: *Combine the authenticated user and the Request Origin*
  - Global configuration per service: *This one doesn't validate the request Origin or the Authenticated User*
    - To use this approach just don't set param 'type'
+      
+Adding Project Lombok Agent
+---
 
+This project uses [Project Lombok](http://projectlombok.org/features/index.html)
+to generate getters and setters etc. Compiling from the command line this
+shouldn't cause any problems, but in an IDE you need to add an agent
+to the JVM. Full instructions can be found in the Lombok website. The
+sign that you need to do this is a lot of compiler errors to do with
+missing methods and fields.     
+   
 Usage
 ---
 >This project is available on maven central
@@ -17,7 +27,7 @@ Add the dependency on pom.xml
 <dependency>
     <groupId>com.marcosbarbero.cloud</groupId>
     <artifactId>spring-cloud-zuul-ratelimit</artifactId>
-    <version>1.0.1.RELEASE</version>
+    <version>1.0.2.RELEASE</version>
 </dependency>
 ```
 

pom.xml

@@ -13,7 +13,7 @@
         ]]>
     </description>
     <url>https://github.com/marcosbarbero/spring-cloud-starter-zuul-ratelimit</url>
-    <version>1.0.1.RELEASE</version>
+    <version>1.0.2.RELEASE</version>
 
     <licenses>
         <license>
@@ -24,7 +24,7 @@
     </licenses>
 
     <properties>
-        <lombok.version>1.16.10</lombok.version>
+        <lombok.version>1.16.12</lombok.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
         <java.version>1.8</java.version>
@@ -118,7 +118,7 @@
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-netflix</artifactId>
-                <version>1.1.5.RELEASE</version>
+                <version>1.2.3.RELEASE</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

src/main/java/com/marcosbarbero/zuul/filters/pre/ratelimit/config/RateLimitAutoConfiguration.java

@@ -17,7 +17,7 @@
  */
 @Configuration
 @EnableConfigurationProperties(RateLimitProperties.class)
-@ConditionalOnProperty(name = "zuul.ratelimit.enabled", matchIfMissing = false)
+@ConditionalOnProperty(name = "zuul.ratelimit.enabled")
 public class RateLimitAutoConfiguration {
 
     @Bean

src/main/java/com/marcosbarbero/zuul/filters/pre/ratelimit/config/redis/RedisRateLimiter.java

@@ -1,8 +1,8 @@
 package com.marcosbarbero.zuul.filters.pre.ratelimit.config.redis;
 
 import com.marcosbarbero.zuul.filters.pre.ratelimit.config.Policy;
-import com.marcosbarbero.zuul.filters.pre.ratelimit.config.RateLimiter;
 import com.marcosbarbero.zuul.filters.pre.ratelimit.config.Rate;
+import com.marcosbarbero.zuul.filters.pre.ratelimit.config.RateLimiter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -32,9 +32,7 @@ public Rate consume(final Policy policy, final String key) {
             public List<Object> execute(RedisOperations ops) throws DataAccessException {
                 ops.multi();
                 ops.boundValueOps(tempKey).increment(1L);
-                if (ops.getExpire(tempKey) == null) {
-                    ops.expire(tempKey, policy.getRefreshInterval(), TimeUnit.SECONDS);
-                }
+                ops.expire(tempKey, policy.getRefreshInterval(), TimeUnit.SECONDS);
                 return ops.exec();
             }
         });