Review comments

aerius · Jan 9, 2025 · f1f41fc · f1f41fc
1 parent 60487e2
commit f1f41fc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/source/Dockerfile b/source/Dockerfile
@@ -1,5 +1,5 @@
 # Builder part for maven packaging.
-FROM maven:3-openjdk-11 as builder
+FROM maven:3-openjdk-17 as builder
 
 WORKDIR /app
 
@@ -13,7 +13,7 @@ RUN mv -v "$(ls taskmanager/target/taskmanager-*.jar | grep -v -e '-javadoc' -e
     && mvn clean
 
 # Final image containing only the application
-FROM openjdk:11-jre-buster
+FROM eclipse-temurin:17
 
 # Set up a non root account to run containers as
 RUN groupadd -r taskmanager \

diff --git a/source/pom.xml b/source/pom.xml
@@ -52,8 +52,6 @@
   </scm>
 
   <properties>
-    <java.version>11</java.version>
-
     <spotless.version>2.28.0</spotless.version>
     <dropwizard.metrics.version>4.2.13</dropwizard.metrics.version>
     <slf4j.version>2.0.5</slf4j.version>

diff --git a/source/taskmanager-client/pom.xml b/source/taskmanager-client/pom.xml
@@ -30,6 +30,10 @@
   <name>Taskmanager :: Client Library</name>
   <description>The Library for Taskmanager Client code</description>
 
+  <properties>
+    <java.version>11</java.version>
+  </properties>
+
   <dependencies>
     <!-- RabbitMQ -->
     <dependency>

diff --git a/source/taskmanager/pom.xml b/source/taskmanager/pom.xml
@@ -30,10 +30,6 @@
   <name>Taskmanager :: Application</name>
   <description>AERIUS Taskmanager actual manager/scheduler (standalone)</description>
 
-  <properties>
-    <java.version>17</java.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>nl.aerius</groupId>

diff --git a/source/taskmanager/src/main/java/nl/aerius/taskmanager/mq/RabbitMQQueueUtil.java b/source/taskmanager/src/main/java/nl/aerius/taskmanager/mq/RabbitMQQueueUtil.java
@@ -47,7 +47,7 @@ public static Map<String, Object> queueDeclareArguments(final boolean durable, f
     if (queueType == null) {
       return Map.of();
     }
-    final RabbitMQQueueType actualType =  durable && PERSISTENT_QUEUE_TYPES.contains(queueType) ? RabbitMQQueueType.CLASSIC : queueType;
+    final RabbitMQQueueType actualType =  !durable && PERSISTENT_QUEUE_TYPES.contains(queueType) ? RabbitMQQueueType.CLASSIC : queueType;
 
     return Map.of(ARG_QUEUE_TYPE, actualType.type());
   }

diff --git a/source/taskmanager/src/test/java/nl/aerius/taskmanager/mq/RabbitMQQueueUtilTest.java b/source/taskmanager/src/test/java/nl/aerius/taskmanager/mq/RabbitMQQueueUtilTest.java
@@ -49,12 +49,13 @@ void testQueueDeclareArguments(final boolean durable, final RabbitMQQueueType in
   private static List<Arguments> combinations() {
     return List.of(
         Arguments.of(false, RabbitMQQueueType.CLASSIC, RabbitMQQueueType.CLASSIC),
-        Arguments.of(false, RabbitMQQueueType.QUORUM, RabbitMQQueueType.QUORUM),
-        Arguments.of(false, RabbitMQQueueType.STREAM, RabbitMQQueueType.STREAM),
+        // when durable is false always return classic because only queue type compatible with non-durable
+        Arguments.of(false, RabbitMQQueueType.QUORUM, RabbitMQQueueType.CLASSIC),
+        Arguments.of(false, RabbitMQQueueType.STREAM, RabbitMQQueueType.CLASSIC),
+
         Arguments.of(true, RabbitMQQueueType.CLASSIC, RabbitMQQueueType.CLASSIC),
-        // when durable is true always return classic because only queue type compatible with classic
-        Arguments.of(true, RabbitMQQueueType.QUORUM, RabbitMQQueueType.CLASSIC),
-        Arguments.of(true, RabbitMQQueueType.STREAM, RabbitMQQueueType.CLASSIC)
+        Arguments.of(true, RabbitMQQueueType.QUORUM, RabbitMQQueueType.QUORUM),
+        Arguments.of(true, RabbitMQQueueType.STREAM, RabbitMQQueueType.STREAM)
         );
   }
 }