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=fee0181383d66062501aa7bd883877fa2ef2b44d;hb=636b5946ed5f9475d13cf4c942a2d9d35d1a5cbd;hp=00e5223fb3e4874a11fae89bb14584bc3ec9d093;hpb=b47a7130c10bef2bf812366ca971e4eaa938b152;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 00e5223f..fee01813 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,73 +20,46 @@ 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; - - private Disposable refreshConfigTask = null; - @NotEmpty private String filepath; - private Vector ricConfigs; + private Collection observers = new Vector<>(); + private Map ricConfigs = new HashMap<>(); @Autowired public ApplicationConfig() { } + public String getLocalConfigurationFilePath() { + return this.filepath; + } + public synchronized void setFilepath(String filepath) { this.filepath = filepath; } - public Vector getRicConfigs() { - return this.ricConfigs; + public synchronized Collection getRicConfigs() { + return this.ricConfigs.values(); } - public Optional lookupRicConfigForManagedElement(String managedElementId) { + public synchronized Optional lookupRicConfigForManagedElement(String managedElementId) { for (RicConfig ricConfig : getRicConfigs()) { if (ricConfig.managedElementIds().contains(managedElementId)) { return Optional.of(ricConfig); @@ -104,94 +77,59 @@ public class ApplicationConfig { throw new ServiceException("Could not find ric: " + ricName); } - public void initialize() { - stop(); - loadConfigurationFromFile(this.filepath); - - 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 static enum RicConfigUpdate { + ADDED, CHANGED, REMOVED } - Mono getEnvironment(Properties systemEnvironment) { - return EnvironmentProcessor.readEnvironmentVariables(systemEnvironment); + public interface Observer { + void onRicConfigUpdate(RicConfig ric, RicConfigUpdate event); } - Flux createRefreshTask() { - return getEnvironment(systemEnvironment) // - .flatMap(this::createCbsClient) // - .flatMapMany(this::periodicConfigurationUpdates) // - .map(this::parseRicConfigurationfromConsul) // - .onErrorResume(this::onErrorResume); + public void addObserver(Observer o) { + this.observers.add(o); } - Mono createCbsClient(EnvProperties env) { - return CbsClientFactory.createCbsClient(env); - } + private class Notification { + final RicConfig ric; + final RicConfigUpdate event; - 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); + Notification(RicConfig ric, RicConfigUpdate event) { + this.ric = ric; + this.event = event; } - return this; } - private synchronized void setConfiguration(@NotNull Vector ricConfigs) { - this.ricConfigs = ricConfigs; - } - - public void stop() { - if (refreshConfigTask != null) { - refreshConfigTask.dispose(); - refreshConfigTask = null; + public void setConfiguration(@NotNull Collection ricConfigs) { + Collection notifications = new Vector<>(); + synchronized (this) { + Map 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(newConfig)) { + 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; } + notifyObservers(notifications); } - /** - * Reads the configuration from file. - */ - protected void loadConfigurationFromFile(String filepath) { - 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"); + private void notifyObservers(Collection notifications) { + for (Observer observer : this.observers) { + for (Notification notif : notifications) { + observer.onRicConfigUpdate(notif.ric, notif.event); } - ApplicationConfigParser appParser = new ApplicationConfigParser(); - appParser.parse(rootObject); - this.ricConfigs = 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)); - } }