*/
@Bean
public CommandLineRunner commandLineRunner(ApplicationContext ctx) {
- return args -> {
-
- startupService.startup();
- };
+ return args -> startupService.startup();
}
}
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;
package org.oransc.policyagent.configuration;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
-import java.util.Vector;
-
import javax.validation.constraints.NotNull;
-
import lombok.Getter;
-
import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
import org.oransc.policyagent.exceptions.ServiceException;
import org.springframework.http.MediaType;
private static final String CONFIG = "config";
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
-
@Getter
- private Vector<RicConfig> ricConfigs;
+ private List<RicConfig> ricConfigs;
@Getter
private Properties dmaapPublisherConfig = new Properties();
@Getter
}
- private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
- Vector<RicConfig> result = new Vector<RicConfig>();
+ private List<RicConfig> parseRics(JsonObject config) throws ServiceException {
+ List<RicConfig> result = new ArrayList<>();
for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
- result.add(gson.fromJson(ricElem.getAsJsonObject(), ImmutableRicConfig.class));
+ JsonObject ricAsJson = ricElem.getAsJsonObject();
+ ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //
+ .name(ricAsJson.get("name").getAsString()) //
+ .baseUrl(ricAsJson.get("baseUrl").getAsString()) //
+ .managedElementIds(parseManagedElementIds(ricAsJson.get("managedElementIds").getAsJsonArray())) //
+ .build();
+ result.add(ricConfig);
}
return result;
}
+ private List<String> parseManagedElementIds(JsonArray asJsonObject) {
+ Iterator<JsonElement> iterator = asJsonObject.iterator();
+ List<String> managedElementIds = new ArrayList<>();
+ while (iterator.hasNext()) {
+ managedElementIds.add(iterator.next().getAsString());
+
+ }
+ return managedElementIds;
+ }
+
private static JsonElement get(JsonObject obj, String memberName) throws ServiceException {
JsonElement elem = obj.get(memberName);
if (elem == null) {
package org.oransc.policyagent.configuration;
-import java.util.Vector;
-
-import org.immutables.gson.Gson;
+import com.google.common.collect.ImmutableList;
import org.immutables.value.Value;
@Value.Immutable
-@Gson.TypeAdapters
public interface RicConfig {
public String name();
public String baseUrl();
- public Vector<String> managedElementIds();
+ public ImmutableList<String> managedElementIds();
}
package org.oransc.policyagent.repository;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Vector;
-
import lombok.Getter;
import lombok.Setter;
-
import org.oransc.policyagent.clients.A1Client.A1ProtocolType;
import org.oransc.policyagent.configuration.RicConfig;
*/
public class Ric {
private final RicConfig ricConfig;
+ private final List<String> managedElementIds;
private RicState state = RicState.UNDEFINED;
private Map<String, PolicyType> supportedPolicyTypes = new HashMap<>();
@Setter
private A1ProtocolType protocolVersion = A1ProtocolType.UNKNOWN;
+
/**
* Creates the Ric. Initial state is {@link RicState.NOT_INITIATED}.
*
*/
public Ric(RicConfig ricConfig) {
this.ricConfig = ricConfig;
+ this.managedElementIds = new ArrayList<>(ricConfig.managedElementIds());
}
public String name() {
* @return a vector containing the nodes managed by this Ric.
*/
public synchronized Collection<String> getManagedElementIds() {
- return new Vector<>(ricConfig.managedElementIds());
+ return managedElementIds;
}
/**
* @return true if the given node is managed by this Ric.
*/
public synchronized boolean isManaging(String managedElementId) {
- return ricConfig.managedElementIds().contains(managedElementId);
+ return managedElementIds.contains(managedElementId);
}
/**
* @param managedElementId the node to add.
*/
public synchronized void addManagedElement(String managedElementId) {
- if (!ricConfig.managedElementIds().contains(managedElementId)) {
- ricConfig.managedElementIds().add(managedElementId);
+ if (!managedElementIds.contains(managedElementId)) {
+ managedElementIds.add(managedElementId);
}
}
* @param managedElementId the node to remove.
*/
public synchronized void removeManagedElement(String managedElementId) {
- ricConfig.managedElementIds().remove(managedElementId);
+ managedElementIds.remove(managedElementId);
}
/**
@Override
public synchronized String toString() {
return Ric.class.getSimpleName() + ": " + "name: " + name() + ", state: " + state + ", baseUrl: "
- + ricConfig.baseUrl() + ", managedNodes: " + ricConfig.managedElementIds();
+ + ricConfig.baseUrl() + ", managedNodes: " + managedElementIds;
}
/**
* Represents the states possible for a Ric.
*/
- public static enum RicState {
+ public enum RicState {
/**
* The agent view of the agent may be inconsistent.
*/
public synchronized Optional<Ric> lookupRicForManagedElement(String managedElementId) {
for (Ric ric : this.rics.values()) {
- if (ric.getConfig().managedElementIds().contains(managedElementId)) {
+ if (ric.getManagedElementIds().contains(managedElementId)) {
return Optional.of(ric);
}
}