From 0c7b99b8238892fef921b9b9f4c4c703ce950140 Mon Sep 17 00:00:00 2001
From: deiflaender <dominique.eiflaender@iqser.com>
Date: Wed, 16 Mar 2022 12:01:41 +0100
Subject: [PATCH] RED-3611: Fixed parameter type of priorityMode

---
 .../iqser/red/service/redaction/v1/server/Application.java    | 3 ++-
 .../redaction/v1/server/queue/MessagingConfiguration.java     | 4 ++++
 .../v1/server/settings/RedactionServiceSettings.java          | 2 --
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java
index 58e2d815..7eab3ef3 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/Application.java
@@ -2,6 +2,7 @@ package com.iqser.red.service.redaction.v1.server;
 
 import com.iqser.red.commons.spring.DefaultWebMvcConfiguration;
 import com.iqser.red.service.redaction.v1.server.client.RulesClient;
+import com.iqser.red.service.redaction.v1.server.queue.MessagingConfiguration;
 import com.iqser.red.service.redaction.v1.server.settings.RedactionServiceSettings;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration;
@@ -11,7 +12,7 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Import;
 
-@Import({DefaultWebMvcConfiguration.class})
+@Import({DefaultWebMvcConfiguration.class, MessagingConfiguration.class})
 @EnableFeignClients(basePackageClasses = RulesClient.class)
 @EnableConfigurationProperties(RedactionServiceSettings.class)
 @SpringBootApplication(exclude = {SecurityAutoConfiguration.class, ManagementWebSecurityAutoConfiguration.class})
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/MessagingConfiguration.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/MessagingConfiguration.java
index c92ebfeb..93cb9726 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/MessagingConfiguration.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/queue/MessagingConfiguration.java
@@ -1,6 +1,7 @@
 package com.iqser.red.service.redaction.v1.server.queue;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.amqp.core.Queue;
 import org.springframework.amqp.core.QueueBuilder;
@@ -8,6 +9,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+@Slf4j
 @Configuration
 @RequiredArgsConstructor
 public class MessagingConfiguration {
@@ -20,6 +22,7 @@ public class MessagingConfiguration {
     @Bean
     @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "false")
     public MessageReceiver messageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+        log.info("Started in normal mode");
         return new MessageReceiver(redactionMessageReceiver);
     }
 
@@ -27,6 +30,7 @@ public class MessagingConfiguration {
     @Bean
     @ConditionalOnProperty(prefix = "redaction-service", name = "priorityMode", havingValue = "true")
     public PriorityMessageReceiver priorityMessageReceiver(RedactionMessageReceiver redactionMessageReceiver){
+        log.info("Started in priority mode");
         return new PriorityMessageReceiver(redactionMessageReceiver);
     }
 
diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/settings/RedactionServiceSettings.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/settings/RedactionServiceSettings.java
index 07e59d54..fd37e29c 100644
--- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/settings/RedactionServiceSettings.java
+++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/settings/RedactionServiceSettings.java
@@ -20,6 +20,4 @@ public class RedactionServiceSettings {
 
     private boolean nerServiceEnabled = true;
 
-    private boolean priorityMode;
-
 }