Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Changed the Dmaap message payload
[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
..
578ff12
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
@@
-20,19
+20,17
@@
package org.oransc.policyagent.configuration;
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 com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
-
import java.net.MalformedURLException;
import java.net.URL;
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.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 javax.validation.constraints.NotNull;
import lombok.Getter;
import org.onap.dmaap.mr.test.clients.ProtocolTypeConstants;
@@
-43,42
+41,53
@@
public class ApplicationConfigParser {
private static final String CONFIG = "config";
private static final String CONFIG = "config";
- private static Gson gson = new GsonBuilder() //
- .serializeNulls() //
- .create(); //
-
@Getter
@Getter
- private
Vector
<RicConfig> ricConfigs;
+ private
List
<RicConfig> ricConfigs;
@Getter
@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 {
-
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")) {
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;
}
}
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) {
private static JsonElement get(JsonObject obj, String memberName) throws ServiceException {
JsonElement elem = obj.get(memberName);
if (elem == null) {
@@
-91,17
+100,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
+133,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 {