diff options
author | 2018-02-21 15:24:46 +0100 | |
---|---|---|
committer | 2018-02-22 16:02:32 -0500 | |
commit | 7353bcd8f2b85a50720b7cc7ca04c837c7b1796a (patch) | |
tree | 92a9c90b5852b3aea04da1526b5f81a1ec1b4223 /appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java | |
parent | 78cc8df2d203e32296e15e5564d9f809734c2e26 (diff) |
DGXML classes refactoring
Did some refactor in org.onap.sdnc.dg.loader package in order to reduce code duplication
Change-Id: I5c063487046c7ff72042d067213ea3d639a37227
Issue-ID: APPC-655
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
Diffstat (limited to 'appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java')
-rw-r--r-- | appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java | 105 |
1 files changed, 7 insertions, 98 deletions
diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java index 77415478a..104f5a2ea 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLActivate.java @@ -9,119 +9,28 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. * ============LICENSE_END========================================================= */ package org.onap.sdnc.dg.loader; -import java.io.File; -import java.util.ArrayList; -import java.util.List; -import org.apache.commons.io.FileUtils; -import org.apache.commons.lang.StringUtils; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; -import org.onap.ccsdk.sli.core.sli.SvcLogicStore; -import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class DGXMLActivate { - private static final Logger logger = LoggerFactory.getLogger(DGXMLLoadNActivate.class); - private static final String STRING_ENCODING = "utf-8"; - private final SvcLogicStore store; - - public DGXMLActivate(String propfile) throws DGXMLException, SvcLogicException { - if (StringUtils.isBlank(propfile)) { - throw new DGXMLException(propfile + " Profile file is not defined"); - } - this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); - } - - protected DGXMLActivate(SvcLogicStore store) { - this.store = store; - } - - public void activateDg(String activateFilePath) { - logger.info( - "******************** Activating DG into Database *****************************"); - try { - List<String> errors = new ArrayList<>(); - if (this.store != null) { - File activateFile = new File(activateFilePath); - if (activateFile.isFile()) { - List<String> fileLines = FileUtils.readLines(activateFile, STRING_ENCODING); - tryActivateDG(errors, fileLines); - } else { - throw new DGXMLException(activateFile + " is not a valid Activate file Path"); - } - } else { - throw new DGXMLException("Failed to initialise SvcLogicStore"); - } - - if (errors.isEmpty()) { - throw new DGXMLException(errors.toString()); - } - } catch (Exception e) { - logger.error("Failed to activate DG", e); - } - } - - private void tryActivateDG(List<String> errors, List<String> fileLines) { - if (fileLines != null) { - for (String line : fileLines) { - if (line != null && !line.trim().startsWith("#")) { - String[] lineArray = line.trim().split(":"); - doActivateDG(errors, line, lineArray); - } - } - } - } - - private void doActivateDG(List<String> errors, String line, String[] lineArray) { - try { - if (lineArray.length >= 4) { - String module = lineArray[0]; - String rpc = lineArray[1]; - String version = lineArray[2]; - String mode = lineArray[3]; - if (StringUtils.isNotBlank(module) - && StringUtils.isNotBlank(rpc) - && StringUtils.isNotBlank(version) - && StringUtils.isNotBlank(mode)) { - logger.info("Activating DG :" + line); - SvcLogicGraph graph = - this.store.fetch(module, rpc, version, mode); - tryActivateStore(line, graph); - } - } - } catch (Exception e) { - logger.error("Failed to Activate " + line, e); - errors.add("Failed to Activate " + line + ", " + e.getMessage()); - } - } - - private void tryActivateStore(String line, SvcLogicGraph graph) throws SvcLogicException, DGXMLException { - if (graph != null) { - logger.info( - "Found Graph :" + line + " Activating ..."); - this.store.activate(graph); - } else { - throw new DGXMLException("Failed to fetch from Database"); - } - } + private static final Logger logger = LoggerFactory.getLogger(DGXMLActivate.class); + private DGXMLActivate(){} public static void main(String[] args) { try { @@ -136,8 +45,8 @@ public class DGXMLActivate { "Sufficient inputs for DGXMLActivate are missing <activatefile> <dbPropertyfile>"); } - DGXMLActivate dgXmlActivate = new DGXMLActivate(propertyPath); - dgXmlActivate.activateDg(activateFile); + DGXMLActivator activator = new DGXMLActivator(propertyPath); + activator.activateDg(activateFile); } catch (Exception e) { logger.error("Arguments missing", e); } finally { |