package org.onap.music.main;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Properties;
import org.onap.music.eelf.logging.EELFLoggerDelegate;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.stereotype.Component;
-@PropertySource(value = {"file:/opt/app/music/etc/music.properties", "classpath:/project.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 {
- @Value("${zookeeper.host}")
- private String zookeeperHost;
-
@Value("${cassandra.host}")
public String cassandraHost;
-
+/*
@Value("${music.ip}")
public String musicIp;
-
+*/
@Value("${debug}")
public String debug;
@Value("${version}")
public String version;
-
- @Value("${music.rest.ip}")
- public String musicRestIp;
+
+ @Value("${build}")
+ public String build;
@Value("${music.properties}")
public String musicProperties;
@Value("${lock.lease.period}")
public String lockLeasePeriod;
- @Value("${public.ip}")
- public String publicIp;
-
- @Value("${my.id}")
- public String myId;
-
- @Value("${all.ids}")
- public String allIds;
-
- @Value("${all.public.ips}")
- public String allPublicIps;
-
@Value("${cassandra.user}")
public String cassandraUser;
@Value("${cassandra.password}")
public String cassandraPassword;
- @Value("${aaf.endpoint.url}")
- public String aafEndpointUrl;
-
- @Value("${admin.username}")
- public String adminUsername;
-
- @Value("${admin.password}")
- public String adminPassword;
-
@Value("${cassandra.port}")
public String cassandraPort;
- @Value("${aaf.admin.url}")
- public String aafAdminUrl;
-
- @Value("${music.namespace}")
- public String musicNamespace;
+ @Value("${cadi}")
+ public String isCadi;
- @Value("${admin.aaf.role}")
- public String adminAafRole;
+ @Value("${keyspace.active}")
+ public String isKeyspaceActive;
+
+ @Value("${retry.count}")
+ public String rertryCount;
- @Value("${notify.interval}")
- public String notifyInterval;
+ @Value("${transId.header.prefix}")
+ private String transIdPrefix;
+
+ @Value("${conversation.header.prefix}")
+ private String conversationIdPrefix;
+
+ @Value("${clientId.header.prefix}")
+ private String clientIdPrefix;
+
+ @Value("${messageId.header.prefix}")
+ private String messageIdPrefix;
- @Value("${notify.timeout}")
- public String notifyTimeout;
+ @Value("${transId.header.required}")
+ private Boolean transIdRequired;
- @Value("${cadi}")
- public String isCadi;
+ @Value("${conversation.header.required}")
+ private Boolean conversationIdRequired;
+
+ @Value("${clientId.header.required}")
+ private Boolean clientIdRequired;
+
+ @Value("${messageId.header.required}")
+ private Boolean messageIdRequired;
+
+ @Value("${music.aaf.ns}")
+ private String musicAafNs;
+
+ @Value("${cipher.enc.key}")
+ private String cipherEncKey;
private static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(PropertiesLoader.class);
return pspc;
}
- public void loadProperties () {
- if(aafAdminUrl != null && !aafAdminUrl.equals("${aaf.admin.url}"))
- MusicUtil.setAafAdminUrl(aafAdminUrl);
- if(aafEndpointUrl != null && !aafEndpointUrl.equals("${aaf.endpoint.url}"))
- MusicUtil.setAafEndpointUrl(aafEndpointUrl);
- if(adminAafRole != null && !adminAafRole.equals("${admin.aaf.role}"))
- MusicUtil.setAdminAafRole(adminAafRole);
- //MusicUtil.setAdminId(adminId);
- if(adminPassword != null && !adminPassword.equals("${admin.password}"))
- MusicUtil.setAdminPass(adminPassword);
- if(adminUsername != null && !adminUsername.equals("${admin.username}"))
- MusicUtil.setAdminId(adminUsername);
- if(allIds != null && !allIds.equals("${all.ids}")) {
- String[] ids = allIds.split(":");
- MusicUtil.setAllIds(new ArrayList<String>(Arrays.asList(ids)));
- }
- if(allPublicIps != null && !allPublicIps.equals("${all.public.ips}")) {
- String[] ips = allPublicIps.split(":");
- if (ips.length == 1) {
- // Future use
- } else if (ips.length > 1) {
- MusicUtil.setAllPublicIps(
- new ArrayList<String>(Arrays.asList(ips)));
- }
- }
- if(cassandraPort != null && !cassandraPort.equals("${cassandra.port}"))
+ /**
+ * .
+ */
+ public void loadProperties() {
+ if(cipherEncKey != null) {
+ MusicUtil.setCipherEncKey(cipherEncKey);
+ }
+ if (musicAafNs != null) {
+ MusicUtil.setMusicAafNs(musicAafNs);
+ }
+ if (cassandraPort != null && !cassandraPort.equals("${cassandra.port}")) {
MusicUtil.setCassandraPort(Integer.parseInt(cassandraPort));
- if(cassandraUser != null && !cassandraUser.equals("${cassandra.user}"))
+ }
+ if (cassandraUser != null && !cassandraUser.equals("${cassandra.user}")) {
MusicUtil.setCassName(cassandraUser);
- if(cassandraPassword != null && !cassandraPassword.equals("${cassandra.password}"))
+ }
+ if (cassandraPassword != null && !cassandraPassword.equals("${cassandra.password}")) {
MusicUtil.setCassPwd(cassandraPassword);
- if(debug != null && !debug.equals("${debug}"))
+ }
+ if (debug != null && !debug.equals("${debug}")) {
MusicUtil.setDebug(Boolean.parseBoolean(debug));
- if(lockLeasePeriod != null && !lockLeasePeriod.equals("${lock.lease.period}"))
+ }
+ if (lockLeasePeriod != null && !lockLeasePeriod.equals("${lock.lease.period}")) {
MusicUtil.setDefaultLockLeasePeriod(Long.parseLong(lockLeasePeriod));
- if(musicIp != null && !musicIp.equals("${music.ip}"))
- MusicUtil.setDefaultMusicIp(musicIp);
- if(musicNamespace != null && !musicNamespace.equals("${music.namespace}"))
- MusicUtil.setMusicNamespace(musicNamespace);
- if(musicProperties != null && !musicProperties.equals("${music.properties}"))
+ }
+ if (musicProperties != null && !musicProperties.equals("${music.properties}")) {
MusicUtil.setMusicPropertiesFilePath(musicProperties);
- if(musicRestIp != null && !musicRestIp.equals("${music.rest.ip}"))
- MusicUtil.setMusicRestIp(musicRestIp);
- if(cassandraHost != null && !cassandraHost.equals("${cassandra.host}"))
+ }
+ if (cassandraHost != null && !cassandraHost.equals("${cassandra.host}")) {
MusicUtil.setMyCassaHost(cassandraHost);
- logger.info("#### Cassandra Host: " + MusicUtil.getMyCassaHost());
- if(myId != null && !myId.equals("${my.id}"))
- MusicUtil.setMyId(Integer.parseInt(myId));
- if(zookeeperHost != null && !zookeeperHost.equals("${zookeeper.host}"))
- MusicUtil.setMyZkHost(zookeeperHost);
- if(notifyInterval != null && !notifyInterval.equals("${notify.interval}"))
- MusicUtil.setNotifyInterval(Integer.parseInt(notifyInterval));
- if(notifyTimeout != null && !notifyTimeout.equals("${notify.timeout}"))
- MusicUtil.setNotifyTimeOut(Integer.parseInt(notifyTimeout));
- if(allPublicIps != null && !allPublicIps.equals("${public.ip}"))
- MusicUtil.setPublicIp(allPublicIps);
- if(version != null && !version.equals("${version}"))
+ }
+ if (version != null && !version.equals("${version}")) {
MusicUtil.setVersion(version);
- if(isCadi != null && !isCadi.equals("${cadi}"))
+ }
+ if (build != null && !version.equals("${build}")) {
+ MusicUtil.setBuild(build);
+ }
+ if (isCadi != null && !isCadi.equals("${cadi}")) {
MusicUtil.setIsCadi(Boolean.parseBoolean(isCadi));
+ }
+ if (rertryCount != null && !rertryCount.equals("${retry.count}")) {
+ MusicUtil.setRetryCount(Integer.parseInt(rertryCount));
+ }
+ if (isKeyspaceActive != null && !isKeyspaceActive.equals("${keyspace.active}")) {
+ MusicUtil.setKeyspaceActive(Boolean.parseBoolean(isKeyspaceActive));
+ }
+ if(transIdPrefix!=null) {
+ MusicUtil.setTransIdPrefix(transIdPrefix);
+ }
+
+ if(conversationIdPrefix!=null) {
+ MusicUtil.setConversationIdPrefix(conversationIdPrefix);
+ }
+
+ if(clientIdPrefix!=null) {
+ MusicUtil.setClientIdPrefix(clientIdPrefix);
+ }
+
+ if(messageIdPrefix!=null) {
+ MusicUtil.setMessageIdPrefix(messageIdPrefix);
+ }
+
+ if(transIdRequired!=null) {
+ MusicUtil.setTransIdRequired(transIdRequired);
+ }
+
+ if(conversationIdRequired!=null) {
+ MusicUtil.setConversationIdRequired(conversationIdRequired);
+ }
+
+ if(clientIdRequired!=null) {
+ MusicUtil.setClientIdRequired(clientIdRequired);
+ }
+
+ if(messageIdRequired!=null) {
+ MusicUtil.setMessageIdRequired(messageIdRequired);
+ }
+ }
+
+ public static void loadProperties(Properties properties) {
+ if (properties.getProperty("cassandra.host")!=null) {
+ MusicUtil.setMyCassaHost(properties.getProperty("cassandra.host"));
+ }
+
+ if (properties.getProperty("cassandra.port")!=null) {
+ MusicUtil.setCassandraPort(Integer.parseInt(properties.getProperty("cassandra.port")));
+ }
+
+ if (properties.getProperty("cassandra.user")!=null) {
+ MusicUtil.setCassName(properties.getProperty("cassandra.user"));
+ }
+
+ if (properties.getProperty("cassandra.password")!=null) {
+ MusicUtil.setCassPwd(properties.getProperty("cassandra.password"));
+ }
+
+ if (properties.getProperty("music.properties")!=null) {
+ MusicUtil.setMusicPropertiesFilePath(properties.getProperty("music.properties"));
+ }
+
+ if (properties.getProperty("debug")!=null) {
+ MusicUtil.setDebug(Boolean.parseBoolean(properties.getProperty("debug")));
+ }
+
+ if (properties.getProperty("version")!=null) {
+ MusicUtil.setVersion(properties.getProperty("version"));
+ }
+
+ if (properties.getProperty("build")!=null) {
+ MusicUtil.setBuild(properties.getProperty("build"));
+ }
+
+ if (properties.getProperty("lock.lease.period")!=null) {
+ MusicUtil.setDefaultLockLeasePeriod(Long.parseLong(properties.getProperty("lock.lease.period")));
+ }
+
+ if (properties.getProperty("cadi")!=null) {
+ MusicUtil.setIsCadi(Boolean.parseBoolean(properties.getProperty("cadi")));
+ }
+
+ if (properties.getProperty("keyspace.active")!=null) {
+ MusicUtil.setKeyspaceActive(Boolean.parseBoolean(properties.getProperty("keyspace.active")));
+ }
+
+ if (properties.getProperty("retry.count")!=null) {
+ MusicUtil.setRetryCount(Integer.parseInt(properties.getProperty("retry.count")));
+ }
+
+ if (properties.getProperty("transId.header.prefix")!=null) {
+ MusicUtil.setTransIdPrefix(properties.getProperty("transId.header.prefix"));
+ }
+
+ if (properties.getProperty("conversation.header.prefix")!=null) {
+ MusicUtil.setConversationIdPrefix(properties.getProperty("conversation.header.prefix"));
+ }
+
+ if (properties.getProperty("clientId.header.prefix")!=null) {
+ MusicUtil.setClientIdPrefix(properties.getProperty("clientId.header.prefix"));
+ }
+
+ if (properties.getProperty("messageId.header.prefix")!=null) {
+ MusicUtil.setMessageIdPrefix(properties.getProperty("messageId.header.prefix"));
+ }
+
+ if (properties.getProperty("transId.header.required")!=null) {
+ MusicUtil.setTransIdRequired(Boolean.parseBoolean(properties.getProperty("transId.header.required")));
+ }
+
+ if (properties.getProperty("conversation.header.required")!=null) {
+ MusicUtil.setConversationIdRequired(Boolean.parseBoolean(properties.getProperty("conversation.header.required")));
+ }
+
+ if (properties.getProperty("clientId.header.required")!=null) {
+ MusicUtil.setClientIdRequired(Boolean.parseBoolean(properties.getProperty("clientId.header.required")));
+ }
+
+ if (properties.getProperty("messageId.header.required")!=null) {
+ MusicUtil.setMessageIdRequired(Boolean.parseBoolean(properties.getProperty("messageId.header.required")));
+ }
+
+ if (properties.getProperty("music.aaf.ns")!=null) {
+ MusicUtil.setMusicAafNs(properties.getProperty("music.aaf.ns"));
+ }
+
+ if (properties.getProperty("cipher.enc.key")!=null) {
+ MusicUtil.setCipherEncKey(properties.getProperty("cipher.enc.key"));
+ }
+
}
-
@Override
public void afterPropertiesSet() throws Exception {
// TODO Auto-generated method stub
}
-
+
}
Code Review / music.git / blobdiff