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;
.serializeNulls() //
.create(); //
- private Vector<RicConfig> ricConfig;
+ @Getter
+ private Vector<RicConfig> ricConfigs;
+ @Getter
private Properties dmaapPublisherConfig;
+ @Getter
private Properties dmaapConsumerConfig;
- public ApplicationConfigParser() {
- }
-
public void parse(JsonObject root) throws ServiceException {
- JsonObject ricConfigJson = root.getAsJsonObject(CONFIG);
- ricConfig = parseRics(ricConfigJson);
- JsonObject dmaapPublisherConfigJson = root.getAsJsonObject("streams_publishes");
+ JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
+ ricConfigs = parseRics(agentConfigJson);
+ JsonObject dmaapPublisherConfigJson = agentConfigJson.getAsJsonObject("streams_publishes");
if (dmaapPublisherConfigJson == null) {
dmaapPublisherConfig = new Properties();
} else {
dmaapPublisherConfig = parseDmaapConfig(dmaapPublisherConfigJson);
}
- JsonObject dmaapConsumerConfigJson = root.getAsJsonObject("streams_subscribes");
+ JsonObject dmaapConsumerConfigJson = agentConfigJson.getAsJsonObject("streams_subscribes");
if (dmaapConsumerConfigJson == null) {
dmaapConsumerConfig = new Properties();
} else {
}
}
- public Vector<RicConfig> getRicConfigs() {
- return this.ricConfig;
- }
-
- public Properties getDmaapPublisherConfig() {
- return dmaapPublisherConfig;
- }
-
- public Properties getDmaapConsumerConfig() {
- return dmaapConsumerConfig;
- }
-
private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
Vector<RicConfig> result = new Vector<RicConfig>();
for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
String urlPath = url.getPath();
DmaapUrlPath path = parseDmaapUrlPath(urlPath);
- dmaapProps.put("ServiceName", url.getHost());
+ dmaapProps.put("ServiceName", url.getHost() + ":" + url.getPort() + "/events");
dmaapProps.put("topic", path.dmaapTopicName);
- dmaapProps.put("host", url.getHost());
+ dmaapProps.put("host", url.getHost() + ":" + url.getPort());
dmaapProps.put("contenttype", MediaType.APPLICATION_JSON.toString());
dmaapProps.put("userName", userName);
dmaapProps.put("password", passwd);
dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
dmaapProps.put("timeout", 15000);
dmaapProps.put("limit", 1000);
- dmaapProps.put("port", url.getPort());
} catch (MalformedURLException e) {
throw new ServiceException("Could not parse the URL", e);
}
throw new ServiceException("The path has incorrect syntax: " + urlPath);
}
- final String dmaapTopicName = tokens[1] + "/" + tokens[2]; // /events/A1-P
+ final String dmaapTopicName = tokens[2]; // /events/A1-P
String consumerGroup = ""; // users
String consumerId = ""; // sdnc1
if (tokens.length == 5) {