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;
@NotEmpty
private String filepath;
+ @NotEmpty
+ private String a1ControllerBaseUrl;
+
+ @NotEmpty
+ private String a1ControllerUsername;
+
+ @NotEmpty
+ private String a1ControllerPassword;
+
private Collection<Observer> observers = new Vector<>();
private Map<String, RicConfig> ricConfigs = new HashMap<>();
+ @Getter
+ private Properties dmaapPublisherConfig;
+ @Getter
+ private Properties dmaapConsumerConfig;
@Autowired
public ApplicationConfig() {
return this.filepath;
}
+ public String getA1ControllerBaseUrl() {
+ return this.a1ControllerBaseUrl;
+ }
+
+ public String getA1ControllerUsername() {
+ return this.a1ControllerUsername;
+ }
+
+ public String getA1ControllerPassword() {
+ return this.a1ControllerPassword;
+ }
+
+ /*
+ * Do not remove, used by framework!
+ */
+ public synchronized void setFilepath(String filepath) {
+ this.filepath = filepath;
+ }
+
+ public synchronized void setA1ControllerBaseUrl(String a1ControllerBaseUrl) {
+ this.a1ControllerBaseUrl = a1ControllerBaseUrl;
+ }
+
+ public synchronized void setA1ControllerUsername(String a1ControllerUsername) {
+ this.a1ControllerUsername = a1ControllerUsername;
+ }
+
+ public synchronized void setA1ControllerPassword(String a1ControllerPassword) {
+ this.a1ControllerPassword = a1ControllerPassword;
+ }
+
public synchronized Collection<RicConfig> getRicConfigs() {
return this.ricConfigs.values();
}
}
}
- public void setConfiguration(@NotNull Collection<RicConfig> ricConfigs) {
+ public void setConfiguration(@NotNull Collection<RicConfig> ricConfigs, Properties dmaapPublisherConfig,
+ Properties dmaapConsumerConfig) {
Collection<Notification> notifications = new Vector<>();
synchronized (this) {
Map<String, RicConfig> newRicConfigs = new HashMap<>();
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());
this.ricConfigs = newRicConfigs;
}
notifyObservers(notifications);
+
+ this.dmaapPublisherConfig = dmaapPublisherConfig;
+ this.dmaapConsumerConfig = dmaapConsumerConfig;
}
private void notifyObservers(Collection<Notification> notifications) {