aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGeora Barsky <georab@amdocs.com>2018-11-02 15:44:04 -0400
committerGeora Barsky <georab@amdocs.com>2018-11-02 16:53:40 -0400
commit4e7f39f1c1a032a9e72696317a6ac801d0541ba1 (patch)
treedb9000e3bcb5e0e705b5e64b2aa69b9815ab2a66 /src
parentf7a85ec2f461e2ed4ee1f089b6a99ce96fedaffc (diff)
Upgrade to the latest tosca parser version
Issue-ID: LOG-796 Change-Id: Ie550bb24665a1ff667a172b4961710dbf123cc23 Signed-off-by: Geora Barsky <georab@amdocs.com>
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java4
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java2
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java2
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java12
-rw-r--r--src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java10
-rw-r--r--src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java2
-rw-r--r--src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java4
7 files changed, 18 insertions, 18 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java
index 28157d1..379433e 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCClientConfiguration.java
@@ -20,7 +20,7 @@ package org.onap.pomba.contextbuilder.sdc;
import java.util.Base64;
import lombok.Data;
import org.eclipse.jetty.util.security.Password;
-import org.openecomp.sdc.http.SdcConnectorClient;
+import org.onap.sdc.http.SdcConnectorClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
@@ -76,7 +76,7 @@ public class SDCClientConfiguration {
sdcContextConfig.setActivateServerTLSAuth(false);
sdcContextConfig.setPollingTimeout(Integer.parseInt(pollingTimeout));
- org.openecomp.sdc.impl.Configuration config = new org.openecomp.sdc.impl.Configuration(sdcContextConfig);
+ org.onap.sdc.impl.Configuration config = new org.onap.sdc.impl.Configuration(sdcContextConfig);
client.init(config);
return client;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java
index a5ec9bc..d88ecb0 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/SDCContextConfig.java
@@ -18,7 +18,7 @@
package org.onap.pomba.contextbuilder.sdc;
import java.util.List;
-import org.openecomp.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.api.consumer.IConfiguration;
public class SDCContextConfig implements IConfiguration {
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java
index 8e3d179..4e540b8 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/ArtifactInfo.java
@@ -20,7 +20,7 @@ package org.onap.pomba.contextbuilder.sdc.model;
import java.util.List;
import lombok.Data;
import lombok.ToString;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
@Data
@ToString(includeFieldNames = true)
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
index bea574f..9fac21e 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaCsarArtifactHandler.java
@@ -33,12 +33,12 @@ import org.onap.pomba.contextbuilder.sdc.ToscaBuilderConfig;
import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
import org.onap.pomba.contextbuilder.sdc.model.ArtifactInfo;
import org.onap.pomba.contextbuilder.sdc.model.SDCContextResponse;
-import org.openecomp.sdc.api.results.IDistributionClientDownloadResult;
-import org.openecomp.sdc.http.SdcConnectorClient;
-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.utils.DistributionActionResultEnum;
+import org.onap.sdc.api.results.IDistributionClientDownloadResult;
+import org.onap.sdc.http.SdcConnectorClient;
+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.utils.DistributionActionResultEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
index 1e7580d..a1c6779 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
@@ -25,11 +25,11 @@ import org.onap.pomba.common.datatypes.VF;
import org.onap.pomba.common.datatypes.VFModule;
import org.onap.pomba.common.datatypes.VNFC;
import org.onap.pomba.contextbuilder.sdc.exception.ToscaCsarException;
-import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;
-import org.openecomp.sdc.toscaparser.api.Group;
-import org.openecomp.sdc.toscaparser.api.NodeTemplate;
-import org.openecomp.sdc.toscaparser.api.elements.Metadata;
+import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.impl.SdcPropertyNames;
+import org.onap.sdc.toscaparser.api.Group;
+import org.onap.sdc.toscaparser.api.NodeTemplate;
+import org.onap.sdc.toscaparser.api.elements.Metadata;
public class ToscaModelConverter {
diff --git a/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java b/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java
index 01902f0..5f58fad 100644
--- a/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java
+++ b/src/test/java/org/onap/pomba/contextbuilder/sdc/model/test/ArtifactInfoTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.onap.pomba.contextbuilder.sdc.model.ArtifactInfo;
-import org.openecomp.sdc.api.notification.IArtifactInfo;
+import org.onap.sdc.api.notification.IArtifactInfo;
public class ArtifactInfoTest {
diff --git a/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java b/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java
index 8567b75..7bd5f86 100644
--- a/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java
+++ b/src/test/java/org/onap/pomba/contextbuilder/sdc/test/SDCClientConfigurationTest.java
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals;
import org.eclipse.jetty.util.security.Password;
import org.junit.Test;
import org.onap.pomba.contextbuilder.sdc.SDCClientConfiguration;
-import org.openecomp.sdc.api.consumer.IConfiguration;
-import org.openecomp.sdc.http.SdcConnectorClient;
+import org.onap.sdc.api.consumer.IConfiguration;
+import org.onap.sdc.http.SdcConnectorClient;
public class SDCClientConfigurationTest {