update the package name

Issue-ID: DMAAP-858
Change-Id: I4c9c2d32b645854fd5e46c134c9b07f6eb2d4d4b
Signed-off-by: sunil unnava <sunil.unnava@att.com>

12 files changed, 61 insertions, 61 deletions

diff --git a/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java b/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
index a377db9..89c9400 100644
--- a/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
+++ b/src/test/java/com/att/nsa/dmaap/DMaaPCambriaExceptionMapperTest.java
@@ -32,9 +32,9 @@ import org.mockito.Mock;
 import org.powermock.api.mockito.PowerMockito;

 import org.powermock.modules.junit4.PowerMockRunner;

 

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-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.ErrorResponse;

 @RunWith(PowerMockRunner.class)

 public class DMaaPCambriaExceptionMapperTest {

 

diff --git a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
index 8807b66..9e67dcd 100644
--- a/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
+++ b/src/test/java/com/att/nsa/dmaap/DMaaPWebExceptionMapperTest.java
@@ -38,7 +38,7 @@ import org.mockito.Mock;
 import org.powermock.api.mockito.PowerMockito;

 import org.powermock.modules.junit4.PowerMockRunner;

 

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

 

 @RunWith(PowerMockRunner.class)

 public class DMaaPWebExceptionMapperTest {

diff --git a/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java b/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
index 20000a4..fde7ab4 100644
--- a/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
+++ b/src/test/java/com/att/nsa/dmaap/mmagent/CreateMirrorMakerTest.java
@@ -20,7 +20,7 @@
 

 package com.att.nsa.dmaap.mmagent;

 

-import com.att.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

 

 import static org.junit.Assert.*;

 

diff --git a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
index 49a4088..5a05a73 100644
--- a/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/AdminRestServiceTest.java
@@ -28,7 +28,7 @@ import org.junit.runner.RunWith;
 import org.mockito.InjectMocks;

 import org.mockito.Mock;

 import org.mockito.MockitoAnnotations;

-import com.att.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

 

 import static org.junit.Assert.assertTrue;

 import static org.mockito.Mockito.when;

@@ -40,15 +40,15 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

 

 import java.io.IOException;

 import java.util.Enumeration;

-import com.att.dmf.mr.service.AdminService;

+import org.onap.dmaap.dmf.mr.service.AdminService;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import org.powermock.core.classloader.annotations.PrepareForTest;

 

 @RunWith(PowerMockRunner.class)

diff --git a/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
index 8a630b1..c784f90 100644
--- a/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/ApiKeysRestServiceTest.java
@@ -31,8 +31,8 @@ import org.junit.Before;
 import org.junit.Test;

 import org.junit.runner.RunWith;

 

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.ApiKeyBean;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.ApiKeyBean;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 

@@ -50,11 +50,11 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

-import com.att.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

 

-import com.att.dmf.mr.utils.ConfigurationReader;

-import com.att.dmf.mr.service.ApiKeysService;

-import com.att.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.service.ApiKeysService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.db.NsaApiDb.KeyExistsException;

 

diff --git a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
index f8e862d..985d38f 100644
--- a/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/EventsRestServiceTest.java
@@ -37,12 +37,12 @@ import org.powermock.api.mockito.PowerMockito;
 import static org.mockito.Mockito.when;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.backends.ConsumerFactory.UnavailableException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.service.EventsService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.backends.ConsumerFactory.UnavailableException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.service.EventsService;

 import com.att.nsa.configs.ConfigDbException;

-import com.att.dmf.mr.utils.Utils;

+import org.onap.dmaap.dmf.mr.utils.Utils;

 import com.att.nsa.drumlin.till.nv.rrNvReadable.missingReqdSetting;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 

@@ -56,10 +56,10 @@ import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;

 import javax.servlet.http.HttpServletRequest;

 

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.ErrorResponse;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;

+import org.onap.dmaap.dmf.mr.exception.ErrorResponse;

+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;

 

 @RunWith(PowerMockRunner.class)

 @PrepareForTest({ PropertiesMapBean.class })

diff --git a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
index 3f98dc2..29d6bc4 100644
--- a/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/MMRestServiceTest.java
@@ -55,19 +55,19 @@ import org.powermock.modules.junit4.PowerMockRunner;
 

 import com.att.ajsc.beans.PropertiesMapBean;

 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.constants.CambriaConstants;

-import com.att.dmf.mr.exception.DMaaPAccessDeniedException;

-import com.att.dmf.mr.exception.DMaaPErrorMessages;

-import com.att.dmf.mr.metabroker.Broker.TopicExistsException;

-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.DMaaPAuthenticator;

-import com.att.dmf.mr.service.MMService;

-import com.att.dmf.mr.utils.ConfigurationReader;

+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.constants.CambriaConstants;

+import org.onap.dmaap.dmf.mr.exception.DMaaPAccessDeniedException;

+import org.onap.dmaap.dmf.mr.exception.DMaaPErrorMessages;

+import org.onap.dmaap.dmf.mr.metabroker.Broker.TopicExistsException;

+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.DMaaPAuthenticator;

+import org.onap.dmaap.dmf.mr.service.MMService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.dmaap.mmagent.CreateMirrorMaker;

 import com.att.nsa.dmaap.mmagent.MirrorMaker;

diff --git a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
index 1b5f39c..5f0669c 100644
--- a/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/MetricsRestServiceTest.java
@@ -32,8 +32,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.service.MetricsService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.service.MetricsService;

 

 

 @RunWith(PowerMockRunner.class)

diff --git a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
index 8ef1391..c805fcb 100644
--- a/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/TopicRestServiceTest.java
@@ -50,20 +50,20 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-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.metabroker.Broker.TopicExistsException;

-import com.att.dmf.mr.metabroker.Topic;

-import com.att.dmf.mr.security.DMaaPAAFAuthenticator;

-import com.att.dmf.mr.security.DMaaPAuthenticator;

-import com.att.dmf.mr.service.TopicService;

-import com.att.dmf.mr.utils.ConfigurationReader;

-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.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.metabroker.Broker.TopicExistsException;

+import org.onap.dmaap.dmf.mr.metabroker.Topic;

+import org.onap.dmaap.dmf.mr.security.DMaaPAAFAuthenticator;

+import org.onap.dmaap.dmf.mr.security.DMaaPAuthenticator;

+import org.onap.dmaap.dmf.mr.service.TopicService;

+import org.onap.dmaap.dmf.mr.utils.ConfigurationReader;

+import org.onap.dmaap.dmf.mr.utils.DMaaPResponseBuilder;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.NsaAcl;

 import com.att.nsa.security.NsaApiKey;

diff --git a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
index 536a685..a5abb75 100644
--- a/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/TransactionRestServiceTest.java
@@ -37,10 +37,10 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.CambriaApiException;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.service.EventsService;

-import com.att.dmf.mr.service.TransactionService;

+import org.onap.dmaap.dmf.mr.CambriaApiException;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.service.EventsService;

+import org.onap.dmaap.dmf.mr.service.TransactionService;

 import com.att.nsa.configs.ConfigDbException;

 import com.att.nsa.security.ReadWriteSecuredResource.AccessDeniedException;

 import com.att.aft.dme2.internal.jettison.json.JSONException;

diff --git a/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java b/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
index d8363ac..ea6535a 100644
--- a/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
+++ b/src/test/java/com/att/nsa/dmaap/service/UIRestServicesTest.java
@@ -29,7 +29,7 @@ import org.junit.After;
 import org.junit.Before;

 import org.junit.Test;

 

-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/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
index f5ad531..dc59f9c 100644
--- a/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
+++ b/src/test/java/com/att/nsa/dmaap/util/DMaaPAuthFilterTest.java
@@ -41,8 +41,8 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;

 

 import com.att.ajsc.beans.PropertiesMapBean;

-import com.att.dmf.mr.beans.DMaaPContext;

-import com.att.dmf.mr.exception.DMaaPResponseCode;

+import org.onap.dmaap.dmf.mr.beans.DMaaPContext;

+import org.onap.dmaap.dmf.mr.exception.DMaaPResponseCode;

 

 

 @RunWith(PowerMockRunner.class)