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=1ed3fdb2b70706ac54c958eaa3e308973ef743e0;hb=f3461cb776023b950d62edd25eca148b6d354c9c;hp=d4f726106134b2ea9204932df567a44f1f4646f9;hpb=934a146caf5c9d0f735f913375d55b59041b9db5;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 d4f72610..1ed3fdb2 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 @@ -23,6 +23,7 @@ package org.oransc.policyagent.configuration; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Properties; import java.util.Vector; import javax.validation.constraints.NotEmpty; @@ -41,6 +42,8 @@ public class ApplicationConfig { private Collection observers = new Vector<>(); private Map ricConfigs = new HashMap<>(); + private Properties dmaapPublisherConfig; + private Properties dmaapConsumerConfig; @Autowired public ApplicationConfig() { @@ -50,6 +53,13 @@ public class ApplicationConfig { return this.filepath; } + /* + * Do not remove, used by framework! + */ + public synchronized void setFilepath(String filepath) { + this.filepath = filepath; + } + public synchronized Collection getRicConfigs() { return this.ricConfigs.values(); } @@ -63,6 +73,14 @@ 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 } @@ -85,7 +103,8 @@ public class ApplicationConfig { } } - public void setConfiguration(@NotNull Collection ricConfigs) { + public void setConfiguration(@NotNull Collection ricConfigs, Properties dmaapPublisherConfig, + Properties dmaapConsumerConfig) { Collection notifications = new Vector<>(); synchronized (this) { Map newRicConfigs = new HashMap<>(); @@ -109,6 +128,9 @@ public class ApplicationConfig { this.ricConfigs = newRicConfigs; } notifyObservers(notifications); + + this.dmaapPublisherConfig = dmaapPublisherConfig; + this.dmaapConsumerConfig = dmaapConsumerConfig; } private void notifyObservers(Collection notifications) {