Refactor code to support no AAF requests

Change-Id: Ib95ba2458eb9fab90013012718f708c15cbf9db3
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-320

10 files changed, 21 insertions, 11 deletions

diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/DrProvConnectionTest.java b/src/test/java/org/onap/dmaap/dbcapi/client/DrProvConnectionTest.java
index 7dec442..420b991 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/DrProvConnectionTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/client/DrProvConnectionTest.java
@@ -17,8 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
 
+import org.onap.dmaap.dbcapi.client.DrProvConnection;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.service.*;
 import org.onap.dmaap.dbcapi.testframework.DmaapObjectFactory;
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/MrProvConnectionTest.java b/src/test/java/org/onap/dmaap/dbcapi/client/MrProvConnectionTest.java
index b96e173..45b2f2e 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/MrProvConnectionTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/client/MrProvConnectionTest.java
@@ -17,8 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
 
+import org.onap.dmaap.dbcapi.client.MrProvConnection;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.service.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/MrTopicConnectionTest.java b/src/test/java/org/onap/dmaap/dbcapi/client/MrTopicConnectionTest.java
index 548c24a..2163925 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/client/MrTopicConnectionTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/client/MrTopicConnectionTest.java
@@ -17,8 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
 
+import org.onap.dmaap.dbcapi.client.MrTopicConnection;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.service.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBFieldHandlerTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java
index 99022b4..c1e9c35 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBFieldHandlerTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/DBFieldHandlerTest.java
@@ -18,8 +18,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
 
+import org.onap.dmaap.dbcapi.database.DBFieldHandler;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBMapTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/DBMapTest.java
index 46138ab..338479d 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBMapTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/DBMapTest.java
@@ -17,8 +17,10 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
 
+import org.onap.dmaap.dbcapi.database.DBMap;
+import org.onap.dmaap.dbcapi.database.DBSingleton;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 import org.onap.dmaap.dbcapi.util.Singleton;
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBSingletonTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/DBSingletonTest.java
index e2b3653..18eff64 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/DBSingletonTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/DBSingletonTest.java
@@ -18,9 +18,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
 
-import org.onap.dmaap.dbcapi.aaf.database.DBSingleton;
+import org.onap.dmaap.dbcapi.database.DBSingleton;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/LoadSchemaTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/LoadSchemaTest.java
index 3650a6e..48a3cf6 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/LoadSchemaTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/LoadSchemaTest.java
@@ -17,8 +17,9 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
 
+import org.onap.dmaap.dbcapi.database.LoadSchema;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
diff --git a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/TableHandlerTest.java b/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java
index ac6b336..dc2bb2f 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/aaf/database/TableHandlerTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/database/TableHandlerTest.java
@@ -17,8 +17,11 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
 
+import org.onap.dmaap.dbcapi.database.ConnectionFactory;
+import org.onap.dmaap.dbcapi.database.DBFieldHandler;
+import org.onap.dmaap.dbcapi.database.TableHandler;
 import org.onap.dmaap.dbcapi.model.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
 
diff --git a/src/test/java/org/onap/dmaap/dbcapi/service/ApiServiceTest.java b/src/test/java/org/onap/dmaap/dbcapi/service/ApiServiceTest.java
index f29d985..67489e1 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/service/ApiServiceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/service/ApiServiceTest.java
@@ -21,9 +21,9 @@ package org.onap.dmaap.dbcapi.service;
 
 import  org.onap.dmaap.dbcapi.model.*;
 import  org.onap.dmaap.dbcapi.aaf.*;
+import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException;
 import org.onap.dmaap.dbcapi.resources.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
-import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException;
 
 import static org.junit.Assert.*;
 
diff --git a/src/test/java/org/onap/dmaap/dbcapi/service/FeedServiceTest.java b/src/test/java/org/onap/dmaap/dbcapi/service/FeedServiceTest.java
index 1827594..d601bc4 100644
--- a/src/test/java/org/onap/dmaap/dbcapi/service/FeedServiceTest.java
+++ b/src/test/java/org/onap/dmaap/dbcapi/service/FeedServiceTest.java
@@ -21,9 +21,9 @@ package org.onap.dmaap.dbcapi.service;
 
 import  org.onap.dmaap.dbcapi.model.*;
 import  org.onap.dmaap.dbcapi.aaf.*;
+import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException;
 import org.onap.dmaap.dbcapi.resources.*;
 import org.onap.dmaap.dbcapi.testframework.ReflectionHarness;
-import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException;
 
 import static org.junit.Assert.*;