From 2f5b61acb0cca6579cc77df2ed9a82819d1dfbc5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 9 Oct 2024 15:26:32 +0200
Subject: [PATCH] OZG-6811 move bescheid and common packe into document package
---
.gitignore | 1 +
.../document/DocumentEventListener.java | 6 ++--
.../de/ozgcloud/document/DocumentMapper.java | 2 +-
.../de/ozgcloud/document/DocumentService.java | 10 +++---
.../{ => document}/bescheid/Bescheid.java | 4 +--
...scheidCallContextAttachingInterceptor.java | 4 +--
.../bescheid/BescheidCreatedEvent.java | 2 +-
.../bescheid/BescheidDeletedEvent.java | 2 +-
.../bescheid/BescheidEventListener.java | 26 +++++++-------
.../bescheid/BescheidGrpcService.java | 6 ++--
.../{ => document}/bescheid/BescheidId.java | 2 +-
.../bescheid/BescheidManagerConfig.java | 2 +-
.../BescheidManagerConfiguration.java | 4 +--
.../bescheid/BescheidMapper.java | 10 +++---
.../bescheid/BescheidRemoteService.java | 4 +--
.../bescheid/BescheidRequest.java | 6 ++--
.../bescheid/BescheidResponse.java | 6 ++--
.../bescheid/BescheidSentEvent.java | 2 +-
.../bescheid/BescheidService.java | 20 +++++------
.../bescheid/BescheidUpdatedEvent.java | 2 +-
.../{ => document}/bescheid/SentInfo.java | 2 +-
.../bescheid/SentInfoMapper.java | 2 +-
.../{ => document}/bescheid/UserId.java | 2 +-
.../AdministrationProperties.java | 2 +-
.../administration/AdministrationService.java | 2 +-
.../AdministrationSyncScheduler.java | 2 +-
.../ClientAttributeRemoteService.java | 4 +--
.../attributes/ClientAttributeService.java | 2 +-
.../binaryfile/BinaryFileRemoteService.java | 4 +--
.../binaryfile/BinaryFileService.java | 4 +--
.../BescheidManagerCallContextProvider.java | 4 +--
.../CallContextAuthenticationToken.java | 2 +-
.../common/callcontext/CallContextUser.java | 2 +-
.../callcontext/CurrentUserService.java | 2 +-
.../common/freemarker/TemplateHandler.java | 2 +-
.../bescheid/common/user/UserProfile.java | 4 +--
.../common/user/UserProfileMapper.java | 4 +--
.../common/user/UserProfileService.java | 4 +--
.../common/user/UserProfileTestFactory.java | 4 +--
.../dummy/DummyBescheidRemoteService.java | 10 +++---
.../SmartDocumentsBescheidRemoteService.java | 24 ++++++-------
.../SmartDocumentsConfiguration.java | 2 +-
.../SmartDocumentsProperties.java | 2 +-
.../smartdocuments/SmartDocumentsRequest.java | 4 +--
.../vorgang/BescheidVorgangMapper.java | 2 +-
.../bescheid/vorgang/FormDataEntry.java | 3 +-
.../bescheid/vorgang/FormDataEntryMapper.java | 6 ++--
.../vorgang/FormDataEntrySerializer.java | 6 ++--
.../bescheid/vorgang/Vorgang.java | 2 +-
.../bescheid/vorgang/VorgangId.java | 2 +-
.../vorgang/VorgangRemoteService.java | 2 +-
.../bescheid/vorgang/VorgangService.java | 2 +-
.../common/attached_item/AttachedItem.java | 2 +-
.../attached_item/AttachedItemMapper.java | 2 +-
.../attached_item/AttachedItemService.java | 14 ++++----
.../VorgangAttachedItemRemoteService.java | 10 +++---
.../document/DocumentEventListenerTest.java | 2 +-
.../ozgcloud/document/DocumentMapperTest.java | 2 +-
.../document/DocumentServiceTest.java | 16 ++++-----
.../bescheid/BescheidEventListenerITCase.java | 10 +++---
.../bescheid/BescheidEventListenerTest.java | 26 +++++++-------
.../bescheid/BescheidGrpcServiceTest.java | 12 +++----
.../BescheidManagerConfigTestFactory.java | 6 ++--
.../bescheid/BescheidMapperTest.java | 8 ++---
.../bescheid/BescheidRequestTestFactory.java | 8 ++---
.../bescheid/BescheidResponseTestFactory.java | 8 ++---
.../bescheid/BescheidServiceTest.java | 34 +++++++++----------
.../bescheid/BescheidTestApplication.java | 2 +-
.../bescheid/BescheidTestFactory.java | 12 +++----
...cheidManagerConfigResponseTestFactory.java | 2 +-
.../bescheid/GrpcBescheidTestFactory.java | 2 +-
...rpcBescheidWithoutDocumentTestFactory.java | 4 +--
.../GrpcGetAllBescheidRequestTestFactory.java | 4 +--
...rpcGetBescheidDraftRequestTestFactory.java | 4 +--
...pcGetBescheidDraftResponseTestFactory.java | 2 +-
.../GrpcGetBescheidRequestTestFactory.java | 4 +--
.../GrpcGetBescheidResponseTestFactory.java | 2 +-
.../bescheid/GrpcSentInfoTestFactory.java | 2 +-
.../bescheid/SentInfoMapperTest.java | 2 +-
.../bescheid/SentInfoTestFactory.java | 4 +--
.../AdministrationServiceTest.java | 2 +-
.../ClientAttributeRemoteServiceTest.java | 4 +--
.../ClientAttributeServiceTest.java | 2 +-
...escheidManagerCallContextProviderTest.java | 4 +--
.../callcontext/CurrentUserServiceTest.java | 2 +-
.../freemarker/TemplateHandlerITCase.java | 4 +--
...tDocumentsBescheidRemoteServiceITCase.java | 8 ++---
...artDocumentsBescheidRemoteServiceTest.java | 12 +++----
.../SmartDocumentsResponseTestFactory.java | 10 +++---
.../vorgang/BescheidVorgangMapperTest.java | 2 +-
.../vorgang/FormDataEntrySerializerTest.java | 8 ++---
.../vorgang/GrpcEingangTestFactory.java | 2 +-
.../GrpcVorgangWithEingangTestFactory.java | 4 +--
.../vorgang/PostfachAddressTestFactory.java | 4 +--
.../vorgang/ServiceKontoTestFactory.java | 4 +--
.../vorgang/VorgangRemoteServiceTest.java | 4 +--
.../bescheid/vorgang/VorgangServiceTest.java | 2 +-
.../bescheid/vorgang/VorgangTestFactory.java | 2 +-
.../attached_item/AttachedItemMapperTest.java | 4 +--
.../AttachedItemServiceTest.java | 14 ++++----
.../AttachedItemTestFactory.java | 18 +++++-----
...organgAttachedItemResponseTestFactory.java | 2 +-
.../GrpcVorgangAttachedItemTestFactory.java | 2 +-
.../VorgangAttachedItemRemoteServiceTest.java | 8 ++---
104 files changed, 289 insertions(+), 287 deletions(-)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/Bescheid.java (95%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidCallContextAttachingInterceptor.java (94%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidCreatedEvent.java (89%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidDeletedEvent.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidEventListener.java (89%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidGrpcService.java (91%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidId.java (85%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidManagerConfig.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidManagerConfiguration.java (93%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidMapper.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidRemoteService.java (55%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidRequest.java (61%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidResponse.java (82%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidSentEvent.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidService.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/BescheidUpdatedEvent.java (84%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/SentInfo.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/SentInfoMapper.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/UserId.java (90%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/administration/AdministrationProperties.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/administration/AdministrationService.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/administration/AdministrationSyncScheduler.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/attributes/ClientAttributeRemoteService.java (95%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/attributes/ClientAttributeService.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/binaryfile/BinaryFileRemoteService.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/binaryfile/BinaryFileService.java (80%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/BescheidManagerCallContextProvider.java (93%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/CallContextAuthenticationToken.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/CallContextUser.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/CurrentUserService.java (98%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/freemarker/TemplateHandler.java (95%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/user/UserProfile.java (92%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/user/UserProfileMapper.java (93%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/user/UserProfileService.java (93%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/common/user/UserProfileTestFactory.java (94%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/dummy/DummyBescheidRemoteService.java (80%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java (89%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsConfiguration.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsProperties.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsRequest.java (93%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/BescheidVorgangMapper.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/FormDataEntry.java (95%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/FormDataEntryMapper.java (83%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/FormDataEntrySerializer.java (92%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/Vorgang.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangId.java (84%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangRemoteService.java (95%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangService.java (88%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItem.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItemMapper.java (97%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItemService.java (96%)
rename document-manager-server/src/main/java/de/ozgcloud/{ => document}/common/attached_item/VorgangAttachedItemRemoteService.java (93%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidEventListenerITCase.java (92%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidEventListenerTest.java (95%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidGrpcServiceTest.java (94%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidManagerConfigTestFactory.java (87%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidMapperTest.java (96%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidRequestTestFactory.java (73%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidResponseTestFactory.java (84%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidServiceTest.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidTestApplication.java (95%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/BescheidTestFactory.java (82%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcBescheidTestFactory.java (88%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcBescheidWithoutDocumentTestFactory.java (89%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcGetAllBescheidRequestTestFactory.java (74%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcGetBescheidDraftRequestTestFactory.java (75%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcGetBescheidDraftResponseTestFactory.java (89%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcGetBescheidRequestTestFactory.java (72%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcGetBescheidResponseTestFactory.java (89%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/GrpcSentInfoTestFactory.java (88%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/SentInfoMapperTest.java (96%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/SentInfoTestFactory.java (94%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/administration/AdministrationServiceTest.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/attributes/ClientAttributeRemoteServiceTest.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/attributes/ClientAttributeServiceTest.java (96%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java (94%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/common/callcontext/CurrentUserServiceTest.java (92%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/common/freemarker/TemplateHandlerITCase.java (94%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java (90%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java (93%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java (55%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/BescheidVorgangMapperTest.java (94%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/FormDataEntrySerializerTest.java (88%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/GrpcEingangTestFactory.java (83%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java (84%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/PostfachAddressTestFactory.java (91%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/ServiceKontoTestFactory.java (74%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangRemoteServiceTest.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangServiceTest.java (95%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/bescheid/vorgang/VorgangTestFactory.java (92%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItemMapperTest.java (96%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItemServiceTest.java (98%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/AttachedItemTestFactory.java (90%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java (96%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/GrpcVorgangAttachedItemTestFactory.java (97%)
rename document-manager-server/src/test/java/de/ozgcloud/{ => document}/common/attached_item/VorgangAttachedItemRemoteServiceTest.java (98%)
diff --git a/.gitignore b/.gitignore
index 3fc1d88..174f396 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ target/
.idea
*.iml
*.orig
+.vscode/
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
index 316388c..2c746fe 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentEventListener.java
@@ -33,7 +33,7 @@ import org.springframework.context.event.EventListener;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.stereotype.Component;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
import de.ozgcloud.command.CommandFailedEvent;
@@ -47,8 +47,8 @@ import lombok.extern.log4j.Log4j2;
public class DocumentEventListener {
static final String CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER = "CREATE_BESCHEID_DOCUMENT_FROM_FILE";
- public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND = command ->
- CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER.equals(command.getOrder());
+ public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND = command -> CREATE_BESCHEID_DOCUMENT_FROM_FILE_ORDER
+ .equals(command.getOrder());
private static final String IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE = "{T(de.ozgcloud.document.DocumentEventListener).IS_CREATE_BESCHEID_DOCUMENT_FROM_FILE_COMMAND.test(event.getSource())}";
private static final String ERROR_MESSAGE = "Error on executing Create Bescheid Document Command.";
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
index a0e8848..027bacf 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentMapper.java
@@ -28,7 +28,7 @@ import org.mapstruct.Mapper;
import org.mapstruct.Mapping;
import org.mapstruct.NullValueCheckStrategy;
-import de.ozgcloud.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
@Mapper(nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
interface DocumentMapper {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
index 0a4d0f0..d558e90 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/DocumentService.java
@@ -38,12 +38,12 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidResponse;
import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
import de.ozgcloud.common.errorhandling.TechnicalException;
@Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
index 63f65d8..e6bbed6 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/Bescheid.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/Bescheid.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.common.binaryfile.FileId;
import lombok.Builder;
import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
similarity index 94%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
index c3e424b..6837a33 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCallContextAttachingInterceptor.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCallContextAttachingInterceptor.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static de.ozgcloud.common.grpc.GrpcUtil.*;
@@ -7,7 +7,7 @@ import java.util.UUID;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
import io.grpc.CallOptions;
import io.grpc.Channel;
import io.grpc.ClientCall;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
index 237f07e..5e68e88 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidCreatedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidCreatedEvent.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
index dd8fc4c..2ddbfb0 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidDeletedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidDeletedEvent.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
index 3beaadf..13829ca 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidEventListener.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidEventListener.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static java.util.Objects.*;
@@ -39,16 +39,16 @@ import org.springframework.context.event.EventListener;
import org.springframework.security.core.context.SecurityContext;
import org.springframework.stereotype.Component;
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.binaryfile.BinaryFileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEvent;
import de.ozgcloud.command.CommandExecutedEvent;
import de.ozgcloud.command.CommandFailedEvent;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
import de.ozgcloud.document.Document;
@@ -69,20 +69,20 @@ class BescheidEventListener {
public static final String SEND_BESCHEID_ORDER = "SEND_BESCHEID";
public static final Predicate<Command> IS_CREATE_BESCHEID_COMMAND = command -> CREATE_BESCHEID_ORDER.equals(command.getOrder());
- private static final String IS_CREATE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_COMMAND.test(event.getSource())}";
+ private static final String IS_CREATE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_COMMAND.test(event.getSource())}";
public static final Predicate<Command> IS_DELETE_BESCHEID_COMMAND = command -> DELETE_BESCHEID_ORDER.equals(command.getOrder());
- private static final String IS_DELETE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_DELETE_BESCHEID_COMMAND.test(event.getSource())}";
+ private static final String IS_DELETE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_DELETE_BESCHEID_COMMAND.test(event.getSource())}";
public static final Predicate<Command> IS_UPDATE_BESCHEID_COMMAND = command -> UPDATE_BESCHEID_ORDER.equals(command.getOrder());
- private static final String IS_UPDATE_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_UPDATE_BESCHEID_COMMAND.test(event.getSource())}";
+ private static final String IS_UPDATE_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_UPDATE_BESCHEID_COMMAND.test(event.getSource())}";
public static final Predicate<Command> IS_CREATE_BESCHEID_DOCUMENT_COMMAND = command -> CREATE_BESCHEID_DOCUMENT_ORDER.equals(command.getOrder());
- private static final String IS_CREATE_BESCHEID_DOCUMENT = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_DOCUMENT_COMMAND.test(event.getSource())}";
+ private static final String IS_CREATE_BESCHEID_DOCUMENT = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_CREATE_BESCHEID_DOCUMENT_COMMAND.test(event.getSource())}";
public static final Predicate<Command> IS_SEND_BESCHEID_COMMAND = command -> nonNull(command) && SEND_BESCHEID_ORDER.equals(command.getOrder());
- private static final String IS_SEND_BESCHEID = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getSource())}";
- private static final String IS_SEND_BESCHEID_ORDER = "{T(de.ozgcloud.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getCommand())}";
+ private static final String IS_SEND_BESCHEID = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getSource())}";
+ private static final String IS_SEND_BESCHEID_ORDER = "{T(de.ozgcloud.document.bescheid.BescheidEventListener).IS_SEND_BESCHEID_COMMAND.test(event.getCommand())}";
static final String VORGANG_ID_BODY_KEY = "vorgangId";
static final String BESCHEID_VOM_BODY_KEY = "bescheidVom";
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
similarity index 91%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
index a4636f9..f750de1 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidGrpcService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidGrpcService.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.util.Optional;
import java.util.stream.Stream;
-import de.ozgcloud.bescheid.BescheidServiceGrpc.BescheidServiceImplBase;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.BescheidServiceGrpc.BescheidServiceImplBase;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import io.grpc.stub.StreamObserver;
import lombok.RequiredArgsConstructor;
import net.devh.boot.grpc.server.service.GrpcService;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
similarity index 85%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
index 4c0f604..902fb85 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import de.ozgcloud.common.datatype.StringBasedValue;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
index 7fbeae9..dc5df2d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfig.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfig.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import lombok.Builder;
import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
index 824f5ad..6c0b291 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidManagerConfiguration.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidManagerConfiguration.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -29,7 +29,7 @@ import org.springframework.context.annotation.Configuration;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.command.grpc.GrpcOzgCloudCommandService;
-import de.ozgcloud.bescheid.common.callcontext.BescheidManagerCallContextProvider;
+import de.ozgcloud.document.bescheid.common.callcontext.BescheidManagerCallContextProvider;
import de.ozgcloud.vorgang.grpc.command.CommandServiceGrpc;
import net.devh.boot.grpc.client.inject.GrpcClient;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
index 28d4be1..ab9ef90 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidMapper.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import static de.ozgcloud.bescheid.Bescheid.*;
+import static de.ozgcloud.document.bescheid.Bescheid.*;
import java.time.LocalDate;
import java.util.Collection;
@@ -21,10 +21,10 @@ import org.mapstruct.NullValuePropertyMappingStrategy;
import org.mapstruct.ReportingPolicy;
import org.springframework.beans.factory.annotation.Autowired;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.datatype.StringBasedValue;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
similarity index 55%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
index 3110e87..d071c93 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRemoteService.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
public interface BescheidRemoteService {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
similarity index 61%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
index bd827b7..e3e88ea 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidRequest.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidRequest.java
@@ -1,9 +1,9 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.LocalDate;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import lombok.Builder;
import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
similarity index 82%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
index 234aec4..0368ed7 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidResponse.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidResponse.java
@@ -1,11 +1,11 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.io.File;
import java.util.List;
import java.util.Optional;
-import de.ozgcloud.bescheid.vorgang.Vorgang.ServiceKonto;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.ServiceKonto;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.common.binaryfile.FileId;
import lombok.Builder;
import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
index 8bfb22f..7a75f05 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidSentEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidSentEvent.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
index cd1d2fc..dab645b 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static java.util.Objects.*;
@@ -26,16 +26,16 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.OzgCloudCreateSubCommandsRequest;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.administration.AdministrationService;
-import de.ozgcloud.bescheid.attributes.ClientAttributeService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangService;
+import de.ozgcloud.document.bescheid.administration.AdministrationService;
+import de.ozgcloud.document.bescheid.attributes.ClientAttributeService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangService;
import de.ozgcloud.command.Command;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
similarity index 84%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
index a602166..5b30957 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/BescheidUpdatedEvent.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/BescheidUpdatedEvent.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandExecutedEvent;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
index a3e1fb0..67a38fe 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfo.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfo.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.ZonedDateTime;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
index 95c5b58..de5a3d0 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/SentInfoMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/SentInfoMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
similarity index 90%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
index d92b402..2487f72 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/UserId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/UserId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.util.Objects;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
index 59f93a0..58573d8 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationProperties.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationProperties.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
import java.util.Optional;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
index 920c5ea..fcf5c76 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
import java.util.Optional;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
index 41fde87..57c0367 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/administration/AdministrationSyncScheduler.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/administration/AdministrationSyncScheduler.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
index d87ae74..3114805 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteService.java
@@ -21,12 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
index 1585971..5f6ffec 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/attributes/ClientAttributeService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
import org.springframework.stereotype.Service;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
index 08cac0c..8af3827 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.binaryfile;
+package de.ozgcloud.document.bescheid.binaryfile;
import java.io.File;
import java.io.FileInputStream;
@@ -14,7 +14,7 @@ import org.springframework.stereotype.Service;
import com.google.protobuf.ByteString;
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponse;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils;
import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils.FileSender;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
similarity index 80%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
index 11ddd6e..db5c540 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/binaryfile/BinaryFileService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/binaryfile/BinaryFileService.java
@@ -1,9 +1,9 @@
-package de.ozgcloud.bescheid.binaryfile;
+package de.ozgcloud.document.bescheid.binaryfile;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.ozgcloud.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponse;
import lombok.NonNull;
@Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
index 40cbdaf..95d316e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProvider.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import java.util.Optional;
@@ -30,7 +30,7 @@ import org.springframework.stereotype.Component;
import de.ozgcloud.apilib.common.callcontext.CallContext;
import de.ozgcloud.apilib.common.callcontext.OzgCloudCallContextProvider;
import de.ozgcloud.apilib.user.OzgCloudUserId;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
import lombok.RequiredArgsConstructor;
@Component
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
index 77ec99f..43b3c13 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextAuthenticationToken.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextAuthenticationToken.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import java.util.Collection;
import java.util.stream.Collectors;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
index 667bb03..f124e7a 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CallContextUser.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CallContextUser.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import java.io.Serializable;
import java.util.Collection;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
similarity index 98%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
index b77b10a..fe7f499 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import java.util.Objects;
import java.util.Optional;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
index 8355a9f..cdf302d 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandler.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandler.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.freemarker;
+package de.ozgcloud.document.bescheid.common.freemarker;
import java.io.IOException;
import java.io.StringWriter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
similarity index 92%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
index 889dbba..9618ea6 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfile.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfile.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
import lombok.Builder;
import lombok.Getter;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
index 0c7c5ce..7591a79 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileMapper.java
@@ -21,13 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
import org.mapstruct.Mapper;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfile;
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
@Mapper
public interface UserProfileMapper {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
index 5346ead..1e359c4 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
import java.util.Optional;
@@ -29,7 +29,7 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.user.OzgCloudUserProfileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.RequiredArgsConstructor;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
similarity index 94%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
index 60949bb..b5f900e 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/common/user/UserProfileTestFactory.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/common/user/UserProfileTestFactory.java
@@ -21,13 +21,13 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.user;
+package de.ozgcloud.document.bescheid.common.user;
import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.ozgcloud.bescheid.UserId;
+import de.ozgcloud.document.bescheid.UserId;
public class UserProfileTestFactory {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
similarity index 80%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
index ef95892..8b4b7af 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/dummy/DummyBescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/dummy/DummyBescheidRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.dummy;
+package de.ozgcloud.document.bescheid.dummy;
import java.util.Optional;
@@ -7,10 +7,10 @@ import org.springframework.stereotype.Service;
import com.google.common.net.MediaType;
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidRemoteService;
-import de.ozgcloud.bescheid.BescheidRequest;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidRemoteService;
+import de.ozgcloud.document.bescheid.BescheidRequest;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
import de.ozgcloud.common.binaryfile.TempFileUtils;
@Service
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
similarity index 89%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
index b93412e..fa59373 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import java.io.File;
import java.io.IOException;
@@ -27,17 +27,17 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidRemoteService;
-import de.ozgcloud.bescheid.BescheidRequest;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.BescheidData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.SmartDocument.Selection;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidRemoteService;
+import de.ozgcloud.document.bescheid.BescheidRequest;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.BescheidData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.SmartDocument.Selection;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
import de.ozgcloud.common.binaryfile.FileDataDeserializer;
import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.AllArgsConstructor;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
index 579a53d..cc0967a 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsConfiguration.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsConfiguration.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
index c45e938..256b1f1 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsProperties.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsProperties.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
index d842134..eb3ec30 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsRequest.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsRequest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import java.time.LocalDate;
@@ -6,7 +6,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
index a544525..474dfa7 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
index e0e2988..2c39527 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntry.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntry.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.List;
@@ -13,6 +13,7 @@ import lombok.Singular;
public interface FormDataEntry {
String getName();
+
@JsonIgnore
String getLabel();
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
similarity index 83%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
index 6cd404f..616d515 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntryMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntryMapper.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.List;
import java.util.stream.Stream;
@@ -8,8 +8,8 @@ import org.mapstruct.Mapping;
import org.mapstruct.Named;
import org.mapstruct.ReportingPolicy;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
import de.ozgcloud.vorgang.vorgang.GrpcFormField;
import de.ozgcloud.vorgang.vorgang.GrpcSubForm;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
similarity index 92%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
index 0a3b48d..9ba98da 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializer.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializer.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.io.IOException;
import java.util.List;
@@ -10,8 +10,8 @@ import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
import de.ozgcloud.common.errorhandling.TechnicalException;
public class FormDataEntrySerializer extends StdSerializer<FormDataEntry> {
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
index ba0e51d..faf84a0 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/Vorgang.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/Vorgang.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.List;
import java.util.Map;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
similarity index 84%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
index 2cb8785..5343737 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangId.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangId.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import de.ozgcloud.common.datatype.StringBasedValue;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
similarity index 95%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
index c3a1aa7..fdf8940 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
similarity index 88%
rename from document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
index 98689c9..a5d8c45 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/bescheid/vorgang/VorgangService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/bescheid/vorgang/VorgangService.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import org.springframework.stereotype.Service;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
index f47223b..ad89aba 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItem.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItem.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import java.util.Map;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
similarity index 97%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
index c3431d1..575c2d6 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemMapper.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemMapper.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import java.util.Map;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
similarity index 96%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
index d0ad2ed..8881932 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/AttachedItemService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/AttachedItemService.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import java.util.Collection;
import java.util.HashMap;
@@ -37,12 +37,12 @@ import org.springframework.stereotype.Service;
import de.ozgcloud.apilib.common.command.OzgCloudCommand;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.Bescheid.Status;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidManagerConfiguration;
-import de.ozgcloud.bescheid.BescheidMapper;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.Bescheid.Status;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidManagerConfiguration;
+import de.ozgcloud.document.bescheid.BescheidMapper;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.command.Command;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
similarity index 93%
rename from document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java
rename to document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
index 1d8756a..20a6ab4 100644
--- a/document-manager-server/src/main/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteService.java
+++ b/document-manager-server/src/main/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteService.java
@@ -21,9 +21,9 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
-import static de.ozgcloud.common.attached_item.AttachedItemService.*;
+import static de.ozgcloud.document.common.attached_item.AttachedItemService.*;
import java.time.LocalDate;
import java.util.Comparator;
@@ -35,9 +35,9 @@ import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemRequest;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcVorgangAttachedItemRequest;
import de.ozgcloud.vorgang.vorgangAttachedItem.VorgangAttachedItemServiceGrpc.VorgangAttachedItemServiceBlockingStub;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
index b95890c..d777d73 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentEventListenerTest.java
@@ -38,7 +38,7 @@ import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.core.context.SecurityContext;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEventTestFactory;
import de.ozgcloud.command.CommandFailedEvent;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
index 50405df..172a59d 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentMapperTest.java
@@ -30,7 +30,7 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mapstruct.factory.Mappers;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
class DocumentMapperTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
index 9a059e8..eedc164 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/DocumentServiceTest.java
@@ -45,16 +45,16 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.datatypes.GenericId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.BescheidResponse;
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.BescheidResponse;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.errorhandling.TechnicalException;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
index 66403e2..cf444b5 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -14,14 +14,14 @@ import org.springframework.context.ApplicationEventPublisher;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEventTestFactory;
import de.ozgcloud.command.CommandExecutedEvent;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
import de.ozgcloud.common.test.ITCase;
@ITCase
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
index a3734e1..1cb7624 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidEventListenerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidEventListenerTest.java
@@ -1,7 +1,7 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import static de.ozgcloud.bescheid.BescheidEventListener.*;
-import static de.ozgcloud.bescheid.BescheidRequestTestFactory.*;
+import static de.ozgcloud.document.bescheid.BescheidEventListener.*;
+import static de.ozgcloud.document.bescheid.BescheidRequestTestFactory.*;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -24,21 +24,21 @@ import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.security.core.context.SecurityContext;
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.binaryfile.BinaryFileService;
-import de.ozgcloud.bescheid.common.callcontext.CurrentUserService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.binaryfile.BinaryFileService;
+import de.ozgcloud.document.bescheid.common.callcontext.CurrentUserService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandCreatedEventTestFactory;
import de.ozgcloud.command.CommandExecutedEvent;
import de.ozgcloud.command.CommandFailedEvent;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.document.BescheidDocumentCreatedEvent;
import de.ozgcloud.document.Document;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
index 04871bb..f3864de 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidGrpcServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidGrpcServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -17,11 +17,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemMapper;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemMapper;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import io.grpc.stub.StreamObserver;
class BescheidGrpcServiceTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
similarity index 87%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
index cdd3c20..450f96f 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidManagerConfigTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidManagerConfigTestFactory.java
@@ -21,10 +21,10 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.bescheid.BescheidManagerConfig.BescheidManagerConfigBuilder;
-import de.ozgcloud.bescheid.BescheidManagerConfig.Features;
+import de.ozgcloud.document.bescheid.BescheidManagerConfig.BescheidManagerConfigBuilder;
+import de.ozgcloud.document.bescheid.BescheidManagerConfig.Features;
public class BescheidManagerConfigTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
index 4e867c4..ffe6f40 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -17,10 +17,10 @@ import org.mapstruct.factory.Mappers;
import org.mockito.InjectMocks;
import org.mockito.Spy;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.document.DocumentTestFactory;
class BescheidMapperTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
similarity index 73%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
index dbe4f9e..7629414 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidRequestTestFactory.java
@@ -1,10 +1,10 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.LocalDate;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
public class BescheidRequestTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
similarity index 84%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
index 94581c9..dadfe25 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidResponseTestFactory.java
@@ -1,13 +1,13 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.io.File;
import java.util.Optional;
import org.springframework.http.MediaType;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.ServiceKontoTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.ServiceKontoTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.document.DocumentTestFactory;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
index e593e42..0db2fa0 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -39,24 +39,24 @@ import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.datatypes.GenericId;
import de.ozgcloud.apilib.user.OzgCloudUserId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.administration.AdministrationService;
-import de.ozgcloud.bescheid.attributes.ClientAttributeService;
-import de.ozgcloud.bescheid.common.freemarker.TemplateHandler;
-import de.ozgcloud.bescheid.common.user.UserProfile;
-import de.ozgcloud.bescheid.common.user.UserProfileService;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.PostfachAddressTestFactory;
-import de.ozgcloud.bescheid.vorgang.ServiceKontoTestFactory;
-import de.ozgcloud.bescheid.vorgang.Vorgang;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangService;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.administration.AdministrationService;
+import de.ozgcloud.document.bescheid.attributes.ClientAttributeService;
+import de.ozgcloud.document.bescheid.common.freemarker.TemplateHandler;
+import de.ozgcloud.document.bescheid.common.user.UserProfile;
+import de.ozgcloud.document.bescheid.common.user.UserProfileService;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.PostfachAddressTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.ServiceKontoTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangService;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem;
-import de.ozgcloud.common.attached_item.AttachedItemService;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItem;
+import de.ozgcloud.document.common.attached_item.AttachedItemService;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.common.datatype.StringBasedValue;
import de.ozgcloud.common.errorhandling.TechnicalException;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
index b04cada..fbb34ab 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestApplication.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestApplication.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.info.BuildProperties;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
similarity index 82%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
index 7b90a22..30883d9 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/BescheidTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/BescheidTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.LocalDate;
import java.util.List;
@@ -7,11 +7,11 @@ import java.util.UUID;
import com.thedeanda.lorem.LoremIpsum;
-import de.ozgcloud.bescheid.Bescheid.SendBy;
-import de.ozgcloud.bescheid.Bescheid.Status;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid.SendBy;
+import de.ozgcloud.document.bescheid.Bescheid.Status;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.document.DocumentTestFactory;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
index 2657fdf..7317259 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidManagerConfigResponseTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
public class GrpcBescheidManagerConfigResponseTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
index e378109..095f105 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
class GrpcBescheidTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
index 532945a..509c59c 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcBescheidWithoutDocumentTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.document.DocumentTestFactory;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
similarity index 74%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
index af6362a..9ff28dc 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetAllBescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetAllBescheidRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
public class GrpcGetAllBescheidRequestTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
similarity index 75%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
index 290201a..66155aa 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
public class GrpcGetBescheidDraftRequestTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
index 2e3d5d8..fe532ec 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidDraftResponseTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
public class GrpcGetBescheidDraftResponseTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
similarity index 72%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
index 43f93b3..681c033 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidRequestTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidRequestTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
-import de.ozgcloud.common.attached_item.AttachedItemTestFactory;
+import de.ozgcloud.document.common.attached_item.AttachedItemTestFactory;
public class GrpcGetBescheidRequestTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
similarity index 89%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
index 3b87d8e..807b760 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcGetBescheidResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcGetBescheidResponseTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
public class GrpcGetBescheidResponseTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
index 86fd1c8..fe1c071 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/GrpcSentInfoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/GrpcSentInfoTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
public class GrpcSentInfoTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
index c3f9eea..12dc221 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import static org.assertj.core.api.Assertions.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
index 8361e82..5295407 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/SentInfoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/SentInfoTestFactory.java
@@ -21,12 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid;
+package de.ozgcloud.document.bescheid;
import java.time.ZonedDateTime;
import java.util.Map;
-import de.ozgcloud.bescheid.SentInfo.SentInfoBuilder;
+import de.ozgcloud.document.bescheid.SentInfo.SentInfoBuilder;
public class SentInfoTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
index 13e6487..3ab9e79 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/administration/AdministrationServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/administration/AdministrationServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.administration;
+package de.ozgcloud.document.bescheid.administration;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
index cfa1813..2498c37 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeRemoteServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -35,7 +35,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
import de.ozgcloud.vorgang.grpc.clientAttribute.ClientAttributeServiceGrpc.ClientAttributeServiceBlockingStub;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcAccessPermission;
import de.ozgcloud.vorgang.grpc.clientAttribute.GrpcClientAttribute;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
index 03d31e5..34a293d 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/attributes/ClientAttributeServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/attributes/ClientAttributeServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.attributes;
+package de.ozgcloud.document.bescheid.attributes;
import static org.mockito.Mockito.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
index ec9d3de..1af869e 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/BescheidManagerCallContextProviderTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
@@ -36,7 +36,7 @@ import org.mockito.Mock;
import org.mockito.Spy;
import de.ozgcloud.apilib.user.OzgCloudUserId;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
class BescheidManagerCallContextProviderTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
index 656b191..2349cfe 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/callcontext/CurrentUserServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/callcontext/CurrentUserServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.callcontext;
+package de.ozgcloud.document.bescheid.common.callcontext;
import static org.assertj.core.api.Assertions.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
index eeca8c0..34fe1de 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/common/freemarker/TemplateHandlerITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/common/freemarker/TemplateHandlerITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.common.freemarker;
+package de.ozgcloud.document.bescheid.common.freemarker;
import static org.assertj.core.api.Assertions.*;
@@ -13,7 +13,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.BescheidService;
+import de.ozgcloud.document.bescheid.BescheidService;
import de.ozgcloud.common.test.ITCase;
@ITCase
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
similarity index 90%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
index 764fc28..9c36356 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceITCase.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import static org.assertj.core.api.Assertions.*;
@@ -14,9 +14,9 @@ import org.springframework.test.context.ActiveProfiles;
import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
-import de.ozgcloud.bescheid.BescheidRequestTestFactory;
-import de.ozgcloud.bescheid.BescheidTestApplication;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.BescheidRequestTestFactory;
+import de.ozgcloud.document.bescheid.BescheidTestApplication;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.common.test.TestUtils;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
similarity index 93%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
index 86bc7f7..25fc00c 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsBescheidRemoteServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -16,11 +16,11 @@ import org.mockito.Spy;
import org.w3c.dom.Document;
import org.w3c.dom.Text;
-import de.ozgcloud.bescheid.BescheidRequestTestFactory;
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.BescheidRequestTestFactory;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsRequest.CustomerData.UserData;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import lombok.SneakyThrows;
class SmartDocumentsBescheidRemoteServiceTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
similarity index 55%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
index 32a0b3a..c5c2d6b 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/smartdocuments/SmartDocumentsResponseTestFactory.java
@@ -1,11 +1,11 @@
-package de.ozgcloud.bescheid.smartdocuments;
+package de.ozgcloud.document.bescheid.smartdocuments;
import java.util.List;
-import de.ozgcloud.bescheid.BescheidResponseTestFactory;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
-import de.ozgcloud.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
+import de.ozgcloud.document.bescheid.BescheidResponseTestFactory;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentDocument;
+import de.ozgcloud.document.bescheid.smartdocuments.SmartDocumentsBescheidRemoteService.SmartDocumentsResponse.SmartDocumentFile;
public class SmartDocumentsResponseTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
similarity index 94%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
index 6f64a48..cea6bd9 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/BescheidVorgangMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/BescheidVorgangMapperTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import static org.assertj.core.api.Assertions.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
similarity index 88%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
index d647a90..85828d9 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/FormDataEntrySerializerTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/FormDataEntrySerializerTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import static org.assertj.core.api.Assertions.*;
@@ -7,9 +7,9 @@ import org.junit.jupiter.api.Test;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.FormField;
-import de.ozgcloud.bescheid.vorgang.FormDataEntry.SubForm;
-import de.ozgcloud.bescheid.vorgang.Vorgang.Eingang;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.FormField;
+import de.ozgcloud.document.bescheid.vorgang.FormDataEntry.SubForm;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.Eingang;
import lombok.SneakyThrows;
class FormDataEntrySerializerTest {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
similarity index 83%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
index 8c9dfc0..3ecadc1 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcEingangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcEingangTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import de.ozgcloud.vorgang.vorgang.GrpcEingang;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
similarity index 84%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
index 63c8a88..44e9c43 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/GrpcVorgangWithEingangTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
-import static de.ozgcloud.bescheid.vorgang.VorgangTestFactory.*;
+import static de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory.*;
import de.ozgcloud.vorgang.vorgang.GrpcFindVorgangWithEingangResponse;
import de.ozgcloud.vorgang.vorgang.GrpcVorgangWithEingang;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
similarity index 91%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
index 5d01a8b..c6d27d7 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/PostfachAddressTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/PostfachAddressTestFactory.java
@@ -21,12 +21,12 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.Map;
import java.util.UUID;
-import de.ozgcloud.bescheid.vorgang.Vorgang.PostfachAddress.PostfachAddressBuilder;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.PostfachAddress.PostfachAddressBuilder;
public class PostfachAddressTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
similarity index 74%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
index 2a30ada..f3cc751 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/ServiceKontoTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/ServiceKontoTestFactory.java
@@ -1,6 +1,6 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
-import de.ozgcloud.bescheid.vorgang.Vorgang.ServiceKonto;
+import de.ozgcloud.document.bescheid.vorgang.Vorgang.ServiceKonto;
public class ServiceKontoTestFactory {
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
index 823dc76..b4ce2e2 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangRemoteServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -36,7 +36,7 @@ class VorgangRemoteServiceTest {
void prepareGrpc() {
when(serviceStub.withInterceptors(any())).thenReturn(serviceStub);
when(serviceStub.findVorgangWithEingang(any())).thenReturn(GrpcVorgangWithEingangTestFactory.createResponse());
-
+
}
@BeforeEach
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
similarity index 95%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
index cc93692..3666f80 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangServiceTest.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
similarity index 92%
rename from document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
index 000bc28..a9c3f21 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/bescheid/vorgang/VorgangTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/bescheid/vorgang/VorgangTestFactory.java
@@ -1,4 +1,4 @@
-package de.ozgcloud.bescheid.vorgang;
+package de.ozgcloud.document.bescheid.vorgang;
import java.util.UUID;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
index 2599852..be1da57 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemMapperTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemMapperTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -37,7 +37,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.bescheid.SentInfoMapper;
+import de.ozgcloud.document.bescheid.SentInfoMapper;
import de.ozgcloud.command.CommandTestFactory;
import de.ozgcloud.document.DocumentService;
import de.ozgcloud.vorgang.common.grpc.GrpcObjectMapper;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
similarity index 98%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
index aaa9b15..56d10e3 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemServiceTest.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import static org.assertj.core.api.Assertions.*;
import static org.junit.jupiter.api.Assertions.*;
@@ -47,12 +47,12 @@ import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
import de.ozgcloud.apilib.common.command.grpc.CommandMapper;
import de.ozgcloud.apilib.common.datatypes.GenericId;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangId;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.BescheidMapper;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangId;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.BescheidMapper;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangId;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.Command;
import de.ozgcloud.command.CommandTestFactory;
import de.ozgcloud.common.errorhandling.TechnicalException;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
similarity index 90%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
index 9b3ac12..7073b4e 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/AttachedItemTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/AttachedItemTestFactory.java
@@ -21,23 +21,23 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
-import static de.ozgcloud.bescheid.SentInfoTestFactory.*;
+import static de.ozgcloud.document.bescheid.SentInfoTestFactory.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidTestFactory;
-import de.ozgcloud.bescheid.SentInfo;
-import de.ozgcloud.bescheid.SentInfoTestFactory;
-import de.ozgcloud.bescheid.common.user.UserProfileTestFactory;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidTestFactory;
+import de.ozgcloud.document.bescheid.SentInfo;
+import de.ozgcloud.document.bescheid.SentInfoTestFactory;
+import de.ozgcloud.document.bescheid.common.user.UserProfileTestFactory;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.CommandTestFactory;
-import de.ozgcloud.common.attached_item.AttachedItem.AttachedItemBuilder;
+import de.ozgcloud.document.common.attached_item.AttachedItem.AttachedItemBuilder;
import de.ozgcloud.common.binaryfile.FileId;
import de.ozgcloud.document.Document;
import de.ozgcloud.document.DocumentService;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
similarity index 96%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
index 6a1ebaa..ed4ff17 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcFindVorgangAttachedItemResponseTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import de.ozgcloud.vorgang.vorgangAttachedItem.GrpcFindVorgangAttachedItemResponse;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
similarity index 97%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
index daa37d3..0c84b49 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/GrpcVorgangAttachedItemTestFactory.java
@@ -21,7 +21,7 @@
* Die sprachspezifischen Genehmigungen und Beschränkungen
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import de.ozgcloud.command.CommandTestFactory;
import de.ozgcloud.vorgang.common.GrpcObject;
diff --git a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
similarity index 98%
rename from document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
rename to document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
index 104ace1..f36508f 100644
--- a/document-manager-server/src/test/java/de/ozgcloud/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
+++ b/document-manager-server/src/test/java/de/ozgcloud/document/common/attached_item/VorgangAttachedItemRemoteServiceTest.java
@@ -23,7 +23,7 @@
* unter der Lizenz sind dem Lizenztext zu entnehmen.
*/
-package de.ozgcloud.common.attached_item;
+package de.ozgcloud.document.common.attached_item;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
@@ -42,9 +42,9 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.bescheid.Bescheid;
-import de.ozgcloud.bescheid.BescheidCallContextAttachingInterceptor;
-import de.ozgcloud.bescheid.vorgang.VorgangTestFactory;
+import de.ozgcloud.document.bescheid.Bescheid;
+import de.ozgcloud.document.bescheid.BescheidCallContextAttachingInterceptor;
+import de.ozgcloud.document.bescheid.vorgang.VorgangTestFactory;
import de.ozgcloud.command.CommandTestFactory;
import de.ozgcloud.vorgang.common.GrpcObject;
import de.ozgcloud.vorgang.common.GrpcProperty;
--
GitLab