import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
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.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import reactor.core.publisher.Flux;
@EnableConfigurationProperties
-@ConfigurationProperties("app")
+@ConfigurationProperties()
public class ApplicationConfig {
@NotEmpty
- private String filepath;
-
- @NotEmpty
- private String a1ControllerBaseUrl;
+ @Getter
+ @Value("${app.filepath}")
+ private String localConfigurationFilePath;
- @NotEmpty
- private String a1ControllerUsername;
+ @Value("${server.ssl.key-store-type}")
+ private String sslKeyStoreType = "";
- @NotEmpty
- private String a1ControllerPassword;
+ @Value("${server.ssl.key-store-password}")
+ private String sslKeyStorePassword = "";
- private Collection<Observer> observers = new ArrayList<>();
- private Map<String, RicConfig> ricConfigs = new HashMap<>();
- @Getter
- private Properties dmaapPublisherConfig;
- @Getter
- private Properties dmaapConsumerConfig;
+ @Value("${server.ssl.key-store}")
+ private String sslKeyStore = "";
- public String getLocalConfigurationFilePath() {
- return this.filepath;
- }
+ @Value("${server.ssl.key-password}")
+ private String sslKeyPassword = "";
- public String getA1ControllerBaseUrl() {
- return this.a1ControllerBaseUrl;
- }
+ @Value("${app.webclient.trust-store-used}")
+ private boolean sslTrustStoreUsed = false;
- public String getA1ControllerUsername() {
- return this.a1ControllerUsername;
- }
+ @Value("${app.webclient.trust-store-password}")
+ private String sslTrustStorePassword = "";
- public String getA1ControllerPassword() {
- return this.a1ControllerPassword;
- }
+ @Value("${app.webclient.trust-store}")
+ private String sslTrustStore = "";
- /*
- * Do not remove, used by framework!
- */
- public synchronized void setFilepath(String filepath) {
- this.filepath = filepath;
- }
+ private Map<String, RicConfig> ricConfigs = new HashMap<>();
- public synchronized void setA1ControllerBaseUrl(String a1ControllerBaseUrl) {
- this.a1ControllerBaseUrl = a1ControllerBaseUrl;
- }
+ @Getter
+ private String dmaapConsumerTopicUrl;
- public synchronized void setA1ControllerUsername(String a1ControllerUsername) {
- this.a1ControllerUsername = a1ControllerUsername;
- }
+ @Getter
+ private String dmaapProducerTopicUrl;
- public synchronized void setA1ControllerPassword(String a1ControllerPassword) {
- this.a1ControllerPassword = a1ControllerPassword;
- }
+ private Map<String, ControllerConfig> controllerConfigs = new HashMap<>();
public synchronized Collection<RicConfig> getRicConfigs() {
return this.ricConfigs.values();
}
- public RicConfig getRic(String ricName) throws ServiceException {
- for (RicConfig ricConfig : getRicConfigs()) {
- if (ricConfig.name().equals(ricName)) {
- return ricConfig;
- }
- }
- throw new ServiceException("Could not find ric: " + ricName);
+ public WebClientConfig getWebClientConfig() {
+ return ImmutableWebClientConfig.builder() //
+ .keyStoreType(this.sslKeyStoreType) //
+ .keyStorePassword(this.sslKeyStorePassword) //
+ .keyStore(this.sslKeyStore) //
+ .keyPassword(this.sslKeyPassword) //
+ .isTrustStoreUsed(this.sslTrustStoreUsed) //
+ .trustStore(this.sslTrustStore) //
+ .trustStorePassword(this.sslTrustStorePassword) //
+ .build();
}
- public enum RicConfigUpdate {
- ADDED, CHANGED, REMOVED
+ public synchronized ControllerConfig getControllerConfig(String name) throws ServiceException {
+ ControllerConfig controllerConfig = this.controllerConfigs.get(name);
+ if (controllerConfig == null) {
+ throw new ServiceException("Could not find controller config: " + name);
+ }
+ return controllerConfig;
}
- public interface Observer {
- void onRicConfigUpdate(RicConfig ric, RicConfigUpdate event);
+ public synchronized RicConfig getRic(String ricName) throws ServiceException {
+ RicConfig ricConfig = this.ricConfigs.get(ricName);
+ if (ricConfig == null) {
+ throw new ServiceException("Could not find ric configuration: " + ricName);
+ }
+ return ricConfig;
}
- public void addObserver(Observer o) {
- this.observers.add(o);
- }
+ public static class RicConfigUpdate {
+ public enum Type {
+ ADDED, CHANGED, REMOVED
+ }
- private class Notification {
- final RicConfig ric;
- final RicConfigUpdate event;
+ @Getter
+ private final RicConfig ricConfig;
+ @Getter
+ private final Type type;
- Notification(RicConfig ric, RicConfigUpdate event) {
- this.ric = ric;
- this.event = event;
+ RicConfigUpdate(RicConfig ric, Type event) {
+ this.ricConfig = ric;
+ this.type = event;
}
}
- public void setConfiguration(@NotNull Collection<RicConfig> ricConfigs, Properties dmaapPublisherConfig,
- Properties dmaapConsumerConfig) {
-
- 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());
- if (oldConfig == null) {
- newRicConfigs.put(newConfig.name(), newConfig);
- notifications.add(new Notification(newConfig, RicConfigUpdate.ADDED));
- this.ricConfigs.remove(newConfig.name());
- } else if (!newConfig.equals(oldConfig)) {
- notifications.add(new Notification(newConfig, RicConfigUpdate.CHANGED));
- newRicConfigs.put(newConfig.name(), newConfig);
- this.ricConfigs.remove(newConfig.name());
- } else {
- newRicConfigs.put(oldConfig.name(), oldConfig);
- }
- }
- for (RicConfig deletedConfig : this.ricConfigs.values()) {
- notifications.add(new Notification(deletedConfig, RicConfigUpdate.REMOVED));
- }
- this.ricConfigs = newRicConfigs;
- }
+ public synchronized Flux<RicConfigUpdate> setConfiguration(
+ ApplicationConfigParser.ConfigParserResult parserResult) {
- notifyObservers(notifications);
- }
+ Collection<RicConfigUpdate> modifications = new ArrayList<>();
+ this.controllerConfigs = parserResult.controllerConfigs();
+
+ this.dmaapConsumerTopicUrl = parserResult.dmaapConsumerTopicUrl();
+ this.dmaapProducerTopicUrl = parserResult.dmaapProducerTopicUrl();
- private void notifyObservers(Collection<Notification> notifications) {
- for (Observer observer : this.observers) {
- for (Notification notif : notifications) {
- observer.onRicConfigUpdate(notif.ric, notif.event);
+ Map<String, RicConfig> newRicConfigs = new HashMap<>();
+ for (RicConfig newConfig : parserResult.ricConfigs()) {
+ RicConfig oldConfig = this.ricConfigs.get(newConfig.name());
+ this.ricConfigs.remove(newConfig.name());
+ if (oldConfig == null) {
+ newRicConfigs.put(newConfig.name(), newConfig);
+ modifications.add(new RicConfigUpdate(newConfig, RicConfigUpdate.Type.ADDED));
+ } else if (!newConfig.equals(oldConfig)) {
+ modifications.add(new RicConfigUpdate(newConfig, RicConfigUpdate.Type.CHANGED));
+ newRicConfigs.put(newConfig.name(), newConfig);
+ } else {
+ newRicConfigs.put(oldConfig.name(), oldConfig);
}
}
+ for (RicConfig deletedConfig : this.ricConfigs.values()) {
+ modifications.add(new RicConfigUpdate(deletedConfig, RicConfigUpdate.Type.REMOVED));
+ }
+ this.ricConfigs = newRicConfigs;
+
+ return Flux.fromIterable(modifications);
}
}
Code Review / nonrtric.git / blobdiff