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=deacb446dba4108237676ea1176cc273fb0c1d04;hb=9013ed7ad46ce6927fbf69890487e8df61b7d7ee;hp=a48e59187f36e2c1e9ad20e52a9687b38d9a1ff5;hpb=a538ca7e0b840e8dc20e85c1864697823ad96ae0;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 a48e5918..deacb446 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 @@ -20,11 +20,11 @@ package org.oransc.policyagent.configuration; +import java.util.ArrayList; 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; import javax.validation.constraints.NotNull; @@ -32,7 +32,6 @@ 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; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -51,17 +50,13 @@ public class ApplicationConfig { @NotEmpty private String a1ControllerPassword; - private Collection observers = new Vector<>(); + private Collection observers = new ArrayList<>(); private Map ricConfigs = new HashMap<>(); @Getter private Properties dmaapPublisherConfig; @Getter private Properties dmaapConsumerConfig; - @Autowired - public ApplicationConfig() { - } - public String getLocalConfigurationFilePath() { return this.filepath; } @@ -110,7 +105,7 @@ public class ApplicationConfig { throw new ServiceException("Could not find ric: " + ricName); } - public static enum RicConfigUpdate { + public enum RicConfigUpdate { ADDED, CHANGED, REMOVED } @@ -135,7 +130,7 @@ public class ApplicationConfig { public void setConfiguration(@NotNull Collection ricConfigs, Properties dmaapPublisherConfig, Properties dmaapConsumerConfig) { - Collection notifications = new Vector<>(); + Collection notifications = new ArrayList<>(); synchronized (this) { this.dmaapPublisherConfig = dmaapPublisherConfig; this.dmaapConsumerConfig = dmaapConsumerConfig;