X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fconfiguration%2FApplicationConfig.java;h=f23b5e24882fa5e23aecd8213c6a036dbcc2ebca;hb=dd7e4f6cd1a2273a583f05e0d86810f70272723d;hp=1ed3fdb2b70706ac54c958eaa3e308973ef743e0;hpb=c3ed1a5199e3f5f539cc813b9a383dd156fed2e2;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java index 1ed3fdb2..f23b5e24 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfig.java @@ -29,6 +29,8 @@ import java.util.Vector; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; +import lombok.Getter; + import org.oransc.policyagent.exceptions.ServiceException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -42,7 +44,9 @@ public class ApplicationConfig { private Collection observers = new Vector<>(); private Map ricConfigs = new HashMap<>(); + @Getter private Properties dmaapPublisherConfig; + @Getter private Properties dmaapConsumerConfig; @Autowired @@ -73,14 +77,6 @@ public class ApplicationConfig { throw new ServiceException("Could not find ric: " + ricName); } - public Properties getDmaapPublisherConfig() { - return dmaapConsumerConfig; - } - - public Properties getDmaapConsumerConfig() { - return dmaapConsumerConfig; - } - public static enum RicConfigUpdate { ADDED, CHANGED, REMOVED } @@ -114,7 +110,7 @@ public class ApplicationConfig { newRicConfigs.put(newConfig.name(), newConfig); notifications.add(new Notification(newConfig, RicConfigUpdate.ADDED)); this.ricConfigs.remove(newConfig.name()); - } else if (!newConfig.equals(newConfig)) { + } else if (!newConfig.equals(oldConfig)) { notifications.add(new Notification(newConfig, RicConfigUpdate.CHANGED)); newRicConfigs.put(newConfig.name(), newConfig); this.ricConfigs.remove(newConfig.name());