From 5e53a261fcb307f5874c5ff215204beaf850c216 Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 5 May 2026 12:55:51 +0200 Subject: [PATCH] =?UTF-8?q?refactor(shared):=20move=20remaining=20services?= =?UTF-8?q?=20to=20domain=20packages=20(stats=E2=86=92dashboard,=20filesto?= =?UTF-8?q?rage,=20importing,=20notification,=20exception)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Sonnet 4.6 --- .../{controller => dashboard}/StatsController.java | 6 +++--- .../raddatz/familienarchiv/{dto => dashboard}/StatsDTO.java | 2 +- .../familienarchiv/{service => dashboard}/StatsService.java | 4 ++-- .../raddatz/familienarchiv/document/DocumentController.java | 2 +- .../raddatz/familienarchiv/document/DocumentService.java | 2 +- .../raddatz/familienarchiv/document/ThumbnailService.java | 2 +- .../document/annotation/CreateAnnotationDTO.java | 2 +- .../{model => document/annotation}/PolygonConverter.java | 2 +- .../{dto => document/annotation}/UniquePoints.java | 2 +- .../{dto => document/annotation}/UniquePointsValidator.java | 2 +- .../{controller => exception}/GlobalExceptionHandler.java | 2 +- .../{service => filestorage}/FileService.java | 2 +- .../{service => importing}/MassImportService.java | 2 +- .../java/org/raddatz/familienarchiv/model/DocumentSort.java | 5 ----- .../familienarchiv/notification/NotificationController.java | 2 +- .../familienarchiv/notification/NotificationService.java | 2 +- .../{service => notification}/SseEmitterRegistry.java | 2 +- .../java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java | 3 +-- .../org/raddatz/familienarchiv/ocr/OcrBatchService.java | 1 - .../java/org/raddatz/familienarchiv/ocr/OcrService.java | 3 +-- .../ocr/SegmentationTrainingExportService.java | 2 +- .../familienarchiv/ocr/TrainingDataExportService.java | 2 +- .../org/raddatz/familienarchiv/user/AdminController.java | 2 +- .../{controller => dashboard}/StatsControllerTest.java | 6 +++--- .../{service => dashboard}/StatsServiceTest.java | 4 ++-- .../familienarchiv/document/DocumentControllerTest.java | 2 +- .../familienarchiv/document/DocumentServiceSortTest.java | 2 +- .../familienarchiv/document/DocumentServiceTest.java | 2 +- .../familienarchiv/document/ThumbnailServiceTest.java | 2 +- .../annotation}/PolygonConverterTest.java | 2 +- .../annotation}/UniquePointsValidatorTest.java | 2 +- .../transcription/TranscriptionBlockRepositoryTest.java | 1 - .../{service => filestorage}/FileServiceTest.java | 2 +- .../{service => importing}/MassImportServiceTest.java | 2 +- .../notification/NotificationControllerTest.java | 2 +- .../notification/NotificationServiceTest.java | 3 +-- .../{service => notification}/SseEmitterRegistryTest.java | 2 +- .../org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java | 3 +-- .../org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java | 1 - .../org/raddatz/familienarchiv/ocr/OcrControllerTest.java | 2 -- .../java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java | 1 - .../familienarchiv/ocr/TrainingDataExportServiceTest.java | 3 +-- .../familienarchiv/repository/TrainingBlockQueryTest.java | 1 - .../raddatz/familienarchiv/user/AdminControllerTest.java | 2 +- 44 files changed, 43 insertions(+), 60 deletions(-) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => dashboard}/StatsController.java (81%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => dashboard}/StatsDTO.java (74%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => dashboard}/StatsService.java (82%) rename backend/src/main/java/org/raddatz/familienarchiv/{model => document/annotation}/PolygonConverter.java (95%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/annotation}/UniquePoints.java (88%) rename backend/src/main/java/org/raddatz/familienarchiv/{dto => document/annotation}/UniquePointsValidator.java (89%) rename backend/src/main/java/org/raddatz/familienarchiv/{controller => exception}/GlobalExceptionHandler.java (98%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => filestorage}/FileService.java (99%) rename backend/src/main/java/org/raddatz/familienarchiv/{service => importing}/MassImportService.java (99%) delete mode 100644 backend/src/main/java/org/raddatz/familienarchiv/model/DocumentSort.java rename backend/src/main/java/org/raddatz/familienarchiv/{service => notification}/SseEmitterRegistry.java (96%) rename backend/src/test/java/org/raddatz/familienarchiv/{controller => dashboard}/StatsControllerTest.java (94%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => dashboard}/StatsServiceTest.java (92%) rename backend/src/test/java/org/raddatz/familienarchiv/{model => document/annotation}/PolygonConverterTest.java (97%) rename backend/src/test/java/org/raddatz/familienarchiv/{dto => document/annotation}/UniquePointsValidatorTest.java (98%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => filestorage}/FileServiceTest.java (99%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => importing}/MassImportServiceTest.java (99%) rename backend/src/test/java/org/raddatz/familienarchiv/{service => notification}/SseEmitterRegistryTest.java (96%) diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/StatsController.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsController.java similarity index 81% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/StatsController.java rename to backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsController.java index 8ed1759a..d4b272a3 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/StatsController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsController.java @@ -1,10 +1,10 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.dashboard; import lombok.RequiredArgsConstructor; -import org.raddatz.familienarchiv.dto.StatsDTO; +import org.raddatz.familienarchiv.dashboard.StatsDTO; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; -import org.raddatz.familienarchiv.service.StatsService; +import org.raddatz.familienarchiv.dashboard.StatsService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/StatsDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsDTO.java similarity index 74% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/StatsDTO.java rename to backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsDTO.java index dcd26c41..37ac36d1 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/StatsDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsDTO.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.dashboard; /** * Aggregate counts for the dashboard/persons stats bar. diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsService.java similarity index 82% rename from backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java rename to backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsService.java index 4f29d441..3c42855c 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/StatsService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/dashboard/StatsService.java @@ -1,9 +1,9 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.dashboard; import lombok.RequiredArgsConstructor; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.person.PersonService; -import org.raddatz.familienarchiv.dto.StatsDTO; +import org.raddatz.familienarchiv.dashboard.StatsDTO; import org.springframework.stereotype.Service; @Service diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java index 640df62a..add2a9f4 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentController.java @@ -44,7 +44,7 @@ import org.raddatz.familienarchiv.security.RequirePermission; import org.raddatz.familienarchiv.security.SecurityUtils; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.DocumentVersionService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.user.UserService; import org.springframework.data.domain.Sort; import org.springframework.security.core.Authentication; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java index d4f0ffc6..3e3f1b4b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/DocumentService.java @@ -38,7 +38,7 @@ import org.springframework.data.jpa.domain.Specification; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.person.PersonService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.tag.TagService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/ThumbnailService.java b/backend/src/main/java/org/raddatz/familienarchiv/document/ThumbnailService.java index 141d272c..b937a126 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/document/ThumbnailService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/ThumbnailService.java @@ -8,7 +8,7 @@ import org.apache.pdfbox.rendering.ImageType; import org.apache.pdfbox.rendering.PDFRenderer; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.ThumbnailAspect; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import software.amazon.awssdk.core.sync.RequestBody; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java index 133bc69b..e7eb04a6 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/CreateAnnotationDTO.java @@ -2,7 +2,7 @@ package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.Valid; import jakarta.validation.constraints.DecimalMax; -import org.raddatz.familienarchiv.dto.UniquePoints; +import org.raddatz.familienarchiv.document.annotation.UniquePoints; import jakarta.validation.constraints.DecimalMin; import jakarta.validation.constraints.Size; import lombok.AllArgsConstructor; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/PolygonConverter.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/PolygonConverter.java similarity index 95% rename from backend/src/main/java/org/raddatz/familienarchiv/model/PolygonConverter.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/PolygonConverter.java index 28362e8f..10ad2ad9 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/PolygonConverter.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/PolygonConverter.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.annotation; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePoints.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePoints.java similarity index 88% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePoints.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePoints.java index 6e954094..73385cee 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePoints.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePoints.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.Constraint; import jakarta.validation.Payload; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePointsValidator.java b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidator.java similarity index 89% rename from backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePointsValidator.java rename to backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidator.java index eac16820..5fbd8348 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/dto/UniquePointsValidator.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidator.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.ConstraintValidator; import jakarta.validation.ConstraintValidatorContext; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/controller/GlobalExceptionHandler.java b/backend/src/main/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandler.java similarity index 98% rename from backend/src/main/java/org/raddatz/familienarchiv/controller/GlobalExceptionHandler.java rename to backend/src/main/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandler.java index 3fbaa1d8..7aecf88f 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/controller/GlobalExceptionHandler.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.exception; import java.util.stream.Collectors; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/FileService.java b/backend/src/main/java/org/raddatz/familienarchiv/filestorage/FileService.java similarity index 99% rename from backend/src/main/java/org/raddatz/familienarchiv/service/FileService.java rename to backend/src/main/java/org/raddatz/familienarchiv/filestorage/FileService.java index 3208455f..64c570b7 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/FileService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/filestorage/FileService.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.filestorage; import software.amazon.awssdk.core.ResponseInputStream; import software.amazon.awssdk.core.sync.RequestBody; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java b/backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java similarity index 99% rename from backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java rename to backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java index 47074910..e35d05cc 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/MassImportService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.importing; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentSort.java b/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentSort.java deleted file mode 100644 index 6456ef54..00000000 --- a/backend/src/main/java/org/raddatz/familienarchiv/model/DocumentSort.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.raddatz.familienarchiv.model; - -public enum DocumentSort { - DATE, TITLE, SENDER, RECEIVER, UPLOAD_DATE -} diff --git a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java index 88310296..7bb3a26e 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationController.java @@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.notification.NotificationType; import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; import org.raddatz.familienarchiv.notification.NotificationService; -import org.raddatz.familienarchiv.service.SseEmitterRegistry; +import org.raddatz.familienarchiv.notification.SseEmitterRegistry; import org.raddatz.familienarchiv.user.UserService; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java index db6e0e8c..5d094227 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/NotificationService.java @@ -8,7 +8,7 @@ import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.user.AppUser; import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.raddatz.familienarchiv.document.DocumentService; -import org.raddatz.familienarchiv.service.SseEmitterRegistry; +import org.raddatz.familienarchiv.notification.SseEmitterRegistry; import org.raddatz.familienarchiv.user.UserService; import org.raddatz.familienarchiv.notification.Notification; import org.raddatz.familienarchiv.notification.NotificationType; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/service/SseEmitterRegistry.java b/backend/src/main/java/org/raddatz/familienarchiv/notification/SseEmitterRegistry.java similarity index 96% rename from backend/src/main/java/org/raddatz/familienarchiv/service/SseEmitterRegistry.java rename to backend/src/main/java/org/raddatz/familienarchiv/notification/SseEmitterRegistry.java index d06b4612..68437b3b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/service/SseEmitterRegistry.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/notification/SseEmitterRegistry.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.notification; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java index 9d597507..c9025aba 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunner.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; import org.raddatz.familienarchiv.document.Document; @@ -12,7 +11,7 @@ import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.transcription.TranscriptionService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java index 30d6a339..367fd295 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrBatchService.java @@ -4,7 +4,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; import org.springframework.stereotype.Service; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java index e9665e6b..1347148b 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/OcrService.java @@ -5,13 +5,12 @@ import lombok.extern.slf4j.Slf4j; import org.raddatz.familienarchiv.ocr.OcrStatusDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; import org.raddatz.familienarchiv.document.DocumentService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.stereotype.Service; import java.util.List; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java index fe48e34d..f183a412 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/SegmentationTrainingExportService.java @@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.stereotype.Service; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java index c6f447f6..ed6f150c 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/ocr/TrainingDataExportService.java @@ -11,7 +11,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.document.annotation.AnnotationService; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.stereotype.Service; import org.springframework.web.servlet.mvc.method.annotation.StreamingResponseBody; diff --git a/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java index 562be7f9..18b6c2c0 100644 --- a/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java +++ b/backend/src/main/java/org/raddatz/familienarchiv/user/AdminController.java @@ -5,7 +5,7 @@ import org.raddatz.familienarchiv.security.Permission; import org.raddatz.familienarchiv.security.RequirePermission; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.DocumentVersionService; -import org.raddatz.familienarchiv.service.MassImportService; +import org.raddatz.familienarchiv.importing.MassImportService; import org.raddatz.familienarchiv.document.ThumbnailBackfillService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsControllerTest.java similarity index 94% rename from backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsControllerTest.java index 4d4ecf38..db18630d 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/controller/StatsControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsControllerTest.java @@ -1,11 +1,11 @@ -package org.raddatz.familienarchiv.controller; +package org.raddatz.familienarchiv.dashboard; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.security.SecurityConfig; -import org.raddatz.familienarchiv.dto.StatsDTO; +import org.raddatz.familienarchiv.dashboard.StatsDTO; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.user.CustomUserDetailsService; -import org.raddatz.familienarchiv.service.StatsService; +import org.raddatz.familienarchiv.dashboard.StatsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsServiceTest.java similarity index 92% rename from backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsServiceTest.java index e84c89c8..f462f43e 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/StatsServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/dashboard/StatsServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.dashboard; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -6,7 +6,7 @@ import org.mockito.InjectMocks; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.document.DocumentService; -import org.raddatz.familienarchiv.dto.StatsDTO; +import org.raddatz.familienarchiv.dashboard.StatsDTO; import org.raddatz.familienarchiv.person.PersonService; import static org.assertj.core.api.Assertions.assertThat; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java index 9028b54a..ad07afb7 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentControllerTest.java @@ -15,7 +15,7 @@ import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.user.CustomUserDetailsService; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.DocumentVersionService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.user.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java index f07ab2d1..80e1e4fa 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceSortTest.java @@ -13,7 +13,7 @@ import org.raddatz.familienarchiv.document.DocumentSort; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.document.DocumentRepository; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.tag.TagService; import org.raddatz.familienarchiv.person.PersonService; import org.springframework.data.domain.PageImpl; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java index 765d357d..3a346ec7 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/DocumentServiceTest.java @@ -25,7 +25,7 @@ import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.person.Person; import org.raddatz.familienarchiv.tag.Tag; import org.raddatz.familienarchiv.document.DocumentRepository; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.tag.TagService; import org.raddatz.familienarchiv.person.PersonService; import org.springframework.data.domain.Page; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/ThumbnailServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/ThumbnailServiceTest.java index e76488fd..97611274 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/document/ThumbnailServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/ThumbnailServiceTest.java @@ -12,7 +12,7 @@ import org.mockito.ArgumentCaptor; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.document.ThumbnailAspect; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.springframework.test.util.ReflectionTestUtils; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.services.s3.S3Client; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/model/PolygonConverterTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/PolygonConverterTest.java similarity index 97% rename from backend/src/test/java/org/raddatz/familienarchiv/model/PolygonConverterTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/annotation/PolygonConverterTest.java index 916cfa2f..e4c9b5c7 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/model/PolygonConverterTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/PolygonConverterTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.model; +package org.raddatz.familienarchiv.document.annotation; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidatorTest.java similarity index 98% rename from backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidatorTest.java index eef0dd4f..4b724562 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/dto/UniquePointsValidatorTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/annotation/UniquePointsValidatorTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.dto; +package org.raddatz.familienarchiv.document.annotation; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java index 185380e5..b41a6d07 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/document/transcription/TranscriptionBlockRepositoryTest.java @@ -10,7 +10,6 @@ import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentRepository; import org.raddatz.familienarchiv.document.DocumentStatus; -import org.raddatz.familienarchiv.model.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase; import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/FileServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/filestorage/FileServiceTest.java similarity index 99% rename from backend/src/test/java/org/raddatz/familienarchiv/service/FileServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/filestorage/FileServiceTest.java index 3fd79033..404961f4 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/FileServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/filestorage/FileServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.filestorage; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java similarity index 99% rename from backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java index c604c173..7470f651 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/MassImportServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.importing; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java index cc34535d..451434ff 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationControllerTest.java @@ -10,7 +10,7 @@ import org.raddatz.familienarchiv.notification.NotificationType; import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.user.CustomUserDetailsService; import org.raddatz.familienarchiv.notification.NotificationService; -import org.raddatz.familienarchiv.service.SseEmitterRegistry; +import org.raddatz.familienarchiv.notification.SseEmitterRegistry; import org.raddatz.familienarchiv.user.UserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java index 51b8a3b7..00aab87e 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/NotificationServiceTest.java @@ -10,10 +10,9 @@ import org.raddatz.familienarchiv.notification.NotificationDTO; import org.raddatz.familienarchiv.document.comment.DocumentComment; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.user.AppUser; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.notification.NotificationRepository; import org.raddatz.familienarchiv.document.DocumentService; -import org.raddatz.familienarchiv.service.SseEmitterRegistry; +import org.raddatz.familienarchiv.notification.SseEmitterRegistry; import org.raddatz.familienarchiv.user.UserService; import org.springframework.data.domain.PageImpl; import org.springframework.mail.MailException; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/service/SseEmitterRegistryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/notification/SseEmitterRegistryTest.java similarity index 96% rename from backend/src/test/java/org/raddatz/familienarchiv/service/SseEmitterRegistryTest.java rename to backend/src/test/java/org/raddatz/familienarchiv/notification/SseEmitterRegistryTest.java index e2a4e967..19e49205 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/service/SseEmitterRegistryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/notification/SseEmitterRegistryTest.java @@ -1,4 +1,4 @@ -package org.raddatz.familienarchiv.service; +package org.raddatz.familienarchiv.notification; import org.junit.jupiter.api.Test; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java index 7dfea9df..b0490711 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrAsyncRunnerTest.java @@ -7,7 +7,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.document.annotation.CreateAnnotationDTO; import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; @@ -16,7 +15,7 @@ import org.raddatz.familienarchiv.ocr.OcrJobRepository; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.transcription.TranscriptionService; import org.raddatz.familienarchiv.document.annotation.AnnotationService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.ocr.SenderModelService; import java.util.ArrayList; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java index 7eb4e61b..dbbb9524 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrBatchServiceTest.java @@ -7,7 +7,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; import org.raddatz.familienarchiv.ocr.OcrJobRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java index 804571b3..79b5df61 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrControllerTest.java @@ -12,11 +12,9 @@ import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; import org.raddatz.familienarchiv.user.UserService; import org.raddatz.familienarchiv.user.CustomUserDetailsService; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.security.PermissionAspect; -import org.raddatz.familienarchiv.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration; import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java index d16d1e26..8fba9299 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/OcrServiceTest.java @@ -8,7 +8,6 @@ import org.mockito.junit.jupiter.MockitoExtension; import org.raddatz.familienarchiv.ocr.OcrStatusDTO; import org.raddatz.familienarchiv.exception.DomainException; import org.raddatz.familienarchiv.exception.ErrorCode; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.ocr.OcrJobDocumentRepository; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java index 40b24cf6..ca32c367 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/ocr/TrainingDataExportServiceTest.java @@ -8,7 +8,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.raddatz.familienarchiv.PostgresContainerConfig; import org.raddatz.familienarchiv.config.FlywayConfig; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.annotation.AnnotationRepository; import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.document.BlockSource; @@ -20,7 +19,7 @@ import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepos import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.annotation.AnnotationService; -import org.raddatz.familienarchiv.service.FileService; +import org.raddatz.familienarchiv.filestorage.FileService; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockQueryService; import org.raddatz.familienarchiv.ocr.TrainingLabel; import org.springframework.beans.factory.annotation.Autowired; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java index b4ba63f6..b03f6940 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/repository/TrainingBlockQueryTest.java @@ -9,7 +9,6 @@ import org.raddatz.familienarchiv.document.annotation.DocumentAnnotation; import org.raddatz.familienarchiv.document.DocumentRepository; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlock; import org.raddatz.familienarchiv.document.transcription.TranscriptionBlockRepository; -import org.raddatz.familienarchiv.model.*; import org.raddatz.familienarchiv.document.Document; import org.raddatz.familienarchiv.document.DocumentStatus; import org.raddatz.familienarchiv.document.BlockSource; diff --git a/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java b/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java index 168020b5..8fc2bf3d 100644 --- a/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java +++ b/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java @@ -7,7 +7,7 @@ import org.raddatz.familienarchiv.security.PermissionAspect; import org.raddatz.familienarchiv.user.CustomUserDetailsService; import org.raddatz.familienarchiv.document.DocumentService; import org.raddatz.familienarchiv.document.DocumentVersionService; -import org.raddatz.familienarchiv.service.MassImportService; +import org.raddatz.familienarchiv.importing.MassImportService; import org.raddatz.familienarchiv.document.ThumbnailBackfillService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.aop.AopAutoConfiguration;