From 0756759f39e125b02d63b4e93de83b3c6b13beea Mon Sep 17 00:00:00 2001 From: Patrick Brady Date: Wed, 13 Dec 2017 11:09:30 -0800 Subject: First part of onap rename This is the first commit of the rename. This commit changes refereces to org.openecomp.appc > org.onap.appc that occur within files. The package folder structure is not changed in this commit. Change-Id: Ic95d749eb99d8a6f4f2b9ee9b06eb41c5cfa7e1c Signed-off-by: Patrick Brady Issue-ID: APPC-13 --- .../appc/dg/dependencymanager/DependencyManager.java | 12 ++++++------ .../appc/dg/dependencymanager/DependencyType.java | 10 +++++----- .../exception/DependencyModelNotFound.java | 2 +- .../helper/DependencyModelParser.java | 10 +++++----- .../impl/DependencyManagerImpl.java | 20 ++++++++++---------- .../impl/DependencyModelFactory.java | 4 ++-- .../dependencymanager/impl/ResourceDependency.java | 18 +++++++++--------- .../openecomp/appc/dg/flowbuilder/FlowBuilder.java | 8 ++++---- .../openecomp/appc/dg/flowbuilder/FlowStrategy.java | 8 ++++---- .../exception/InvalidDependencyModel.java | 2 +- .../openecomp/appc/dg/flowbuilder/helper/Graph.java | 4 ++-- .../dg/flowbuilder/impl/AbstractFlowStrategy.java | 12 ++++++------ .../appc/dg/flowbuilder/impl/FlowBuilderFactory.java | 6 +++--- .../appc/dg/flowbuilder/impl/FlowBuilderImpl.java | 12 ++++++------ .../dg/flowbuilder/impl/ForwardFlowStrategy.java | 6 +++--- .../dg/flowbuilder/impl/ReverseFlowStrategy.java | 6 +++--- .../openecomp/appc/dg/objects/DependencyTypes.java | 2 +- .../openecomp/appc/dg/objects/FlowStrategies.java | 2 +- .../openecomp/appc/dg/objects/InventoryModel.java | 4 ++-- .../java/org/openecomp/appc/dg/objects/Node.java | 2 +- .../appc/dg/objects/VnfcDependencyModel.java | 4 ++-- .../org/openecomp/appc/dg/objects/VnfcFlowModel.java | 4 ++-- .../appc/dg/flowbuilder/TestFlowBuilder.java | 16 ++++++++-------- 23 files changed, 87 insertions(+), 87 deletions(-) (limited to 'appc-dg/appc-dg-shared/appc-dg-dependency-model/src') diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java index 34ebff8b6..8d04cea11 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyManager.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager; +package org.onap.appc.dg.dependencymanager; -import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.objects.DependencyTypes; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.objects.DependencyTypes; +import org.onap.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.metadata.objects.DependencyModelIdentifier; +import org.onap.appc.metadata.objects.DependencyModelIdentifier; public interface DependencyManager { VnfcDependencyModel getVnfcDependencyModel(DependencyModelIdentifier modelIdentifier, DependencyTypes dependencyType) throws InvalidDependencyModel, DependencyModelNotFound; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java index 16c568a99..15717f06b 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/DependencyType.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager; +package org.onap.appc.dg.dependencymanager; -import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.metadata.objects.DependencyModelIdentifier; +import org.onap.appc.metadata.objects.DependencyModelIdentifier; public interface DependencyType { VnfcDependencyModel getVnfcDependencyModel(DependencyModelIdentifier modelIdentifier) throws InvalidDependencyModel, DependencyModelNotFound; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java index f12da927a..ffb6182cd 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/exception/DependencyModelNotFound.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager.exception; +package org.onap.appc.dg.dependencymanager.exception; public class DependencyModelNotFound extends Exception { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java index c06841251..187020028 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/helper/DependencyModelParser.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager.helper; +package org.onap.appc.dg.dependencymanager.helper; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -31,10 +31,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.dataformat.yaml.YAMLFactory; import org.apache.commons.lang3.StringUtils; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.objects.Node; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.objects.Node; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.domainmodel.Vnfc; import java.io.IOException; import java.util.*; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java index 1cbdb7ed5..31ea46cc6 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyManagerImpl.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager.impl; +package org.onap.appc.dg.dependencymanager.impl; -import org.openecomp.appc.dg.dependencymanager.DependencyManager; -import org.openecomp.appc.dg.dependencymanager.DependencyType; -import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.objects.DependencyTypes; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.dependencymanager.DependencyManager; +import org.onap.appc.dg.dependencymanager.DependencyType; +import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.objects.DependencyTypes; +import org.onap.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.cache.MetadataCache; -import org.openecomp.appc.cache.impl.MetadataCacheFactory; -import org.openecomp.appc.metadata.objects.DependencyModelIdentifier; +import org.onap.appc.cache.MetadataCache; +import org.onap.appc.cache.impl.MetadataCacheFactory; +import org.onap.appc.metadata.objects.DependencyModelIdentifier; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java index 54d55817c..a3fd36937 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/DependencyModelFactory.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager.impl; +package org.onap.appc.dg.dependencymanager.impl; -import org.openecomp.appc.dg.dependencymanager.DependencyManager; +import org.onap.appc.dg.dependencymanager.DependencyManager; public class DependencyModelFactory { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java index 889df971b..73792d3ad 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/dependencymanager/impl/ResourceDependency.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.dependencymanager.impl; +package org.onap.appc.dg.dependencymanager.impl; -import org.openecomp.appc.metadata.MetadataService; -import org.openecomp.appc.metadata.objects.DependencyModelIdentifier; +import org.onap.appc.metadata.MetadataService; +import org.onap.appc.metadata.objects.DependencyModelIdentifier; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.openecomp.appc.dg.dependencymanager.DependencyType; -import org.openecomp.appc.dg.dependencymanager.exception.DependencyModelNotFound; -import org.openecomp.appc.dg.dependencymanager.helper.DependencyModelParser; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.dependencymanager.DependencyType; +import org.onap.appc.dg.dependencymanager.exception.DependencyModelNotFound; +import org.onap.appc.dg.dependencymanager.helper.DependencyModelParser; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; @@ -60,7 +60,7 @@ public class ResourceDependency implements DependencyType{ } else { logger.info("MetadataService error from bundlecontext"); - logger.warn("Cannot find service reference for org.openecomp.appc.metadata.MetadataService"); + logger.warn("Cannot find service reference for org.onap.appc.metadata.MetadataService"); } } diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java index 155842032..78dacd105 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowBuilder.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder; +package org.onap.appc.dg.flowbuilder; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.VnfcFlowModel; public interface FlowBuilder { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java index 4f802a9c7..e2c292776 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/FlowStrategy.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder; +package org.onap.appc.dg.flowbuilder; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.VnfcFlowModel; public interface FlowStrategy { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java index 305d4eba2..9f4cfed93 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/exception/InvalidDependencyModel.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.exception; +package org.onap.appc.dg.flowbuilder.exception; public class InvalidDependencyModel extends RuntimeException { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java index b21c22d69..95e0b6675 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/helper/Graph.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.helper; +package org.onap.appc.dg.flowbuilder.helper; import java.util.*; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; public class Graph { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java index 247bd0249..fbb2d5d67 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/AbstractFlowStrategy.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.impl; +package org.onap.appc.dg.flowbuilder.impl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -31,11 +31,11 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import org.openecomp.appc.dg.flowbuilder.FlowStrategy; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.flowbuilder.helper.Graph; -import org.openecomp.appc.dg.objects.*; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.dg.flowbuilder.FlowStrategy; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.flowbuilder.helper.Graph; +import org.onap.appc.dg.objects.*; +import org.onap.appc.domainmodel.Vnfc; public abstract class AbstractFlowStrategy implements FlowStrategy { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java index b7cec3c6d..ac5e35b89 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderFactory.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.impl; +package org.onap.appc.dg.flowbuilder.impl; -import org.openecomp.appc.dg.flowbuilder.FlowBuilder; -import org.openecomp.appc.dg.objects.FlowStrategies; +import org.onap.appc.dg.flowbuilder.FlowBuilder; +import org.onap.appc.dg.objects.FlowStrategies; public class FlowBuilderFactory { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java index 38a7a64c4..59d1e4bf9 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/FlowBuilderImpl.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.impl; +package org.onap.appc.dg.flowbuilder.impl; -import org.openecomp.appc.dg.flowbuilder.FlowBuilder; -import org.openecomp.appc.dg.flowbuilder.FlowStrategy; -import org.openecomp.appc.dg.objects.InventoryModel; -import org.openecomp.appc.dg.objects.VnfcDependencyModel; -import org.openecomp.appc.dg.objects.VnfcFlowModel; +import org.onap.appc.dg.flowbuilder.FlowBuilder; +import org.onap.appc.dg.flowbuilder.FlowStrategy; +import org.onap.appc.dg.objects.InventoryModel; +import org.onap.appc.dg.objects.VnfcDependencyModel; +import org.onap.appc.dg.objects.VnfcFlowModel; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java index 422559d79..9c5aae64f 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ForwardFlowStrategy.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.impl; +package org.onap.appc.dg.flowbuilder.impl; import java.util.*; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.domainmodel.Vnfc; public class ForwardFlowStrategy extends AbstractFlowStrategy { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java index 246ee3433..79cd4420c 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/flowbuilder/impl/ReverseFlowStrategy.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder.impl; +package org.onap.appc.dg.flowbuilder.impl; import java.util.*; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.domainmodel.Vnfc; public class ReverseFlowStrategy extends AbstractFlowStrategy { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java index f891f9114..b74ea7965 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/DependencyTypes.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; public enum DependencyTypes { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java index 387502ca5..857d802c2 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/FlowStrategies.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; public enum FlowStrategies { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java index 8f46c0ad3..e9156a8d9 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/InventoryModel.java @@ -22,9 +22,9 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; -import org.openecomp.appc.domainmodel.Vnf; +import org.onap.appc.domainmodel.Vnf; public class InventoryModel { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java index af7da267c..586ce7deb 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/Node.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; import java.util.LinkedList; import java.util.List; diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java index f8b0d0381..278d6fcaa 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcDependencyModel.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; import java.util.Set; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vnfc; public class VnfcDependencyModel { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java index 3f30cdce6..1100e42cb 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/main/java/org/openecomp/appc/dg/objects/VnfcFlowModel.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.objects; +package org.onap.appc.dg.objects; import java.util.*; -import org.openecomp.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vnfc; public class VnfcFlowModel { diff --git a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java index 6f6277f1d..009515378 100644 --- a/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java +++ b/appc-dg/appc-dg-shared/appc-dg-dependency-model/src/test/java/org/openecomp/appc/dg/flowbuilder/TestFlowBuilder.java @@ -22,17 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.dg.flowbuilder; +package org.onap.appc.dg.flowbuilder; import org.junit.Assert; import org.junit.Test; -import org.openecomp.appc.dg.flowbuilder.FlowBuilder; -import org.openecomp.appc.dg.flowbuilder.exception.InvalidDependencyModel; -import org.openecomp.appc.dg.flowbuilder.impl.FlowBuilderFactory; -import org.openecomp.appc.dg.objects.*; -import org.openecomp.appc.domainmodel.Vnf; -import org.openecomp.appc.domainmodel.Vnfc; -import org.openecomp.appc.domainmodel.Vserver; +import org.onap.appc.dg.flowbuilder.FlowBuilder; +import org.onap.appc.dg.flowbuilder.exception.InvalidDependencyModel; +import org.onap.appc.dg.flowbuilder.impl.FlowBuilderFactory; +import org.onap.appc.dg.objects.*; +import org.onap.appc.domainmodel.Vnf; +import org.onap.appc.domainmodel.Vnfc; +import org.onap.appc.domainmodel.Vserver; import java.util.HashSet; import java.util.Iterator; -- cgit 1.2.3-korg