refactor: move to @JdbiRepository and remove JdbiBeanFactoryPostProce…

…ssor
HangarMC · Dec 2, 2023 · e400327 · e400327
1 parent 0040524
commit e400327
Show file tree

Hide file tree

Showing 57 changed files with 110 additions and 238 deletions.
diff --git a/backend/src/main/java/io/papermc/hangar/HangarApplication.java b/backend/src/main/java/io/papermc/hangar/HangarApplication.java
@@ -3,6 +3,7 @@
 import io.papermc.hangar.config.hangar.PagesConfig;
 import io.papermc.hangar.security.authentication.HangarPrincipal;
 import java.util.Optional;
+import org.jdbi.v3.spring5.EnableJdbiRepositories;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
@@ -14,8 +15,8 @@
 @EnableAsync
 @EnableScheduling
 @EnableCaching
+@EnableJdbiRepositories
 @SpringBootApplication
-@Import(JdbiBeanFactoryPostProcessor.class)
 @ConfigurationPropertiesScan(value = "io.papermc.hangar.config.hangar", basePackageClasses = PagesConfig.class)
 public class HangarApplication {
 

diff --git a/backend/src/main/java/io/papermc/hangar/JdbiBeanFactoryPostProcessor.java b/backend/src/main/java/io/papermc/hangar/JdbiBeanFactoryPostProcessor.java
diff --git a/backend/src/main/java/io/papermc/hangar/JdbiDaoBeanFactory.java b/backend/src/main/java/io/papermc/hangar/JdbiDaoBeanFactory.java
diff --git a/backend/src/main/java/io/papermc/hangar/components/auth/dao/UserCredentialDAO.java b/backend/src/main/java/io/papermc/hangar/components/auth/dao/UserCredentialDAO.java
@@ -5,14 +5,14 @@
 import io.papermc.hangar.db.customtypes.JSONB;
 import java.util.List;
 import org.jdbi.v3.core.enums.EnumByOrdinal;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.Timestamped;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(UserCredentialTable.class)
 public interface UserCredentialDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/components/auth/dao/UserRefreshTokenDAO.java b/backend/src/main/java/io/papermc/hangar/components/auth/dao/UserRefreshTokenDAO.java
@@ -2,15 +2,15 @@
 
 import io.papermc.hangar.components.auth.model.db.UserRefreshToken;
 import java.util.UUID;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.BindBean;
 import org.jdbi.v3.sqlobject.customizer.Timestamped;
 import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(UserRefreshToken.class)
 public interface UserRefreshTokenDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/components/auth/dao/VerificationCodeDao.java b/backend/src/main/java/io/papermc/hangar/components/auth/dao/VerificationCodeDao.java
@@ -2,15 +2,15 @@
 
 import io.papermc.hangar.components.auth.model.db.VerificationCodeTable;
 import org.jdbi.v3.core.enums.EnumByOrdinal;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.BindBean;
 import org.jdbi.v3.sqlobject.customizer.Timestamped;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
 import org.jetbrains.annotations.Nullable;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(VerificationCodeTable.class)
 public interface VerificationCodeDao {
 

diff --git a/backend/src/main/java/io/papermc/hangar/components/images/dao/AvatarDAO.java b/backend/src/main/java/io/papermc/hangar/components/images/dao/AvatarDAO.java
@@ -1,14 +1,14 @@
 package io.papermc.hangar.components.images.dao;
 
 import io.papermc.hangar.components.images.model.AvatarTable;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.BindBean;
 import org.jdbi.v3.sqlobject.customizer.Timestamped;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(AvatarTable.class)
 public interface AvatarDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/PermissionsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/PermissionsDAO.java
@@ -3,13 +3,13 @@
 import io.papermc.hangar.model.common.Permission;
 import io.papermc.hangar.model.db.UserTable;
 import java.util.Map;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.config.ValueColumn;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface PermissionsDAO {
 
     @SqlQuery("SELECT coalesce(gt.permission, B'0'::bit(64))::bigint perm_value" +

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/UsersDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/UsersDAO.java
@@ -6,16 +6,16 @@
 import io.papermc.hangar.model.api.requests.RequestPagination;
 import io.papermc.hangar.model.internal.user.HangarUser;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterColumnMapperFactory;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.AllowUnusedBindings;
 import org.jdbi.v3.sqlobject.customizer.Define;
 import org.jdbi.v3.sqlobject.statement.MapTo;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.stringtemplate4.UseStringTemplateEngine;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(HangarUser.class)
 @RegisterConstructorMapper(User.class)
 @RegisterColumnMapperFactory(RoleColumnMapperFactory.class)

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/ActivityDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/ActivityDAO.java
@@ -3,11 +3,11 @@
 import io.papermc.hangar.model.internal.admin.activity.FlagActivity;
 import io.papermc.hangar.model.internal.admin.activity.ReviewActivity;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface ActivityDAO {
 
     @RegisterConstructorMapper(FlagActivity.class)

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarApiKeysDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarApiKeysDAO.java
@@ -2,11 +2,11 @@
 
 import io.papermc.hangar.model.api.ApiKey;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(ApiKey.class)
 public interface HangarApiKeysDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarNotificationsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarNotificationsDAO.java
@@ -5,11 +5,11 @@
 import io.papermc.hangar.model.internal.user.notifications.HangarInvite;
 import io.papermc.hangar.model.internal.user.notifications.HangarNotification;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(HangarNotification.class)
 public interface HangarNotificationsDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarOrganizationsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarOrganizationsDAO.java
@@ -5,14 +5,14 @@
 import io.papermc.hangar.model.db.roles.OrganizationRoleTable;
 import io.papermc.hangar.model.internal.user.JoinableMember;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.config.RegisterRowMapperFactory;
 import org.jdbi.v3.sqlobject.customizer.Define;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.stringtemplate4.UseStringTemplateEngine;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface HangarOrganizationsDAO {
 
     @RegisterRowMapperFactory(JoinableRowMapperFactory.class)

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarStatsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarStatsDAO.java
@@ -3,15 +3,15 @@
 import io.papermc.hangar.model.internal.admin.DayStats;
 import java.time.LocalDate;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.Define;
 import org.jdbi.v3.sqlobject.locator.UseClasspathSqlLocator;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
 import org.jdbi.v3.stringtemplate4.UseStringTemplateEngine;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface HangarStatsDAO {
 
     @SqlQuery

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarUsersDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HangarUsersDAO.java
@@ -3,12 +3,12 @@
 import io.papermc.hangar.model.db.OrganizationTable;
 import io.papermc.hangar.model.db.UserTable;
 import org.apache.commons.lang3.tuple.Pair;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface HangarUsersDAO {
 
     @RegisterConstructorMapper(UserTable.class)

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/HealthDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/HealthDAO.java
@@ -4,13 +4,13 @@
 import io.papermc.hangar.model.internal.admin.health.UnhealthyProject;
 import java.util.List;
 import org.jdbi.v3.core.enums.EnumStrategy;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.config.UseEnumStrategy;
 import org.jdbi.v3.sqlobject.customizer.Define;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 @RegisterConstructorMapper(UnhealthyProject.class)
 public interface HealthDAO {
 

diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/LoggedActionsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/LoggedActionsDAO.java
@@ -10,6 +10,7 @@
 import io.papermc.hangar.model.db.log.LoggedActionsVersionTable;
 import io.papermc.hangar.model.internal.logs.HangarLoggedAction;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterColumnMapper;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.customizer.BindBean;
@@ -18,9 +19,8 @@
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
 import org.jdbi.v3.sqlobject.statement.SqlUpdate;
 import org.jdbi.v3.stringtemplate4.UseStringTemplateEngine;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface LoggedActionsDAO {
 
     @Timestamped

diff --git a/...in/java/io/papermc/hangar/db/dao/internal/projects/HangarProjectFlagNofiticationsDAO.java b/...in/java/io/papermc/hangar/db/dao/internal/projects/HangarProjectFlagNofiticationsDAO.java
@@ -2,11 +2,11 @@
 
 import io.papermc.hangar.model.internal.projects.HangarProjectFlagNotification;
 import java.util.List;
+import org.jdbi.v3.spring5.JdbiRepository;
 import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper;
 import org.jdbi.v3.sqlobject.statement.SqlQuery;
-import org.springframework.stereotype.Repository;
 
-@Repository
+@JdbiRepository
 public interface HangarProjectFlagNofiticationsDAO {
 
     @RegisterConstructorMapper(HangarProjectFlagNotification.class)