diff options
author | Dan Timoney <dt5972@att.com> | 2018-03-08 21:20:35 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-03-08 21:20:35 +0000 |
commit | 6cea464120223c13d7d6e48f422d9964d14c8c8d (patch) | |
tree | 5f7b62dee9dc7990f19c12a5da026bca89e52df1 /sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java | |
parent | a9e89cccc344b5f1aecbe3936f6bb917cfe7b20f (diff) | |
parent | d1fcd126f971380f3e6a2401902ca4a261147324 (diff) |
Merge "re-use parser instance"
Diffstat (limited to 'sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java')
-rw-r--r-- | sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java index 95f73f96..37d7faae 100644 --- a/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java +++ b/sli/common/src/main/java/org/onap/ccsdk/sli/core/sli/SvcLogicLoader.java @@ -39,15 +39,18 @@ public class SvcLogicLoader { private static final Logger LOGGER = LoggerFactory.getLogger(SvcLogicLoader.class); protected SvcLogicStore store; protected String directoryRoot; + protected SvcLogicParser parser; public SvcLogicLoader(String directoryRoot, SvcLogicStore store) { this.store = store; this.directoryRoot = directoryRoot; + this.parser = new SvcLogicParser(); } - + public SvcLogicLoader(String directoryRoot, String propFile) { this.store = SvcLogicParser.getStore(propFile); this.directoryRoot = directoryRoot; + this.parser = new SvcLogicParser(); } public void loadAndActivate() throws IOException { @@ -58,7 +61,7 @@ public class SvcLogicLoader { activateGraphs(activationEntries); } - private List<ActivationEntry> processActivationFiles(List<Path> activationPaths) { + protected List<ActivationEntry> processActivationFiles(List<Path> activationPaths) { List<ActivationEntry> activationEntries = new ArrayList<ActivationEntry>(); for (Path activationFile : activationPaths) { activationEntries.addAll(getActivationEntries(activationFile)); @@ -66,10 +69,12 @@ public class SvcLogicLoader { return activationEntries; } - private void activateGraphs(List<ActivationEntry> activationEntries) { + protected void activateGraphs(List<ActivationEntry> activationEntries) { for (ActivationEntry entry : activationEntries) { try { if (store.hasGraph(entry.module, entry.rpc, entry.version, entry.mode)) { + LOGGER.info("Activating SvcLogicGraph [module=" + entry.module + ", rpc=" + entry.rpc + ", mode=" + + entry.mode + ", version=" + entry.version + "]"); store.activate(entry.module, entry.rpc, entry.version, entry.mode); } else { LOGGER.error("hasGraph returned false for " + entry.toString()); @@ -113,13 +118,12 @@ public class SvcLogicLoader { } } - private void saveGraph(String xmlFile) throws SvcLogicException { + protected void saveGraph(String xmlFile) throws SvcLogicException { File f = new File(xmlFile); if (!f.canRead()) { throw new ConfigurationException("Cannot read xml file (" + xmlFile + ")"); } - SvcLogicParser parser = new SvcLogicParser(); LinkedList<SvcLogicGraph> graphs = null; try { |