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>
package org.onap.sdnc.dg.loader;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
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 {
- private List<ServiceRegistration> registrations = new LinkedList<ServiceRegistration>();
+ private List<ServiceRegistration> registrations = new LinkedList<>();
private static final EELFLogger log =
- EELFManager.getInstance().getLogger(DGLoaderActivator.class);
+ EELFManager.getInstance().getLogger(DGLoaderActivator.class);
@Override
public void start(BundleContext ctx) throws Exception {
-
-
-
}
@Override
registration.unregister();
registration = null;
}
-
}
}
* 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 {
"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 {
--- /dev/null
+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 DGXMLActivator {
+
+ private static final Logger logger = LoggerFactory.getLogger(DGXMLActivator.class);
+ private static final String STRING_ENCODING = "utf-8";
+ private final SvcLogicStore store;
+
+ public DGXMLActivator(String propertiesFile) throws DGXMLException, SvcLogicException {
+ if (StringUtils.isBlank(propertiesFile)) {
+ throw new DGXMLException(propertiesFile + " Profile file is not defined");
+ }
+ this.store = SvcLogicStoreFactory.getSvcLogicStore(propertiesFile);
+ }
+
+ protected DGXMLActivator(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");
+ }
+ }
+
+}
package org.onap.sdnc.dg.loader;
-import java.io.File;
-import java.io.IOException;
-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.SvcLogicParser;
-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 DGXMLLoad {
- private static final Logger logger = LoggerFactory.getLogger(DGXMLLoad.class);
- public static final String STRING_ENCODING = "utf-8";
+ private static final Logger logger = LoggerFactory.getLogger(DGXMLLoader.class);
- private final SvcLogicStore store;
-
- public DGXMLLoad(String propfile) throws DGXMLException, SvcLogicException {
- if (StringUtils.isBlank(propfile)) {
- throw new DGXMLException(propfile + " Profile file is not defined");
- }
- this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
- }
-
- protected DGXMLLoad(SvcLogicStore store) {
- this.store = store;
- }
-
- public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException {
- if (dgXMLpath != null) {
- SvcLogicParser.load(dgXMLpath, this.store);
- }
- }
-
- private void loadDGXMLDir(String xmlPath) {
- try {
- logger.info(
- "******************** Loading DG into Database *****************************");
- List<String> errors = new ArrayList<>();
- if (this.store != null) {
- File xmlDir = new File(xmlPath);
- if (xmlDir.isDirectory()) {
- String[] extensions = new String[]{"xml", "XML"};
- List<File> files = (List<File>) FileUtils.listFiles(xmlDir, extensions, true);
- tryLoadXmls(errors, files);
- } else {
- throw new DGXMLException(xmlPath + " is not a valid XML Directory");
- }
- } else {
- throw new DGXMLException("Failed to initialise SvcLogicStore");
- }
-
- if (!errors.isEmpty()) {
- throw new DGXMLException(errors.toString());
- }
- } catch (Exception e) {
- logger.error("Failed to load DGXML directories", e);
- }
- }
-
- private void tryLoadXmls(List<String> errors, List<File> files) throws IOException {
- for (File file : files) {
- logger.info("Loading DG XML file :" + file.getCanonicalPath());
- try {
- SvcLogicParser.load(file.getCanonicalPath(), store);
- } catch (Exception e) {
- logger.error("Failed to load XML " + file.getCanonicalPath(), e);
- errors.add("Failed to load XML " + file.getCanonicalPath()
- + ", Exception : " + e.getMessage());
- }
- }
- }
+ private DGXMLLoad(){}
public static void main(String[] args) {
try {
String xmlPath;
String propertyPath;
-
if (args != null && args.length >= 2) {
xmlPath = args[0];
propertyPath = args[1];
throw new DGXMLException(
"Sufficient inputs for DGXMLLoadNActivate are missing <xmlpath> <dbPropertyfile>");
}
- DGXMLLoad dgXMLLoadDB = new DGXMLLoad(propertyPath);
- dgXMLLoadDB.loadDGXMLDir(xmlPath);
+ DGXMLLoader loader = new DGXMLLoader(propertyPath);
+ loader.loadDGXMLDir(xmlPath);
} catch (Exception e) {
- logger.error("Arguments missing", e);
+ logger.error("Arguments missing", e);
} finally {
System.exit(1);
}
package org.onap.sdnc.dg.loader;
-import java.io.File;
-import java.io.IOException;
-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.SvcLogicParser;
-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 DGXMLLoadNActivate {
private static final Logger logger = LoggerFactory.getLogger(DGXMLLoadNActivate.class);
- private static final String STRING_ENCODING = "utf-8";
-
- private final SvcLogicStore store;
-
- public DGXMLLoadNActivate(String propfile) throws DGXMLException, SvcLogicException {
- if (StringUtils.isBlank(propfile)) {
- throw new DGXMLException(propfile + " Profile file is not defined");
- }
- this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
- }
-
- protected DGXMLLoadNActivate(SvcLogicStore store) {
- this.store = store;
- }
-
- public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException {
- if (dgXMLpath != null) {
- SvcLogicParser.load(dgXMLpath, this.store);
- }
- }
-
- private void loadDGXMLDir(String xmlPath) {
- try {
- logger.info(
- "******************** Loading DG into Database *****************************");
- List<String> errors = new ArrayList<>();
- if (this.store != null) {
- File xmlDir = new File(xmlPath);
- if (xmlDir.isDirectory()) {
- String[] extensions = new String[]{"xml", "XML"};
- List<File> files = (List<File>) FileUtils.listFiles(xmlDir, extensions, true);
- tryLoadXmls(errors, files);
- } else {
- throw new DGXMLException(xmlPath + " is not a valid XML Directory");
- }
- } else {
- throw new DGXMLException("Failed to initialise SvcLogicStore");
- }
-
- if (!errors.isEmpty()) {
- throw new DGXMLException(errors.toString());
- }
- } catch (Exception e) {
- logger.error("Failed to load DGXML directories", e);
- }
- }
-
- private void tryLoadXmls(List<String> errors, List<File> files) throws IOException {
- for (File file : files) {
- logger.info("Loading DG XML file :" + file.getCanonicalPath());
- try {
- SvcLogicParser.load(file.getCanonicalPath(), this.store);
- } catch (Exception e) {
- logger.error("Failed to load XML " + file.getCanonicalPath(), e);
- errors.add("Failed to load XML " + file.getCanonicalPath()
- + ", Exception : " + e.getMessage());
- }
- }
- }
-
- 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 activade 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 != 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)) {
- 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 ...");
- store.activate(graph);
- } else {
- throw new DGXMLException("Failed to fetch from Database");
- }
- }
+ private DGXMLLoadNActivate() {}
public static void main(String[] args) {
try {
"Sufficient inputs for DGXMLLoadNActivate are missing <xmlpath> <activatefile> <dbPropertyfile>");
}
- DGXMLLoadNActivate dgXMLLoadDB = new DGXMLLoadNActivate(propertyPath);
- dgXMLLoadDB.loadDGXMLDir(xmlPath);
- dgXMLLoadDB.activateDg(activateFile);
+ DGXMLActivator activator = new DGXMLActivator(propertyPath);
+ DGXMLLoader loader = new DGXMLLoader(propertyPath);
+
+ loader.loadDGXMLDir(xmlPath);
+ activator.activateDg(activateFile);
+
} catch (Exception e) {
logger.error("Arguments missing", e);
} finally {
--- /dev/null
+package org.onap.sdnc.dg.loader;
+
+import java.io.File;
+import java.io.IOException;
+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.SvcLogicParser;
+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 DGXMLLoader {
+
+ private static final Logger logger = LoggerFactory.getLogger(DGXMLLoader.class);
+ public static final String STRING_ENCODING = "utf-8";
+
+ private final SvcLogicStore store;
+
+ public DGXMLLoader(String propfile) throws DGXMLException, SvcLogicException {
+ if (StringUtils.isBlank(propfile)) {
+ throw new DGXMLException(propfile + " Profile file is not defined");
+ }
+ this.store = SvcLogicStoreFactory.getSvcLogicStore(propfile);
+ }
+
+ protected DGXMLLoader(SvcLogicStore store) {
+ this.store = store;
+ }
+
+ public void loadDGXMLFile(String dgXMLpath) throws SvcLogicException {
+ if (dgXMLpath != null) {
+ SvcLogicParser.load(dgXMLpath, this.store);
+ }
+ }
+
+ public void loadDGXMLDir(String xmlPath) {
+ try {
+ logger.info(
+ "******************** Loading DG into Database *****************************");
+ List<String> errors = new ArrayList<>();
+ if (this.store != null) {
+ File xmlDir = new File(xmlPath);
+ if (xmlDir.isDirectory()) {
+ String[] extensions = new String[]{"xml", "XML"};
+ List<File> files = (List<File>) FileUtils.listFiles(xmlDir, extensions, true);
+ tryLoadXmls(errors, files);
+ } else {
+ throw new DGXMLException(xmlPath + " is not a valid XML Directory");
+ }
+ } else {
+ throw new DGXMLException("Failed to initialise SvcLogicStore");
+ }
+
+ if (!errors.isEmpty()) {
+ throw new DGXMLException(errors.toString());
+ }
+ } catch (Exception e) {
+ logger.error("Failed to load DGXML directories", e);
+ }
+ }
+
+ private void tryLoadXmls(List<String> errors, List<File> files) throws IOException {
+ for (File file : files) {
+ logger.info("Loading DG XML file :" + file.getCanonicalPath());
+ try {
+ SvcLogicParser.load(file.getCanonicalPath(), store);
+ } catch (Exception e) {
+ logger.error("Failed to load XML " + file.getCanonicalPath(), e);
+ errors.add("Failed to load XML " + file.getCanonicalPath()
+ + ", Exception : " + e.getMessage());
+ }
+ }
+ }
+}
// Generate, GenerateLoad, GenerateLoadActivate
String[] args = new String[] {"src/test/resources/json", "src/test/resources/xml"};
// logger.info("DGXML Conversion Started with arguments :"+ args[0] +":"+ args[1]);
- if (args != null && args.length >= 2) {
+ if (args.length >= 2) {
jsonPath = args[0];
xmlPath = args[1];
}
application.generateXMLFromJSON(jsonPath, xmlPath, propertyPath);
File dir = new File("src/test/resources/xml");
String extensions[] = new String[] {"xml", "XML"};
- List<File> files = new ArrayList<File>();
- files = (List<File>) FileUtils.listFiles(dir, extensions, true);
+ List<File> files = (List<File>) FileUtils.listFiles(dir, extensions, true);
assertNotNull(files.get(0));
assertNotNull(files.get(0).getName());
}
DGXMLGenerator.main(args);
File dir = new File("src/test/resources/xml");
String extensions[] = new String[] {"xml", "XML"};
- List<File> files = new ArrayList<File>();
- files = (List<File>) FileUtils.listFiles(dir, extensions, true);
+ List<File> files = (List<File>) FileUtils.listFiles(dir, extensions, true);
assertNotNull(files.get(0));
assertNotNull(files.get(0).getName());
}
public void testDGLoader() throws Exception {
String propertyPath = "src/test/resources/dummy.properties";
String xmlPath = "src/test/resources/xml/Appc_UniTest.xml";
- DGXMLLoad dgXMLLoad = new MockDGXMLLoad();
+ DGXMLLoader dgXMLLoad = new MockDGXMLLoader();
dgXMLLoad.loadDGXMLFile(xmlPath);
}
public void testDGLoaderWithDir() throws Exception {
String propertyPath = "src/test/resources/dummy.properties";
String xmlPath = "src/test/resources/xml";
- DGXMLLoad dgXMLLoad = new MockDGXMLLoad();
+ DGXMLLoader dgXMLLoad = new MockDGXMLLoader();
Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir", xmlPath);
}
public void testDGLoaderWithDirThrowsException() throws Exception {
String propertyPath = "src/test/resources/dummy.properties";
String xmlPath = "src/test/resources/xml/xml";
- DGXMLLoad dgXMLLoad = new MockDGXMLLoad();
- Whitebox.invokeMethod(dgXMLLoad, "loadDGXMLDir", xmlPath);
+ DGXMLLoader dgXMLLoader = new MockDGXMLLoader();
+ Whitebox.invokeMethod(dgXMLLoader, "loadDGXMLDir", xmlPath);
}
@Test
public void testDGActivate() throws Exception {
String propertyPath = "src/test/resources/dummy.properties";
String activateFilePath = "src/test/resources/dg_activate_test";
- DGXMLActivate dgXMLActivate = new MockDGXMLActivate();
- dgXMLActivate.activateDg(activateFilePath);
+ DGXMLActivator dgXMLActivator = new MockDGXMLActivator();
+ dgXMLActivator.activateDg(activateFilePath);
}
public void testDGActivateThrowsException() throws Exception {
String propertyPath = "src/test/resources/dummy.properties";
String activateFilePath = "src/test/resources/someFile";
- DGXMLActivate dgXMLActivate = new MockDGXMLActivate();
- dgXMLActivate.activateDg(activateFilePath);
-
- }
+ DGXMLActivator dgXMLActivator = new MockDGXMLActivator();
+ dgXMLActivator.activateDg(activateFilePath);
- @Test
- public void testDGLoadNActivate() throws Exception {
- String propertyPath = "src/test/resources/dummy.properties";
- String activateFilePath = "src/test/resources/dg_activate_test";
- String xmlPath = "src/test/resources/xml/Appc_UniTest.xml";
- DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate();
- dgXMLLoadNActivate.loadDGXMLFile(xmlPath);
- dgXMLLoadNActivate.activateDg(activateFilePath);
- }
-
- @Test
- public void testDGLoadNActivateThrowsException() throws Exception {
- String propertyPath = "src/test/resources/dummy.properties";
- String activateFilePath = "src/test/resources/someFile";
- String xmlPath = "src/test/resources/xml/Appc_UniTest.xml";
- DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate();
- dgXMLLoadNActivate.loadDGXMLFile(xmlPath);
- dgXMLLoadNActivate.activateDg(activateFilePath);
- }
-
- @Test
- public void testDGLoadNActivateloadDGXMLDir() throws Exception {
- String xmlPath = "src/test/resources/xml";
- DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate();
- Whitebox.invokeMethod(dgXMLLoadNActivate, "loadDGXMLDir", xmlPath);
- }
-
-
- public void testDGLoadNActivateloadDGXMLDirThrowsException() throws Exception {
- String xmlPath = "src/test/resources/someDir";
- DGXMLLoadNActivate dgXMLLoadNActivate = new MockDGXMLLoadNActivate();
- Whitebox.invokeMethod(dgXMLLoadNActivate, "loadDGXMLDir", xmlPath);
}
@Test
@Test(expected = Exception.class)
public void testDGActivateConstructorThrowsException() throws Exception {
String somePath = "";
- DGXMLActivate dgXMLActivate = new DGXMLActivate(somePath);
+ DGXMLActivator dgXMLActivator = new DGXMLActivator(somePath);
}
@Test(expected = Exception.class)
public void testDGXMLLoadConstructorThrowsException() throws Exception {
String somePath = "";
- DGXMLLoad dgXMLLoad = new DGXMLLoad(somePath);
- }
-
- @Test(expected = Exception.class)
- public void testDGLoadNActivateConstructorThrowsException() throws Exception {
- String somePath = "";
- DGXMLLoadNActivate dgXMLLoadNActivate = new DGXMLLoadNActivate(somePath);
+ DGXMLLoader dgXMLLoader = new DGXMLLoader(somePath);
}
-
}
import org.onap.ccsdk.sli.core.sli.SvcLogicStore;
-public class MockDGXMLActivate extends DGXMLActivate {
+public class MockDGXMLActivator extends DGXMLActivator {
private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();;
- MockDGXMLActivate() throws Exception {
+ MockDGXMLActivator() throws Exception {
super(storeChild);
}
+++ /dev/null
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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 org.onap.ccsdk.sli.core.sli.SvcLogicStore;
-
-public class MockDGXMLLoadNActivate extends DGXMLLoadNActivate {
- private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();;
-
- MockDGXMLLoadNActivate() throws Exception {
- super(storeChild);
- }
-}
import org.onap.ccsdk.sli.core.sli.SvcLogicStore;
-public class MockDGXMLLoad extends DGXMLLoad {
+public class MockDGXMLLoader extends DGXMLLoader {
private final static SvcLogicStore storeChild = MockSvcLogicFactory.getMockSvcLogicStore();;
- MockDGXMLLoad() throws Exception {
+ MockDGXMLLoader() throws Exception {
super(storeChild);
}
Code Review / appc.git / commitdiff