From 53223bf4ad918ea6d2ae096e893a2814e5fcd58c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 12 Oct 2023 12:56:51 +0200
Subject: [PATCH] OZG-3931 fix formatting
---
.../java/de/itvsh/ozg/mail/postfach/PostfachService.java | 3 ++-
.../postfach/bayernid/BayernIdPostfachRemoteService.java | 5 +++--
.../ozg/mail/postfach/bayernid/BayernIdProperties.java | 3 ++-
.../ozg/mail/postfach/osi/OsiPostfachRemoteService.java | 3 ++-
.../java/de/itvsh/ozg/mail/email/EMailServiceTest.java | 7 ++++---
5 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
index 491d56927..11ab95054 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/PostfachService.java
@@ -29,6 +29,8 @@ import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
+import jakarta.validation.Valid;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
@@ -39,7 +41,6 @@ import de.itvsh.ozg.mail.attributes.ClientAttributeService;
import de.itvsh.ozg.mail.postfach.PostfachNachricht.Direction;
import de.itvsh.ozg.mail.postfach.osi.OsiPostfachServerProcessException;
import de.itvsh.ozg.pluto.common.callcontext.CurrentUserService;
-import jakarta.validation.Valid;
import lombok.NonNull;
import lombok.extern.log4j.Log4j2;
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
index 5c0378643..4911c8cbf 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdPostfachRemoteService.java
@@ -2,6 +2,9 @@ package de.itvsh.ozg.mail.postfach.bayernid;
import java.util.stream.Stream;
+import jakarta.annotation.PostConstruct;
+import jakarta.xml.bind.JAXBElement;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.oxm.jaxb.Jaxb2Marshaller;
@@ -17,8 +20,6 @@ import de.akdb.egov.bsp.nachrichten.BspQuittung;
import de.itvsh.ozg.mail.postfach.PostfachNachricht;
import de.itvsh.ozg.mail.postfach.PostfachRemoteService;
import de.itvsh.ozg.mail.postfach.PostfachRuntimeException;
-import jakarta.annotation.PostConstruct;
-import jakarta.xml.bind.JAXBElement;
import lombok.extern.log4j.Log4j2;
@Log4j2
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
index b6a6b28ab..c5404ab48 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/bayernid/BayernIdProperties.java
@@ -1,12 +1,13 @@
package de.itvsh.ozg.mail.postfach.bayernid;
+import jakarta.validation.constraints.NotEmpty;
+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
import org.springframework.context.annotation.Configuration;
import org.springframework.validation.annotation.Validated;
-import jakarta.validation.constraints.NotEmpty;
import lombok.Getter;
import lombok.Setter;
diff --git a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
index 9625d099d..098eed562 100644
--- a/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
+++ b/mail-service/src/main/java/de/itvsh/ozg/mail/postfach/osi/OsiPostfachRemoteService.java
@@ -28,6 +28,8 @@ import java.util.Objects;
import java.util.function.Supplier;
import java.util.stream.Stream;
+import jakarta.annotation.PostConstruct;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -44,7 +46,6 @@ import de.itvsh.ozg.mail.postfach.PostfachBadRequestException;
import de.itvsh.ozg.mail.postfach.PostfachNachricht;
import de.itvsh.ozg.mail.postfach.PostfachRemoteService;
import de.itvsh.ozg.mail.postfach.PostfachRuntimeException;
-import jakarta.annotation.PostConstruct;
import lombok.extern.log4j.Log4j2;
@Service
diff --git a/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
index 2912e143e..f5e60b1b2 100644
--- a/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
+++ b/mail-service/src/test/java/de/itvsh/ozg/mail/email/EMailServiceTest.java
@@ -27,6 +27,10 @@ import static de.itvsh.ozg.mail.email.MailSendRequestTestFactory.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
+import jakarta.activation.DataSource;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.MimeMessage;
+
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
@@ -38,9 +42,6 @@ import org.springframework.mail.MailSendException;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
-import jakarta.activation.DataSource;
-import jakarta.mail.MessagingException;
-import jakarta.mail.internet.MimeMessage;
import lombok.SneakyThrows;
class EMailServiceTest {
--
GitLab