Pull Request requested changes adjusted

Gepardec · Jul 26, 2024 · d8ea530 · d8ea530
1 parent 17b3f5f
commit d8ea530
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/Containerfile b/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/openjdk-17:latest
+FROM registry.access.redhat.com/ubi9/openjdk-17:1.20-2.1721231695
 ENV TZ="Europe/Vienna"
 
 USER jboss

diff --git a/pom.xml b/pom.xml
@@ -21,8 +21,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.version>3.8.1</maven.version>
 
-        <commons-lang3.version>3.12.0</commons-lang3.version>
-        <commons-io.version>2.11.0</commons-io.version>
         <guava.version>33.2.1-jre</guava.version>
 
         <quarkus-plugin.version>3.12.1</quarkus-plugin.version>
@@ -223,11 +221,6 @@
             <artifactId>jakarta.mail-api</artifactId>
             <version>${jakarta.mail-api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.eclipse.angus</groupId>
-            <artifactId>angus-mail</artifactId>
-            <version>1.0.0</version>
-        </dependency>
     </dependencies>
     <build>
         <resources>

diff --git a/src/test/java/com/gepardec/mega/notification/mail/NotificationHelperTest.java b/src/test/java/com/gepardec/mega/notification/mail/NotificationHelperTest.java
@@ -24,11 +24,11 @@ class NotificationHelperTest {
     NotificationHelper notificationHelper;
 
     @InjectMock
-            @MockitoConfig (returnsDeepMocks = true)
+    @MockitoConfig (returnsDeepMocks = true)
     private NotificationConfig notificationConfig;
 
     @InjectMock
-            @MockitoConfig (returnsDeepMocks = true)
+    @MockitoConfig (returnsDeepMocks = true)
     private ResourceBundleProducer resourceBundleProducer;
 
     @Test

diff --git a/src/test/java/com/gepardec/mega/notification/mail/receiver/MailReceiverTest.java b/src/test/java/com/gepardec/mega/notification/mail/receiver/MailReceiverTest.java
@@ -1,7 +1,6 @@
 package com.gepardec.mega.notification.mail.receiver;
 
 import com.gepardec.mega.application.configuration.MailReceiverConfig;
-import com.sun.mail.imap.IMAPMessage;
 import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
@@ -50,7 +49,7 @@ void retrieveZepEmailsFromInbox_Successful() throws MessagingException {
         //GIVEN
         try (var mockedStatic = Mockito.mockStatic(Session.class)) {
             var inbox = mock(Folder.class);
-            when(inbox.search(any())).thenReturn(new Message[]{mock(IMAPMessage.class)});
+            when(inbox.search(any())).thenReturn(new Message[]{mock(Message.class)});
 
             var store = mock(Store.class);
             when(store.getFolder(anyString())).thenReturn(inbox);

diff --git a/src/test/java/com/gepardec/mega/notification/mail/receiver/ZepMailToCommentServiceTest.java b/src/test/java/com/gepardec/mega/notification/mail/receiver/ZepMailToCommentServiceTest.java
@@ -12,10 +12,10 @@
 import com.gepardec.mega.service.api.CommentService;
 import com.gepardec.mega.service.api.ProjectService;
 import com.gepardec.mega.service.api.UserService;
-import com.sun.mail.imap.IMAPMessage;
 import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
+import jakarta.mail.Message;
 import jakarta.mail.MessagingException;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -74,7 +74,7 @@ void saveAsComment_BillableProject_Successful() throws MessagingException, IOExc
         );
 
         //WHEN
-        testedObject.saveAsComment(mock(IMAPMessage.class));
+        testedObject.saveAsComment(mock(Message.class));
 
         //THEN
         verify(commentService, times(1)).create(
@@ -106,7 +106,7 @@ void saveAsComment_NotBillableProject_Successful() throws MessagingException, IO
         );
 
         //WHEN
-        testedObject.saveAsComment(mock(IMAPMessage.class));
+        testedObject.saveAsComment(mock(Message.class));
 
         //THEN
         verify(commentService, times(1)).create(
@@ -131,7 +131,7 @@ void saveAsComment_ExceptionInMapper_ErrorLogged() throws MessagingException, IO
 
         //WHEN
         //THEN
-        assertThatCode(() -> testedObject.saveAsComment(mock(IMAPMessage.class)))
+        assertThatCode(() -> testedObject.saveAsComment(mock(Message.class)))
                 .doesNotThrowAnyException();
         verify(logger).error(any());
         verify(commentService, times(0)).create(any(), any(), any(), any(), any(), any(), any());
@@ -148,7 +148,7 @@ void saveAsComment_ExceptionInMapper_EmailSent() throws MessagingException, IOEx
 
         //WHEN
         //THEN
-        assertThatCode(() -> testedObject.saveAsComment(mock(IMAPMessage.class)))
+        assertThatCode(() -> testedObject.saveAsComment(mock(Message.class)))
                 .doesNotThrowAnyException();
         verify(commentService, times(0)).create(any(), any(), any(), any(), any(), any(), any());
         verify(mailSender, times(1)).send(

diff --git a/...ava/com/gepardec/mega/notification/mail/receiver/ZepProjektzeitDetailsMailMapperTest.java b/...ava/com/gepardec/mega/notification/mail/receiver/ZepProjektzeitDetailsMailMapperTest.java
@@ -1,6 +1,5 @@
 package com.gepardec.mega.notification.mail.receiver;
 
-import com.sun.mail.imap.IMAPMessage;
 import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import jakarta.inject.Inject;
@@ -64,7 +63,7 @@ void setup() throws MessagingException, IOException {
         var multipart = mock(Multipart.class);
         when(multipart.getBodyPart(0)).thenReturn(bodyPart);
 
-        givenMessage = mock(IMAPMessage.class);
+        givenMessage = mock(Message.class);
         when(givenMessage.getContent()).thenReturn(multipart);
         when(givenMessage.getSubject()).thenReturn(SUBJECT);
     }