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;
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;
@NotEmpty
private String a1ControllerPassword;
- private Collection<Observer> observers = new Vector<>();
+ private Collection<Observer> observers = new ArrayList<>();
private Map<String, RicConfig> ricConfigs = new HashMap<>();
@Getter
private Properties dmaapPublisherConfig;
@Getter
private Properties dmaapConsumerConfig;
- @Autowired
- public ApplicationConfig() {
- }
-
public String getLocalConfigurationFilePath() {
return this.filepath;
}
throw new ServiceException("Could not find ric: " + ricName);
}
- public static enum RicConfigUpdate {
+ public enum RicConfigUpdate {
ADDED, CHANGED, REMOVED
}
public void setConfiguration(@NotNull Collection<RicConfig> ricConfigs, Properties dmaapPublisherConfig,
Properties dmaapConsumerConfig) {
- Collection<Notification> notifications = new Vector<>();
+
+ Collection<Notification> notifications = new ArrayList<>();
synchronized (this) {
+ this.dmaapPublisherConfig = dmaapPublisherConfig;
+ this.dmaapConsumerConfig = dmaapConsumerConfig;
+
Map<String, RicConfig> newRicConfigs = new HashMap<>();
for (RicConfig newConfig : ricConfigs) {
RicConfig oldConfig = this.ricConfigs.get(newConfig.name());
}
this.ricConfigs = newRicConfigs;
}
- notifyObservers(notifications);
- this.dmaapPublisherConfig = dmaapPublisherConfig;
- this.dmaapConsumerConfig = dmaapConsumerConfig;
+ notifyObservers(notifications);
}
private void notifyObservers(Collection<Notification> notifications) {