X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=music-rest%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fmusic%2Fmain%2FPropertiesLoader.java;h=11dc51dd3e8620f1c75ff3ad8682a5f266298cb8;hb=0c173cdf44af313e376f1e8ae4fd6e6973c6c20b;hp=3017b6d3e3c0ec250b9bc541d546ae768afe07cd;hpb=4019754f9d0df4d9cc5a9338b1e6888d110710fd;p=music.git diff --git a/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java b/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java index 3017b6d3..11dc51dd 100644 --- a/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java +++ b/music-rest/src/main/java/org/onap/music/main/PropertiesLoader.java @@ -33,7 +33,8 @@ import org.springframework.context.annotation.PropertySource; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.stereotype.Component; -@PropertySource(value = {"file:/opt/app/music/etc/music.properties", "classpath:/project.properties","file:/opt/app/music/etc/key.properties"}) +@PropertySource(value = {"file:/opt/app/music/etc/music.properties", "classpath:/project.properties"}) +//"file:/opt/app/music/etc/key.properties" @Component public class PropertiesLoader implements InitializingBean { @@ -118,7 +119,7 @@ public class PropertiesLoader implements InitializingBean { @Value("${music.aaf.ns}") private String musicAafNs; - @Value("${cipher.enc.key}") + @Value("${cipher.enc.key:}") private String cipherEncKey; @SuppressWarnings("unused")