Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add unit tests for SdncOscA1Client
[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
1352cb5
..
c21af83
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,9
@@
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 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;
@@
-50,25
+52,24
@@
public class ApplicationConfigParser {
@Getter
private Vector<RicConfig> ricConfigs;
@Getter
@Getter
private Vector<RicConfig> ricConfigs;
@Getter
- private Properties dmaapPublisherConfig;
+ private Properties dmaapPublisherConfig
= new Properties()
;
@Getter
@Getter
- private Properties dmaapConsumerConfig;
+ private Properties dmaapConsumerConfig
= new Properties()
;
public void parse(JsonObject root) throws ServiceException {
JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
ricConfigs = parseRics(agentConfigJson);
public void parse(JsonObject root) throws ServiceException {
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 json = agentConfigJson.getAsJsonObject("streams_publishes");
+ if (json != null) {
+ this.dmaapPublisherConfig = parseDmaapConfig(json);
}
}
- JsonObject dmaapConsumerConfigJson = agentConfigJson.getAsJsonObject("streams_subscribes");
- if (dmaapConsumerConfigJson == null) {
- dmaapConsumerConfig = new Properties();
- } else {
- dmaapConsumerConfig = parseDmaapConfig(dmaapConsumerConfigJson);
+
+ json = agentConfigJson.getAsJsonObject("streams_subscribes");
+ if (json != null) {
+ this.dmaapConsumerConfig = parseDmaapConfig(json);
}
}
+
}
private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
}
private Vector<RicConfig> parseRics(JsonObject config) throws ServiceException {
@@
-91,17
+92,18
@@
public class ApplicationConfigParser {
return get(obj, memberName).getAsJsonArray();
}
return get(obj, memberName).getAsJsonArray();
}
- private Properties parseDmaapConfig(JsonObject consumerCfg) throws ServiceException {
- Set<Entry<String, JsonElement>> topics = consumerCfg.entrySet();
- if (topics.size() != 1) {
- throw new ServiceException("Invalid configuration, number of topic must be one, config: " + topics);
+ private Properties parseDmaapConfig(JsonObject streamCfg) throws ServiceException {
+ Set<Entry<String, JsonElement>> streamConfigEntries = streamCfg.entrySet();
+ if (streamConfigEntries.size() != 1) {
+ throw new ServiceException(
+ "Invalid configuration. Number of streams must be one, config: " + streamConfigEntries);
}
}
- JsonObject
topic = topic
s.iterator().next().getValue().getAsJsonObject();
- JsonObject dmaapInfo = get(
topic
, "dmaap_info").getAsJsonObject();
+ JsonObject
streamConfigEntry = streamConfigEntrie
s.iterator().next().getValue().getAsJsonObject();
+ JsonObject dmaapInfo = get(
streamConfigEntry
, "dmaap_info").getAsJsonObject();
String topicUrl = getAsString(dmaapInfo, "topic_url");
String topicUrl = getAsString(dmaapInfo, "topic_url");
- Properties dmaapProps = new Properties();
try {
try {
+ Properties dmaapProps = new Properties();
URL url = new URL(topicUrl);
String passwd = "";
String userName = "";
URL url = new URL(topicUrl);
String passwd = "";
String userName = "";
@@
-123,12
+125,16
@@
public class ApplicationConfigParser {
dmaapProps.put("id", path.consumerId);
dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
dmaapProps.put("timeout", 15000);
dmaapProps.put("id", path.consumerId);
dmaapProps.put("TransportType", ProtocolTypeConstants.HTTPNOAUTH.toString());
dmaapProps.put("timeout", 15000);
- dmaapProps.put("limit", 1000);
+ dmaapProps.put("limit", 100);
+ dmaapProps.put("maxBatchSize", "10");
+ dmaapProps.put("maxAgeMs", "10000");
+ dmaapProps.put("compress", true);
+ dmaapProps.put("MessageSentThreadOccurance", "2");
+ return dmaapProps;
} catch (MalformedURLException e) {
throw new ServiceException("Could not parse the URL", e);
}
} catch (MalformedURLException e) {
throw new ServiceException("Could not parse the URL", e);
}
- return dmaapProps;
}
private static @NotNull String getAsString(JsonObject obj, String memberName) throws ServiceException {
}
private static @NotNull String getAsString(JsonObject obj, String memberName) throws ServiceException {