Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Removed the DMAAP Accepted/Rejected Call"
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
configuration
/
ApplicationConfigParser.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
b/policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
index
d32db7a
..
1352cb5
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/configuration/ApplicationConfigParser.java
@@
-34,7
+34,7
@@
import java.util.Set;
import java.util.Vector;
import javax.validation.constraints.NotNull;
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;
import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
import org.oransc.policyagent.exceptions.ServiceException;
import org.springframework.http.MediaType;
@@
-47,23
+47,23
@@
public class ApplicationConfigParser {
.serializeNulls() //
.create(); //
.serializeNulls() //
.create(); //
- private Vector<RicConfig> ricConfig;
+ @Getter
+ private Vector<RicConfig> ricConfigs;
+ @Getter
private Properties dmaapPublisherConfig;
private Properties dmaapPublisherConfig;
+ @Getter
private Properties dmaapConsumerConfig;
private Properties dmaapConsumerConfig;
- public ApplicationConfigParser() {
- }
-
public void parse(JsonObject root) throws ServiceException {
public void parse(JsonObject root) throws ServiceException {
- JsonObject
ric
ConfigJson = root.getAsJsonObject(CONFIG);
- ricConfig
= parseRics(ric
ConfigJson);
- JsonObject dmaapPublisherConfigJson =
root
.getAsJsonObject("streams_publishes");
+ JsonObject
agent
ConfigJson = root.getAsJsonObject(CONFIG);
+ ricConfig
s = parseRics(agent
ConfigJson);
+ JsonObject dmaapPublisherConfigJson =
agentConfigJson
.getAsJsonObject("streams_publishes");
if (dmaapPublisherConfigJson == null) {
dmaapPublisherConfig = new Properties();
} else {
dmaapPublisherConfig = parseDmaapConfig(dmaapPublisherConfigJson);
}
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 {
if (dmaapConsumerConfigJson == null) {
dmaapConsumerConfig = new Properties();
} else {
@@
-71,18
+71,6
@@
public class ApplicationConfigParser {
}
}
}
}
- 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")) {
private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
Vector<RicConfig> result = new Vector<RicConfig>();
for (JsonElement ricElem : getAsJsonArray(config, "ric")) {
@@
-125,9
+113,9
@@
public class ApplicationConfigParser {
String urlPath = url.getPath();
DmaapUrlPath path = parseDmaapUrlPath(urlPath);
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("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("contenttype", MediaType.APPLICATION_JSON.toString());
dmaapProps.put("userName", userName);
dmaapProps.put("password", passwd);
@@
-136,7
+124,6
@@
public class ApplicationConfigParser {
dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
dmaapProps.put("timeout", 15000);
dmaapProps.put("limit", 1000);
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);
}
} catch (MalformedURLException e) {
throw new ServiceException("Could not parse the URL", e);
}
@@
-166,7
+153,7
@@
public class ApplicationConfigParser {
throw new ServiceException("The path has incorrect syntax: " + urlPath);
}
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) {
String consumerGroup = ""; // users
String consumerId = ""; // sdnc1
if (tokens.length == 5) {