update SDC-TOSCA package namesv1.3.0

Change-Id: I496713bcf2551f3b5c7f629f89ffcb8b1954b489
Issue-ID: SDC-951
Signed-off-by: Yuli Shlosberg <ys9693@att.com>

12 files changed, 61 insertions, 67 deletions

diff --git a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java b/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java
index 1695671..39f5190 100644
--- a/src/test/java/org/openecomp/sdc/impl/SdcToscaParserBasicTest.java
+++ b/src/test/java/org/onap/sdc/impl/SdcToscaParserBasicTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -8,12 +8,11 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.openecomp.sdc.toscaparser.api.common.JToscaException;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.common.JToscaException;
 import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.BeforeSuite;
 
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java
index b57522d..6c0455b 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserConfigurationTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserConfigurationTest.java
@@ -1,10 +1,10 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.tosca.parser.config.ErrorConfiguration;
-import org.openecomp.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
+import org.onap.sdc.tosca.parser.config.ErrorConfiguration;
+import org.onap.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
 import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.config.Configuration;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.config.Configuration;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserErrorHandlingTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
index 8451a58..d022a1a 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserErrorHandlingTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserErrorHandlingTest.java
@@ -1,12 +1,12 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import org.testng.annotations.Test;
 import static org.testng.Assert.*;
 
 import java.io.File;
 
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.utils.JToscaErrorCodes;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.utils.JToscaErrorCodes;
 
 
 /*put(JToscaErrorCodes.GENERAL_ERROR, GENERAL_ERROR);
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserGeneralUtilTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java
index 9f349ae..d4ad73d 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserGeneralUtilTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserGeneralUtilTest.java
@@ -1,7 +1,7 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.utils.GeneralUtility;
+import org.onap.sdc.tosca.parser.utils.GeneralUtility;
 
 import static org.testng.Assert.assertTrue;
 
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java
index 8435c12..540236c 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserGroupTest.java
@@ -1,11 +1,10 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static org.testng.Assert.*;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java
index 1746042..8487dec 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserMetadataTest.java
@@ -1,10 +1,11 @@
-package org.openecomp.sdc.impl;
-
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+package org.onap.sdc.impl;
+
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.testng.annotations.Test;
 
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java
index 04675b4..0692ebe 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserNodeTemplateTest.java
@@ -1,4 +1,4 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
@@ -9,12 +9,12 @@ import static org.hamcrest.CoreMatchers.is;
 
 import com.google.common.collect.ImmutableMap;
 import org.apache.commons.lang3.tuple.Pair;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.FilterType;
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.Property;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.FilterType;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.Property;
 import org.testng.annotations.Test;
 
 import fj.data.fingertrees.Node;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserReqAndCapTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java
index 8d800e1..75f8962 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserReqAndCapTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserReqAndCapTest.java
@@ -1,11 +1,11 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.tosca.parser.impl.SdcTypes;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignments;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignment;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.RequirementAssignments;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.impl.SdcTypes;
+import org.onap.sdc.toscaparser.api.CapabilityAssignments;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.RequirementAssignments;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
 import org.testng.annotations.Test;
 
 import java.util.List;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java
index 75f904f..b11487f 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserServiceInputTest.java
@@ -1,7 +1,7 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import org.testng.annotations.Test;
-import org.openecomp.sdc.toscaparser.api.parameters.Input;
+import org.onap.sdc.toscaparser.api.parameters.Input;
 
 import java.util.List;
 
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserSubsMappingsTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java
index 7570ced..cbd8e8a 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserSubsMappingsTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserSubsMappingsTest.java
@@ -1,19 +1,18 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.CapabilityAssignment;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.RequirementAssignment;
-import org.openecomp.sdc.toscaparser.api.elements.CapabilityTypeDef;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.CapabilityAssignment;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.RequirementAssignment;
+import org.onap.sdc.toscaparser.api.elements.CapabilityTypeDef;
 //import org.testng.ReporterConfig.Property;
 import org.testng.annotations.Test;
-import org.openecomp.sdc.toscaparser.api.Property;
+import org.onap.sdc.toscaparser.api.Property;
 
 //import static org.junit.Assert.assertEquals;
 //import static org.junit.Assert.assertNull;
diff --git a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java b/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java
index 60119c4..0fc42f7 100644
--- a/src/test/java/org/openecomp/sdc/impl/ToscaParserValidationIssueTest.java
+++ b/src/test/java/org/onap/sdc/impl/ToscaParserValidationIssueTest.java
@@ -1,17 +1,14 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.apache.commons.io.IOUtils;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.config.ConfigurationManager;
-import org.openecomp.sdc.tosca.parser.config.JtoscaValidationIssueConfiguration;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.toscaparser.api.common.JToscaValidationIssue;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.config.ConfigurationManager;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.toscaparser.api.common.JToscaValidationIssue;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.io.IOException;
-import java.net.URL;
 import java.util.List;
 import java.util.stream.Collectors;
 
diff --git a/src/test/java/org/openecomp/sdc/impl/myTest.java b/src/test/java/org/onap/sdc/impl/myTest.java
index 2f0da7f..4833f6f 100644
--- a/src/test/java/org/openecomp/sdc/impl/myTest.java
+++ b/src/test/java/org/onap/sdc/impl/myTest.java
@@ -1,15 +1,14 @@
-package org.openecomp.sdc.impl;
+package org.onap.sdc.impl;
 
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.testng.annotations.Test;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;
-import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
+import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
 
 import java.io.File;
-import java.util.List;
 
-import static org.openecomp.sdc.impl.SdcToscaParserBasicTest.getCsarHelper;
+import static org.onap.sdc.impl.SdcToscaParserBasicTest.getCsarHelper;
 
 public class myTest  {