Adding the capability to specify the Throttle duration

spring-boot-throttling/src/main/java/com.weddini.throttling/Throttling.java

@@ -30,6 +30,8 @@
      */
     int limit() default 1;
 
+
+
     /**
      * Returns ThrottlingType {@see ThrottlingType}
      * Used to evaluate method execution context.
@@ -47,6 +49,15 @@
      */
     TimeUnit timeUnit() default TimeUnit.SECONDS;
 
+
+    /**
+     * Returns throttling duration
+     * Default value is 1, it means 1 second considering the default TimeUnit
+     *
+     * @return The throttle duration to measure the number of calls
+     */
+    long duration() default 1L;
+
     /**
      * Returns header name for type = {@code ThrottlingType.HeaderValue}
      * Header value will be evaluated in the request-scoped bean {@link javax.servlet.http.HttpServletRequest}

spring-boot-throttling/src/main/java/com.weddini.throttling/ThrottlingGauge.java

@@ -18,9 +18,9 @@ public class ThrottlingGauge {
     private final ArrayList<Long> callTimestamps;
     private final ReadWriteLock lock;
 
-    public ThrottlingGauge(TimeUnit timeUnit, int throttleLimit) {
+    public ThrottlingGauge(TimeUnit timeUnit, long duration, int throttleLimit) {
         this.throttleLimit = throttleLimit;
-        mills = timeUnit.toMillis(1);
+        mills = timeUnit.toMillis(duration);
         callTimestamps = new ArrayList<>();
         lock = new ReentrantReadWriteLock(true);
     }

spring-boot-throttling/src/main/java/com.weddini.throttling/ThrottlingKey.java

@@ -16,13 +16,15 @@ public class ThrottlingKey {
     private final ThrottlingType type;
     private final TimeUnit timeUnit;
     private final String evaluatedValue;
+    private final long duration;
 
-    private ThrottlingKey(Method method, int limit, ThrottlingType type, TimeUnit timeUnit, String evaluatedValue) {
+    private ThrottlingKey(Method method, int limit, ThrottlingType type, TimeUnit timeUnit, String evaluatedValue, long duration) {
         this.method = method;
         this.limit = limit;
         this.type = type;
         this.timeUnit = timeUnit;
         this.evaluatedValue = evaluatedValue;
+        this.duration = duration;
     }
 
     public static Builder builder() {
@@ -49,6 +51,8 @@ public String getEvaluatedValue() {
         return evaluatedValue;
     }
 
+    public long getDuration() {return duration; }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -60,6 +64,7 @@ public boolean equals(Object o) {
         if (!method.equals(that.method)) return false;
         if (type != that.type) return false;
         if (timeUnit != that.timeUnit) return false;
+        if (duration != that.duration) return false;
         return evaluatedValue != null ? evaluatedValue.equals(that.evaluatedValue) : that.evaluatedValue == null;
     }
 
@@ -70,6 +75,7 @@ public int hashCode() {
         result = 31 * result + type.hashCode();
         result = 31 * result + timeUnit.hashCode();
         result = 31 * result + (evaluatedValue != null ? evaluatedValue.hashCode() : 0);
+        result = (int) (31 * result + timeUnit.toMillis(duration));
         return result;
     }
 
@@ -79,6 +85,7 @@ public String toString() {
                 "method=" + method +
                 ", limit=" + limit +
                 ", type=" + type +
+                ", duration = " + duration +
                 ", timeUnit=" + timeUnit +
                 ", evaluatedValue='" + evaluatedValue + '\'' +
                 '}';
@@ -90,6 +97,7 @@ public static class Builder {
         private ThrottlingType type;
         private TimeUnit timeUnit;
         private String evaluatedValue;
+        private long duration;
 
         public Builder method(Method method) {
             this.method = method;
@@ -100,6 +108,7 @@ public Builder annotation(Throttling throttling) {
             this.limit = throttling.limit();
             this.type = throttling.type();
             this.timeUnit = throttling.timeUnit();
+            this.duration = throttling.duration();
             return this;
         }
 
@@ -109,7 +118,7 @@ public Builder evaluatedValue(String evaluatedValue) {
         }
 
         public ThrottlingKey build() {
-            return new ThrottlingKey(method, limit, type, timeUnit, evaluatedValue);
+            return new ThrottlingKey(method, limit, type, timeUnit, evaluatedValue, duration);
         }
     }
 }

spring-boot-throttling/src/main/java/com.weddini.throttling/service/ThrottlingServiceImpl.java

@@ -16,7 +16,7 @@ public class ThrottlingServiceImpl implements ThrottlingService {
     private final Log logger = LogFactory.getLog(getClass());
 
     private final Cache<ThrottlingKey, ThrottlingGauge> cache;
-    private final CacheLoader<ThrottlingKey, ThrottlingGauge> gaugeLoader = key -> new ThrottlingGauge(key.getTimeUnit(), key.getLimit());
+    private final CacheLoader<ThrottlingKey, ThrottlingGauge> gaugeLoader = key -> new ThrottlingGauge(key.getTimeUnit(), key.getDuration(),key.getLimit());
 
 
     public ThrottlingServiceImpl(int cacheSize) {

spring-boot-throttling/src/test/java/com/weddini/throttling/ThrottlingGaugeTest.java

@@ -9,7 +9,7 @@ public class ThrottlingGaugeTest {
 
     @Test
     public void testThrottlingGauge() throws InterruptedException {
-        ThrottlingGauge gauge = new ThrottlingGauge(TimeUnit.SECONDS, 1);
+        ThrottlingGauge gauge = new ThrottlingGauge(TimeUnit.SECONDS, 1L, 1);
 
         gauge.removeEldest();
         Assert.isTrue(gauge.throttle(), "Should be ok with the first call");