diff --git a/README.md b/README.md
index e45c351..1506483 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ public class WebConfig implements WebMvcConfigurer {
RestInterceptorRegistry restInterceptorRegistry = new RestInterceptorRegistry(registry);
restInterceptorRegistry.addInterceptor(testInterceptor)
- .addRestfulPatterns(RestfulPattern.of("/memos", HttpMethod.GET)); // GET /memos
+ .addRestPatterns(RestPattern.of("/memos", HttpMethod.GET)); // GET /memos
restInterceptorRegistry.build(); // Deprecated Since v1.0
}
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptor.java b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptor.java
index d44b84f..8281ed1 100644
--- a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptor.java
+++ b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptor.java
@@ -16,8 +16,8 @@
*/
public abstract class RestInterceptor implements HandlerInterceptor {
- RestfulPatterns restfulPatterns = RestfulPatterns.empty();
- RestfulPatterns excludePatterns = RestfulPatterns.empty();
+ RestPatterns restPatterns = RestPatterns.empty();
+ RestPatterns excludePatterns = RestPatterns.empty();
@Override
public final boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
@@ -40,7 +40,7 @@ private boolean isPreFlightRequest(final HttpServletRequest request) {
* If request path is matched with any of the excludePatterns, it should be skipped.
*/
private boolean shouldSkip(final HttpServletRequest request) {
- return excludePatterns.anyMatches(request) || restfulPatterns.noneMatches(request);
+ return excludePatterns.anyMatches(request) || restPatterns.noneMatches(request);
}
/**
@@ -52,26 +52,26 @@ protected boolean doInternal(HttpServletRequest request, HttpServletResponse res
}
/**
- * Adds all RestfulPatterns from the given RestfulPatterns instance.
+ * Adds all RestPatterns from the given RestPatterns instance.
*
- * This method merges the provided RestfulPatterns into the existing collection.
+ * This method merges the provided RestPatterns into the existing collection.
*
- * @param restfulPatterns the RestfulPatterns to be added
+ * @param restPatterns the RestPatterns to be added
* @since 1.0.2
*/
- void addRestfulPatterns(final RestfulPatterns restfulPatterns) {
- this.restfulPatterns.addAll(restfulPatterns);
+ void addRestPatterns(final RestPatterns restPatterns) {
+ this.restPatterns.addAll(restPatterns);
}
/**
- * Adds all RestfulPatterns from the given RestfulPatterns instance.
+ * Adds all RestPatterns from the given RestPatterns instance.
*
- * This method merges the provided RestfulPatterns into the existing collection.
+ * This method merges the provided RestPatterns into the existing collection.
*
- * @param excludePatterns the RestfulPatterns to be added
+ * @param excludePatterns the RestPatterns to be added
* @since 1.0.2
*/
- void addExcludePatterns(final RestfulPatterns excludePatterns) {
+ void addExcludePatterns(final RestPatterns excludePatterns) {
this.excludePatterns.addAll(excludePatterns);
}
}
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistration.java b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistration.java
index 99179e5..f6104aa 100644
--- a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistration.java
+++ b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistration.java
@@ -25,60 +25,60 @@ public final class RestInterceptorRegistration {
}
/**
- * Add RestfulPatterns the interceptor should be included in.
+ * Add RestPatterns the interceptor should be included in.
*/
- public RestInterceptorRegistration addRestfulPatterns(RestfulPattern... restfulPatterns) {
- return addRestfulPatterns(Arrays.asList(restfulPatterns));
+ public RestInterceptorRegistration addRestPatterns(RestPattern... restPatterns) {
+ return addRestPatterns(Arrays.asList(restPatterns));
}
/**
- * Collection-based variant of {@link #addRestfulPatterns(RestfulPattern...)}.
+ * Collection-based variant of {@link #addRestPatterns(RestPattern...)}.
*/
- public RestInterceptorRegistration addRestfulPatterns(Collection restfulPatterns) {
- return addRestfulPatterns(RestfulPatterns.from(restfulPatterns));
+ public RestInterceptorRegistration addRestPatterns(Collection restPatterns) {
+ return addRestPatterns(RestPatterns.from(restPatterns));
}
/**
- * Adds the given RestfulPatterns to the RestInterceptor and updates path patterns.
+ * Adds the given RestPatterns to the RestInterceptor and updates path patterns.
*
- * This method registers the provided RestfulPatterns with the RestInterceptor and ensures that the corresponding
- * paths are added to the interceptor registration.
+ * This method registers the provided RestPatterns with the RestInterceptor and ensures that the corresponding paths
+ * are added to the interceptor registration.
*
- * @param restfulPatterns the RestfulPatterns to be registered
+ * @param restPatterns the RestPatterns to be registered
* @return this RestInterceptorRegistration instance for method chaining
* @since 1.0.2
*/
- RestInterceptorRegistration addRestfulPatterns(RestfulPatterns restfulPatterns) {
- restInterceptor.addRestfulPatterns(restfulPatterns);
- registration.addPathPatterns(restfulPatterns.getPaths());
+ RestInterceptorRegistration addRestPatterns(RestPatterns restPatterns) {
+ restInterceptor.addRestPatterns(restPatterns);
+ registration.addPathPatterns(restPatterns.getPaths());
return this;
}
/**
- * Add RestfulPatterns the interceptor should be excluded from.
+ * Add RestPatterns the interceptor should be excluded from.
*/
- public RestInterceptorRegistration excludeRestfulPatterns(RestfulPattern... restfulPatterns) {
- return excludeRestfulPatterns(Arrays.asList(restfulPatterns));
+ public RestInterceptorRegistration excludeRestPatterns(RestPattern... restPatterns) {
+ return excludeRestPatterns(Arrays.asList(restPatterns));
}
/**
- * Collection-based variant of {@link #excludeRestfulPatterns(RestfulPattern...)}.
+ * Collection-based variant of {@link #excludeRestPatterns(RestPattern...)}.
*/
- public RestInterceptorRegistration excludeRestfulPatterns(Collection restfulPatterns) {
- return excludeRestfulPatterns(RestfulPatterns.from(restfulPatterns));
+ public RestInterceptorRegistration excludeRestPatterns(Collection restPatterns) {
+ return excludeRestPatterns(RestPatterns.from(restPatterns));
}
/**
- * Adds the given RestfulPatterns to the RestInterceptor and updates exclude path patterns.
+ * Adds the given RestPatterns to the RestInterceptor and updates exclude path patterns.
*
- * This method registers the provided RestfulPatterns with the RestInterceptor and ensures that the corresponding
- * paths are added to the exclude path patterns of the interceptor registration.
+ * This method registers the provided RestPatterns with the RestInterceptor and ensures that the corresponding paths
+ * are added to the exclude path patterns of the interceptor registration.
*
- * @param excludePatterns the RestfulPatterns to be registered
+ * @param excludePatterns the RestPatterns to be registered
* @return this RestInterceptorRegistration instance for method chaining
* @since 1.0.2
*/
- RestInterceptorRegistration excludeRestfulPatterns(RestfulPatterns excludePatterns) {
+ RestInterceptorRegistration excludeRestPatterns(RestPatterns excludePatterns) {
restInterceptor.addExcludePatterns(excludePatterns);
registration.excludePathPatterns(excludePatterns.getPaths());
return this;
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistry.java b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistry.java
index 45a8985..bc18b23 100644
--- a/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistry.java
+++ b/src/main/java/com/restful_spring/rest_interceptor/RestInterceptorRegistry.java
@@ -21,7 +21,7 @@ public RestInterceptorRegistry(InterceptorRegistry registry) {
*
* @param restInterceptor the restInterceptor to add
* @return an {@link RestInterceptorRegistration} that allows you optionally configure the registered
- * restInterceptor further for example adding RestfulPatterns it should apply to.
+ * restInterceptor further for example adding RestPatterns it should apply to.
*/
public RestInterceptorRegistration addInterceptor(RestInterceptor restInterceptor) {
return new RestInterceptorRegistration(restInterceptor, registry);
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestfulPattern.java b/src/main/java/com/restful_spring/rest_interceptor/RestPattern.java
similarity index 58%
rename from src/main/java/com/restful_spring/rest_interceptor/RestfulPattern.java
rename to src/main/java/com/restful_spring/rest_interceptor/RestPattern.java
index 5e5a91e..038d03b 100644
--- a/src/main/java/com/restful_spring/rest_interceptor/RestfulPattern.java
+++ b/src/main/java/com/restful_spring/rest_interceptor/RestPattern.java
@@ -19,54 +19,54 @@
* @author cookie-meringue
* @since 0.1
*/
-public final class RestfulPattern {
+public final class RestPattern {
private final String path;
private final Set methods;
private final AntPathMatcher pathMatcher = new AntPathMatcher();
- private RestfulPattern(final String path, final Set methods) {
+ private RestPattern(final String path, final Set methods) {
this.path = path;
this.methods = methods;
}
/**
- * Create a new instance of {@link RestfulPattern} with the given path.
+ * Create a new instance of {@link RestPattern} with the given path.
* Default HTTP methods are GET, POST, PUT, DELETE, PATCH, TRACE, OPTIONS, HEAD.
*
* @author cookie-meringue
* @since 1.0
*/
- public static RestfulPattern fromPath(final String path) {
- return new RestfulPattern(path, Set.of(HttpMethod.values()));
+ public static RestPattern fromPath(final String path) {
+ return new RestPattern(path, Set.of(HttpMethod.values()));
}
/**
- * Create a new instance of {@link RestfulPattern} with the given path and HTTP methods.
+ * Create a new instance of {@link RestPattern} with the given path and HTTP methods.
*
* @author cookie-meringue
* @since 1.0
*/
- public static RestfulPattern of(final String path, final HttpMethod... methods) {
- return new RestfulPattern(path, Set.of(methods));
+ public static RestPattern of(final String path, final HttpMethod... methods) {
+ return new RestPattern(path, Set.of(methods));
}
/**
- * Create a new instance of {@link RestfulPattern} with the given path and HTTP method Collections.
+ * Create a new instance of {@link RestPattern} with the given path and HTTP method Collections.
*/
- public static RestfulPattern of(final String path, final Collection methods) {
- return new RestfulPattern(path, new HashSet<>(methods));
+ public static RestPattern of(final String path, final Collection methods) {
+ return new RestPattern(path, new HashSet<>(methods));
}
/**
- * Create a new instance of {@link RestfulPattern} with the given path and HTTP method.
+ * Create a new instance of {@link RestPattern} with the given path and HTTP method.
*/
- public static RestfulPattern of(final String path, final HttpMethod method) {
- return new RestfulPattern(path, Set.of(method));
+ public static RestPattern of(final String path, final HttpMethod method) {
+ return new RestPattern(path, Set.of(method));
}
- public static RestfulPatternBuilder builder() {
- return new RestfulPatternBuilder();
+ public static RestPatternBuilder builder() {
+ return new RestPatternBuilder();
}
/**
@@ -75,7 +75,7 @@ public static RestfulPatternBuilder builder() {
*/
boolean matches(final HttpServletRequest request) {
return methods.contains(HttpMethod.valueOf(request.getMethod())) &&
- pathMatcher.match(path, request.getRequestURI());
+ pathMatcher.match(path, request.getRequestURI());
}
String getPath() {
@@ -87,7 +87,7 @@ public boolean equals(Object o) {
if (this == o) {
return true;
}
- if (!(o instanceof RestfulPattern that)) {
+ if (!(o instanceof RestPattern that)) {
return false;
}
@@ -106,79 +106,79 @@ public int hashCode() {
@Override
public String toString() {
- return "RestfulPattern{" +
- "methods=" + methods +
- ", path=" + path +
- '}';
+ return "RestPattern{" +
+ "methods=" + methods +
+ ", path=" + path +
+ '}';
}
/**
- * Builder for {@link RestfulPattern}.
- * This class is used to create a new instance of {@link RestfulPattern}.
+ * Builder for {@link RestPattern}.
+ *
This class is used to create a new instance of {@link RestPattern}.
*
Can set HTTP methods easily.
*/
- public static class RestfulPatternBuilder {
+ public static class RestPatternBuilder {
private final Set methods = new HashSet<>();
private String path = "/**";
- public RestfulPatternBuilder() {
+ public RestPatternBuilder() {
}
- public RestfulPatternBuilder path(String path) {
+ public RestPatternBuilder path(String path) {
this.path = path;
return this;
}
- public RestfulPatternBuilder get() {
+ public RestPatternBuilder get() {
this.methods.add(GET);
return this;
}
- public RestfulPatternBuilder post() {
+ public RestPatternBuilder post() {
this.methods.add(HttpMethod.POST);
return this;
}
- public RestfulPatternBuilder put() {
+ public RestPatternBuilder put() {
this.methods.add(HttpMethod.PUT);
return this;
}
- public RestfulPatternBuilder delete() {
+ public RestPatternBuilder delete() {
this.methods.add(HttpMethod.DELETE);
return this;
}
- public RestfulPatternBuilder patch() {
+ public RestPatternBuilder patch() {
this.methods.add(HttpMethod.PATCH);
return this;
}
- public RestfulPatternBuilder trace() {
+ public RestPatternBuilder trace() {
this.methods.add(HttpMethod.TRACE);
return this;
}
- public RestfulPatternBuilder options() {
+ public RestPatternBuilder options() {
this.methods.add(HttpMethod.OPTIONS);
return this;
}
- public RestfulPatternBuilder head() {
+ public RestPatternBuilder head() {
this.methods.add(HttpMethod.HEAD);
return this;
}
- public RestfulPatternBuilder all() {
+ public RestPatternBuilder all() {
return get().post().put().delete().patch().trace().options().head();
}
- public RestfulPattern build() {
+ public RestPattern build() {
if (methods.isEmpty()) {
- return new RestfulPattern(path, Set.of(HttpMethod.values()));
+ return new RestPattern(path, Set.of(HttpMethod.values()));
}
- return new RestfulPattern(path, methods);
+ return new RestPattern(path, methods);
}
}
}
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestPatterns.java b/src/main/java/com/restful_spring/rest_interceptor/RestPatterns.java
new file mode 100644
index 0000000..adbcbb2
--- /dev/null
+++ b/src/main/java/com/restful_spring/rest_interceptor/RestPatterns.java
@@ -0,0 +1,89 @@
+package com.restful_spring.rest_interceptor;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * First-class collection of RestPattern.
+ *
+ * Encapsulates a Collection of RestPattern and provides apis.
+ *
+ * @author cookie-meringue
+ * @since 1.0.2
+ */
+final class RestPatterns {
+
+ private final List values;
+
+ private RestPatterns(List values) {
+ this.values = values;
+ }
+
+ /**
+ * Create an empty RestPatterns.
+ *
+ * Static factory method for creating a RestPatterns.
+ *
+ * @return an empty RestPatterns
+ */
+ static RestPatterns empty() {
+ return new RestPatterns(new ArrayList<>());
+ }
+
+ /**
+ * Create a RestPatterns from a Collection of RestPattern.
+ *
+ * Static factory method for creating a RestPatterns.
+ *
+ * @param values a Collection of RestPattern
+ * @return a RestPatterns
+ */
+ static RestPatterns from(final Collection values) {
+ return new RestPatterns(new ArrayList<>(values));
+ }
+
+ /**
+ * Determines whether the given request does not match any RestPatterns.
+ *
+ * @param request the HttpServletRequest to be checked against the patterns
+ * @return {@code true} if no patterns match the request, otherwise {@code false}
+ */
+ boolean noneMatches(final HttpServletRequest request) {
+ return values.stream()
+ .noneMatch(pattern -> pattern.matches(request));
+ }
+
+ /**
+ * Determines whether the given request matches any RestPatterns.
+ *
+ * @param request the HttpServletRequest to be checked against the patterns
+ * @return {@code true} if any patterns match the request, otherwise {@code false}
+ * @since 1.0.2
+ */
+ boolean anyMatches(final HttpServletRequest request) {
+ return values.stream()
+ .anyMatch(pattern -> pattern.matches(request));
+ }
+
+ /**
+ * Add all RestPatterns from another RestPatterns.
+ *
+ * @param restPatterns another RestPatterns
+ */
+ void addAll(final RestPatterns restPatterns) {
+ values.addAll(List.copyOf(restPatterns.values));
+ }
+
+ /**
+ * Get the paths of the RestPatterns.
+ *
+ * @return a List of paths
+ */
+ List getPaths() {
+ return values.stream()
+ .map(RestPattern::getPath)
+ .toList();
+ }
+}
diff --git a/src/main/java/com/restful_spring/rest_interceptor/RestfulPatterns.java b/src/main/java/com/restful_spring/rest_interceptor/RestfulPatterns.java
deleted file mode 100644
index f07dfec..0000000
--- a/src/main/java/com/restful_spring/rest_interceptor/RestfulPatterns.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.restful_spring.rest_interceptor;
-
-import jakarta.servlet.http.HttpServletRequest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-/**
- * First-class collection of RestfulPattern.
- *
- * Encapsulates a Collection of RestfulPattern and provides apis.
- *
- * @author cookie-meringue
- * @since 1.0.2
- */
-final class RestfulPatterns {
-
- private final List values;
-
- private RestfulPatterns(List values) {
- this.values = values;
- }
-
- /**
- * Create an empty RestfulPatterns.
- *
- * Static factory method for creating a RestfulPatterns.
- *
- * @return an empty RestfulPatterns
- */
- static RestfulPatterns empty() {
- return new RestfulPatterns(new ArrayList<>());
- }
-
- /**
- * Create a RestfulPatterns from a Collection of RestfulPattern.
- *
- * Static factory method for creating a RestfulPatterns.
- *
- * @param values a Collection of RestfulPattern
- * @return a RestfulPatterns
- */
- static RestfulPatterns from(final Collection values) {
- return new RestfulPatterns(new ArrayList<>(values));
- }
-
- /**
- * Determines whether the given request does not match any RestfulPatterns.
- *
- * @param request the HttpServletRequest to be checked against the patterns
- * @return {@code true} if no patterns match the request, otherwise {@code false}
- */
- boolean noneMatches(final HttpServletRequest request) {
- return values.stream()
- .noneMatch(pattern -> pattern.matches(request));
- }
-
- /**
- * Determines whether the given request matches any RestfulPatterns.
- *
- * @param request the HttpServletRequest to be checked against the patterns
- * @return {@code true} if any patterns match the request, otherwise {@code false}
- * @since 1.0.2
- */
- boolean anyMatches(final HttpServletRequest request) {
- return values.stream()
- .anyMatch(pattern -> pattern.matches(request));
- }
-
- /**
- * Add all RestfulPatterns from another RestfulPatterns.
- *
- * @param restfulPatterns another RestfulPatterns
- */
- void addAll(final RestfulPatterns restfulPatterns) {
- values.addAll(List.copyOf(restfulPatterns.values));
- }
-
- /**
- * Get the paths of the RestfulPatterns.
- *
- * @return a List of paths
- */
- List getPaths() {
- return values.stream()
- .map(RestfulPattern::getPath)
- .toList();
- }
-}
diff --git a/src/test/java/com/restful_spring/rest_interceptor/RestInterceptorTest.java b/src/test/java/com/restful_spring/rest_interceptor/RestInterceptorTest.java
index f5c94dc..eaed1b7 100644
--- a/src/test/java/com/restful_spring/rest_interceptor/RestInterceptorTest.java
+++ b/src/test/java/com/restful_spring/rest_interceptor/RestInterceptorTest.java
@@ -18,8 +18,8 @@ class RestInterceptorTest {
private static final String FOO = "/foo";
private static final String BAR = "/bar";
- private static final RestfulPattern REGISTRATION_PATTERN = RestfulPattern.of(FOO, GET);
- private static final RestfulPattern EXCLUSION_PATTERN = RestfulPattern.of(BAR, POST);
+ private static final RestPattern REGISTRATION_PATTERN = RestPattern.of(FOO, GET);
+ private static final RestPattern EXCLUSION_PATTERN = RestPattern.of(BAR, POST);
private final AtomicBoolean doInternalCalled = new AtomicBoolean(false);
private RestInterceptor interceptor;
private MockHttpServletRequest request;
@@ -53,9 +53,9 @@ void preFlightRequest() {
}
@Test
- void pathMatchingWithRestfulPattern() {
+ void pathMatchingWithRestPattern() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
// When
request.setRequestURI(FOO);
@@ -69,7 +69,7 @@ void pathMatchingWithRestfulPattern() {
@Test
void skipWithNonMatchingPath() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
// When
request.setRequestURI(BAR);
@@ -83,7 +83,7 @@ void skipWithNonMatchingPath() {
@Test
void shouldSkipWhenNoPatterns() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.empty();
+ interceptor.restPatterns = RestPatterns.empty();
// When
request.setRequestURI(FOO);
@@ -96,7 +96,7 @@ void shouldSkipWhenNoPatterns() {
@Test
void doInternalCalledForMatchingRequest() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
// When
request.setRequestURI(FOO);
@@ -110,7 +110,7 @@ void doInternalCalledForMatchingRequest() {
@Test
void doInternalNotCalledForNonMatchingRequest() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
// When
request.setRequestURI(BAR);
@@ -124,8 +124,8 @@ void doInternalNotCalledForNonMatchingRequest() {
@Test
void doInternalNotCalledForExcludingRequest() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
- interceptor.excludePatterns = RestfulPatterns.from(List.of(EXCLUSION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.excludePatterns = RestPatterns.from(List.of(EXCLUSION_PATTERN));
// When
request.setRequestURI(BAR);
@@ -139,8 +139,8 @@ void doInternalNotCalledForExcludingRequest() {
@Test
void doInternalCalledForNonExcludingRequest() {
// Given
- interceptor.restfulPatterns = RestfulPatterns.from(List.of(REGISTRATION_PATTERN));
- interceptor.excludePatterns = RestfulPatterns.from(List.of(EXCLUSION_PATTERN));
+ interceptor.restPatterns = RestPatterns.from(List.of(REGISTRATION_PATTERN));
+ interceptor.excludePatterns = RestPatterns.from(List.of(EXCLUSION_PATTERN));
// When
request.setRequestURI(FOO);
diff --git a/src/test/java/com/restful_spring/rest_interceptor/RestfulPatternTest.java b/src/test/java/com/restful_spring/rest_interceptor/RestPatternTest.java
similarity index 85%
rename from src/test/java/com/restful_spring/rest_interceptor/RestfulPatternTest.java
rename to src/test/java/com/restful_spring/rest_interceptor/RestPatternTest.java
index 7d47ad5..a7ce363 100644
--- a/src/test/java/com/restful_spring/rest_interceptor/RestfulPatternTest.java
+++ b/src/test/java/com/restful_spring/rest_interceptor/RestPatternTest.java
@@ -19,12 +19,12 @@
import org.springframework.mock.web.MockHttpServletRequest;
/**
- * Test class for {@link RestfulPattern}.
+ * Test class for {@link RestPattern}.
*
* @author cookie-meringue
* @since 0.2
*/
-class RestfulPatternTest {
+class RestPatternTest {
private static final String FOO = "/foo";
private static final String BAR = "/bar";
@@ -33,7 +33,7 @@ class RestfulPatternTest {
@Test
void createFromPath() {
// Given
- RestfulPattern pattern = RestfulPattern.fromPath(FOO);
+ RestPattern pattern = RestPattern.fromPath(FOO);
// When
List requests = Arrays.stream(HttpMethod.values())
@@ -47,7 +47,7 @@ void createFromPath() {
@Test
void pathMatchingWithSingleHttpMethod() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO, GET);
+ RestPattern pattern = RestPattern.of(FOO, GET);
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), FOO);
@@ -59,7 +59,7 @@ void pathMatchingWithSingleHttpMethod() {
@Test
void pathMatchingWithMultipleHttpMethods() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO, Set.of(GET, POST));
+ RestPattern pattern = RestPattern.of(FOO, Set.of(GET, POST));
// When
MockHttpServletRequest getRequest = new MockHttpServletRequest(GET.name(), FOO);
@@ -73,7 +73,7 @@ void pathMatchingWithMultipleHttpMethods() {
@Test
void pathMatchingWithWildcard() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO + ALL, Set.of(GET));
+ RestPattern pattern = RestPattern.of(FOO + ALL, Set.of(GET));
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), FOO + BAR);
@@ -85,7 +85,7 @@ void pathMatchingWithWildcard() {
@Test
void pathNotMatching() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO, GET);
+ RestPattern pattern = RestPattern.of(FOO, GET);
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), BAR);
@@ -97,7 +97,7 @@ void pathNotMatching() {
@Test
void methodNotMatching() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO, GET);
+ RestPattern pattern = RestPattern.of(FOO, GET);
// When
MockHttpServletRequest request = new MockHttpServletRequest(POST.name(), FOO);
@@ -109,7 +109,7 @@ void methodNotMatching() {
@Test
void pathNotMatchingWithWildcard() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO + ALL, Set.of(GET));
+ RestPattern pattern = RestPattern.of(FOO + ALL, Set.of(GET));
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), BAR + FOO);
@@ -121,7 +121,7 @@ void pathNotMatchingWithWildcard() {
@Test
void pathVariableMatching() {
// Given
- RestfulPattern pattern = RestfulPattern.of(FOO + "/{id}", GET);
+ RestPattern pattern = RestPattern.of(FOO + "/{id}", GET);
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), FOO + "/123");
@@ -133,7 +133,7 @@ void pathVariableMatching() {
@Test
void emptyMethodsSet() {
// Given
- RestfulPattern pattern = RestfulPattern.builder().path(FOO).build();
+ RestPattern pattern = RestPattern.builder().path(FOO).build();
// When
MockHttpServletRequest request = new MockHttpServletRequest(GET.name(), FOO);
@@ -145,7 +145,7 @@ void emptyMethodsSet() {
@Test
void builderPattern() {
// Given
- RestfulPattern pattern = RestfulPattern.builder()
+ RestPattern pattern = RestPattern.builder()
.path(FOO)
.get()
.post()
@@ -163,7 +163,7 @@ void builderPattern() {
@Test
void allMethods() {
// Given
- RestfulPattern pattern = RestfulPattern.builder().path(FOO).all().build();
+ RestPattern pattern = RestPattern.builder().path(FOO).all().build();
// When
MockHttpServletRequest getRequest = new MockHttpServletRequest(GET.name(), FOO);
diff --git a/src/test/java/com/restful_spring/rest_interceptor/RestfulPatternsTest.java b/src/test/java/com/restful_spring/rest_interceptor/RestPatternsTest.java
similarity index 58%
rename from src/test/java/com/restful_spring/rest_interceptor/RestfulPatternsTest.java
rename to src/test/java/com/restful_spring/rest_interceptor/RestPatternsTest.java
index 56de071..1310d5d 100644
--- a/src/test/java/com/restful_spring/rest_interceptor/RestfulPatternsTest.java
+++ b/src/test/java/com/restful_spring/rest_interceptor/RestPatternsTest.java
@@ -8,13 +8,13 @@
import org.springframework.http.HttpMethod;
import org.springframework.mock.web.MockHttpServletRequest;
-class RestfulPatternsTest {
+class RestPatternsTest {
- private static List parseValues(RestfulPatterns patterns) {
+ private static List parseValues(RestPatterns patterns) {
try {
- Field valuesField = RestfulPatterns.class.getDeclaredField("values");
+ Field valuesField = RestPatterns.class.getDeclaredField("values");
valuesField.setAccessible(true);
- return (List) valuesField.get(patterns);
+ return (List) valuesField.get(patterns);
} catch (NoSuchFieldException | IllegalAccessException e) {
throw new RuntimeException(e);
}
@@ -24,10 +24,10 @@ private static List parseValues(RestfulPatterns patterns) {
void emptyCreation() {
// Given
- RestfulPatterns patterns = RestfulPatterns.empty();
+ RestPatterns patterns = RestPatterns.empty();
// When
- List values = parseValues(patterns);
+ List values = parseValues(patterns);
int actual = values.size();
// Then
@@ -38,9 +38,9 @@ void emptyCreation() {
void noneMatches() {
// Given
- RestfulPattern pattern1 = RestfulPattern.of("/foo", HttpMethod.GET);
- RestfulPattern pattern2 = RestfulPattern.of("/bar", HttpMethod.POST);
- RestfulPatterns patterns = RestfulPatterns.from(List.of(pattern1, pattern2));
+ RestPattern pattern1 = RestPattern.of("/foo", HttpMethod.GET);
+ RestPattern pattern2 = RestPattern.of("/bar", HttpMethod.POST);
+ RestPatterns patterns = RestPatterns.from(List.of(pattern1, pattern2));
// When
MockHttpServletRequest request1 = new MockHttpServletRequest(HttpMethod.GET.name(), "/bar");
@@ -57,12 +57,12 @@ void noneMatches() {
void addAll() {
// Given
- RestfulPattern pattern1 = RestfulPattern.of("/foo", HttpMethod.GET);
- RestfulPattern pattern2 = RestfulPattern.of("/bar", HttpMethod.POST);
- RestfulPatterns patterns = RestfulPatterns.empty();
+ RestPattern pattern1 = RestPattern.of("/foo", HttpMethod.GET);
+ RestPattern pattern2 = RestPattern.of("/bar", HttpMethod.POST);
+ RestPatterns patterns = RestPatterns.empty();
// When
- patterns.addAll(RestfulPatterns.from(List.of(pattern1, pattern2)));
+ patterns.addAll(RestPatterns.from(List.of(pattern1, pattern2)));
int actual = parseValues(patterns).size();
// Then
@@ -73,9 +73,9 @@ void addAll() {
void getPaths() {
// Given
- RestfulPattern pattern1 = RestfulPattern.of("/foo", HttpMethod.GET);
- RestfulPattern pattern2 = RestfulPattern.of("/bar", HttpMethod.POST);
- RestfulPatterns patterns = RestfulPatterns.from(List.of(pattern1, pattern2));
+ RestPattern pattern1 = RestPattern.of("/foo", HttpMethod.GET);
+ RestPattern pattern2 = RestPattern.of("/bar", HttpMethod.POST);
+ RestPatterns patterns = RestPatterns.from(List.of(pattern1, pattern2));
// When
List actual = patterns.getPaths();
@@ -83,4 +83,4 @@ void getPaths() {
// Then
assertThat(actual).containsExactlyInAnyOrder("/foo", "/bar");
}
-}
\ No newline at end of file
+}