Make Jasypt configuration optional (#225)

Author: tobiasake

pom.xml

@@ -9,7 +9,7 @@
         <version>2.0.5</version>
     </parent>
     <properties>
-        <eiffel-remrem-publish.version>2.0.21</eiffel-remrem-publish.version>
+        <eiffel-remrem-publish.version>2.0.22</eiffel-remrem-publish.version>
         <eiffel-remrem-shared.version>2.0.5</eiffel-remrem-shared.version>
         <eiffel-remrem-semantics.version>2.0.13</eiffel-remrem-semantics.version>
     </properties>

publish-common/pom.xml

@@ -113,11 +113,17 @@
             <version>2.4.0</version>
             <scope>compile</scope>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> 
+        <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
         <dependency>
-           <groupId>com.fasterxml.jackson.core</groupId>
-           <artifactId>jackson-databind</artifactId>
-           </dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>2.13.0</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>2.13.0</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

publish-common/src/main/java/com/ericsson/eiffel/remrem/publish/config/RabbitMqPropertiesConfig.java

@@ -48,10 +48,10 @@ public class RabbitMqPropertiesConfig {
     @Autowired
     Environment env;
 
-    @Value("${rabbitmq.instances.jsonlist:{null}}")
+    @Value("${rabbitmq.instances.jsonlist:#{null}}")
     private String rabbitmqInstancesJsonListContent;
 
-    @Value("${jasypt.encryptor.jasyptKeyFilePath:{null}}")
+    @Value("${jasypt.encryptor.jasyptKeyFilePath:#{null}}")
     private String jasyptKeyFilePath;
 
     private Map<String, RabbitMqProperties> rabbitMqPropertiesMap = new HashMap<String, RabbitMqProperties>();
@@ -80,8 +80,12 @@ public Map<String, RabbitMqProperties> getRabbitMqProperties() {
      */
     private void readSpringProperties() {
         JsonNode rabbitmqInstancesJsonListJsonArray = null;
+        String jasyptKey = null;
         final ObjectMapper objMapper = new ObjectMapper();
-        final String jasyptKey = readJasyptKeyFile(jasyptKeyFilePath);
+        if (jasyptKeyFilePath != null && !jasyptKeyFilePath.equals("\"\"") && !jasyptKeyFilePath.equals("''")) {
+            log.info("Initiating Jasypt Key File");
+            jasyptKey = readJasyptKeyFile(jasyptKeyFilePath);
+        }
 
         try {
             rabbitmqInstancesJsonListJsonArray = objMapper.readTree(rabbitmqInstancesJsonListContent);
@@ -101,8 +105,11 @@ private void readSpringProperties() {
                 String rabbitMqPassword = rabbitmqInstanceObject.get("password").asText();
                 if (rabbitMqPassword.startsWith("{ENC(") && rabbitMqPassword.endsWith("}")) {
                     rabbitMqPassword = rabbitMqPassword.substring(1, rabbitMqPassword.length() - 1);
+                    rabbitMqProperties.setPassword(DecryptionUtils.decryptString(rabbitMqPassword, jasyptKey));
+                }
+                else{
+                    rabbitMqProperties.setPassword(rabbitMqPassword);
                 }
-                rabbitMqProperties.setPassword(DecryptionUtils.decryptString(rabbitMqPassword, jasyptKey));
                 rabbitMqProperties.setTlsVer(rabbitmqInstanceObject.get("tls").asText());
                 rabbitMqProperties.setExchangeName(rabbitmqInstanceObject.get("exchangeName").asText());
                 rabbitMqProperties.setCreateExchangeIfNotExisting(rabbitmqInstanceObject.get("createExchangeIfNotExisting").asBoolean());