refactor(): optimize rds jpa repository high-level structure

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/AuthController.java

@@ -4,9 +4,9 @@
 import com.auth0.jwt.interfaces.DecodedJWT;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
-import org.clevercastle.authforge.CastleException;
-import org.clevercastle.authforge.User;
-import org.clevercastle.authforge.UserLoginItem;
+import org.clevercastle.authforge.exception.CastleException;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.clevercastle.authforge.UserRegisterRequest;
 import org.clevercastle.authforge.UserService;
 import org.clevercastle.authforge.UserWithToken;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/Beans.java

@@ -5,10 +5,10 @@
 import org.clevercastle.authforge.UserService;
 import org.clevercastle.authforge.UserServiceImpl;
 import org.clevercastle.authforge.repository.UserRepository;
-import org.clevercastle.authforge.repository.rdsjpa.IUserLoginItemRepository;
-import org.clevercastle.authforge.repository.rdsjpa.IUserModelRepository;
-import org.clevercastle.authforge.repository.rdsjpa.IUserRefreshTokenMappingRepository;
-import org.clevercastle.authforge.repository.rdsjpa.UserRepositoryImpl;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserLoginItemRepository;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserModelRepository;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingRepository;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRepositoryImpl;
 import org.clevercastle.authforge.token.TokenService;
 import org.clevercastle.authforge.token.jwt.JwtTokenService;
 import org.clevercastle.authforge.verification.DummyVerificationService;
@@ -31,10 +31,10 @@
 @Configuration
 public class Beans {
     @Bean
-    public UserRepository userRepository(IUserModelRepository userModelRepository,
-                                         IUserLoginItemRepository userLoginItemRepository,
-                                         IUserRefreshTokenMappingRepository userRefreshTokenMappingRepository) {
-        return new UserRepositoryImpl(userModelRepository, userLoginItemRepository, userRefreshTokenMappingRepository);
+    public UserRepository userRepository(RdsJpaUserModelRepository userModelRepository,
+                                         RdsJpaUserLoginItemRepository userLoginItemRepository,
+                                         RdsJpaUserRefreshTokenMappingRepository userRefreshTokenMappingRepository) {
+        return new RdsJpaUserRepositoryImpl(userModelRepository, userLoginItemRepository, userRefreshTokenMappingRepository);
     }
 
     @Bean
@@ -56,8 +56,8 @@ public TokenService tokenService() throws NoSuchAlgorithmException, InvalidKeySp
     }
 
     @Bean
-    public UserService userService(UserRepository userRepository, IUserLoginItemRepository userLoginItemRepository, TokenService tokenService) {
-        return new UserServiceImpl(Config.builder().build(), userRepository, tokenService, new DummyVerificationService(userLoginItemRepository));
+    public UserService userService(UserRepository userRepository, TokenService tokenService) {
+        return new UserServiceImpl(Config.builder().build(), userRepository, tokenService, new DummyVerificationService(userRepository));
     }
 
 

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/HttpClientImpl.java

@@ -7,7 +7,7 @@
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.util.Timeout;
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 import org.clevercastle.authforge.http.HttpRequest;
 import org.clevercastle.authforge.http.HttpResponse;
 import org.clevercastle.authforge.http.IHttpClient;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/SpringBootExampleApplication.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.User;
+import org.clevercastle.authforge.entity.User;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserLoginItemRepositoryAdapter.java

@@ -1,10 +1,10 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.UserLoginItem;
-import org.clevercastle.authforge.repository.rdsjpa.UserLoginItemJpaRepository;
+import org.clevercastle.authforge.entity.UserLoginItem;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserLoginItemRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UserLoginItemRepositoryAdapter extends UserLoginItemJpaRepository, JpaRepository<UserLoginItem, String> {
+public interface UserLoginItemRepositoryAdapter extends RdsJpaUserLoginItemRepository, JpaRepository<UserLoginItem, String> {
 }

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserModelRepositoryAdapter.java

@@ -1,10 +1,10 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.User;
-import org.clevercastle.authforge.repository.rdsjpa.IUserModelRepository;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserModelRepository;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface UserModelRepositoryAdapter extends IUserModelRepository, JpaRepository<User, String> {
+public interface UserModelRepositoryAdapter extends RdsJpaUserModelRepository, JpaRepository<User, String> {
 }

examples/spring-boot-example/src/main/java/org/clevercastle/authforge/examples/springboot/springbootexample/UserRefreshTokenMappingRepositoryAdapter.java

@@ -1,9 +1,9 @@
 package org.clevercastle.authforge.examples.springboot.springbootexample;
 
-import org.clevercastle.authforge.UserRefreshTokenMapping;
-import org.clevercastle.authforge.repository.rdsjpa.IUserRefreshTokenMappingRepository;
-import org.clevercastle.authforge.repository.rdsjpa.UserRefreshTokenMappingId;
+import org.clevercastle.authforge.entity.UserRefreshTokenMapping;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingRepository;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingId;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface UserRefreshTokenMappingRepositoryAdapter extends IUserRefreshTokenMappingRepository, JpaRepository<UserRefreshTokenMapping, UserRefreshTokenMappingId> {
+public interface UserRefreshTokenMappingRepositoryAdapter extends RdsJpaUserRefreshTokenMappingRepository, JpaRepository<UserRefreshTokenMapping, RdsJpaUserRefreshTokenMappingId> {
 }

src/main/java/org/clevercastle/authforge/UserService.java

@@ -1,6 +1,9 @@
 package org.clevercastle.authforge;
 
 import org.apache.commons.lang3.tuple.Pair;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
+import org.clevercastle.authforge.exception.CastleException;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;
 
 public interface UserService {

src/main/java/org/clevercastle/authforge/UserServiceImpl.java

@@ -14,8 +14,11 @@
 import jakarta.annotation.Nonnull;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
+import org.clevercastle.authforge.exception.CastleException;
 import org.clevercastle.authforge.exception.UserExistException;
 import org.clevercastle.authforge.exception.UserNotFoundException;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;
 import org.clevercastle.authforge.oauth2.Oauth2User;
 import org.clevercastle.authforge.repository.UserRepository;

src/main/java/org/clevercastle/authforge/UserWithToken.java

@@ -1,5 +1,7 @@
 package org.clevercastle.authforge;
 
+import org.clevercastle.authforge.entity.User;
+
 public class UserWithToken {
     private final User user;
     private final TokenHolder tokenHolder;

src/main/java/org/clevercastle/authforge/User.java → src/main/java/org/clevercastle/authforge/entity/User.java

@@ -1,10 +1,11 @@
-package org.clevercastle.authforge;
+package org.clevercastle.authforge.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
+import org.clevercastle.authforge.UserState;
 
 import java.time.OffsetDateTime;
 

src/main/java/org/clevercastle/authforge/UserLoginItem.java → src/main/java/org/clevercastle/authforge/entity/UserLoginItem.java

@@ -1,4 +1,4 @@
-package org.clevercastle.authforge;
+package org.clevercastle.authforge.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;

src/main/java/org/clevercastle/authforge/UserRefreshTokenMapping.java → src/main/java/org/clevercastle/authforge/entity/UserRefreshTokenMapping.java

@@ -1,19 +1,19 @@
-package org.clevercastle.authforge;
+package org.clevercastle.authforge.entity;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.Table;
-import org.clevercastle.authforge.repository.rdsjpa.UserRefreshTokenMappingId;
+import org.clevercastle.authforge.repository.rdsjpa.RdsJpaUserRefreshTokenMappingId;
 
 import java.time.OffsetDateTime;
 
 @javax.persistence.Entity
 @javax.persistence.Table(name = "user_refresh_token")
 @Entity
 @Table(name = "user_refresh_token")
-@javax.persistence.IdClass(UserRefreshTokenMappingId.class)
-@IdClass(UserRefreshTokenMappingId.class)
+@javax.persistence.IdClass(RdsJpaUserRefreshTokenMappingId.class)
+@IdClass(RdsJpaUserRefreshTokenMappingId.class)
 public class UserRefreshTokenMapping {
     @javax.persistence.Id
     @Id

src/main/java/org/clevercastle/authforge/CastleException.java → src/main/java/org/clevercastle/authforge/exception/CastleException.java

@@ -1,4 +1,4 @@
-package org.clevercastle.authforge;
+package org.clevercastle.authforge.exception;
 
 public class CastleException extends Exception {
     public CastleException() {

src/main/java/org/clevercastle/authforge/exception/UserExistException.java

@@ -1,6 +1,4 @@
 package org.clevercastle.authforge.exception;
 
-import org.clevercastle.authforge.CastleException;
-
 public class UserExistException extends CastleException {
 }

src/main/java/org/clevercastle/authforge/exception/UserNotConfirmedException.java

@@ -1,7 +1,5 @@
 package org.clevercastle.authforge.exception;
 
-import org.clevercastle.authforge.CastleException;
-
 public class UserNotConfirmedException extends CastleException {
     public UserNotConfirmedException() {
     }

src/main/java/org/clevercastle/authforge/exception/UserNotFoundException.java

@@ -1,7 +1,5 @@
 package org.clevercastle.authforge.exception;
 
-import org.clevercastle.authforge.CastleException;
-
 public class UserNotFoundException extends CastleException {
     public UserNotFoundException() {
     }

src/main/java/org/clevercastle/authforge/http/IHttpClient.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.http;
 
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 
 public interface IHttpClient {
     HttpResponse execute(HttpRequest request) throws CastleException;

src/main/java/org/clevercastle/authforge/oauth2/AbstractOauth2ExchangeService.java

@@ -12,7 +12,7 @@
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.oauth2.sdk.id.ClientID;
 import org.apache.commons.lang3.StringUtils;
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/org/clevercastle/authforge/oauth2/Oauth2ExchangeService.java

@@ -1,6 +1,6 @@
 package org.clevercastle.authforge.oauth2;
 
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 
 public interface Oauth2ExchangeService {
 

src/main/java/org/clevercastle/authforge/oauth2/github/GithubOauth2ExchangeService.java

@@ -6,7 +6,7 @@
 import com.nimbusds.oauth2.sdk.http.HTTPRequest;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 import org.clevercastle.authforge.http.HttpResponse;
 import org.clevercastle.authforge.oauth2.AbstractOauth2ExchangeService;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;

src/main/java/org/clevercastle/authforge/oauth2/oidc/OidcExchangeService.java

@@ -6,7 +6,7 @@
 import com.nimbusds.oauth2.sdk.TokenResponse;
 import com.nimbusds.oauth2.sdk.http.HTTPResponse;
 import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
-import org.clevercastle.authforge.CastleException;
+import org.clevercastle.authforge.exception.CastleException;
 import org.clevercastle.authforge.oauth2.AbstractOauth2ExchangeService;
 import org.clevercastle.authforge.oauth2.Oauth2ClientConfig;
 import org.clevercastle.authforge.oauth2.Oauth2User;

src/main/java/org/clevercastle/authforge/repository/UserRepository.java

@@ -1,22 +1,21 @@
 package org.clevercastle.authforge.repository;
 
+import jakarta.annotation.Nonnull;
 import org.apache.commons.lang3.tuple.Pair;
-import org.clevercastle.authforge.CastleException;
-import org.clevercastle.authforge.User;
-import org.clevercastle.authforge.UserLoginItem;
-import org.clevercastle.authforge.UserRefreshTokenMapping;
+import org.clevercastle.authforge.exception.CastleException;
+import org.clevercastle.authforge.entity.User;
+import org.clevercastle.authforge.entity.UserLoginItem;
+import org.clevercastle.authforge.entity.UserRefreshTokenMapping;
 
 import java.time.OffsetDateTime;
 
 public interface UserRepository {
     void save(User user, UserLoginItem userLoginItem);
 
-    void save(User user);
-
-    void saveLoginItem(UserLoginItem loginItem);
-
+    @Nonnull
     Pair<User, UserLoginItem> getByLoginIdentifier(String loginIdentifier);
 
+    @Nonnull
     Pair<User, UserLoginItem> getByUserSub(String userSUb);
 
     void confirmLoginItem(String loginIdentifier);

src/main/java/org/clevercastle/authforge/repository/rdsjpa/UserLoginItemJpaRepository.java → src/main/java/org/clevercastle/authforge/repository/rdsjpa/RdsJpaUserLoginItemRepository.java

@@ -1,18 +1,20 @@
 package org.clevercastle.authforge.repository.rdsjpa;
 
+import org.clevercastle.authforge.entity.UserLoginItem;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.query.Param;
 
-import javax.transaction.Transactional;
+public interface RdsJpaUserLoginItemRepository {
+    UserLoginItem save(UserLoginItem userLoginItem);
 
-public interface UserLoginItemJpaRepository extends IUserLoginItemRepository {
+    UserLoginItem getByLoginIdentifier(String loginIdentifier);
+
+    UserLoginItem getByUserSub(String userSub);
 
     @Modifying
-    @Transactional
     @Query("UPDATE UserLoginItem u\n" +
             "            SET u.state = 'ACTIVE', \n" +
             "                u.verificationCode = NULL\n" +
             "            WHERE u.loginIdentifier = :loginIdentifier")
-    void confirmLoginItem(@Param("loginIdentifier") String loginIdentifier);
+    void confirmLoginItem(String loginIdentifier);
 }

src/main/java/org/clevercastle/authforge/repository/rdsjpa/IUserModelRepository.java → src/main/java/org/clevercastle/authforge/repository/rdsjpa/RdsJpaUserModelRepository.java

@@ -1,8 +1,8 @@
 package org.clevercastle.authforge.repository.rdsjpa;
 
-import org.clevercastle.authforge.User;
+import org.clevercastle.authforge.entity.User;
 
-public interface IUserModelRepository {
+public interface RdsJpaUserModelRepository {
     User save(User user);
 
     User getByUserId(String userId);

src/main/java/org/clevercastle/authforge/repository/rdsjpa/UserRefreshTokenMappingId.java → src/main/java/org/clevercastle/authforge/repository/rdsjpa/RdsJpaUserRefreshTokenMappingId.java

@@ -2,14 +2,14 @@
 
 import java.io.Serializable;
 
-public class UserRefreshTokenMappingId implements Serializable {
+public class RdsJpaUserRefreshTokenMappingId implements Serializable {
     private String userId;
     private String refreshToken;
 
-    public UserRefreshTokenMappingId() {
+    public RdsJpaUserRefreshTokenMappingId() {
     }
 
-    public UserRefreshTokenMappingId(String userId, String refreshToken) {
+    public RdsJpaUserRefreshTokenMappingId(String userId, String refreshToken) {
         this.userId = userId;
         this.refreshToken = refreshToken;
     }

src/main/java/org/clevercastle/authforge/repository/rdsjpa/IUserRefreshTokenMappingRepository.java → src/main/java/org/clevercastle/authforge/repository/rdsjpa/RdsJpaUserRefreshTokenMappingRepository.java

@@ -1,8 +1,8 @@
 package org.clevercastle.authforge.repository.rdsjpa;
 
-import org.clevercastle.authforge.UserRefreshTokenMapping;
+import org.clevercastle.authforge.entity.UserRefreshTokenMapping;
 
-public interface IUserRefreshTokenMappingRepository {
+public interface RdsJpaUserRefreshTokenMappingRepository {
     UserRefreshTokenMapping getByUserIdAndRefreshToken(String userIed, String refreshToken);
 
     void deleteByUserIdAndRefreshToken(String userIed, String refreshToken);