From 61fd662855ce6e8c40cd5324089da680e77b0aee Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Jul 2022 14:22:56 +0200
Subject: [PATCH] OZG-2566 OZG-2684 move vorgangAttachedItem to
 *common.attacheditem* package

---
 .../attacheditem}/VorgangAttachedItem.java                    | 2 +-
 .../attacheditem}/VorgangAttachedItemService.java             | 2 +-
 .../main/java/de/itvsh/goofy/kommentar/KommentarService.java  | 2 +-
 .../de/itvsh/goofy/wiedervorlage/WiedervorlageService.java    | 2 +-
 .../attacheditem}/VorgangAttachedItemServiceTest.java         | 4 +++-
 .../attacheditem}/VorgangAttachedItemTestFactory.java         | 4 +++-
 .../java/de/itvsh/goofy/kommentar/KommentarServiceTest.java   | 2 +-
 .../itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java   | 2 +-
 8 files changed, 12 insertions(+), 8 deletions(-)
 rename goofy-server/src/main/java/de/itvsh/goofy/{attached_item => common/attacheditem}/VorgangAttachedItem.java (88%)
 rename goofy-server/src/main/java/de/itvsh/goofy/{attached_item => common/attacheditem}/VorgangAttachedItemService.java (98%)
 rename goofy-server/src/test/java/de/itvsh/goofy/{attached_item => common/attacheditem}/VorgangAttachedItemServiceTest.java (97%)
 rename goofy-server/src/test/java/de/itvsh/goofy/{attached_item => common/attacheditem}/VorgangAttachedItemTestFactory.java (86%)

diff --git a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
similarity index 88%
rename from goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java
rename to goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
index 12d2e399fe..68f99ec311 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItem.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItem.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import java.util.Map;
 
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
similarity index 98%
rename from goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java
rename to goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
index 7c9aac4d96..de236d619f 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/attached_item/VorgangAttachedItemService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemService.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
index 1782047c75..1a6627031e 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/kommentar/KommentarService.java
@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.user.CurrentUserService;
 
diff --git a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
index c878201f49..e508c813a1 100644
--- a/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
+++ b/goofy-server/src/main/java/de/itvsh/goofy/wiedervorlage/WiedervorlageService.java
@@ -14,7 +14,7 @@ import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.user.CurrentUserService;
 
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
similarity index 97%
rename from goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
rename to goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
index 81c082d760..119c694762 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
@@ -13,6 +13,8 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItem;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandBodyMapper;
 import de.itvsh.goofy.common.command.CommandOrder;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
similarity index 86%
rename from goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java
rename to goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
index e60eb90836..4ea3c92504 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/attached_item/VorgangAttachedItemTestFactory.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/common/attacheditem/VorgangAttachedItemTestFactory.java
@@ -1,8 +1,10 @@
-package de.itvsh.goofy.attached_item;
+package de.itvsh.goofy.common.attacheditem;
 
 import java.util.Map;
 import java.util.UUID;
 
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItem;
+
 public class VorgangAttachedItemTestFactory {
 
 	public static final String ID = UUID.randomUUID().toString();
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
index ed1fcd6c06..ab903893f2 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/kommentar/KommentarServiceTest.java
@@ -18,7 +18,7 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandTestFactory;
 import de.itvsh.goofy.common.user.CurrentUserService;
diff --git a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
index 9e24db3059..a3621a9d1f 100644
--- a/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
+++ b/goofy-server/src/test/java/de/itvsh/goofy/wiedervorlage/WiedervorlageServiceTest.java
@@ -22,7 +22,7 @@ import org.mockito.Spy;
 
 import static org.assertj.core.api.Assertions.*;
 
-import de.itvsh.goofy.attached_item.VorgangAttachedItemService;
+import de.itvsh.goofy.common.attacheditem.VorgangAttachedItemService;
 import de.itvsh.goofy.common.command.Command;
 import de.itvsh.goofy.common.command.CommandService;
 import de.itvsh.goofy.common.command.CommandTestFactory;
-- 
GitLab