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 --- .../main/java/org/openecomp/appc/oam/AppcOam.java | 78 +++++++++++----------- .../org/openecomp/appc/oam/OAMCommandStatus.java | 6 +- .../appc/oam/messageadapter/Converter.java | 16 ++--- .../oam/messageadapter/DmaapOutgoingMessage.java | 4 +- .../appc/oam/messageadapter/MessageAdapter.java | 10 +-- .../appc/oam/messageadapter/OAMContext.java | 10 +-- .../appc/oam/processor/BaseActionRunnable.java | 10 +-- .../openecomp/appc/oam/processor/BaseCommon.java | 30 ++++----- .../appc/oam/processor/BaseProcessor.java | 26 ++++---- .../appc/oam/processor/OamMmodeProcessor.java | 28 ++++---- .../appc/oam/processor/OamRestartProcessor.java | 20 +++--- .../appc/oam/processor/OamStartProcessor.java | 20 +++--- .../appc/oam/processor/OamStopProcessor.java | 18 ++--- .../openecomp/appc/oam/util/AsyncTaskHelper.java | 8 +-- .../org/openecomp/appc/oam/util/BundleFilter.java | 2 +- .../org/openecomp/appc/oam/util/BundleHelper.java | 10 +-- .../appc/oam/util/ConfigurationHelper.java | 8 +-- .../openecomp/appc/oam/util/OperationHelper.java | 38 +++++------ .../org/openecomp/appc/oam/util/StateHelper.java | 6 +- 19 files changed, 174 insertions(+), 174 deletions(-) (limited to 'appc-oam/appc-oam-bundle/src/main/java/org/openecomp') diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java index 7ad3b6201..97938339c 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/AppcOam.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; @@ -31,47 +31,47 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcOamService; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetAppcStateOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.GetMetricsOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.Metrics; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.MetricsBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValues; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcOamService; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetAppcStateOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.GetMetricsOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.Metrics; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.MetricsBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValues; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.get.metrics.output.metrics.KpiValuesBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; import org.opendaylight.yangtools.yang.common.RpcError; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.metricservice.MetricRegistry; -import org.openecomp.appc.metricservice.MetricService; -import org.openecomp.appc.metricservice.metric.Metric; -import org.openecomp.appc.oam.processor.OamMmodeProcessor; -import org.openecomp.appc.oam.processor.OamRestartProcessor; -import org.openecomp.appc.oam.processor.OamStartProcessor; -import org.openecomp.appc.oam.processor.OamStopProcessor; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.metricservice.MetricRegistry; +import org.onap.appc.metricservice.MetricService; +import org.onap.appc.metricservice.metric.Metric; +import org.onap.appc.oam.processor.OamMmodeProcessor; +import org.onap.appc.oam.processor.OamRestartProcessor; +import org.onap.appc.oam.processor.OamStartProcessor; +import org.onap.appc.oam.processor.OamStopProcessor; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader.AppcOperation; import java.util.ArrayList; import java.util.List; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java index b8a4e3e86..294b9d2cf 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/OAMCommandStatus.java @@ -22,10 +22,10 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam; +package org.onap.appc.oam; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.util.MessageFormatter; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.util.MessageFormatter; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java index a70d12042..152ffc9cc 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/Converter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; @@ -32,15 +32,15 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.MapperFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectWriter; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopOutputBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopOutputBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; import org.opendaylight.yangtools.concepts.Builder; import org.opendaylight.yangtools.yang.binding.DataContainer; -import org.openecomp.appc.oam.AppcOam; +import org.onap.appc.oam.AppcOam; import java.text.SimpleDateFormat; import java.util.TimeZone; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java index 54887521d..25bf0cf8b 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/DmaapOutgoingMessage.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -30,7 +30,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * This class represents a message being sent out to DMaaP by APPC as async response. - * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.openecomp.appc.listener.LCM.domainmodel.DmaapOutgoingMessage + * note the structure of this class must be adapted to the sync message sent to DMaaP represented in org.onap.appc.listener.LCM.domainmodel.DmaapOutgoingMessage * */ @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java index d93feabe4..91836cb40 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/MessageAdapter.java @@ -22,16 +22,16 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.core.JsonProcessingException; import org.apache.commons.lang.ObjectUtils; -import org.openecomp.appc.adapter.message.MessageAdapterFactory; -import org.openecomp.appc.adapter.message.Producer; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.adapter.message.MessageAdapterFactory; +import org.onap.appc.adapter.message.Producer; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java index 2d33388a0..3af395923 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/messageadapter/OAMContext.java @@ -22,15 +22,15 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.messageadapter; +package org.onap.appc.oam.messageadapter; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.*; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeaderBuilder; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status;import org.openecomp.appc.oam.AppcOam; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.*; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeaderBuilder; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status;import org.onap.appc.oam.AppcOam; public class OAMContext { diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java index b118eb0d1..927334670 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseActionRunnable.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.HashMap; import java.util.Map; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java index 0cfab98b4..93e79dd2f 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseCommon.java @@ -22,24 +22,24 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.i18n.EELFResourceManager; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.StatusBuilder; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.executor.objects.Params; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.logging.LoggingConstants; -import org.openecomp.appc.logging.LoggingUtils; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.StatusBuilder; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.executor.objects.Params; +import org.onap.appc.i18n.Msg; +import org.onap.appc.logging.LoggingConstants; +import org.onap.appc.logging.LoggingUtils; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; import org.slf4j.MDC; import java.net.InetAddress; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java index 41955e135..414b94605 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/BaseProcessor.java @@ -22,21 +22,21 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.BundleHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.BundleHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.Date; import java.util.concurrent.Future; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java index 6a0466022..23f9fd130 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamMmodeProcessor.java @@ -22,22 +22,22 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.OAMCommandStatus; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.requesthandler.RequestHandler; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.OAMCommandStatus; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.requesthandler.RequestHandler; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import java.util.concurrent.TimeoutException; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java index 857578917..b23b4d2aa 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamRestartProcessor.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle restart OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java index 0d2f50513..2ca353244 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStartProcessor.java @@ -22,18 +22,18 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.requesthandler.LCMStateManager; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.requesthandler.LCMStateManager; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle start OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java index d8d88d319..8710e0f08 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/processor/OamStopProcessor.java @@ -22,17 +22,17 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.processor; +package org.onap.appc.oam.processor; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.i18n.Msg; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.util.AsyncTaskHelper; -import org.openecomp.appc.oam.util.ConfigurationHelper; -import org.openecomp.appc.oam.util.OperationHelper; -import org.openecomp.appc.oam.util.StateHelper; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.i18n.Msg; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.util.AsyncTaskHelper; +import org.onap.appc.oam.util.ConfigurationHelper; +import org.onap.appc.oam.util.OperationHelper; +import org.onap.appc.oam.util.StateHelper; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; /** * Processor to handle stop OAM API. diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java index 9c344c14e..2f74bf5a9 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/AsyncTaskHelper.java @@ -22,12 +22,12 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.processor.BaseActionRunnable; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.processor.BaseActionRunnable; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.FrameworkUtil; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java index 1e9f9b6a1..6dd98f165 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleFilter.java @@ -22,7 +22,7 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import org.osgi.framework.Bundle; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java index 74159bd65..3a4602542 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/BundleHelper.java @@ -22,14 +22,14 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang3.ArrayUtils; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.processor.BaseCommon; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.processor.BaseCommon; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java index 25df3dfd9..3c5629f11 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/ConfigurationHelper.java @@ -22,13 +22,13 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import org.apache.commons.lang3.ArrayUtils; -import org.openecomp.appc.Constants; -import org.openecomp.appc.configuration.Configuration; -import org.openecomp.appc.configuration.ConfigurationFactory; +import org.onap.appc.Constants; +import org.onap.appc.configuration.Configuration; +import org.onap.appc.configuration.ConfigurationFactory; import java.util.concurrent.TimeUnit; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java index 0b20104f4..9eec0b67b 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/OperationHelper.java @@ -22,28 +22,28 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.MaintenanceModeInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.RestartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StartInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.StopInput; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.CommonHeader; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.common.header.common.header.Flags; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.status.Status; -import org.openecomp.appc.exceptions.APPCException; -import org.openecomp.appc.exceptions.InvalidInputException; -import org.openecomp.appc.exceptions.InvalidStateException; -import org.openecomp.appc.lifecyclemanager.LifecycleManager; -import org.openecomp.appc.lifecyclemanager.objects.LifecycleException; -import org.openecomp.appc.lifecyclemanager.objects.NoTransitionDefinedException; -import org.openecomp.appc.oam.AppcOam; -import org.openecomp.appc.oam.messageadapter.MessageAdapter; -import org.openecomp.appc.oam.messageadapter.OAMContext; -import org.openecomp.appc.statemachine.impl.readers.AppcOamMetaDataReader; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.MaintenanceModeInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.RestartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StartInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.StopInput; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.CommonHeader; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.common.header.common.header.Flags; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.status.Status; +import org.onap.appc.exceptions.APPCException; +import org.onap.appc.exceptions.InvalidInputException; +import org.onap.appc.exceptions.InvalidStateException; +import org.onap.appc.lifecyclemanager.LifecycleManager; +import org.onap.appc.lifecyclemanager.objects.LifecycleException; +import org.onap.appc.lifecyclemanager.objects.NoTransitionDefinedException; +import org.onap.appc.oam.AppcOam; +import org.onap.appc.oam.messageadapter.MessageAdapter; +import org.onap.appc.oam.messageadapter.OAMContext; +import org.onap.appc.statemachine.impl.readers.AppcOamMetaDataReader; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; import org.osgi.framework.ServiceReference; diff --git a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java index a9ccc26d0..871a07676 100644 --- a/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java +++ b/appc-oam/appc-oam-bundle/src/main/java/org/openecomp/appc/oam/util/StateHelper.java @@ -22,11 +22,11 @@ * ============LICENSE_END========================================================= */ -package org.openecomp.appc.oam.util; +package org.onap.appc.oam.util; import com.att.eelf.configuration.EELFLogger; -import org.opendaylight.yang.gen.v1.org.openecomp.appc.oam.rev170303.AppcState; -import org.openecomp.appc.statemachine.impl.readers.AppcOamStates; +import org.opendaylight.yang.gen.v1.org.onap.appc.oam.rev170303.AppcState; +import org.onap.appc.statemachine.impl.readers.AppcOamStates; import org.osgi.framework.Bundle; import java.util.Map; -- cgit 1.2.3-korg