From 4deb002eb60dac7e8e215b2d854567573b9cf3a4 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@knecon.com>
Date: Wed, 14 Jun 2023 10:21:17 +0300
Subject: [PATCH] RED-6686 Service communication issues

---
 pom.xml                                                    | 2 +-
 .../messaging/MessagingConfiguration.java                  | 7 ++++++-
 src/main/resources/application.yaml                        | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0d9a6e..0795564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
         <commons-validator.version>1.7</commons-validator.version>
         <guava.version>31.1-jre</guava.version>
         <swagger-commons.version>0.5.0</swagger-commons.version>
-        <keycloak-commons.version>0.5.0</keycloak-commons.version>
+        <keycloak-commons.version>0.9.0</keycloak-commons.version>
     </properties>
     <dependencies>
 
diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/messaging/MessagingConfiguration.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/messaging/MessagingConfiguration.java
index 132ecda..014fea1 100644
--- a/src/main/java/com/knecon/fforesight/tenantusermanagement/messaging/MessagingConfiguration.java
+++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/messaging/MessagingConfiguration.java
@@ -5,9 +5,12 @@ import org.springframework.amqp.rabbit.connection.ConnectionFactory;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.amqp.support.converter.Jackson2JsonMessageConverter;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 @Configuration
 public class MessagingConfiguration {
 
@@ -37,7 +40,9 @@ public class MessagingConfiguration {
     @Bean
     public Jackson2JsonMessageConverter producerJackson2MessageConverter() {
 
-        return new Jackson2JsonMessageConverter();
+        ObjectMapper mapper = new ObjectMapper().findAndRegisterModules();
+
+        return new Jackson2JsonMessageConverter(mapper);
     }
 
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 30e1e7c..e9f5bac 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -82,6 +82,7 @@ spring:
 fforesight:
   keycloak:
     ignored-endpoints: [ '/tenant-user-management','/tenant-user-management/internal/**','/tenant-user-management/docs/**','/tenant-user-management/docs','/tenant-user-management/tenants/simple' ]
+    enabled: true
   springdoc:
     base-path: '/tenant-user-management'
     auth-server-url: ${fforesight.tenant-user-management.server-url}