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 "Two minor bugfies"
[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
8418749
..
5495710
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
@@
-70,8
+70,6
@@
public class ApplicationConfigParser {
Properties dmaapConsumerConfig = new Properties();
JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
Properties dmaapConsumerConfig = new Properties();
JsonObject agentConfigJson = root.getAsJsonObject(CONFIG);
- List<RicConfig> ricConfigs = parseRics(agentConfigJson);
- Map<String, ControllerConfig> controllerConfigs = parseControllerConfigs(agentConfigJson);
JsonObject json = agentConfigJson.getAsJsonObject("streams_publishes");
if (json != null) {
JsonObject json = agentConfigJson.getAsJsonObject("streams_publishes");
if (json != null) {
@@
-83,6
+81,8
@@
public class ApplicationConfigParser {
dmaapConsumerConfig = parseDmaapConfig(json);
}
dmaapConsumerConfig = parseDmaapConfig(json);
}
+ List<RicConfig> ricConfigs = parseRics(agentConfigJson);
+ Map<String, ControllerConfig> controllerConfigs = parseControllerConfigs(agentConfigJson);
checkConfigurationConsistency(ricConfigs, controllerConfigs);
return ImmutableConfigParserResult.builder() //
checkConfigurationConsistency(ricConfigs, controllerConfigs);
return ImmutableConfigParserResult.builder() //