Overide the AMQP Basic Properties (#262)

* Overide the AMQP Basic Properties

Co-authored-by: Vishnu <vishnu.alapati@ericsson.com>
Co-authored-by: Magnus Bäck <magnus@noun.se>

Author: 3 people

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.28
+- Made changes to override AMQP Basic properties.
+
 ## 2.0.27
 - Degraded the spring-boot-maven-plugin version to 2.7.5
 - Updated the eiffel-remrem-parent version to 2.0.9

pom.xml

@@ -9,7 +9,7 @@
         <version>2.0.9</version>
     </parent>
     <properties>
-        <eiffel-remrem-publish.version>2.0.27</eiffel-remrem-publish.version>
+        <eiffel-remrem-publish.version>2.0.28</eiffel-remrem-publish.version>
         <eiffel-remrem-semantics.version>2.2.4</eiffel-remrem-semantics.version>
     </properties>
     <artifactId>eiffel-remrem-publish</artifactId>

publish-common/src/main/java/com/ericsson/eiffel/remrem/publish/helper/RabbitMqProperties.java

@@ -59,6 +59,9 @@ public class RabbitMqProperties {
     private Long waitForConfirmsTimeOut;
     public static final Long DEFAULT_WAIT_FOR_CONFIRMS_TIMEOUT = 5000L;
     public static final Integer DEFAULT_CHANNEL_COUNT = 1;
+    public static final String CONTENT_TYPE = "application/json";
+    public static final String ENCODING_TYPE = "UTF-8";
+    public static final BasicProperties PERSISTENT_BASIC_APPLICATION_JSON;
 
     private Connection rabbitConnection;
     private String protocol;
@@ -67,6 +70,13 @@ public class RabbitMqProperties {
 
     Logger log = (Logger) LoggerFactory.getLogger(RMQHelper.class);
 
+    static {
+        PERSISTENT_BASIC_APPLICATION_JSON =
+                MessageProperties.PERSISTENT_BASIC.builder()
+                        .contentType(CONTENT_TYPE)
+                        .contentEncoding(ENCODING_TYPE)
+                        .build();
+    }
 
     public Long getWaitForConfirmsTimeOut() {
         return waitForConfirmsTimeOut;
@@ -491,9 +501,9 @@ public void shutdownCompleted(ShutdownSignalException cause) {
                     }
                 }
             });
-            BasicProperties msgProps = MessageProperties.BASIC;
-            if (usePersitance)
-                msgProps = MessageProperties.PERSISTENT_BASIC;
+            BasicProperties msgProps = usePersitance ? PERSISTENT_BASIC_APPLICATION_JSON
+                    : MessageProperties.BASIC;
+
         try {
             channel.basicPublish(exchangeName, routingKey, msgProps, msg.getBytes());
             log.info("Published message with size {} bytes on exchange '{}' with routing key '{}'",