Merge pull request #40 from wwan13/feature/refactor

Feature/refactor

build.gradle

@@ -1,12 +1,12 @@
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.7.13'
+    id 'org.springframework.boot' version '3.3.4'
     id 'io.spring.dependency-management' version '1.1.4'
     id 'maven-publish'
 }
 
 group = 'io.wwan13'
-version = '0.0.9'
+version = '1.0.0'
 
 java {
     sourceCompatibility = '17'

src/main/java/io/wwan13/wintersecurity/auth/AbstractAuthProcessor.java

@@ -16,7 +16,7 @@
 
 package io.wwan13.wintersecurity.auth;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public abstract class AbstractAuthProcessor implements AuthProcessor {
 

src/main/java/io/wwan13/wintersecurity/auth/AuthProcessor.java

@@ -16,7 +16,7 @@
 
 package io.wwan13.wintersecurity.auth;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 public interface AuthProcessor {
 

src/main/java/io/wwan13/wintersecurity/auth/RequestStorage.java

@@ -16,7 +16,8 @@
 
 package io.wwan13.wintersecurity.auth;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,6 +38,6 @@ public void saveAll(Map<String, Object> values) {
     }
 
     public void toRequestAttribute(HttpServletRequest request) {
-        storage.forEach(request::setAttribute);
+        storage.keySet().forEach(it -> request.setAttribute(it, storage.get(it)));
     }
 }

src/main/java/io/wwan13/wintersecurity/auth/TokenExtractor.java

@@ -16,7 +16,8 @@
 
 package io.wwan13.wintersecurity.auth;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.Optional;
 
 public interface TokenExtractor {

src/main/java/io/wwan13/wintersecurity/auth/processor/AbstractInterceptorAuthProcessor.java

@@ -17,11 +17,10 @@
 package io.wwan13.wintersecurity.auth.processor;
 
 import io.wwan13.wintersecurity.auth.AbstractAuthProcessor;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 public abstract class AbstractInterceptorAuthProcessor
         extends AbstractAuthProcessor implements HandlerInterceptor {
 

src/main/java/io/wwan13/wintersecurity/auth/processor/InterceptorAuthProcessor.java

@@ -24,10 +24,9 @@
 import io.wwan13.wintersecurity.exception.unauthirized.InvalidJwtTokenException;
 import io.wwan13.wintersecurity.jwt.TokenClaims;
 import io.wwan13.wintersecurity.jwt.TokenDecoder;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.http.HttpMethod;
 
-import javax.servlet.http.HttpServletRequest;
-
 public class InterceptorAuthProcessor extends AbstractInterceptorAuthProcessor {
 
     private final TokenExtractor tokenExtractor;
@@ -62,14 +61,14 @@ private void actionIfTokenPresent(
             TokenClaims claims = tokenDecoder.decode(token);
 
             accessManager.manageWithAuthentication(
-                    HttpMethod.resolve(request.getMethod()),
+                    HttpMethod.valueOf(request.getMethod()),
                     request.getRequestURI(),
                     claims.getRoles()
             );
 
             storage.save(Constants.ATTRIBUTE_CLAIMS_KEY, claims);
         } catch (InvalidJwtTokenException | ExpiredJwtTokenException e) {
-            HttpMethod method = HttpMethod.resolve(request.getMethod());
+            HttpMethod method = HttpMethod.valueOf(request.getMethod());
             String uri = request.getRequestURI();
 
             if (!accessManager.isUnsecuredRequest(method, uri)) {
@@ -80,7 +79,7 @@ private void actionIfTokenPresent(
 
     private void actionIfTokenAbsent(HttpServletRequest request) {
         accessManager.manageWithoutAuthentication(
-                HttpMethod.resolve(request.getMethod()),
+                HttpMethod.valueOf(request.getMethod()),
                 request.getRequestURI()
         );
     }

src/main/java/io/wwan13/wintersecurity/auth/provider/BearerTokenExtractor.java

@@ -17,8 +17,8 @@
 package io.wwan13.wintersecurity.auth.provider;
 
 import io.wwan13.wintersecurity.auth.TokenExtractor;
+import jakarta.servlet.http.HttpServletRequest;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Optional;
 
 public class BearerTokenExtractor implements TokenExtractor {

src/main/java/io/wwan13/wintersecurity/resolve/RolesResolver.java

@@ -19,13 +19,13 @@
 import io.wwan13.wintersecurity.jwt.TokenClaims;
 import io.wwan13.wintersecurity.resolve.util.AttributeExtractor;
 import io.wwan13.wintersecurity.resolve.util.ResolveTypeConverter;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Collection;
 
 public class RolesResolver implements HandlerMethodArgumentResolver {

src/main/java/io/wwan13/wintersecurity/resolve/SubjectResolver.java

@@ -19,14 +19,13 @@
 import io.wwan13.wintersecurity.jwt.TokenClaims;
 import io.wwan13.wintersecurity.resolve.util.AttributeExtractor;
 import io.wwan13.wintersecurity.resolve.util.ResolveTypeConverter;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.core.MethodParameter;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
-import javax.servlet.http.HttpServletRequest;
-
 public class SubjectResolver implements HandlerMethodArgumentResolver {
 
     private final TargetAnnotations targetAnnotations;

src/main/java/io/wwan13/wintersecurity/resolve/util/AttributeExtractor.java

@@ -18,8 +18,8 @@
 
 import io.wwan13.wintersecurity.constant.Constants;
 import io.wwan13.wintersecurity.jwt.TokenClaims;
+import jakarta.servlet.http.HttpServletRequest;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Objects;
 
 public class AttributeExtractor {

src/test/java/io/wwan13/wintersecurity/auth/AbstractAuthProcessorTest.java

@@ -18,10 +18,9 @@
 
 import io.wwan13.wintersecurity.UnitTest;
 import io.wwan13.wintersecurity.auth.stub.StubHttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletRequest;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 class AbstractAuthProcessorTest extends UnitTest {

src/test/java/io/wwan13/wintersecurity/auth/RequestStorageTest.java

@@ -18,9 +18,9 @@
 
 import io.wwan13.wintersecurity.UnitTest;
 import io.wwan13.wintersecurity.auth.stub.StubHttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.junit.jupiter.api.Test;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
 

src/test/java/io/wwan13/wintersecurity/auth/authpattern/AuthPatternsTest.java

@@ -76,7 +76,7 @@ void should_JudgeRequestIsAccessible(
 
         // when
         boolean result = authPatterns
-                .isAccessibleRequest(HttpMethod.resolve(requestMethod), requestUri, Set.of(requestRole));
+                .isAccessibleRequest(HttpMethod.valueOf(requestMethod), requestUri, Set.of(requestRole));
 
         // then
         assertThat(result).isEqualTo(expected);
@@ -109,7 +109,7 @@ void should_AcceptUnregisteredRequest_when_AnyRequestPermitAll(
 
         // when
         boolean result = authPatterns
-                .isAccessibleRequest(HttpMethod.resolve(requestMethod), requestUri, Set.of(requestRole));
+                .isAccessibleRequest(HttpMethod.valueOf(requestMethod), requestUri, Set.of(requestRole));
 
         // then
         assertThat(result).isEqualTo(expected);
@@ -143,7 +143,7 @@ void should_BlockUnregisteredRequest_when_AnyRequestAuthenticated(
 
         // when
         boolean result = authPatterns
-                .isAccessibleRequest(HttpMethod.resolve(requestMethod), requestUri, Set.of(requestRole));
+                .isAccessibleRequest(HttpMethod.valueOf(requestMethod), requestUri, Set.of(requestRole));
 
         // then
         assertThat(result).isEqualTo(expected);

src/test/java/io/wwan13/wintersecurity/auth/authpattern/RequestsTest.java

@@ -65,7 +65,7 @@ void should_JudgeRequestIsRegistered_when_MethodAndUriEntered(
         Requests requests = new Requests(methods, uriPattern);
 
         // when
-        boolean result = requests.isRegistered(HttpMethod.resolve(method), uri);
+        boolean result = requests.isRegistered(HttpMethod.valueOf(method), uri);
 
         // then
         assertThat(result).isEqualTo(expected);

src/test/java/io/wwan13/wintersecurity/auth/processor/AbstractInterceptorAuthProcessorTest.java

@@ -20,17 +20,16 @@
 import io.wwan13.wintersecurity.auth.RequestStorage;
 import io.wwan13.wintersecurity.auth.stub.StubHttpServletRequest;
 import io.wwan13.wintersecurity.auth.stub.StubHttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
 import org.springframework.web.servlet.HandlerInterceptor;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 class AbstractInterceptorAuthProcessorTest extends UnitTest {
 
-    static class StubAbstractInterceptorAuthProcessor extends  AbstractInterceptorAuthProcessor {
+    static class StubAbstractInterceptorAuthProcessor extends AbstractInterceptorAuthProcessor {
         @Override
         protected void processInternal(HttpServletRequest request, RequestStorage storage) {
             final String key = "key";