Merge pull request #408 from ls1intum/chore/fix-package-path

Fix server package path

server/build.gradle

@@ -8,10 +8,14 @@ plugins {
 	id "com.github.ben-manes.versions" version "0.52.0"
 }
 
-group = "thesis.aet"
+group = "de.tum.cit.aet.thesis"
 version = "3.0.6"
 description = "Thesis Management"
 
+springBoot {
+	mainClass = "de.tum.cit.aet.thesis.ThesisManagementApplication"
+}
+
 java {
 	sourceCompatibility = JavaVersion.VERSION_21
 	targetCompatibility = JavaVersion.VERSION_21

server/src/main/java/thesis/aet/controller/ApplicationController.java → server/src/main/java/de/tum/cit/aet/thesis/controller/ApplicationController.java

@@ -3,14 +3,10 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.AccessDeniedException;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.server.ResponseStatusException;
-import de.tum.cit.aet.thesis.constants.ApplicationRejectReason;
 import de.tum.cit.aet.thesis.constants.ApplicationState;
 import de.tum.cit.aet.thesis.constants.StringLimits;
 import de.tum.cit.aet.thesis.controller.payload.*;

server/src/main/java/thesis/aet/controller/AvatarController.java → server/src/main/java/de/tum/cit/aet/thesis/controller/AvatarController.java

@@ -3,26 +3,14 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
-import org.springframework.data.domain.Page;
 import org.springframework.http.CacheControl;
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.*;
-import de.tum.cit.aet.thesis.constants.ThesisState;
-import de.tum.cit.aet.thesis.constants.ThesisVisibility;
-import de.tum.cit.aet.thesis.dto.PaginationDto;
-import de.tum.cit.aet.thesis.dto.PublishedThesisDto;
-import de.tum.cit.aet.thesis.entity.Thesis;
 import de.tum.cit.aet.thesis.entity.User;
-import de.tum.cit.aet.thesis.service.AuthenticationService;
-import de.tum.cit.aet.thesis.service.ThesisService;
 import de.tum.cit.aet.thesis.service.UploadService;
 import de.tum.cit.aet.thesis.service.UserService;
 
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 

server/src/main/java/thesis/aet/controller/PublishedPresentationController.java → server/src/main/java/de/tum/cit/aet/thesis/controller/PublishedPresentationController.java

@@ -2,24 +2,14 @@
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.bind.annotation.*;
-import de.tum.cit.aet.thesis.constants.ThesisState;
-import de.tum.cit.aet.thesis.constants.ThesisVisibility;
 import de.tum.cit.aet.thesis.dto.PaginationDto;
 import de.tum.cit.aet.thesis.dto.PublishedPresentationDto;
-import de.tum.cit.aet.thesis.dto.PublishedThesisDto;
-import de.tum.cit.aet.thesis.entity.Thesis;
 import de.tum.cit.aet.thesis.entity.ThesisPresentation;
 import de.tum.cit.aet.thesis.service.ThesisPresentationService;
-import de.tum.cit.aet.thesis.service.ThesisService;
 
-import java.util.Set;
 import java.util.UUID;
 
 @Slf4j

server/src/main/java/thesis/aet/dto/UserDto.java → server/src/main/java/de/tum/cit/aet/thesis/dto/UserDto.java

@@ -1,6 +1,5 @@
 package de.tum.cit.aet.thesis.dto;
 
-import jakarta.mail.internet.InternetAddress;
 import de.tum.cit.aet.thesis.entity.User;
 
 import java.time.Instant;

server/src/main/java/thesis/aet/entity/Thesis.java → server/src/main/java/de/tum/cit/aet/thesis/entity/Thesis.java

@@ -7,11 +7,9 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.type.SqlTypes;
-import de.tum.cit.aet.thesis.constants.ThesisFeedbackType;
 import de.tum.cit.aet.thesis.constants.ThesisRoleName;
 import de.tum.cit.aet.thesis.constants.ThesisState;
 import de.tum.cit.aet.thesis.constants.ThesisVisibility;
-import de.tum.cit.aet.thesis.dto.LightUserDto;
 import de.tum.cit.aet.thesis.entity.jsonb.ThesisMetadata;
 
 import java.time.Instant;
@@ -289,4 +287,4 @@ public Optional<ThesisProposal> getProposalById(UUID proposalId) {
 
         return Optional.empty();
     }
-}
+}

server/src/main/java/thesis/aet/entity/ThesisRole.java → server/src/main/java/de/tum/cit/aet/thesis/entity/ThesisRole.java

@@ -5,7 +5,6 @@
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.CreationTimestamp;
-import de.tum.cit.aet.thesis.constants.ThesisRoleName;
 import de.tum.cit.aet.thesis.entity.key.ThesisRoleId;
 
 import java.time.Instant;
@@ -42,4 +41,4 @@ public class ThesisRole {
     @JoinColumn(name = "assigned_by", nullable = false)
     private User assignedBy;
 
-}
+}

server/src/main/java/thesis/aet/entity/key/ThesisStateChangeId.java → server/src/main/java/de/tum/cit/aet/thesis/entity/key/ThesisStateChangeId.java

@@ -10,7 +10,6 @@
 import org.hibernate.Hibernate;
 import de.tum.cit.aet.thesis.constants.ThesisState;
 
-import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 import java.util.UUID;
@@ -42,4 +41,4 @@ public int hashCode() {
         return Objects.hash("thesis-state-changes", thesisId, state);
     }
 
-}
+}

server/src/main/java/thesis/aet/repository/ApplicationReviewerRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/ApplicationReviewerRepository.java

@@ -3,9 +3,7 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 import de.tum.cit.aet.thesis.entity.ApplicationReviewer;
-import de.tum.cit.aet.thesis.entity.ThesisStateChange;
 import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId;
-import de.tum.cit.aet.thesis.entity.key.ThesisStateChangeId;
 
 
 @Repository

server/src/main/java/thesis/aet/repository/NotificationSettingRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/NotificationSettingRepository.java

@@ -2,15 +2,9 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import de.tum.cit.aet.thesis.entity.ApplicationReviewer;
 import de.tum.cit.aet.thesis.entity.NotificationSetting;
-import de.tum.cit.aet.thesis.entity.key.ApplicationReviewerId;
 import de.tum.cit.aet.thesis.entity.key.NotificationSettingId;
 
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
 
 @Repository
 public interface NotificationSettingRepository extends JpaRepository<NotificationSetting, NotificationSettingId> {

server/src/main/java/thesis/aet/repository/ThesisCommentRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/ThesisCommentRepository.java

@@ -7,12 +7,8 @@
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
 import de.tum.cit.aet.thesis.constants.ThesisCommentType;
-import de.tum.cit.aet.thesis.constants.ThesisState;
-import de.tum.cit.aet.thesis.constants.ThesisVisibility;
-import de.tum.cit.aet.thesis.entity.Thesis;
 import de.tum.cit.aet.thesis.entity.ThesisComment;
 
-import java.util.Set;
 import java.util.UUID;
 
 @Repository

server/src/main/java/thesis/aet/repository/ThesisFileRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/ThesisFileRepository.java

@@ -2,7 +2,6 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import de.tum.cit.aet.thesis.entity.ThesisFeedback;
 import de.tum.cit.aet.thesis.entity.ThesisFile;
 
 import java.util.UUID;

server/src/main/java/thesis/aet/repository/ThesisPresentationInviteRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/ThesisPresentationInviteRepository.java

@@ -2,7 +2,6 @@
 
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
-import de.tum.cit.aet.thesis.entity.ThesisFeedback;
 import de.tum.cit.aet.thesis.entity.ThesisPresentationInvite;
 import de.tum.cit.aet.thesis.entity.key.ThesisPresentationInviteId;
 

server/src/main/java/thesis/aet/repository/TopicRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/TopicRepository.java

@@ -6,13 +6,8 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Repository;
-import de.tum.cit.aet.thesis.constants.ThesisState;
-import de.tum.cit.aet.thesis.constants.ThesisVisibility;
-import de.tum.cit.aet.thesis.entity.Thesis;
 import de.tum.cit.aet.thesis.entity.Topic;
 
-import java.util.List;
-import java.util.Set;
 import java.util.UUID;
 
 @Repository

server/src/main/java/thesis/aet/repository/UserGroupRepository.java → server/src/main/java/de/tum/cit/aet/thesis/repository/UserGroupRepository.java

@@ -5,7 +5,6 @@
 import de.tum.cit.aet.thesis.entity.UserGroup;
 import de.tum.cit.aet.thesis.entity.key.UserGroupId;
 
-import java.util.List;
 import java.util.UUID;
 
 @Repository

server/src/main/java/thesis/aet/service/AuthenticationService.java → server/src/main/java/de/tum/cit/aet/thesis/service/AuthenticationService.java

@@ -1,7 +1,5 @@
 package de.tum.cit.aet.thesis.service;
 
-import jakarta.mail.internet.AddressException;
-import jakarta.mail.internet.InternetAddress;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.stereotype.Service;

server/src/main/java/thesis/aet/service/DashboardService.java → server/src/main/java/de/tum/cit/aet/thesis/service/DashboardService.java

@@ -1,20 +1,15 @@
 package de.tum.cit.aet.thesis.service;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import de.tum.cit.aet.thesis.constants.ThesisPresentationState;
-import de.tum.cit.aet.thesis.constants.ThesisPresentationVisibility;
 import de.tum.cit.aet.thesis.constants.ThesisRoleName;
 import de.tum.cit.aet.thesis.constants.ThesisState;
 import de.tum.cit.aet.thesis.dto.TaskDto;
 import de.tum.cit.aet.thesis.entity.Thesis;
 import de.tum.cit.aet.thesis.entity.ThesisPresentation;
 import de.tum.cit.aet.thesis.entity.User;
 import de.tum.cit.aet.thesis.repository.ApplicationRepository;
-import de.tum.cit.aet.thesis.repository.ThesisPresentationRepository;
 import de.tum.cit.aet.thesis.repository.ThesisRepository;
 import de.tum.cit.aet.thesis.repository.TopicRepository;
 

server/src/main/java/thesis/aet/service/ThesisCommentService.java → server/src/main/java/de/tum/cit/aet/thesis/service/ThesisCommentService.java

@@ -3,7 +3,6 @@
 import org.springframework.core.io.Resource;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

server/src/main/java/thesis/aet/service/ThesisService.java → server/src/main/java/de/tum/cit/aet/thesis/service/ThesisService.java

@@ -5,7 +5,6 @@
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
-import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;

server/src/main/java/thesis/aet/service/TopicService.java → server/src/main/java/de/tum/cit/aet/thesis/service/TopicService.java

@@ -1,6 +1,5 @@
 package de.tum.cit.aet.thesis.service;
 
-import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;

server/src/main/java/thesis/aet/service/UploadService.java → server/src/main/java/de/tum/cit/aet/thesis/service/UploadService.java

@@ -12,12 +12,10 @@
 import de.tum.cit.aet.thesis.exception.UploadException;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
@@ -30,7 +28,7 @@ public class UploadService {
 
     @Autowired
     public UploadService(@Value("${thesis-management.storage.upload-location}") String uploadLocation) {
-        this.rootLocation = Paths.get(uploadLocation);
+        this.rootLocation = Path.of(uploadLocation);
 
         File uploadDirectory = rootLocation.toFile();
 

server/src/main/java/thesis/aet/utility/DataFormatter.java → server/src/main/java/de/tum/cit/aet/thesis/utility/DataFormatter.java

@@ -1,15 +1,13 @@
 package de.tum.cit.aet.thesis.utility;
 
 import de.tum.cit.aet.thesis.dto.LightUserDto;
-import de.tum.cit.aet.thesis.entity.User;
 
 import java.time.Instant;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 public class DataFormatter {
     public static String formatDate(Object time) {

server/src/main/java/thesis/aet/utility/MailBuilder.java → server/src/main/java/de/tum/cit/aet/thesis/utility/MailBuilder.java

@@ -13,7 +13,6 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.thymeleaf.context.Context;
-import org.thymeleaf.spring6.SpringTemplateEngine;
 import de.tum.cit.aet.thesis.constants.ThesisRoleName;
 import de.tum.cit.aet.thesis.dto.ApplicationDto;
 import de.tum.cit.aet.thesis.dto.ThesisCommentDto;

server/src/main/java/thesis/aet/utility/MailConfig.java → server/src/main/java/de/tum/cit/aet/thesis/utility/MailConfig.java

@@ -6,7 +6,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
-import org.thymeleaf.ITemplateEngine;
 import org.thymeleaf.TemplateEngine;
 import de.tum.cit.aet.thesis.entity.User;
 import de.tum.cit.aet.thesis.repository.UserRepository;

server/src/test/java/thesis/aet/controller/ApplicationControllerTest.java → server/src/test/java/de/tum/cit/aet/thesis/controller/ApplicationControllerTest.java

@@ -1,7 +1,5 @@
 package de.tum.cit.aet.thesis.controller;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.DynamicPropertyRegistry;

server/src/test/java/thesis/aet/controller/TopicControllerTest.java → server/src/test/java/de/tum/cit/aet/thesis/controller/TopicControllerTest.java

@@ -1,7 +1,5 @@
 package de.tum.cit.aet.thesis.controller;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.http.MediaType;
 import org.springframework.test.context.DynamicPropertyRegistry;

server/src/test/java/thesis/aet/controller/UserControllerTest.java → server/src/test/java/de/tum/cit/aet/thesis/controller/UserControllerTest.java

@@ -1,7 +1,5 @@
 package de.tum.cit.aet.thesis.controller;
 
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.test.context.DynamicPropertyRegistry;
 import org.springframework.test.context.DynamicPropertySource;

server/src/test/java/thesis/aet/mock/BaseIntegrationTest.java → server/src/test/java/de/tum/cit/aet/thesis/mock/BaseIntegrationTest.java

@@ -15,8 +15,6 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
-import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.testcontainers.containers.PostgreSQLContainer;

server/src/test/java/thesis/aet/service/TopicServiceTest.java → server/src/test/java/de/tum/cit/aet/thesis/service/TopicServiceTest.java

@@ -1,6 +1,5 @@
 package de.tum.cit.aet.thesis.service;
 
-import org.hibernate.SessionFactory;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -187,4 +186,4 @@ void findById_WithInvalidId_ThrowsException() {
                 topicService.findById(testTopic.getId())
         );
     }
-}
+}