From 099720cb77fbd9d507ba514d10c1481fd5f0d72d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 28 Jun 2021 13:45:56 +0200
Subject: [PATCH] OZG-982 rename package for email service
---
.../java/de/itvsh/ozg/mail/{ => email}/EMailService.java | 4 ++--
.../de/itvsh/ozg/mail/{ => email}/MailSendErrorEvent.java | 2 +-
.../de/itvsh/ozg/mail/{ => email}/MailSendRequest.java | 2 +-
.../java/de/itvsh/ozg/mail/{ => email}/MailSentEvent.java | 2 +-
.../java/de/itvsh/ozg/mail/{ => email}/MailService.java | 2 +-
.../de/itvsh/ozg/mail/{ => email}/EMailServiceTest.java | 7 ++++++-
.../mail/{ => email}/MailSendErrorEventTestFactory.java | 5 ++++-
.../ozg/mail/{ => email}/MailSendRequestTestFactory.java | 5 +++--
.../ozg/mail/{ => email}/MailSentEventTestFactory.java | 4 +++-
.../pluto/vorgang/redirect/ForwardingEventListener.java | 6 +++---
.../ozg/pluto/vorgang/redirect/ForwardingService.java | 6 +++---
.../ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java | 4 ++--
.../vorgang/redirect/ForwardingEventListenerITCase.java | 2 +-
.../vorgang/redirect/ForwardingEventListenerTest.java | 2 +-
.../ozg/pluto/vorgang/redirect/ForwardingServiceTest.java | 4 ++--
15 files changed, 34 insertions(+), 23 deletions(-)
rename mail-service/src/main/java/de/itvsh/ozg/mail/{ => email}/EMailService.java (97%)
rename mail-service/src/main/java/de/itvsh/ozg/mail/{ => email}/MailSendErrorEvent.java (93%)
rename mail-service/src/main/java/de/itvsh/ozg/mail/{ => email}/MailSendRequest.java (94%)
rename mail-service/src/main/java/de/itvsh/ozg/mail/{ => email}/MailSentEvent.java (90%)
rename mail-service/src/main/java/de/itvsh/ozg/mail/{ => email}/MailService.java (91%)
rename mail-service/src/test/java/de/itvsh/ozg/mail/{ => email}/EMailServiceTest.java (95%)
rename mail-service/src/test/java/de/itvsh/ozg/mail/{ => email}/MailSendErrorEventTestFactory.java (63%)
rename mail-service/src/test/java/de/itvsh/ozg/mail/{ => email}/MailSendRequestTestFactory.java (87%)
rename mail-service/src/test/java/de/itvsh/ozg/mail/{ => email}/MailSentEventTestFactory.java (72%)
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
similarity index 97%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
index 9d6a42b94..34a4df14d 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/EMailService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/EMailService.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import java.util.Objects;
@@ -12,8 +12,8 @@ import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
import de.itvsh.ozg.mail.common.errorhandling.TechnicalException;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
similarity index 93%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
index 9c1efd382..2ad1295a5 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendErrorEvent.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendErrorEvent.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import org.springframework.context.ApplicationEvent;
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
similarity index 94%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
index f51ba8ce3..b7e19f11b 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSendRequest.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSendRequest.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import java.util.Collection;
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
similarity index 90%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
index c343eefab..bd8b5df38 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailSentEvent.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailSentEvent.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import org.springframework.context.ApplicationEvent;
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
similarity index 91%
rename from mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java
rename to mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
index 5e50c48a4..6532bf123 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/MailService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/email/MailService.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
similarity index 95%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
index 10575282a..b0a1eb2e1 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/EMailServiceTest.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
@@ -1,4 +1,4 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
@@ -18,6 +18,11 @@ import org.springframework.mail.MailSendException;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
+import de.itvsh.ozg.mail.email.EMailService;
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSentEvent;
+
class EMailServiceTest {
@Spy // NOSONAR
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
similarity index 63%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
index 57c43869a..4d92e0b5e 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendErrorEventTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendErrorEventTestFactory.java
@@ -1,4 +1,7 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
+
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
public class MailSendErrorEventTestFactory {
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
similarity index 87%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
index f8cadd668..d68abf06c 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSendRequestTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSendRequestTestFactory.java
@@ -1,10 +1,11 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
import java.util.UUID;
import javax.mail.util.ByteArrayDataSource;
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
class MailSendRequestTestFactory {
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
similarity index 72%
rename from mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java
rename to mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
index 68acc0d73..6cc2bea6a 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/MailSentEventTestFactory.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/MailSentEventTestFactory.java
@@ -1,4 +1,6 @@
-package de.itvsh.ozg.mail;
+package de.itvsh.ozg.mail.email;
+
+import de.itvsh.ozg.mail.email.MailSentEvent;
public class MailSentEventTestFactory {
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
index 5e5cbd3d5..364bd2251 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListener.java
@@ -6,9 +6,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
-import de.itvsh.ozg.mail.MailSendErrorEvent;
-import de.itvsh.ozg.mail.MailSendRequest;
-import de.itvsh.ozg.mail.MailSentEvent;
+import de.itvsh.ozg.mail.email.MailSendErrorEvent;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailSentEvent;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
import de.itvsh.ozg.pluto.command.Order;
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
index d584997d6..89511aec4 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingService.java
@@ -19,9 +19,9 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.stereotype.Service;
import org.springframework.util.MimeTypeUtils;
-import de.itvsh.ozg.mail.MailSendRequest;
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest;
+import de.itvsh.ozg.mail.email.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.common.errorhandling.TechnicalException;
import de.itvsh.ozg.pluto.vorgang.Vorgang;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
index df58d774d..c4d788518 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardVorgangITCase.java
@@ -14,8 +14,8 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.data.mongodb.core.MongoOperations;
-import de.itvsh.ozg.mail.MailSendErrorEventTestFactory;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailSendErrorEventTestFactory;
+import de.itvsh.ozg.mail.email.MailService;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandStatus;
import de.itvsh.ozg.pluto.command.GrpcCreateCommandRequestTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
index bde113a90..c5c596f15 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerITCase.java
@@ -13,7 +13,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.mail.javamail.JavaMailSender;
-import de.itvsh.ozg.mail.MailSentEventTestFactory;
+import de.itvsh.ozg.mail.email.MailSentEventTestFactory;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandCreatedEventTestFactory;
import de.itvsh.ozg.pluto.command.CommandTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
index 4695037bc..3126553a1 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingEventListenerTest.java
@@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.ozg.mail.MailSentEventTestFactory;
+import de.itvsh.ozg.mail.email.MailSentEventTestFactory;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandCreatedEventTestFactory;
import de.itvsh.ozg.pluto.command.CommandTestFactory;
diff --git a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
index c0879a870..bdf1a0c7c 100644
--- a/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
+++ b/pluto-server/src/test/java/de/itvsh/ozg/pluto/vorgang/redirect/ForwardingServiceTest.java
@@ -18,8 +18,8 @@ import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.ozg.mail.MailSendRequest.MailAttachment;
-import de.itvsh.ozg.mail.MailService;
+import de.itvsh.ozg.mail.email.MailService;
+import de.itvsh.ozg.mail.email.MailSendRequest.MailAttachment;
import de.itvsh.ozg.pluto.command.Command;
import de.itvsh.ozg.pluto.command.CommandTestFactory;
import de.itvsh.ozg.pluto.vorgang.AntragstellerTestFactory;
--
GitLab