From 04e7fa443307328986942c66fbcb01693c8f9ccb Mon Sep 17 00:00:00 2001 From: Pavel Aharoni Date: Thu, 27 Apr 2017 17:52:06 +0300 Subject: [SDC-13] fixing JTosca package declarations Change-Id: I0741c743e50e9784c50cb59529d2188ce984d830 Signed-off-by: Pavel Aharoni --- .../openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java | 8 ++++---- .../sdc/tosca/parser/impl/SdcCsarHelperImpl.java | 18 +++++++++--------- .../sdc/tosca/parser/impl/SdcToscaParserFactory.java | 6 +++--- .../org/openecomp/sdc/impl/ToscaParserGroupTest.java | 4 ++-- .../openecomp/sdc/impl/ToscaParserMetadataTest.java | 2 +- .../sdc/impl/ToscaParserNodeTemplateTest.java | 4 ++-- .../sdc/impl/ToscaParserServiceInputTest.java | 2 +- .../org/openecomp/sdc/impl/ToscaParserTestSuite.java | 2 +- 8 files changed, 23 insertions(+), 23 deletions(-) (limited to 'sdc-tosca-parser/src') diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java index 8d04d97..dd0e96c 100644 --- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java +++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/api/ISdcCsarHelper.java @@ -22,10 +22,10 @@ package org.openecomp.sdc.tosca.parser.api; import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import org.openecomp.sdc.toscaparser.Group; -import org.openecomp.sdc.toscaparser.NodeTemplate; -import org.openecomp.sdc.toscaparser.elements.Metadata; -import org.openecomp.sdc.toscaparser.parameters.Input; +import org.openecomp.sdc.toscaparser.api.Group; +import org.openecomp.sdc.toscaparser.api.NodeTemplate; +import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.openecomp.sdc.toscaparser.api.parameters.Input; public interface ISdcCsarHelper { diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java index 5ce66a5..b5fb6af 100644 --- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java +++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcCsarHelperImpl.java @@ -34,15 +34,15 @@ import org.apache.commons.lang3.tuple.Pair; import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; import org.openecomp.sdc.tosca.parser.utils.GeneralUtility; import org.openecomp.sdc.tosca.parser.utils.SdcToscaUtility; -import org.openecomp.sdc.toscaparser.Group; -import org.openecomp.sdc.toscaparser.NodeTemplate; -import org.openecomp.sdc.toscaparser.Property; -import org.openecomp.sdc.toscaparser.SubstitutionMappings; -import org.openecomp.sdc.toscaparser.TopologyTemplate; -import org.openecomp.sdc.toscaparser.ToscaTemplate; -import org.openecomp.sdc.toscaparser.elements.Metadata; -import org.openecomp.sdc.toscaparser.elements.NodeType; -import org.openecomp.sdc.toscaparser.parameters.Input; +import org.openecomp.sdc.toscaparser.api.Group; +import org.openecomp.sdc.toscaparser.api.NodeTemplate; +import org.openecomp.sdc.toscaparser.api.Property; +import org.openecomp.sdc.toscaparser.api.SubstitutionMappings; +import org.openecomp.sdc.toscaparser.api.TopologyTemplate; +import org.openecomp.sdc.toscaparser.api.ToscaTemplate; +import org.openecomp.sdc.toscaparser.api.elements.Metadata; +import org.openecomp.sdc.toscaparser.api.elements.NodeType; +import org.openecomp.sdc.toscaparser.api.parameters.Input; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java index f8ac3cc..3f62e12 100644 --- a/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java +++ b/sdc-tosca-parser/src/main/java/org/openecomp/sdc/tosca/parser/impl/SdcToscaParserFactory.java @@ -5,9 +5,9 @@ import java.util.List; import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper; import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.toscaparser.NodeTemplate; -import org.openecomp.sdc.toscaparser.ToscaTemplate; -import org.openecomp.sdc.toscaparser.common.JToscaException; +import org.openecomp.sdc.toscaparser.api.NodeTemplate; +import org.openecomp.sdc.toscaparser.api.ToscaTemplate; +import org.openecomp.sdc.toscaparser.api.common.JToscaException; public class SdcToscaParserFactory{ diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java index e92502c..0bda21e 100644 --- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java +++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserGroupTest.java @@ -2,8 +2,8 @@ package org.openecomp.sdc.impl; import org.junit.Test; import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.toscaparser.Group; -import org.openecomp.sdc.toscaparser.elements.Metadata; +import org.openecomp.sdc.toscaparser.api.Group; +import org.openecomp.sdc.toscaparser.api.elements.Metadata; import java.util.List; diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java index 6744536..9321bc6 100644 --- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java +++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserMetadataTest.java @@ -1,7 +1,7 @@ package org.openecomp.sdc.impl; import org.junit.Test; -import org.openecomp.sdc.toscaparser.elements.Metadata; +import org.openecomp.sdc.toscaparser.api.elements.Metadata; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java index 3ca3ca4..469ddd2 100644 --- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java +++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserNodeTemplateTest.java @@ -10,8 +10,8 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; import org.junit.Test; import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException; -import org.openecomp.sdc.toscaparser.Group; -import org.openecomp.sdc.toscaparser.NodeTemplate; +import org.openecomp.sdc.toscaparser.api.Group; +import org.openecomp.sdc.toscaparser.api.NodeTemplate; public class ToscaParserNodeTemplateTest extends BasicTest { diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java index 30aff6a..3444e53 100644 --- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java +++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserServiceInputTest.java @@ -1,7 +1,7 @@ package org.openecomp.sdc.impl; import org.junit.Test; -import org.openecomp.sdc.toscaparser.parameters.Input; +import org.openecomp.sdc.toscaparser.api.parameters.Input; import java.util.List; diff --git a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java index 3437b8d..d4b474f 100644 --- a/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java +++ b/sdc-tosca-parser/src/test/java/org/openecomp/sdc/impl/ToscaParserTestSuite.java @@ -6,7 +6,7 @@ import org.junit.runner.RunWith; 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.common.JToscaException; +import org.openecomp.sdc.toscaparser.api.common.JToscaException; import java.io.File; import java.io.IOException; -- cgit 1.2.3-korg