From 0db7ade9ad9560f9d912ef29683213cf400cf0ca Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Sun, 12 Jan 2025 10:19:18 +0100 Subject: [PATCH] chore: cleanup unused stuff --- .../auth/controller/AuthController.java | 1 - .../hangar/config/hangar/HangarConfig.java | 1 - .../internal/BackendDataController.java | 1 - .../internal/OnboardingController.java | 1 - .../internal/projects/ProjectController.java | 1 - .../io/papermc/hangar/db/dao/UsersDAO.java | 13 +-- .../projects/ProjectFlagNotificationsDAO.java | 6 -- .../versions/PinnedProjectVersionsDAO.java | 13 +-- .../exceptions/InternalHangarException.java | 16 ---- .../ProjectVersionDownloadWarningTable.java | 92 ------------------- .../ProjectVersionUnsafeDownloadTable.java | 40 -------- .../model/internal/user/HangarUser.java | 1 - .../internal/versions/HangarVersion.java | 1 - .../hangar/service/PermissionService.java | 4 - .../service/api/ProjectsApiService.java | 4 +- .../hangar/service/api/UsersApiService.java | 5 +- .../organizations/OrganizationService.java | 8 +- .../perms/roles/GlobalRoleService.java | 4 - .../internal/projects/ChannelService.java | 12 --- .../internal/projects/ProjectPageService.java | 4 - .../internal/projects/ProjectService.java | 11 --- .../service/internal/users/UserService.java | 2 - .../io/papermc/hangar/util/FileUtils.java | 10 -- 23 files changed, 7 insertions(+), 244 deletions(-) delete mode 100644 backend/src/main/java/io/papermc/hangar/exceptions/InternalHangarException.java delete mode 100644 backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadWarningTable.java delete mode 100644 backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionUnsafeDownloadTable.java diff --git a/backend/src/main/java/io/papermc/hangar/components/auth/controller/AuthController.java b/backend/src/main/java/io/papermc/hangar/components/auth/controller/AuthController.java index e2d8252c9..5c375f407 100644 --- a/backend/src/main/java/io/papermc/hangar/components/auth/controller/AuthController.java +++ b/backend/src/main/java/io/papermc/hangar/components/auth/controller/AuthController.java @@ -13,7 +13,6 @@ import io.papermc.hangar.components.auth.service.AuthService; import io.papermc.hangar.components.auth.service.CredentialsService; import io.papermc.hangar.components.auth.service.TokenService; -import io.papermc.hangar.components.auth.service.TurnstileService; import io.papermc.hangar.components.auth.service.VerificationService; import io.papermc.hangar.exceptions.HangarApiException; import io.papermc.hangar.model.db.UserTable; diff --git a/backend/src/main/java/io/papermc/hangar/config/hangar/HangarConfig.java b/backend/src/main/java/io/papermc/hangar/config/hangar/HangarConfig.java index 194f09432..ef50b3027 100644 --- a/backend/src/main/java/io/papermc/hangar/config/hangar/HangarConfig.java +++ b/backend/src/main/java/io/papermc/hangar/config/hangar/HangarConfig.java @@ -7,7 +7,6 @@ import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.NestedConfigurationProperty; import org.springframework.context.annotation.Configuration; -import org.springframework.stereotype.Component; @Configuration @ConfigurationProperties(prefix = "hangar") diff --git a/backend/src/main/java/io/papermc/hangar/controller/internal/BackendDataController.java b/backend/src/main/java/io/papermc/hangar/controller/internal/BackendDataController.java index 431b80de5..f71ab2ada 100644 --- a/backend/src/main/java/io/papermc/hangar/controller/internal/BackendDataController.java +++ b/backend/src/main/java/io/papermc/hangar/controller/internal/BackendDataController.java @@ -25,7 +25,6 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -import java.util.concurrent.ThreadLocalRandom; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.info.GitProperties; import org.springframework.cache.annotation.Cacheable; diff --git a/backend/src/main/java/io/papermc/hangar/controller/internal/OnboardingController.java b/backend/src/main/java/io/papermc/hangar/controller/internal/OnboardingController.java index 8acf3eae7..446e212b4 100644 --- a/backend/src/main/java/io/papermc/hangar/controller/internal/OnboardingController.java +++ b/backend/src/main/java/io/papermc/hangar/controller/internal/OnboardingController.java @@ -3,7 +3,6 @@ import io.papermc.hangar.HangarComponent; import io.papermc.hangar.components.auth.model.dto.SignupForm; import io.papermc.hangar.components.auth.service.AuthService; -import io.papermc.hangar.exceptions.HangarApiException; import io.papermc.hangar.model.common.NamedPermission; import io.papermc.hangar.model.common.roles.GlobalRole; import io.papermc.hangar.model.db.UserTable; diff --git a/backend/src/main/java/io/papermc/hangar/controller/internal/projects/ProjectController.java b/backend/src/main/java/io/papermc/hangar/controller/internal/projects/ProjectController.java index ec123da0d..e83543e38 100644 --- a/backend/src/main/java/io/papermc/hangar/controller/internal/projects/ProjectController.java +++ b/backend/src/main/java/io/papermc/hangar/controller/internal/projects/ProjectController.java @@ -42,7 +42,6 @@ import org.springframework.web.bind.annotation.ResponseStatus; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; -import org.springframework.web.server.ResponseStatusException; // @el(author: String, slug: String, projectId: long, project: io.papermc.hangar.model.db.projects.ProjectTable) @RestController 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 index 1eac51f93..1dbe827e6 100644 --- a/backend/src/main/java/io/papermc/hangar/db/dao/UsersDAO.java +++ b/backend/src/main/java/io/papermc/hangar/db/dao/UsersDAO.java @@ -41,19 +41,10 @@ public interface UsersDAO { u.avatar_url, exists(SELECT 1 FROM organizations o WHERE u.id = o.user_id) AS is_organization FROM users u - WHERE lower(u.name) = lower(:name) - OR u.id = :id + WHERE u.id = :id GROUP BY u.id """) - T _getUser(String name, Long id, @MapTo Class type); - - default T getUser(final String name, final Class type) { - return this._getUser(name, null, type); - } - - default T getUser(final long id, final Class type) { - return this._getUser(null, id, type); - } + T getUser(final Long id, @MapTo final Class type); @AllowUnusedBindings // query can be unused @UseStringTemplateEngine diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/projects/ProjectFlagNotificationsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/projects/ProjectFlagNotificationsDAO.java index b75552c8e..b39dc23d4 100644 --- a/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/projects/ProjectFlagNotificationsDAO.java +++ b/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/projects/ProjectFlagNotificationsDAO.java @@ -1,15 +1,12 @@ package io.papermc.hangar.db.dao.internal.table.projects; import io.papermc.hangar.model.db.projects.ProjectFlagNotificationTable; -import io.papermc.hangar.model.db.projects.ProjectFlagTable; import java.util.Collection; -import java.util.List; import org.jdbi.v3.spring.JdbiRepository; import org.jdbi.v3.sqlobject.config.RegisterConstructorMapper; import org.jdbi.v3.sqlobject.customizer.BindBean; import org.jdbi.v3.sqlobject.statement.GetGeneratedKeys; import org.jdbi.v3.sqlobject.statement.SqlBatch; -import org.jdbi.v3.sqlobject.statement.SqlQuery; import org.jdbi.v3.sqlobject.statement.SqlUpdate; @JdbiRepository @@ -22,7 +19,4 @@ public interface ProjectFlagNotificationsDAO { @SqlBatch("INSERT INTO project_flag_notifications (flag_id, notification_id) VALUES (:flagId, :notificationId)") void insert(@BindBean Collection projectFlagNotificationTables); - - @SqlQuery("SELECT * FROM project_flag_notifications WHERE flag_id = :flagId") - List notificationsForFlag(long flagId); } diff --git a/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/versions/PinnedProjectVersionsDAO.java b/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/versions/PinnedProjectVersionsDAO.java index 68c0e0ef2..9707b3dd5 100644 --- a/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/versions/PinnedProjectVersionsDAO.java +++ b/backend/src/main/java/io/papermc/hangar/db/dao/internal/table/versions/PinnedProjectVersionsDAO.java @@ -5,7 +5,6 @@ import org.jdbi.v3.sqlobject.customizer.BindBean; import org.jdbi.v3.sqlobject.customizer.Timestamped; import org.jdbi.v3.sqlobject.statement.SqlUpdate; -import org.checkerframework.checker.nullness.qual.Nullable; @JdbiRepository public interface PinnedProjectVersionsDAO { @@ -14,14 +13,6 @@ public interface PinnedProjectVersionsDAO { @SqlUpdate("INSERT INTO pinned_project_versions (created_at, project_id, version_id) VALUES (:now, :projectId, :versionId) ON CONFLICT DO NOTHING") void insert(@BindBean PinnedProjectVersionTable pinnedProjectVersionTable); - @SqlUpdate("DELETE FROM pinned_project_versions WHERE project_id = :projectId AND (id = :ppvId OR version_id = :versionId)") - void _delete(long projectId, @Nullable Long ppvId, @Nullable Long versionId); - - default void deletePinnedProjectVersion(final long projectId, final long ppvId) { - this._delete(projectId, ppvId, null); - } - - default void deleteVersion(final long projectId, final long versionId) { - this._delete(projectId, null, versionId); - } + @SqlUpdate("DELETE FROM pinned_project_versions WHERE project_id = :projectId AND version_id = :versionId") + void deleteVersion(long projectId, Long versionId); } diff --git a/backend/src/main/java/io/papermc/hangar/exceptions/InternalHangarException.java b/backend/src/main/java/io/papermc/hangar/exceptions/InternalHangarException.java deleted file mode 100644 index f6c0e60b4..000000000 --- a/backend/src/main/java/io/papermc/hangar/exceptions/InternalHangarException.java +++ /dev/null @@ -1,16 +0,0 @@ -package io.papermc.hangar.exceptions; - -/** - * Use to throw/catch exceptions inside hangar. - * Should never be thrown without catching it later. - */ -public class InternalHangarException extends RuntimeException { - - public InternalHangarException(final String message) { - super(message); - } - - public InternalHangarException(final String message, final Throwable cause) { - super(message, cause); - } -} diff --git a/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadWarningTable.java b/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadWarningTable.java deleted file mode 100644 index a34d2a8ee..000000000 --- a/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionDownloadWarningTable.java +++ /dev/null @@ -1,92 +0,0 @@ -package io.papermc.hangar.model.db.versions.downloads; - -import io.papermc.hangar.model.db.Table; -import java.net.InetAddress; -import java.time.OffsetDateTime; -import java.util.UUID; -import org.jdbi.v3.core.annotation.JdbiProperty; -import org.jdbi.v3.core.mapper.reflect.JdbiConstructor; - -public class ProjectVersionDownloadWarningTable extends Table { - - private final OffsetDateTime expiresAt; - private final UUID token; - private final long versionId; - private final InetAddress address; - private boolean confirmed; - private Long downloadId; - - public ProjectVersionDownloadWarningTable(final OffsetDateTime expiresAt, final UUID token, final long versionId, final InetAddress address) { - this.expiresAt = expiresAt; - this.token = token; - this.versionId = versionId; - this.address = address; - this.confirmed = false; - this.downloadId = null; - } - - @JdbiConstructor - public ProjectVersionDownloadWarningTable(final OffsetDateTime createdAt, final long id, final OffsetDateTime expiresAt, final UUID token, final long versionId, final InetAddress address, final boolean confirmed, final Long downloadId) { - super(createdAt, id); - this.expiresAt = expiresAt; - this.token = token; - this.versionId = versionId; - this.address = address; - this.confirmed = confirmed; - this.downloadId = downloadId; - } - - public OffsetDateTime getExpiresAt() { - return this.expiresAt; - } - - public UUID getToken() { - return this.token; - } - - public long getVersionId() { - return this.versionId; - } - - public InetAddress getAddress() { - return this.address; - } - - public boolean isConfirmed() { - return this.confirmed; - } - - public void setConfirmed(final boolean confirmed) { - this.confirmed = confirmed; - } - - public Long getDownloadId() { - return this.downloadId; - } - - public void setDownloadId(final Long downloadId) { - this.downloadId = downloadId; - } - - @JdbiProperty(map = false) - public static String cookieKey(final long versionId) { - return "_warning_" + versionId; - } - - @JdbiProperty(map = false) - public boolean hasExpired() { - return this.expiresAt.isBefore(OffsetDateTime.now()); - } - - @Override - public String toString() { - return "ProjectVersionDownloadWarningTable{" + - "expiresAt=" + this.expiresAt + - ", token=" + this.token + - ", versionId=" + this.versionId + - ", address=" + this.address + - ", confirmed=" + this.confirmed + - ", downloadId=" + this.downloadId + - "} " + super.toString(); - } -} diff --git a/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionUnsafeDownloadTable.java b/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionUnsafeDownloadTable.java deleted file mode 100644 index d54623b89..000000000 --- a/backend/src/main/java/io/papermc/hangar/model/db/versions/downloads/ProjectVersionUnsafeDownloadTable.java +++ /dev/null @@ -1,40 +0,0 @@ -package io.papermc.hangar.model.db.versions.downloads; - -import io.papermc.hangar.model.db.Table; -import java.net.InetAddress; -import java.time.OffsetDateTime; -import org.jdbi.v3.core.mapper.reflect.JdbiConstructor; - -public class ProjectVersionUnsafeDownloadTable extends Table { - - private final Long userId; - private final InetAddress address; - - public ProjectVersionUnsafeDownloadTable(final Long userId, final InetAddress address) { - this.userId = userId; - this.address = address; - } - - @JdbiConstructor - public ProjectVersionUnsafeDownloadTable(final OffsetDateTime createdAt, final long id, final Long userId, final InetAddress address) { - super(createdAt, id); - this.userId = userId; - this.address = address; - } - - public Long getUserId() { - return this.userId; - } - - public InetAddress getAddress() { - return this.address; - } - - @Override - public String toString() { - return "ProjectVersionUnsafeDownloadTable{" + - "userId=" + this.userId + - ", address=" + this.address + - "} " + super.toString(); - } -} diff --git a/backend/src/main/java/io/papermc/hangar/model/internal/user/HangarUser.java b/backend/src/main/java/io/papermc/hangar/model/internal/user/HangarUser.java index 87c45bc15..3688e4556 100644 --- a/backend/src/main/java/io/papermc/hangar/model/internal/user/HangarUser.java +++ b/backend/src/main/java/io/papermc/hangar/model/internal/user/HangarUser.java @@ -1,7 +1,6 @@ package io.papermc.hangar.model.internal.user; import io.papermc.hangar.db.customtypes.JSONB; -import io.papermc.hangar.model.Identified; import io.papermc.hangar.model.api.User; import io.papermc.hangar.model.api.UserNameChange; import io.papermc.hangar.model.common.Permission; diff --git a/backend/src/main/java/io/papermc/hangar/model/internal/versions/HangarVersion.java b/backend/src/main/java/io/papermc/hangar/model/internal/versions/HangarVersion.java index 3ae37e5d3..d72d0e0b2 100644 --- a/backend/src/main/java/io/papermc/hangar/model/internal/versions/HangarVersion.java +++ b/backend/src/main/java/io/papermc/hangar/model/internal/versions/HangarVersion.java @@ -1,7 +1,6 @@ package io.papermc.hangar.model.internal.versions; import io.papermc.hangar.config.jackson.RequiresPermission; -import io.papermc.hangar.model.Identified; import io.papermc.hangar.model.api.project.ProjectChannel; import io.papermc.hangar.model.api.project.version.Version; import io.papermc.hangar.model.api.project.version.VersionStats; diff --git a/backend/src/main/java/io/papermc/hangar/service/PermissionService.java b/backend/src/main/java/io/papermc/hangar/service/PermissionService.java index 26ce0d4b8..b811bf3f3 100644 --- a/backend/src/main/java/io/papermc/hangar/service/PermissionService.java +++ b/backend/src/main/java/io/papermc/hangar/service/PermissionService.java @@ -27,10 +27,6 @@ public PermissionService(final PermissionsDAO permissionsDAO) { return this.getPermissions(userId, this.permissionsDAO::getGlobalPermission); } - public @NotNull Permission getGlobalPermissions(final @Nullable String userName) { - return this.getPermissions(userName, this.permissionsDAO::getGlobalPermission); - } - // Project permissions public Permission getProjectPermissions(final @Nullable Long userId, final long projectId) { //TODO still leaks not listed projects (e.g. via pages api) as the perm is technically given diff --git a/backend/src/main/java/io/papermc/hangar/service/api/ProjectsApiService.java b/backend/src/main/java/io/papermc/hangar/service/api/ProjectsApiService.java index 1ada5057a..a73f7a928 100644 --- a/backend/src/main/java/io/papermc/hangar/service/api/ProjectsApiService.java +++ b/backend/src/main/java/io/papermc/hangar/service/api/ProjectsApiService.java @@ -31,12 +31,10 @@ public class ProjectsApiService extends HangarComponent { private final ProjectsApiDAO projectsApiDAO; - private final UsersApiService usersApiService; @Autowired - public ProjectsApiService(final ProjectsApiDAO projectsApiDAO, final UsersApiService usersApiService) { + public ProjectsApiService(final ProjectsApiDAO projectsApiDAO) { this.projectsApiDAO = projectsApiDAO; - this.usersApiService = usersApiService; } public Project getProject(final long id) { diff --git a/backend/src/main/java/io/papermc/hangar/service/api/UsersApiService.java b/backend/src/main/java/io/papermc/hangar/service/api/UsersApiService.java index 7cfc6cb7a..9bfc0ad0f 100644 --- a/backend/src/main/java/io/papermc/hangar/service/api/UsersApiService.java +++ b/backend/src/main/java/io/papermc/hangar/service/api/UsersApiService.java @@ -17,7 +17,6 @@ import io.papermc.hangar.model.internal.user.HangarUser; import io.papermc.hangar.security.authentication.HangarPrincipal; import io.papermc.hangar.service.PermissionService; -import io.papermc.hangar.components.images.service.AvatarService; import io.papermc.hangar.service.internal.admin.FlagService; import io.papermc.hangar.service.internal.organizations.OrganizationService; import io.papermc.hangar.service.internal.projects.PinnedProjectService; @@ -51,10 +50,9 @@ public class UsersApiService extends HangarComponent { private final ReviewService reviewService; private final ProjectAdminService projectAdminService; private final FlagService flagService; - private final AvatarService avatarService; @Autowired - public UsersApiService(final UsersDAO usersDAO, final UsersApiDAO usersApiDAO, final NotificationsDAO notificationsDAO, final PermissionService permissionService, final OrganizationService organizationService, final PinnedProjectService pinnedProjectService, final ReviewService reviewService, @Lazy final ProjectAdminService projectAdminService, final FlagService flagService, final AvatarService avatarService) { + public UsersApiService(final UsersDAO usersDAO, final UsersApiDAO usersApiDAO, final NotificationsDAO notificationsDAO, final PermissionService permissionService, final OrganizationService organizationService, final PinnedProjectService pinnedProjectService, final ReviewService reviewService, @Lazy final ProjectAdminService projectAdminService, final FlagService flagService) { this.usersDAO = usersDAO; this.usersApiDAO = usersApiDAO; this.notificationsDAO = notificationsDAO; @@ -64,7 +62,6 @@ public UsersApiService(final UsersDAO usersDAO, final UsersApiDAO usersApiDAO, f this.reviewService = reviewService; this.projectAdminService = projectAdminService; this.flagService = flagService; - this.avatarService = avatarService; } public T getUser(final long id, final Class type) { diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/organizations/OrganizationService.java b/backend/src/main/java/io/papermc/hangar/service/internal/organizations/OrganizationService.java index e014682df..9431c99a1 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/organizations/OrganizationService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/organizations/OrganizationService.java @@ -5,7 +5,6 @@ import io.papermc.hangar.db.dao.internal.table.OrganizationDAO; import io.papermc.hangar.db.dao.internal.table.UserDAO; import io.papermc.hangar.db.dao.internal.table.roles.OrganizationRolesDAO; -import io.papermc.hangar.exceptions.HangarApiException; import io.papermc.hangar.model.common.Permission; import io.papermc.hangar.model.db.OrganizationTable; import io.papermc.hangar.model.db.UserTable; @@ -13,13 +12,10 @@ import io.papermc.hangar.model.internal.HangarOrganization; import io.papermc.hangar.model.internal.user.JoinableMember; import io.papermc.hangar.service.PermissionService; -import io.papermc.hangar.components.images.service.AvatarService; import io.papermc.hangar.service.internal.perms.members.OrganizationMemberService; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.annotation.Lazy; -import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; @Service @@ -31,17 +27,15 @@ public class OrganizationService extends HangarComponent { private final UserDAO userDAO; private final PermissionService permissionService; private final OrganizationMemberService organizationMemberService; - private final AvatarService avatarService; @Autowired - public OrganizationService(final HangarOrganizationsDAO hangarOrganizationsDAO, final OrganizationRolesDAO organizationRolesDAO, final OrganizationDAO organizationDAO, final UserDAO userDAO, final PermissionService permissionService, final OrganizationMemberService organizationMemberService, @Lazy final AvatarService avatarService) { + public OrganizationService(final HangarOrganizationsDAO hangarOrganizationsDAO, final OrganizationRolesDAO organizationRolesDAO, final OrganizationDAO organizationDAO, final UserDAO userDAO, final PermissionService permissionService, final OrganizationMemberService organizationMemberService) { this.hangarOrganizationsDAO = hangarOrganizationsDAO; this.organizationRolesDAO = organizationRolesDAO; this.organizationDAO = organizationDAO; this.userDAO = userDAO; this.permissionService = permissionService; this.organizationMemberService = organizationMemberService; - this.avatarService = avatarService; } public OrganizationTable getOrganizationTable(final long id) { diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/perms/roles/GlobalRoleService.java b/backend/src/main/java/io/papermc/hangar/service/internal/perms/roles/GlobalRoleService.java index 35106f010..721800f75 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/perms/roles/GlobalRoleService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/perms/roles/GlobalRoleService.java @@ -19,8 +19,4 @@ public GlobalRoleService(final GlobalRolesDAO roleDao) { public List getGlobalRoles(final long userId) { return this.roleDao.getGlobalRoleTables(userId).stream().map(GlobalRoleTable::getRole).collect(Collectors.toList()); } - - public void removeAllGlobalRoles(final long userId) { - this.roleDao.deleteAll(userId); - } } diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ChannelService.java b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ChannelService.java index b2b39e9a3..5a09dac3f 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ChannelService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ChannelService.java @@ -142,10 +142,6 @@ public List getProjectChannels(final long projectId) { return this.hangarProjectsDAO.getHangarChannels(projectId); } - public ProjectChannelTable getProjectChannel(final long projectId, final String name, final Color color) { - return this.projectChannelsDAO.getProjectChannel(projectId, name, color); - } - public ProjectChannelTable getProjectChannel(final long projectId, final String name) { return this.projectChannelsDAO.getProjectChannel(projectId, name); } @@ -154,14 +150,6 @@ public ProjectChannelTable getProjectChannel(final long channelId) { return this.projectChannelsDAO.getProjectChannel(channelId); } - public ProjectChannelTable getProjectChannelForVersion(final long versionId) { - return this.projectChannelsDAO.getProjectChannelForVersion(versionId); - } - - public ProjectChannelTable getFirstChannel(final long projectId) { - return this.projectChannelsDAO.getFirstChannel(projectId); - } - private static String formatChannelChange(final ProjectChannelTable channelTable) { return "Name: " + channelTable.getName() + " Color: " + channelTable.getColor().getHex() + " Flags: " + channelTable.getFlags(); } diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectPageService.java b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectPageService.java index 5c30db922..78c5e0cbd 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectPageService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectPageService.java @@ -128,10 +128,6 @@ public ExtendedProjectPage getProjectPage(final ProjectTable project, String pat return pageTable; } - public ExtendedProjectPage getProjectPage(final long id) { - return this.hangarProjectPagesDAO.getProjectPage(id); - } - public ExtendedProjectPage getProjectHomePage(final long projectId) { return this.hangarProjectPagesDAO.getProjectHomePage(projectId); } diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectService.java b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectService.java index 96d2b9a74..663cb6a33 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/projects/ProjectService.java @@ -19,7 +19,6 @@ import io.papermc.hangar.model.common.Permission; import io.papermc.hangar.model.common.Platform; import io.papermc.hangar.model.common.projects.Visibility; -import io.papermc.hangar.model.db.OrganizationTable; import io.papermc.hangar.model.db.UserTable; import io.papermc.hangar.model.db.projects.ProjectOwner; import io.papermc.hangar.model.db.projects.ProjectTable; @@ -51,7 +50,6 @@ import java.util.function.Function; import java.util.function.Supplier; import java.util.regex.Pattern; -import org.apache.commons.lang3.tuple.Pair; import org.checkerframework.checker.nullness.qual.Nullable; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -61,7 +59,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.server.ResponseStatusException; @Service public class ProjectService extends HangarComponent { @@ -115,14 +112,6 @@ public List getProjectTables(final long userId) { return this.organizationService.getOrganizationTableWithPermission(this.getHangarPrincipal().getId(), userId, Permission.CreateProject); } - public ProjectOwner getProjectOwner(final String userName) { - final Pair pair = this.hangarUsersDAO.getUserAndOrg(userName); - if (pair.getRight() != null) { - return pair.getRight(); - } - return pair.getLeft(); - } - public String getProjectUrlFromSlug(final ProjectTable project) { return "/" + project.getOwnerName() + "/" + project.getSlug(); } diff --git a/backend/src/main/java/io/papermc/hangar/service/internal/users/UserService.java b/backend/src/main/java/io/papermc/hangar/service/internal/users/UserService.java index 26ca64454..dcfdbd7ad 100644 --- a/backend/src/main/java/io/papermc/hangar/service/internal/users/UserService.java +++ b/backend/src/main/java/io/papermc/hangar/service/internal/users/UserService.java @@ -9,8 +9,6 @@ import io.papermc.hangar.model.internal.logs.LogAction; import io.papermc.hangar.model.internal.logs.LoggedAction; import io.papermc.hangar.model.internal.logs.contexts.UserContext; -import java.util.Arrays; -import java.util.HashMap; import java.util.Map; import java.util.Set; import java.util.UUID; diff --git a/backend/src/main/java/io/papermc/hangar/util/FileUtils.java b/backend/src/main/java/io/papermc/hangar/util/FileUtils.java index 9e5442769..8b47db7c3 100644 --- a/backend/src/main/java/io/papermc/hangar/util/FileUtils.java +++ b/backend/src/main/java/io/papermc/hangar/util/FileUtils.java @@ -6,8 +6,6 @@ import java.nio.file.Path; import java.nio.file.SimpleFileVisitor; import java.nio.file.attribute.BasicFileAttributes; -import java.util.function.Predicate; -import java.util.stream.Stream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -18,14 +16,6 @@ public final class FileUtils { private FileUtils() { } - public static void deletedFiles(final Path superDir) { - try (final Stream files = Files.list(superDir)) { - files.filter(Predicate.not(Files::isDirectory)).forEach(FileUtils::delete); - } catch (final IOException e) { - e.printStackTrace(); - } - } - public static boolean delete(final Path path) { if (path == null) return false; try {