#768: initial changes for email-integration migration

it-at-m · Nov 9, 2023 · 33fe8ed · 33fe8ed
1 parent 97f3944
commit 33fe8ed
Show file tree

Hide file tree

Showing 15 changed files with 51 additions and 39 deletions.
diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-core/pom.xml
@@ -52,10 +52,6 @@
             <artifactId>jai-imageio-jpeg2000</artifactId>
             <version>${jai-imageio-jpeg2000.version}</version>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-        </dependency>
 
         <!-- testing -->
         <dependency>
@@ -74,11 +70,6 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-junit-jupiter</artifactId>

diff --git a/...e/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessor.java b/...e/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessor.java
@@ -11,7 +11,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.messaging.Message;
 
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
 import java.util.function.Consumer;
 
 import static de.muenchen.oss.digiwf.message.common.MessageConstants.DIGIWF_MESSAGE_NAME;

diff --git a/...on-core/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/out/S3Adapter.java b/...on-core/src/main/java/de/muenchen/oss/digiwf/email/integration/adapter/out/S3Adapter.java
@@ -13,7 +13,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tika.Tika;
 
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
 
 @Slf4j
 @RequiredArgsConstructor

diff --git a/.../src/main/java/de/muenchen/oss/digiwf/email/integration/application/port/in/SendMail.java b/.../src/main/java/de/muenchen/oss/digiwf/email/integration/application/port/in/SendMail.java
@@ -2,7 +2,7 @@
 
 import de.muenchen.oss.digiwf.email.integration.model.Mail;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 public interface SendMail {
 

diff --git a/...in/java/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCase.java b/...in/java/de/muenchen/oss/digiwf/email/integration/application/usecase/SendMailUseCase.java
@@ -16,11 +16,11 @@
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.validation.annotation.Validated;
 
-import javax.mail.Message;
-import javax.mail.MessagingException;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
-import javax.validation.Valid;
+import jakarta.mail.Message;
+import jakarta.mail.MessagingException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.mail.internet.MimeMessage;
+import jakarta.validation.Valid;
 import java.util.HashMap;
 import java.util.Map;
 

diff --git a/...ion-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/FileAttachment.java b/...ion-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/FileAttachment.java
@@ -4,7 +4,7 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import javax.mail.util.ByteArrayDataSource;
+import jakarta.mail.util.ByteArrayDataSource;
 
 @Data
 @RequiredArgsConstructor

diff --git a/...l-integration-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/Mail.java b/...l-integration-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/Mail.java
@@ -4,8 +4,8 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

diff --git a/...ation-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/PresignedUrl.java b/...ation-core/src/main/java/de/muenchen/oss/digiwf/email/integration/model/PresignedUrl.java
@@ -4,8 +4,8 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * Attachment File you want to get from the S3 storage.

diff --git a/...c/test/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessorTest.java b/...c/test/java/de/muenchen/oss/digiwf/email/integration/adapter/in/MessageProcessorTest.java
@@ -14,7 +14,7 @@
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
 
-import javax.validation.ValidationException;
+import jakarta.validation.ValidationException;
 import java.util.Map;
 
 import static de.muenchen.oss.digiwf.message.common.MessageConstants.DIGIWF_MESSAGE_NAME;

diff --git a/...ntegration-example/src/main/java/de/muenchen/oss/digiwf/email/integration/model/Mail.java b/...ntegration-example/src/main/java/de/muenchen/oss/digiwf/email/integration/model/Mail.java
@@ -4,8 +4,8 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotBlank;
 import java.util.List;
 
 /**

diff --git a/...on-example/src/main/java/de/muenchen/oss/digiwf/email/integration/model/PresignedUrl.java b/...on-example/src/main/java/de/muenchen/oss/digiwf/email/integration/model/PresignedUrl.java
@@ -4,8 +4,8 @@
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 
 /**
  * Attachment File you want to get from the S3 storage.

diff --git a/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml b/digiwf-integrations/digiwf-email-integration/digiwf-email-integration-service/pom.xml
@@ -23,16 +23,6 @@
             <artifactId>digiwf-email-integration-starter</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <!-- Logging -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sleuth</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>net.logstash.logback</groupId>
-            <artifactId>logstash-logback-encoder</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...ain/java/de/muenchen/oss/digiwf/email/integration/configuration/CustomMailProperties.java b/...ain/java/de/muenchen/oss/digiwf/email/integration/configuration/CustomMailProperties.java
@@ -3,7 +3,7 @@
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 
 @Data
 @ConfigurationProperties(prefix = "io.muenchendigital.digiwf.mail")

diff --git a/...in/java/de/muenchen/oss/digiwf/email/integration/configuration/MailAutoConfiguration.java b/...in/java/de/muenchen/oss/digiwf/email/integration/configuration/MailAutoConfiguration.java
@@ -23,7 +23,7 @@
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.messaging.Message;
 
-import javax.mail.MessagingException;
+import jakarta.mail.MessagingException;
 import java.util.Properties;
 import java.util.function.Consumer;
 

diff --git a/digiwf-integrations/digiwf-email-integration/pom.xml b/digiwf-integrations/digiwf-email-integration/pom.xml
@@ -18,6 +18,10 @@
     </parent>
 
     <properties>
+        <!--todo: remove after the successfully spring boot version upgrade of all migrations-->
+        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring.cloud.version>2022.0.4</spring.cloud.version>
+
         <digiwf.s3.integration.client.version>${project.version}</digiwf.s3.integration.client.version>
         <!-- tika parsers -->
         <jbig2-imageio.version>3.0.4</jbig2-imageio.version>
@@ -31,4 +35,31 @@
         <module>digiwf-email-integration-service</module>
     </modules>
 
+    <dependencies>
+        <!--        TODO could be removed after migrate all migrations to spring 3-->
+        <dependency>
+            <groupId>de.muenchen.oss.digiwf</groupId>
+            <artifactId>digiwf-message-starter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <!-- Logging -->
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-tracing-bridge-brave</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>io.micrometer</groupId>
+            <artifactId>micrometer-registry-prometheus</artifactId>
+        </dependency>
+    </dependencies>
+
 </project>