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=7e5228425c957d124e0c3b44a1a6c3078f60c784;hpb=cc53bb179ee61d77290c3831fc75dc5f3e972aac;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 7e522842..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 @@ -20,72 +20,42 @@ package org.oransc.policyagent.configuration; -import com.google.gson.GsonBuilder; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.google.gson.JsonSyntaxException; -import com.google.gson.TypeAdapterFactory; - -import java.io.BufferedInputStream; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.time.Duration; import java.util.Collection; import java.util.HashMap; import java.util.Map; -import java.util.Optional; import java.util.Properties; -import java.util.ServiceLoader; import java.util.Vector; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; -import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient; -import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClientFactory; -import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests; -import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest; -import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.EnvProperties; -import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext; import org.oransc.policyagent.exceptions.ServiceException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import reactor.core.Disposable; -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; - @EnableConfigurationProperties @ConfigurationProperties("app") public class ApplicationConfig { - private static final Logger logger = LoggerFactory.getLogger(ApplicationConfig.class); - - @Value("#{systemEnvironment}") - Properties systemEnvironment; + @NotEmpty + private String filepath; - private Disposable refreshConfigTask = null; private Collection observers = new Vector<>(); - private Map ricConfigs = new HashMap<>(); - - @NotEmpty - private String filepath; + private Properties dmaapPublisherConfig; + private Properties dmaapConsumerConfig; @Autowired public ApplicationConfig() { } - protected String getLocalConfigurationFilePath() { + public String getLocalConfigurationFilePath() { return this.filepath; } + /* + * Do not remove, used by framework! + */ public synchronized void setFilepath(String filepath) { this.filepath = filepath; } @@ -94,15 +64,6 @@ public class ApplicationConfig { return this.ricConfigs.values(); } - public synchronized Optional lookupRicConfigForManagedElement(String managedElementId) { - for (RicConfig ricConfig : getRicConfigs()) { - if (ricConfig.managedElementIds().contains(managedElementId)) { - return Optional.of(ricConfig); - } - } - return Optional.empty(); - } - public RicConfig getRic(String ricName) throws ServiceException { for (RicConfig ricConfig : getRicConfigs()) { if (ricConfig.name().equals(ricName)) { @@ -112,14 +73,12 @@ public class ApplicationConfig { throw new ServiceException("Could not find ric: " + ricName); } - public void initialize() { - stop(); - loadConfigurationFromFile(); + public Properties getDmaapPublisherConfig() { + return dmaapConsumerConfig; + } - refreshConfigTask = createRefreshTask() // - .subscribe(notUsed -> logger.info("Refreshed configuration data"), - throwable -> logger.error("Configuration refresh terminated due to exception", throwable), - () -> logger.error("Configuration refresh terminated")); + public Properties getDmaapConsumerConfig() { + return dmaapConsumerConfig; } public static enum RicConfigUpdate { @@ -134,46 +93,6 @@ public class ApplicationConfig { this.observers.add(o); } - Mono getEnvironment(Properties systemEnvironment) { - return EnvironmentProcessor.readEnvironmentVariables(systemEnvironment); - } - - Flux createRefreshTask() { - return getEnvironment(systemEnvironment) // - .flatMap(this::createCbsClient) // - .flatMapMany(this::periodicConfigurationUpdates) // - .map(this::parseRicConfigurationfromConsul) // - .onErrorResume(this::onErrorResume); - } - - Mono createCbsClient(EnvProperties env) { - return CbsClientFactory.createCbsClient(env); - } - - private Flux periodicConfigurationUpdates(CbsClient cbsClient) { - final Duration initialDelay = Duration.ZERO; - final Duration refreshPeriod = Duration.ofMinutes(1); - final CbsRequest getConfigRequest = CbsRequests.getAll(RequestDiagnosticContext.create()); - return cbsClient.updates(getConfigRequest, initialDelay, refreshPeriod); - } - - private Mono onErrorResume(Throwable trowable) { - logger.error("Could not refresh application configuration {}", trowable.toString()); - return Mono.empty(); - } - - private ApplicationConfig parseRicConfigurationfromConsul(JsonObject jsonObject) { - try { - ApplicationConfigParser parser = new ApplicationConfigParser(); - parser.parse(jsonObject); - setConfiguration(parser.getRicConfigs()); - - } catch (ServiceException e) { - logger.error("Could not parse configuration {}", e.toString(), e); - } - return this; - } - private class Notification { final RicConfig ric; final RicConfigUpdate event; @@ -184,7 +103,8 @@ public class ApplicationConfig { } } - private 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<>(); @@ -208,6 +128,9 @@ public class ApplicationConfig { this.ricConfigs = newRicConfigs; } notifyObservers(notifications); + + this.dmaapPublisherConfig = dmaapPublisherConfig; + this.dmaapConsumerConfig = dmaapConsumerConfig; } private void notifyObservers(Collection notifications) { @@ -217,46 +140,4 @@ public class ApplicationConfig { } } } - - public void stop() { - if (refreshConfigTask != null) { - refreshConfigTask.dispose(); - refreshConfigTask = null; - } - } - - /** - * Reads the configuration from file. - */ - public void loadConfigurationFromFile() { - String filepath = getLocalConfigurationFilePath(); - if (filepath == null) { - logger.debug("No localconfiguration file used"); - return; - } - GsonBuilder gsonBuilder = new GsonBuilder(); - ServiceLoader.load(TypeAdapterFactory.class).forEach(gsonBuilder::registerTypeAdapterFactory); - - try (InputStream inputStream = createInputStream(filepath)) { - JsonParser parser = new JsonParser(); - JsonObject rootObject = getJsonElement(parser, inputStream).getAsJsonObject(); - if (rootObject == null) { - throw new JsonSyntaxException("Root is not a json object"); - } - ApplicationConfigParser appParser = new ApplicationConfigParser(); - appParser.parse(rootObject); - setConfiguration(appParser.getRicConfigs()); - logger.info("Local configuration file loaded: {}", filepath); - } catch (JsonSyntaxException | ServiceException | IOException e) { - logger.trace("Local configuration file not loaded: {}", filepath, e); - } - } - - JsonElement getJsonElement(JsonParser parser, InputStream inputStream) { - return parser.parse(new InputStreamReader(inputStream)); - } - - InputStream createInputStream(@NotNull String filepath) throws IOException { - return new BufferedInputStream(new FileInputStream(filepath)); - } }