From 9c44fb1cb83f5368fba40438a7b1fa1a45e27b58 Mon Sep 17 00:00:00 2001 From: Skip Wonnell Date: Sun, 17 Dec 2017 16:13:56 -0600 Subject: Move dg-loader files to org.onap package Issue-ID: APPC-13 Change-Id: I5bab561f243f31bca633882b9291b147e24bea9e Signed-off-by: Skip Wonnell --- .../org/onap/sdnc/dg/loader/DGLoaderActivator.java | 21 +++-- .../org/onap/sdnc/dg/loader/DGXMLActivate.java | 61 +++++++------- .../org/onap/sdnc/dg/loader/DGXMLGenerator.java | 63 ++++++++------- .../java/org/onap/sdnc/dg/loader/DGXMLLoad.java | 47 +++++------ .../onap/sdnc/dg/loader/DGXMLLoadNActivate.java | 94 ++++++++++++---------- 5 files changed, 153 insertions(+), 133 deletions(-) (limited to 'appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader') diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java index 99f7f8b6c..db437a9b2 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGLoaderActivator.java @@ -18,37 +18,34 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; import java.util.LinkedList; import java.util.List; - import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceRegistration; - import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -public class DGLoaderActivator implements BundleActivator{ +public class DGLoaderActivator implements BundleActivator { private List registrations = new LinkedList(); - private static final EELFLogger log = EELFManager.getInstance().getLogger(DGLoaderActivator.class); + private static final EELFLogger log = + EELFManager.getInstance().getLogger(DGLoaderActivator.class); @Override - public void start(BundleContext ctx) throws Exception - { + public void start(BundleContext ctx) throws Exception { + - } + @Override - public void stop(BundleContext arg0) throws Exception - { - for (ServiceRegistration registration: registrations) - { + public void stop(BundleContext arg0) throws Exception { + for (ServiceRegistration registration : registrations) { registration.unregister(); registration = null; } 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 6af447742..9050fa061 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 @@ -22,12 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +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.SvcLogicGraph; @@ -44,63 +43,70 @@ public class DGXMLActivate { private final SvcLogicStore store; public static String STRING_ENCODING = "utf-8"; - public DGXMLActivate(String propfile) throws Exception{ - if(StringUtils.isBlank(propfile)){ + public DGXMLActivate(String propfile) throws Exception { + if (StringUtils.isBlank(propfile)) { throw new Exception(propfile + " Profile file is not defined"); } this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } - + protected DGXMLActivate(SvcLogicStore store) { this.store = store; } public void activateDg(String activateFilePath) throws Exception { - logger.info("******************** Activating DG into Database *****************************"); + logger.info( + "******************** Activating DG into Database *****************************"); try { List errors = new ArrayList(); - if(this.store != null){ + if (this.store != null) { File activateFile = new File(activateFilePath); - if(activateFile != null && activateFile.isFile()){ - List fileLines = FileUtils.readLines(activateFile,STRING_ENCODING); - if(fileLines != null ){ + if (activateFile != null && activateFile.isFile()) { + List fileLines = FileUtils.readLines(activateFile, STRING_ENCODING); + if (fileLines != null) { for (String line : fileLines) { - if(line != null && ! line.trim().startsWith("#")){ + if (line != null && !line.trim().startsWith("#")) { String lineArray[] = line.trim().split(":"); try { - if(lineArray != null && lineArray.length >= 4){ + if (lineArray != null && 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)){ + 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); - if(graph != null){ - logger.info("Found Graph :" + line + " Activating ..."); + SvcLogicGraph graph = + this.store.fetch(module, rpc, version, mode); + if (graph != null) { + logger.info( + "Found Graph :" + line + " Activating ..."); this.store.activate(graph); - }else{ - throw new Exception("Failed to fetch from Database"); + } else { + throw new Exception( + "Failed to fetch from Database"); } } } } catch (Exception e) { e.printStackTrace(); - errors.add("Failed to Activate "+line + ", "+e.getMessage()); + errors.add( + "Failed to Activate " + line + ", " + e.getMessage()); } } } } - }else{ + } else { throw new Exception(activateFile + " is not a valid Activate file Path"); } - }else{ + } else { throw new Exception("Failed to initialise SvcLogicStore"); } - if(errors.size() > 0){ + if (errors.size() > 0) { throw new Exception(errors.toString()); } } catch (Exception e) { @@ -114,18 +120,19 @@ public class DGXMLActivate { String activateFile = null; String propertyPath = null; - if(args != null && args.length >= 2){ + if (args != null && args.length >= 2) { activateFile = args[0]; propertyPath = args[1]; - }else{ - throw new Exception("Sufficient inputs for DGXMLActivate are missing "); + } else { + throw new Exception( + "Sufficient inputs for DGXMLActivate are missing "); } DGXMLActivate dgXmlActivate = new DGXMLActivate(propertyPath); dgXmlActivate.activateDg(activateFile); } catch (Exception e) { e.printStackTrace(); - }finally { + } finally { System.exit(1); } } diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java index 60fcd5ba8..0d60a7135 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLGenerator.java @@ -18,15 +18,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +package org.onap.sdnc.dg.loader; + import java.io.File; import java.util.ArrayList; import java.util.List; - import javax.script.Invocable; import javax.script.ScriptEngine; import javax.script.ScriptEngineManager; - import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.slf4j.Logger; @@ -41,8 +40,9 @@ public class DGXMLGenerator { public static String JS_METHOD_GET_NODE_TO_XML = "getNodeToXml"; public static String GENERATOR_TEMPLATE_FILE = "js/dg_xml2json.js"; - public void generateXMLFromJSON(String jsonPath, String xmlpath, String propertyPath) throws Exception { - try{ + public void generateXMLFromJSON(String jsonPath, String xmlpath, String propertyPath) + throws Exception { + try { ScriptEngineManager manager = new ScriptEngineManager(); ScriptEngine engine = manager.getEngineByName("JavaScript"); if (!(engine instanceof Invocable)) { @@ -50,52 +50,57 @@ public class DGXMLGenerator { return; } Invocable inv = (Invocable) engine; - // engine.eval(new FileReader(DGXMLGenerator.class.getClassLoader().getResource(GENERATOR_TEMPLATE_FILE).getPath())); - String js = IOUtils.toString(DGXMLGenerator.class.getClassLoader().getResourceAsStream(GENERATOR_TEMPLATE_FILE),STRING_ENCODING); + // engine.eval(new + // FileReader(DGXMLGenerator.class.getClassLoader().getResource(GENERATOR_TEMPLATE_FILE).getPath())); + String js = IOUtils.toString(DGXMLGenerator.class.getClassLoader() + .getResourceAsStream(GENERATOR_TEMPLATE_FILE), STRING_ENCODING); engine.eval(js); Object dgconverter = engine.get(JS_INTERFACE_DG_CONVERTOR); List files = new ArrayList(); - if(dgconverter != null){ + if (dgconverter != null) { File jsonPathFile = new File(jsonPath); - if(jsonPathFile.isDirectory()){ - String[] extensions = new String[] { "json", "JSON" }; + if (jsonPathFile.isDirectory()) { + String[] extensions = new String[] {"json", "JSON"}; files = (List) FileUtils.listFiles(jsonPathFile, extensions, true); - }else if(jsonPathFile.isFile()){ + } else if (jsonPathFile.isFile()) { files.add(jsonPathFile); - }else{ - throw new Exception("Failed to get the nature of the JSON path :"+ jsonPath); + } else { + throw new Exception("Failed to get the nature of the JSON path :" + jsonPath); } - logger.info("JSON Files identified "+ files.size()); + logger.info("JSON Files identified " + files.size()); - if(files.size() > 0){ + if (files.size() > 0) { boolean isXmlPathDeleted = FileUtils.deleteQuietly(new File(xmlpath)); - logger.info("Cleaning old DG XML under : " + xmlpath + ", delete status :" + isXmlPathDeleted); + logger.info("Cleaning old DG XML under : " + xmlpath + ", delete status :" + + isXmlPathDeleted); for (File file : files) { - String dgJson = FileUtils.readFileToString(file,STRING_ENCODING); + String dgJson = FileUtils.readFileToString(file, STRING_ENCODING); logger.info("Generating XML from :" + file.getName()); - String xmlFileName = xmlpath +"/"+file.getName().replace(".json", ".xml"); + String xmlFileName = + xmlpath + "/" + file.getName().replace(".json", ".xml"); - Object dgXMl = inv.invokeMethod(dgconverter, JS_METHOD_GET_NODE_TO_XML, dgJson); + Object dgXMl = + inv.invokeMethod(dgconverter, JS_METHOD_GET_NODE_TO_XML, dgJson); // Write the XML File - if(dgXMl != null){ + if (dgXMl != null) { File xmlFile = new File(xmlFileName); FileUtils.writeStringToFile(xmlFile, dgXMl.toString(), STRING_ENCODING); logger.info("Generated XML File under :" + xmlFile.getCanonicalPath()); } } - }else{ + } else { logger.info("No JSON Files to generate XML"); } - }else{ + } else { logger.error("Couldn't get Java Script Engine.."); } - }catch (Exception e) { - logger.error("Failed to generate generateXMLFromJSON :"+e.getMessage()); + } catch (Exception e) { + logger.error("Failed to generate generateXMLFromJSON :" + e.getMessage()); } } @@ -107,19 +112,19 @@ public class DGXMLGenerator { String xmlPath = null; String propertyPath = null; // Generate, GenerateLoad, GenerateLoadActivate - //args = new String[]{"src/main/resources/json","src/test/resources/xml"}; - logger.info("DGXML Conversion Started with arguments :"+ args[0] +":"+ args[1]); - if(args != null && args.length >= 2){ + // args = new String[]{"src/main/resources/json","src/test/resources/xml"}; + logger.info("DGXML Conversion Started with arguments :" + args[0] + ":" + args[1]); + if (args != null && args.length >= 2) { jsonPath = args[0]; xmlPath = args[1]; - }else{ + } else { throw new Exception("Sufficient inputs are missing "); } application.generateXMLFromJSON(jsonPath, xmlPath, propertyPath); logger.info("DGXML Conversion Completed..."); } catch (Exception e) { - logger.error("Failed in DG XML Generation :"+e.getMessage()); + logger.error("Failed in DG XML Generation :" + e.getMessage()); e.printStackTrace(); } diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java index 1b6116cc3..ced6b007c 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoad.java @@ -22,17 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +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.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicParser; import org.onap.ccsdk.sli.core.sli.SvcLogicStore; @@ -43,48 +41,50 @@ public class DGXMLLoad { private final SvcLogicStore store; public static String STRING_ENCODING = "utf-8"; - public DGXMLLoad(String propfile) throws Exception{ - if(StringUtils.isBlank(propfile)){ + public DGXMLLoad(String propfile) throws Exception { + if (StringUtils.isBlank(propfile)) { throw new Exception(propfile + " Profile file is not defined"); } this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } protected DGXMLLoad(SvcLogicStore store) throws Exception { - this.store=store; + this.store = store; } - - public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException{ - if(dgXMLpath != null ){ + + public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException { + if (dgXMLpath != null) { SvcLogicParser.load(dgXMLpath, this.store); } } private void loadDGXMLDir(String xmlPath) throws Exception { try { - logger.info("******************** Loading DG into Database *****************************"); + logger.info( + "******************** Loading DG into Database *****************************"); List errors = new ArrayList(); - if(this.store != null){ + if (this.store != null) { File xmlDir = new File(xmlPath); - if(xmlDir != null && xmlDir.isDirectory()){ - String[] extensions = new String[] { "xml", "XML" }; + if (xmlDir != null && xmlDir.isDirectory()) { + String[] extensions = new String[] {"xml", "XML"}; List files = (List) FileUtils.listFiles(xmlDir, extensions, true); for (File file : files) { logger.info("Loading DG XML file :" + file.getCanonicalPath()); - try{ + try { SvcLogicParser.load(file.getCanonicalPath(), this.store); - }catch (Exception e) { - errors.add("Failed to load XML "+file.getCanonicalPath() + ", Exception : "+e.getMessage()); + } catch (Exception e) { + errors.add("Failed to load XML " + file.getCanonicalPath() + + ", Exception : " + e.getMessage()); } } - }else{ + } else { throw new Exception(xmlPath + " is not a valid XML Directory"); } - }else{ + } else { throw new Exception("Failed to initialise SvcLogicStore"); } - if(errors.size() > 0){ + if (errors.size() > 0) { throw new Exception(errors.toString()); } } catch (Exception e) { @@ -97,17 +97,18 @@ public class DGXMLLoad { String xmlPath = null; String propertyPath = null; - if(args != null && args.length >= 2){ + if (args != null && args.length >= 2) { xmlPath = args[0]; propertyPath = args[1]; - }else{ - throw new Exception("Sufficient inputs for DGXMLLoadNActivate are missing "); + } else { + throw new Exception( + "Sufficient inputs for DGXMLLoadNActivate are missing "); } DGXMLLoad dgXMLLoadDB = new DGXMLLoad(propertyPath); dgXMLLoadDB.loadDGXMLDir(xmlPath); } catch (Exception e) { e.printStackTrace(); - }finally { + } finally { System.exit(1); } } diff --git a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java index 54f109177..490a1f9bb 100644 --- a/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java +++ b/appc-directed-graph/dg-loader/provider/src/main/java/org/onap/sdnc/dg/loader/DGXMLLoadNActivate.java @@ -22,17 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.sdnc.dg.loader; +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.slf4j.Logger; import org.slf4j.LoggerFactory; - import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; import org.onap.ccsdk.sli.core.sli.SvcLogicParser; @@ -44,48 +42,50 @@ public class DGXMLLoadNActivate { private final SvcLogicStore store; public static String STRING_ENCODING = "utf-8"; - public DGXMLLoadNActivate(String propfile) throws Exception{ - if(StringUtils.isBlank(propfile)){ + public DGXMLLoadNActivate(String propfile) throws Exception { + if (StringUtils.isBlank(propfile)) { throw new Exception(propfile + " Profile file is not defined"); } this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile); } protected DGXMLLoadNActivate(SvcLogicStore store) { - this.store=store; + this.store = store; } - public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException{ - if(dgXMLpath != null ){ + public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException { + if (dgXMLpath != null) { SvcLogicParser.load(dgXMLpath, this.store); } } private void loadDGXMLDir(String xmlPath) throws Exception { try { - logger.info("******************** Loading DG into Database *****************************"); + logger.info( + "******************** Loading DG into Database *****************************"); List errors = new ArrayList(); - if(this.store != null){ + if (this.store != null) { File xmlDir = new File(xmlPath); - if(xmlDir.isDirectory()){ - String[] extensions = new String[] { "xml", "XML" }; + if (xmlDir.isDirectory()) { + String[] extensions = new String[] {"xml", "XML"}; List files = (List) FileUtils.listFiles(xmlDir, extensions, true); for (File file : files) { logger.info("Loading DG XML file :" + file.getCanonicalPath()); - try{ + try { SvcLogicParser.load(file.getCanonicalPath(), this.store); - }catch (Exception e) { - errors.add("Failed to load XML "+file.getCanonicalPath() + ", Exception : "+e.getMessage()); + } catch (Exception e) { + errors.add("Failed to load XML " + file.getCanonicalPath() + + ", Exception : " + e.getMessage()); } } - }else{ + } else { throw new Exception(xmlPath + " is not a valid XML Directory"); } - }else{ + } else { throw new Exception("Failed to initialise SvcLogicStore"); } - if(errors.size() > 0){ + if (errors.size() > 0) { throw new Exception(errors.toString()); } } catch (Exception e) { @@ -94,50 +94,57 @@ public class DGXMLLoadNActivate { } public void activateDg(String activateFilePath) throws Exception { - logger.info("******************** Activating DG into Database *****************************"); + logger.info( + "******************** Activating DG into Database *****************************"); try { List errors = new ArrayList(); - if(this.store != null){ + if (this.store != null) { File activateFile = new File(activateFilePath); - if(activateFile.isFile()){ - List fileLines = FileUtils.readLines(activateFile,STRING_ENCODING); - if(fileLines != null ){ + if (activateFile.isFile()) { + List fileLines = FileUtils.readLines(activateFile, STRING_ENCODING); + if (fileLines != null) { for (String line : fileLines) { - if(line != null && ! line.trim().startsWith("#")){ + if (line != null && !line.trim().startsWith("#")) { String lineArray[] = line.trim().split(":"); try { - if(lineArray != null && lineArray.length >= 4){ + if (lineArray != null && 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)){ + 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); - if(graph != null){ - logger.info("Found Graph :" + line + " Activating ..."); + SvcLogicGraph graph = + this.store.fetch(module, rpc, version, mode); + if (graph != null) { + logger.info( + "Found Graph :" + line + " Activating ..."); this.store.activate(graph); - }else{ - throw new Exception("Failed to fetch from Database"); + } else { + throw new Exception( + "Failed to fetch from Database"); } } } } catch (Exception e) { e.printStackTrace(); - errors.add("Failed to Activate "+line + ", "+e.getMessage()); + errors.add( + "Failed to Activate " + line + ", " + e.getMessage()); } } } } - }else{ + } else { throw new Exception(activateFile + " is not a valid Activate file Path"); } - }else{ + } else { throw new Exception("Failed to initialise SvcLogicStore"); } - if(errors.size() > 0){ + if (errors.size() > 0) { throw new Exception(errors.toString()); } } catch (Exception e) { @@ -152,23 +159,26 @@ public class DGXMLLoadNActivate { String propertyPath = null; String activateFile = null; - if(args != null && args.length >= 3){ + if (args != null && args.length >= 3) { xmlPath = args[0]; activateFile = args[1]; propertyPath = args[2]; - }else{ - throw new Exception("Sufficient inputs for DGXMLLoadNActivate are missing "); + } else { + throw new Exception( + "Sufficient inputs for DGXMLLoadNActivate are missing "); } - //propertyPath = "/Users/bs2796/0Source/ecomp/bvc-3.2.2/others/properties/dblib.properties"; - //xmlPath = DGXMLLoadNActivate.class.getClassLoader().getResource(".").getPath() +"/xml" ; + // propertyPath = + // "/Users/bs2796/0Source/ecomp/bvc-3.2.2/others/properties/dblib.properties"; + // xmlPath = DGXMLLoadNActivate.class.getClassLoader().getResource(".").getPath() + // +"/xml" ; DGXMLLoadNActivate dgXMLLoadDB = new DGXMLLoadNActivate(propertyPath); dgXMLLoadDB.loadDGXMLDir(xmlPath); dgXMLLoadDB.activateDg(activateFile); } catch (Exception e) { e.printStackTrace(); - }finally { + } finally { System.exit(1); } } -- cgit 1.2.3-korg