diff options
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java (renamed from src/main/java/com/att/dmf/mr/CambriaApiException.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java (renamed from src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java (renamed from src/main/java/com/att/dmf/mr/backends/Consumer.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java (renamed from src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java (renamed from src/main/java/com/att/dmf/mr/backends/MetricsSet.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java (renamed from src/main/java/com/att/dmf/mr/backends/Publisher.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumer.txt (renamed from src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumer.txt) | 0 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java) | 12 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java (renamed from src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java (renamed from src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java (renamed from src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java (renamed from src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java (renamed from src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java (renamed from src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java (renamed from src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java) | 12 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPContext.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java) | 28 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java) | 16 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java (renamed from src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java (renamed from src/main/java/com/att/dmf/mr/beans/LogDetails.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java (renamed from src/main/java/com/att/dmf/mr/beans/TopicBean.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java (renamed from src/main/java/com/att/dmf/mr/constants/CambriaConstants.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java (renamed from src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java (renamed from src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java (renamed from src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java (renamed from src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java (renamed from src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java (renamed from src/main/java/com/att/dmf/mr/exception/ErrorResponse.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java (renamed from src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java (renamed from src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java (renamed from src/main/java/com/att/dmf/mr/metabroker/Broker.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java (renamed from src/main/java/com/att/dmf/mr/metabroker/Broker1.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java (renamed from src/main/java/com/att/dmf/mr/metabroker/Topic.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java (renamed from src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java (renamed from src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java) | 14 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java (renamed from src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java) | 16 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java (renamed from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java (renamed from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java (renamed from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java (renamed from src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java (renamed from src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java (renamed from src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java (renamed from src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java (renamed from src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java (renamed from src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java (renamed from src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java (renamed from src/main/java/com/att/dmf/mr/service/AdminService.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java (renamed from src/main/java/com/att/dmf/mr/service/ApiKeysService.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java (renamed from src/main/java/com/att/dmf/mr/service/EventsService.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java (renamed from src/main/java/com/att/dmf/mr/service/MMService.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java (renamed from src/main/java/com/att/dmf/mr/service/MetricsService.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java (renamed from src/main/java/com/att/dmf/mr/service/TopicService.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java (renamed from src/main/java/com/att/dmf/mr/service/TransactionService.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java (renamed from src/main/java/com/att/dmf/mr/service/UIService.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java) | 14 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java) | 18 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java) | 54 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java) | 44 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java) | 12 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java) | 42 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java (renamed from src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java) | 14 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java (renamed from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java (renamed from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java (renamed from src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java (renamed from src/main/java/com/att/dmf/mr/transaction/TransactionObj.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java (renamed from src/main/java/com/att/dmf/mr/transaction/TrnRequest.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java (renamed from src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java (renamed from src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java) | 36 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java (renamed from src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java (renamed from src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java (renamed from src/main/java/com/att/dmf/mr/utils/Emailer.java) | 4 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java (renamed from src/main/java/com/att/dmf/mr/utils/PropertyReader.java) | 2 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java (renamed from src/main/java/com/att/dmf/mr/utils/Utils.java) | 6 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java (renamed from src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java) | 8 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java (renamed from src/main/java/com/att/mr/filter/ContentLengthFilter.java) | 10 | ||||
| -rw-r--r-- | src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java (renamed from src/main/java/com/att/mr/filter/DefaultLength.java) | 2 |
96 files changed, 358 insertions, 358 deletions
diff --git a/src/main/java/com/att/dmf/mr/CambriaApiException.java b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java index cdf95ab..59d6115 100644 --- a/src/main/java/com/att/dmf/mr/CambriaApiException.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiException.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr; +package org.onap.dmaap.dmf.mr; import org.json.JSONObject; -import com.att.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; import com.att.nsa.apiServer.NsaAppException; public class CambriaApiException extends NsaAppException diff --git a/src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java index f0c57b5..6858fe4 100644 --- a/src/main/java/com/att/dmf/mr/CambriaApiVersionInfo.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/CambriaApiVersionInfo.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr; +package org.onap.dmaap.dmf.mr; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/att/dmf/mr/backends/Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java index f4a9a80..cba3696 100644 --- a/src/main/java/com/att/dmf/mr/backends/Consumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/Consumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; /** diff --git a/src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java index 55e0645..a857fc3 100644 --- a/src/main/java/com/att/dmf/mr/backends/ConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/ConsumerFactory.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import java.util.Collection; import java.util.HashMap; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; /** * This is the factory class to instantiate the consumer diff --git a/src/main/java/com/att/dmf/mr/backends/MetricsSet.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java index de665b8..bc0f4c6 100644 --- a/src/main/java/com/att/dmf/mr/backends/MetricsSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/MetricsSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import com.att.nsa.metrics.CdmMetricsRegistry; /** diff --git a/src/main/java/com/att/dmf/mr/backends/Publisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java index 25022e2..ac7977b 100644 --- a/src/main/java/com/att/dmf/mr/backends/Publisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/Publisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends; +package org.onap.dmaap.dmf.mr.backends; import java.io.IOException; import java.util.ArrayList; @@ -27,7 +27,7 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.beans.LogDetails; /** * A publisher interface. Publishers receive messages and post them to a topic. diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java index 9be9073..347f625 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011Consumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011Consumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.net.InetAddress; import java.net.UnknownHostException; @@ -39,8 +39,8 @@ import org.apache.kafka.clients.consumer.ConsumerRecords; import org.apache.kafka.clients.consumer.KafkaConsumer; import org.apache.kafka.common.KafkaException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java index e066df5..a93ac33 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/Kafka011ConsumerUtil.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.ArrayList; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumer.txt b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumer.txt index dd6259f..dd6259f 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumer.txt +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumer.txt diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java index 83c08ec..a38d77b 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaConsumerCache.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaConsumerCache.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.io.IOException; import java.net.InetAddress; @@ -56,11 +56,11 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.ComponentScan; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.eelf.configuration.EELFLogger; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java index f521b41..0bfbcb5 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaLiveLockAvoider2.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java index 1e78b01..2a9e0ab 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/KafkaPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/KafkaPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.io.IOException; import java.util.ArrayList; @@ -33,9 +33,9 @@ import org.apache.kafka.clients.producer.ProducerRecord; import org.json.JSONException; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.Utils; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java index a13ecea..4aa8a97 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/LiveLockAvoidance.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LiveLockAvoidance.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; diff --git a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java index cc3338b..1d31a44 100644 --- a/src/main/java/com/att/dmf/mr/backends/kafka/LockInstructionWatcher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/kafka/LockInstructionWatcher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.kafka; +package org.onap.dmaap.dmf.mr.backends.kafka; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java index 237cac8..d5dc33b 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryConsumerFactory.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; /** * * @author anowarul.islam diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java index e0c80bd..fc3ba98 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryMetaBroker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryMetaBroker.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.HashMap; import java.util.LinkedList; @@ -27,8 +27,8 @@ import java.util.List; import java.util.Set; import java.util.TreeSet; -import com.att.dmf.mr.metabroker.Broker; -import com.att.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.metabroker.Broker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; import com.att.nsa.configs.ConfigDb; import com.att.nsa.security.NsaAcl; import com.att.nsa.security.NsaApiKey; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java index 25cb2df..809b7ae 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueue.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueue.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.util.ArrayList; import java.util.HashMap; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; /** * When broker type is memory, then this class is doing all the topic related diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java index 2b43ed3..a9c7470 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MemoryQueuePublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MemoryQueuePublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.io.IOException; import java.util.ArrayList; @@ -27,8 +27,8 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; diff --git a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java index eb77dc2..d88771e 100644 --- a/src/main/java/com/att/dmf/mr/backends/memory/MessageLogger.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/backends/memory/MessageLogger.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.backends.memory; +package org.onap.dmaap.dmf.mr.backends.memory; import java.io.File; import java.io.FileNotFoundException; @@ -30,7 +30,7 @@ import java.util.List; import org.apache.kafka.clients.producer.ProducerRecord; -import com.att.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher; diff --git a/src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java index 4f0108f..4356aa7 100644 --- a/src/main/java/com/att/dmf/mr/beans/ApiKeyBean.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/ApiKeyBean.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.io.Serializable; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java index 8cbf64f..7db9f54 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPCambriaLimiter.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPCambriaLimiter.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Date; import java.util.HashMap; @@ -29,11 +29,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPContext.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java index a880877..c4b6412 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPContext.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPContext.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; /** * DMaaPContext provide and maintain all the configurations , Http request/response diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java index fb0ace0..0a909ff 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaConsumerFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaConsumerFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.net.InetAddress; import java.net.UnknownHostException; @@ -34,19 +34,19 @@ import org.apache.kafka.clients.consumer.KafkaConsumer; import org.springframework.beans.factory.annotation.Qualifier; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.kafka.Kafka011Consumer; -import com.att.dmf.mr.backends.kafka.Kafka011ConsumerUtil; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; -import com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; -import com.att.dmf.mr.backends.kafka.LiveLockAvoidance; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.kafka.Kafka011Consumer; +import org.onap.dmaap.dmf.mr.backends.kafka.Kafka011ConsumerUtil; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; +import org.onap.dmaap.dmf.mr.backends.kafka.LiveLockAvoidance; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java index acf4824..a4ae2be 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPKafkaMetaBroker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPKafkaMetaBroker.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Arrays; import java.util.LinkedList; @@ -41,13 +41,13 @@ import org.json.JSONArray; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Broker; -import com.att.dmf.mr.metabroker.Broker1; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Broker; +import org.onap.dmaap.dmf.mr.metabroker.Broker1; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.Utils; //import org.apache.log4-j.Logger; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java index 4c9532b..0226b9b 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPMetricsSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPMetricsSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.text.SimpleDateFormat; import java.util.Date; @@ -28,9 +28,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import com.att.dmf.mr.CambriaApiVersionInfo; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.mr.apiServer.metrics.cambria.DMaaPMetricsSender; +import org.onap.dmaap.dmf.mr.CambriaApiVersionInfo; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.mr.apiServer.metrics.cambria.DMaaPMetricsSender; import com.att.nsa.drumlin.till.nv.rrNvReadable; import com.att.nsa.metrics.impl.CdmConstant; import com.att.nsa.metrics.impl.CdmCounter; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java index 963ff2d..8813f24 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPNsaApiDb.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPNsaApiDb.java @@ -19,14 +19,14 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.security.Key; import org.springframework.beans.factory.annotation.Autowired; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDb; diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java index 78a7426..7f6a8fe 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPZkClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkClient.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import org.I0Itec.zkclient.ZkClient; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.nsa.drumlin.till.nv.rrNvReadable; /** diff --git a/src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java index 5aa25fa..ff0b136 100644 --- a/src/main/java/com/att/dmf/mr/beans/DMaaPZkConfigDb.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/DMaaPZkConfigDb.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import org.springframework.beans.factory.annotation.Qualifier; -import com.att.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; import com.att.nsa.configs.confimpl.ZkConfigDb; import com.att.nsa.drumlin.till.nv.rrNvReadable; diff --git a/src/main/java/com/att/dmf/mr/beans/LogDetails.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java index b7fb325..b10cda6 100644 --- a/src/main/java/com/att/dmf/mr/beans/LogDetails.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/LogDetails.java @@ -22,12 +22,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.util.Date; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.utils.Utils; /** * @author muzainulhaque.qazi diff --git a/src/main/java/com/att/dmf/mr/beans/TopicBean.java b/src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java index a397921..127466b 100644 --- a/src/main/java/com/att/dmf/mr/beans/TopicBean.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/beans/TopicBean.java @@ -22,7 +22,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.beans; +package org.onap.dmaap.dmf.mr.beans; import java.io.Serializable; diff --git a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java b/src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java index cb6653c..fd342b7 100644 --- a/src/main/java/com/att/dmf/mr/constants/CambriaConstants.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/constants/CambriaConstants.java @@ -19,9 +19,9 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.constants; +package org.onap.dmaap.dmf.mr.constants; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.utils.Utils; /** * This is the constant files for all the property or parameters. diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java index de66617..c70190f 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPAccessDeniedException.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPAccessDeniedException.java @@ -19,9 +19,9 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; public class DMaaPAccessDeniedException extends CambriaApiException{ diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java index 304c15b..4e03a58 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPCambriaExceptionMapper.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPCambriaExceptionMapper.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.inject.Singleton; import javax.ws.rs.core.MediaType; @@ -30,7 +30,7 @@ import javax.ws.rs.ext.Provider; import org.apache.http.HttpStatus; import org.springframework.beans.factory.annotation.Autowired; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java index 409aa60..7b68b42 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPErrorMessages.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPErrorMessages.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.annotation.PostConstruct; diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java index 593863a..a7b073a 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPResponseCode.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPResponseCode.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; /** * Define the Error Response Codes for MR diff --git a/src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java index db691bd..c768794 100644 --- a/src/main/java/com/att/dmf/mr/exception/DMaaPWebExceptionMapper.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/DMaaPWebExceptionMapper.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import javax.inject.Singleton; import javax.ws.rs.BadRequestException; diff --git a/src/main/java/com/att/dmf/mr/exception/ErrorResponse.java b/src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java index c92cadd..58e81ae 100644 --- a/src/main/java/com/att/dmf/mr/exception/ErrorResponse.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/exception/ErrorResponse.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.exception; +package org.onap.dmaap.dmf.mr.exception; import org.json.JSONObject; /** * Represents the Error Response Object diff --git a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java b/src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java index 64b20e8..273b906 100644 --- a/src/main/java/com/att/dmf/mr/listener/CambriaServletContextListener.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/listener/CambriaServletContextListener.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.listener; +package org.onap.dmaap.dmf.mr.listener; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java b/src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java index f61b6ea..5d98f98 100644 --- a/src/main/java/com/att/dmf/mr/listener/DME2EndPointLoader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/listener/DME2EndPointLoader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.listener; +package org.onap.dmaap.dmf.mr.listener; import java.io.IOException; import java.io.InputStream; @@ -28,7 +28,7 @@ import java.util.Properties; import com.att.aft.dme2.manager.registry.DME2EndpointRegistry; import com.att.aft.dme2.api.DME2Exception; import com.att.aft.dme2.api.DME2Manager; -import com.att.dmf.mr.service.impl.EventsServiceImpl; +import org.onap.dmaap.dmf.mr.service.impl.EventsServiceImpl; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Broker.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java index e5fe8da..6cbb8c8 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Broker.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import java.util.List; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Broker1.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java index e7d7f6c..69dacf9 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Broker1.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Broker1.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import java.util.List; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/metabroker/Topic.java b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java index d191070..ea23182 100644 --- a/src/main/java/com/att/dmf/mr/metabroker/Topic.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metabroker/Topic.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metabroker; +package org.onap.dmaap.dmf.mr.metabroker; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.NsaAcl; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java index 45644b7..023bb28 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaBatchingPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; import java.util.List; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java index 4b219b1..2ce4216 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaClient.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java index 4a6ca81..4d05070 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaConsumer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaConsumer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java index 4020a6d..441d325 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.IOException; import java.util.Collection; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java index 46dfa99..4f072ac 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/CambriaPublisherUtility.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/CambriaPublisherUtility.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java index d7818de..ff46ce3 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/DMaaPCambriaClientFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher; +package org.onap.dmaap.dmf.mr.metrics.publisher; import java.net.MalformedURLException; import java.nio.channels.NotYetConnectedException; @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.TreeSet; import java.util.UUID; -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; -import com.att.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaConsumerImpl; +import org.onap.dmaap.dmf.mr.metrics.publisher.impl.DMaaPCambriaSimplerBatchPublisher; /** * A factory for Cambria clients.<br/> diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java index 84576fc..6bedd18 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/CambriaBaseClient.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.net.MalformedURLException; import java.util.Collection; @@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit; import org.json.JSONArray; import org.json.JSONException; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; //import org.slf4j.LoggerFactory; import com.att.eelf.configuration.EELFLogger; @@ -43,7 +43,7 @@ import com.att.nsa.apiClient.http.HttpClient; * @author anowarul.islam * */ -public class CambriaBaseClient extends HttpClient implements com.att.dmf.mr.metrics.publisher.CambriaClient +public class CambriaBaseClient extends HttpClient implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaClient { protected CambriaBaseClient ( Collection<String> hosts ) throws MalformedURLException { diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java index 7463700..ac83a9e 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/Clock.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/Clock.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; /** * diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java index ee56213..56c1173 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaConsumerImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -33,7 +33,7 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; import com.att.nsa.apiClient.http.HttpException; import com.att.nsa.apiClient.http.HttpObjectNotFoundException; @@ -45,7 +45,7 @@ import jline.internal.Log; * */ public class DMaaPCambriaConsumerImpl extends CambriaBaseClient - implements com.att.dmf.mr.metrics.publisher.CambriaConsumer { + implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaConsumer { private final String fTopic; private final String fGroup; private final String fId; diff --git a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java index e9b1cdb..634ea80 100644 --- a/src/main/java/com/att/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/metrics/publisher/impl/DMaaPCambriaSimplerBatchPublisher.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.metrics.publisher.impl; +package org.onap.dmaap.dmf.mr.metrics.publisher.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -41,8 +41,8 @@ import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisherUtility; /** * @@ -53,7 +53,7 @@ import com.att.dmf.mr.metrics.publisher.CambriaPublisherUtility; * */ public class DMaaPCambriaSimplerBatchPublisher extends CambriaBaseClient - implements com.att.dmf.mr.metrics.publisher.CambriaBatchingPublisher { + implements org.onap.dmaap.dmf.mr.metrics.publisher.CambriaBatchingPublisher { /** * * static inner class initializes with urls, topic,batchSize diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java index 4565d3a..4b65628 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaEventSet.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaEventSet.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources; +package org.onap.dmaap.dmf.mr.resources; import java.io.IOException; import java.io.InputStream; @@ -27,12 +27,12 @@ import java.util.zip.GZIPInputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaRawStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaStreamReader; -import com.att.dmf.mr.resources.streamReaders.CambriaTextStreamReader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaJsonStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaRawStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaStreamReader; +import org.onap.dmaap.dmf.mr.resources.streamReaders.CambriaTextStreamReader; import com.att.nsa.apiServer.streams.ChunkedInputStream; import com.att.nsa.drumlin.service.standards.HttpStatusCodes; diff --git a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java index aae15fb..19e8e65 100644 --- a/src/main/java/com/att/dmf/mr/resources/CambriaOutboundEventStream.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/CambriaOutboundEventStream.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources; +package org.onap.dmaap.dmf.mr.resources; import java.io.IOException; import java.io.OutputStream; @@ -36,13 +36,13 @@ import org.json.JSONObject; import org.json.JSONTokener; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.utils.DMaaPResponseBuilder.StreamWriter; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder.StreamWriter; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java index 7a67c92..fe2fc85 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaJsonStreamReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.InputStream; @@ -29,10 +29,10 @@ import org.json.JSONException; import org.json.JSONObject; import org.json.JSONTokener; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java index f64c0de..93baee0 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaRawStreamReader.java @@ -19,17 +19,17 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.IOException; import java.io.InputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; import com.att.nsa.util.StreamTools; /** diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java index 3dbf339..6df1dd4 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaStreamReader.java @@ -19,17 +19,17 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.IOException; import java.io.InputStream; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * Read an optionally chunked stream in the Cambria app format. This format diff --git a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java index b06e17a..67a31bb 100644 --- a/src/main/java/com/att/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/resources/streamReaders/CambriaTextStreamReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.resources.streamReaders; +package org.onap.dmaap.dmf.mr.resources.streamReaders; import java.io.BufferedReader; import java.io.IOException; @@ -28,10 +28,10 @@ import java.io.InputStreamReader; import javax.servlet.http.HttpServletResponse; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.resources.CambriaEventSet.reader; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet.reader; /** * This stream reader just pulls single lines. It uses the default partition if provided. If diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java index 59196d2..a7f2376 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticator.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.CambriaApiException; diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java index e4e24cd..25644a7 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAAFAuthenticatorImpl.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; /** diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java index 848d4cc..e6ff30f 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticator.java @@ -19,11 +19,11 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.security.NsaApiKey; diff --git a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java index 0ae0839..f0d0d4d 100644 --- a/src/main/java/com/att/dmf/mr/security/DMaaPAuthenticatorImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/DMaaPAuthenticatorImpl.java @@ -19,14 +19,14 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security; +package org.onap.dmaap.dmf.mr.security; import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; import com.att.nsa.security.NsaApiKey; import com.att.nsa.security.db.NsaApiDb; import com.att.nsa.security.db.simple.NsaSimpleApiKey; diff --git a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java index 64dbc14..6f2ebac 100644 --- a/src/main/java/com/att/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPMechIdAuthenticator.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security.impl; +package org.onap.dmaap.dmf.mr.security.impl; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java index b1e28e7..f8cb066 100644 --- a/src/main/java/com/att/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/security/impl/DMaaPOriginalUebAuthenticator.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.security.impl; +package org.onap.dmaap.dmf.mr.security.impl; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -27,8 +27,8 @@ import java.util.Date; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/AdminService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java index aaf7c0b..ef89d06 100644 --- a/src/main/java/com/att/dmf/mr/service/AdminService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/AdminService.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/ApiKeysService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java index 57fc8be..9526ca1 100644 --- a/src/main/java/com/att/dmf/mr/service/ApiKeysService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/ApiKeysService.java @@ -19,12 +19,12 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; import com.att.nsa.security.db.NsaApiDb.KeyExistsException; diff --git a/src/main/java/com/att/dmf/mr/service/EventsService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java index 2f89bd2..526b7b8 100644 --- a/src/main/java/com/att/dmf/mr/service/EventsService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/EventsService.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import java.io.InputStream; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/MMService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java index ae01bbf..1bd28e7 100644 --- a/src/main/java/com/att/dmf/mr/service/MMService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MMService.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import java.io.InputStream; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/MetricsService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java index b6cc60d..fd24d6c 100644 --- a/src/main/java/com/att/dmf/mr/service/MetricsService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/MetricsService.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; /** * @author amol.ramesh.dalne @@ -27,8 +27,8 @@ package com.att.dmf.mr.service; */ import java.io.IOException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; /** * diff --git a/src/main/java/com/att/dmf/mr/service/TopicService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java index b42d9c9..ae257c1 100644 --- a/src/main/java/com/att/dmf/mr/service/TopicService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/TopicService.java @@ -19,16 +19,16 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.json.JSONException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException; diff --git a/src/main/java/com/att/dmf/mr/service/TransactionService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java index f2763a6..b1593c7 100644 --- a/src/main/java/com/att/dmf/mr/service/TransactionService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/TransactionService.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDbException; /** diff --git a/src/main/java/com/att/dmf/mr/service/UIService.java b/src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java index 1155a2a..777abf6 100644 --- a/src/main/java/com/att/dmf/mr/service/UIService.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/UIService.java @@ -22,15 +22,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service; +package org.onap.dmaap.dmf.mr.service; import java.io.IOException; import org.apache.kafka.common.errors.TopicExistsException; import org.json.JSONException; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.nsa.configs.ConfigDbException; /** * @author muzainulhaque.qazi diff --git a/src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java index f7c48de..29a431e 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/AdminServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/AdminServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.util.Collection; @@ -30,12 +30,12 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.stereotype.Component; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.AdminService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.AdminService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java index b0e8a86..47da903 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/ApiKeysServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/ApiKeysServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; @@ -27,14 +27,14 @@ import org.json.JSONArray; import org.json.JSONObject; import org.springframework.stereotype.Service; -import com.att.dmf.mr.beans.ApiKeyBean; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.ApiKeysService; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Emailer; +import org.onap.dmaap.dmf.mr.beans.ApiKeyBean; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.ApiKeysService; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Emailer; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java index 104d7de..1e248bf 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/BaseTransactionDbImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/BaseTransactionDbImpl.java @@ -19,15 +19,15 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.util.Set; import java.util.TreeSet; -import com.att.dmf.mr.transaction.DMaaPTransactionFactory; -import com.att.dmf.mr.transaction.DMaaPTransactionObj; -import com.att.dmf.mr.transaction.DMaaPTransactionObjDB; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionFactory; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObjDB; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDb; import com.att.nsa.configs.ConfigDbException; import com.att.nsa.configs.ConfigPath; diff --git a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java index 73a373e..387b667 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/EventsServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/EventsServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.io.InputStream; @@ -49,32 +49,32 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; - -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.resources.CambriaEventSet; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.EventsService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaLiveLockAvoider2; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; + +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.EventsService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java index 387d8b1..d862677 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/MMServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MMServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -42,27 +42,27 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.Consumer; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.Publisher.message; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.LogDetails; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.resources.CambriaEventSet; -import com.att.dmf.mr.resources.CambriaOutboundEventStream; -import com.att.dmf.mr.service.MMService; -import com.att.dmf.mr.utils.ConfigurationReader; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.Consumer; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.Publisher.message; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.LogDetails; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.resources.CambriaEventSet; +import org.onap.dmaap.dmf.mr.resources.CambriaOutboundEventStream; +import org.onap.dmaap.dmf.mr.service.MMService; +import org.onap.dmaap.dmf.mr.utils.ConfigurationReader; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java index d867ea8..2041e54 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/MetricsServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/MetricsServiceImpl.java @@ -19,18 +19,18 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import org.json.JSONObject; import org.springframework.stereotype.Component; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.MetricsService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.MetricsService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.metrics.CdmMeasuredItem; diff --git a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java index 983af7e..f2ba222 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/TopicServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TopicServiceImpl.java @@ -22,7 +22,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; @@ -34,25 +34,25 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.TopicBean; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.exception.DMaaPAccessDeniedException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; -import com.att.dmf.mr.metabroker.Broker.TopicExistsException; -import com.att.dmf.mr.metabroker.Broker1; - -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.security.DMaaPAAFAuthenticator; -import com.att.dmf.mr.security.DMaaPAAFAuthenticatorImpl; -import com.att.dmf.mr.security.DMaaPAuthenticatorImpl; -import com.att.dmf.mr.service.TopicService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; -import com.att.dmf.mr.utils.Utils; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.TopicBean; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException; +import org.onap.dmaap.dmf.mr.metabroker.Broker1; + +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator; +import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticatorImpl; +import org.onap.dmaap.dmf.mr.service.TopicService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.utils.Utils; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; @@ -313,7 +313,7 @@ public class TopicServiceImpl implements TopicService { DMaaPResponseCode.INCORRECT_JSON.getResponseCode(), errorMessages.getIncorrectJson()); LOGGER.info(errRes.toString()); throw new CambriaApiException(errRes); - } catch (com.att.dmf.mr.metabroker.Broker1.TopicExistsException e) { + } catch (org.onap.dmaap.dmf.mr.metabroker.Broker1.TopicExistsException e) { // TODO Auto-generated catch block LOGGER.error( e.getMessage()); } diff --git a/src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java index 3065928..cfe2948 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/TransactionServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/TransactionServiceImpl.java @@ -19,16 +19,16 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import org.springframework.stereotype.Service; import com.att.aft.dme2.internal.jettison.json.JSONException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.service.TransactionService; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.service.TransactionService; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; import com.att.nsa.configs.ConfigDbException; /** diff --git a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java index 73ad83b..b60fb44 100644 --- a/src/main/java/com/att/dmf/mr/service/impl/UIServiceImpl.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/service/impl/UIServiceImpl.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.service.impl; +package org.onap.dmaap.dmf.mr.service.impl; import java.io.IOException; import java.util.LinkedList; @@ -34,12 +34,12 @@ import org.json.JSONException; import org.json.JSONObject; import org.springframework.stereotype.Service; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.beans.DMaaPContext; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.metabroker.Topic; -import com.att.dmf.mr.service.UIService; -import com.att.dmf.mr.utils.DMaaPResponseBuilder; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.metabroker.Topic; +import org.onap.dmaap.dmf.mr.service.UIService; +import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java index 8ae4c12..3a02252 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionFactory.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; /** * * @author anowarul.islam diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java index 7f5dd3a..5ef986a 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObj.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObj.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import org.json.JSONObject; /** diff --git a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java index abebaba..d2d297c 100644 --- a/src/main/java/com/att/dmf/mr/transaction/DMaaPTransactionObjDB.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/DMaaPTransactionObjDB.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import java.util.Set; diff --git a/src/main/java/com/att/dmf/mr/transaction/TransactionObj.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java index 7223f0f..660acec 100644 --- a/src/main/java/com/att/dmf/mr/transaction/TransactionObj.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TransactionObj.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; import org.json.JSONObject; diff --git a/src/main/java/com/att/dmf/mr/transaction/TrnRequest.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java index f7f18a2..138ebea 100644 --- a/src/main/java/com/att/dmf/mr/transaction/TrnRequest.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/TrnRequest.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction; +package org.onap.dmaap.dmf.mr.transaction; /** * Created for transaction enable logging details, this is nothing but a bean diff --git a/src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java index c54f2db..31bc6ca 100644 --- a/src/main/java/com/att/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/transaction/impl/DMaaPSimpleTransactionFactory.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.transaction.impl; +package org.onap.dmaap.dmf.mr.transaction.impl; import org.json.JSONObject; -import com.att.dmf.mr.transaction.DMaaPTransactionFactory; -import com.att.dmf.mr.transaction.DMaaPTransactionObj; -import com.att.dmf.mr.transaction.TransactionObj; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionFactory; +import org.onap.dmaap.dmf.mr.transaction.DMaaPTransactionObj; +import org.onap.dmaap.dmf.mr.transaction.TransactionObj; /** * A factory for the simple Transaction implementation diff --git a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java index aebca34..3462567 100644 --- a/src/main/java/com/att/dmf/mr/utils/ConfigurationReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/ConfigurationReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import javax.servlet.ServletException; @@ -29,23 +29,23 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.stereotype.Component; -import com.att.dmf.mr.backends.ConsumerFactory; -import com.att.dmf.mr.backends.MetricsSet; -import com.att.dmf.mr.backends.Publisher; -import com.att.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; -import com.att.dmf.mr.backends.memory.MemoryConsumerFactory; -import com.att.dmf.mr.backends.memory.MemoryMetaBroker; -import com.att.dmf.mr.backends.memory.MemoryQueue; -import com.att.dmf.mr.backends.memory.MemoryQueuePublisher; -import com.att.dmf.mr.beans.DMaaPCambriaLimiter; -import com.att.dmf.mr.beans.DMaaPKafkaMetaBroker; -import com.att.dmf.mr.beans.DMaaPZkConfigDb; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metabroker.Broker; - -import com.att.dmf.mr.metabroker.Broker1; -import com.att.dmf.mr.security.DMaaPAuthenticator; -import com.att.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; +import org.onap.dmaap.dmf.mr.backends.ConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.MetricsSet; +import org.onap.dmaap.dmf.mr.backends.Publisher; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaConsumerCache.KafkaConsumerCacheException; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryConsumerFactory; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryMetaBroker; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueue; +import org.onap.dmaap.dmf.mr.backends.memory.MemoryQueuePublisher; +import org.onap.dmaap.dmf.mr.beans.DMaaPCambriaLimiter; +import org.onap.dmaap.dmf.mr.beans.DMaaPKafkaMetaBroker; +import org.onap.dmaap.dmf.mr.beans.DMaaPZkConfigDb; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metabroker.Broker; + +import org.onap.dmaap.dmf.mr.metabroker.Broker1; +import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator; +import org.onap.dmaap.dmf.mr.security.impl.DMaaPOriginalUebAuthenticator; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.configs.ConfigDbException; diff --git a/src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java index 5a9968d..a5afa75 100644 --- a/src/main/java/com/att/dmf/mr/utils/DMaaPCuratorFactory.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPCuratorFactory.java @@ -19,13 +19,13 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; import org.apache.curator.retry.ExponentialBackoffRetry; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.nsa.drumlin.till.nv.rrNvReadable; /** diff --git a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java index 72db9de..3630086 100644 --- a/src/main/java/com/att/dmf/mr/utils/DMaaPResponseBuilder.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/DMaaPResponseBuilder.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.json.JSONException; import org.json.JSONObject; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/utils/Emailer.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java index 1b68216..cb4fcdc 100644 --- a/src/main/java/com/att/dmf/mr/utils/Emailer.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Emailer.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.IOException; import java.util.Properties; @@ -40,7 +40,7 @@ import javax.mail.internet.MimeMultipart; import com.att.ajsc.filemonitor.AJSCPropertiesMap; -import com.att.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/dmf/mr/utils/PropertyReader.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java index 000869e..ee503af 100644 --- a/src/main/java/com/att/dmf/mr/utils/PropertyReader.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/PropertyReader.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.util.Map; diff --git a/src/main/java/com/att/dmf/mr/utils/Utils.java b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java index 5f84d85..f568d77 100644 --- a/src/main/java/com/att/dmf/mr/utils/Utils.java +++ b/src/main/java/org/onap/dmaap/dmf/mr/utils/Utils.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.dmf.mr.utils; +package org.onap.dmaap.dmf.mr.utils; import java.io.IOException; import java.io.InputStream; @@ -33,8 +33,8 @@ import java.util.Properties; import javax.servlet.http.HttpServletRequest; -import com.att.dmf.mr.backends.kafka.KafkaPublisher; -import com.att.dmf.mr.beans.DMaaPContext; +import org.onap.dmaap.dmf.mr.backends.kafka.KafkaPublisher; +import org.onap.dmaap.dmf.mr.beans.DMaaPContext; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; /** diff --git a/src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java b/src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java index 0e2804e..76999e1 100644 --- a/src/main/java/com/att/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java +++ b/src/main/java/org/onap/dmaap/mr/apiServer/metrics/cambria/DMaaPMetricsSender.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.apiServer.metrics.cambria; +package org.onap.dmaap.mr.apiServer.metrics.cambria; import java.io.IOException; import java.net.InetAddress; @@ -35,9 +35,9 @@ import org.json.JSONObject; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; -import com.att.dmf.mr.constants.CambriaConstants; -import com.att.dmf.mr.metrics.publisher.CambriaPublisher; -import com.att.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; +import org.onap.dmaap.dmf.mr.constants.CambriaConstants; +import org.onap.dmaap.dmf.mr.metrics.publisher.CambriaPublisher; +import org.onap.dmaap.dmf.mr.metrics.publisher.DMaaPCambriaClientFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.att.nsa.apiServer.metrics.cambria.MetricsSender; diff --git a/src/main/java/com/att/mr/filter/ContentLengthFilter.java b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java index 26f58e0..a175b16 100644 --- a/src/main/java/com/att/mr/filter/ContentLengthFilter.java +++ b/src/main/java/org/onap/dmaap/mr/filter/ContentLengthFilter.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.filter; +package org.onap.dmaap.mr.filter; import java.io.IOException; @@ -36,10 +36,10 @@ import org.json.JSONObject; import org.springframework.context.ApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; -import com.att.dmf.mr.CambriaApiException; -import com.att.dmf.mr.exception.DMaaPErrorMessages; -import com.att.dmf.mr.exception.DMaaPResponseCode; -import com.att.dmf.mr.exception.ErrorResponse; +import org.onap.dmaap.dmf.mr.CambriaApiException; +import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages; +import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode; +import org.onap.dmaap.dmf.mr.exception.ErrorResponse; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/com/att/mr/filter/DefaultLength.java b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java index 43169e5..598ef1b 100644 --- a/src/main/java/com/att/mr/filter/DefaultLength.java +++ b/src/main/java/org/onap/dmaap/mr/filter/DefaultLength.java @@ -19,7 +19,7 @@ * ECOMP is a trademark and service mark of AT&T Intellectual Property. * *******************************************************************************/ -package com.att.mr.filter; +package org.onap.dmaap.mr.filter; public class DefaultLength { |