Move expression, Matcher from rate-limiter-annotation to rate-limiter

README.md

@@ -91,22 +91,18 @@ __3. Annotate classes and/or methods.__
 ```java
 package com.myapplicatioon.web.rest;
 
-import io.github.poshjosh.ratelimiter.annotations.RateCondition;
-import io.github.poshjosh.ratelimiter.util.Rate;
+import io.github.poshjosh.ratelimiter.model.Rate;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-@RestController 
-@RequestMapping("/my-resources") 
-public class MyResource {
+@RestController @RequestMapping("/my-resources") public class MyResource {
 
     // Only 25 calls per second for users in role GUEST
-    @Rate(permits=25, when="web.request.user.role=GUEST")
-    @GetMapping("/greet/{name}") 
-    public ResponseEntity<String> greet(@PathVariable String name) {
+    @Rate(permits = 25, when = "web.request.user.role=GUEST") @GetMapping("/greet/{name}") public ResponseEntity<String> greet(
+            @PathVariable String name) {
         return ResponseEntity.ok("Hello " + name);
     }
 }

src/main/java/io/github/poshjosh/ratelimiter/web/spring/RateLimitPropertiesSpring.java

@@ -1,6 +1,6 @@
 package io.github.poshjosh.ratelimiter.web.spring;
 
-import io.github.poshjosh.ratelimiter.util.Rates;
+import io.github.poshjosh.ratelimiter.model.Rates;
 import io.github.poshjosh.ratelimiter.web.core.util.RateLimitProperties;
 
 import java.util.*;

src/main/java/io/github/poshjosh/ratelimiter/web/spring/uri/ResourceInfoProviderSpring.java

@@ -1,6 +1,6 @@
 package io.github.poshjosh.ratelimiter.web.spring.uri;
 
-import io.github.poshjosh.ratelimiter.annotation.RateSource;
+import io.github.poshjosh.ratelimiter.model.RateSource;
 import io.github.poshjosh.ratelimiter.web.core.util.PathPatterns;
 import io.github.poshjosh.ratelimiter.web.core.util.ResourceInfoProvider;
 import org.springframework.web.bind.annotation.*;

src/test/java/io/github/poshjosh/ratelimiter/web/spring/weblayertests/AbstractResourceTest.java

@@ -1,6 +1,6 @@
 package io.github.poshjosh.ratelimiter.web.spring.weblayertests;
 
-import io.github.poshjosh.ratelimiter.BandwidthFactory;
+import io.github.poshjosh.ratelimiter.bandwidths.BandwidthFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;

src/test/java/io/github/poshjosh/ratelimiter/web/spring/weblayertests/PropertiesBoundLimitTest.java

@@ -2,8 +2,8 @@
 
 import io.github.poshjosh.ratelimiter.annotation.ElementId;
 import io.github.poshjosh.ratelimiter.util.Operator;
-import io.github.poshjosh.ratelimiter.util.Rate;
-import io.github.poshjosh.ratelimiter.util.Rates;
+import io.github.poshjosh.ratelimiter.model.Rate;
+import io.github.poshjosh.ratelimiter.model.Rates;
 import io.github.poshjosh.ratelimiter.web.core.ResourceLimiterRegistry;
 import io.github.poshjosh.ratelimiter.web.spring.RateLimitPropertiesSpring;
 import org.junit.jupiter.api.Test;