diff options
46 files changed, 121 insertions, 108 deletions
diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..17efa84 --- /dev/null +++ b/.classpath @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java index 727ec19..01506bf 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/aaf/AafService.java @@ -36,6 +36,13 @@ public class AafService extends BaseLoggingClass { private AafConnection aaf; private ServiceType ctype; private String aafURL ; + private boolean useAAF = false; + + public AafService() { + DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig(); + useAAF= "true".equalsIgnoreCase(p.getProperty("UseAAF", "false")); + + } private String getCred( boolean wPwd ) { String mechIdProperty = null; @@ -54,21 +61,10 @@ public class AafService extends BaseLoggingClass { return null; } String user = p.getProperty( mechIdProperty, "noMechId@domain.netset.com" ); - //String dClass = p.getProperty( "AafDecryption.Class", "org.openecomp.dmaapbc.aaf.ClearDecrypt"); + String pwd = ""; String encPwd = p.getProperty( pwdProperty, "notSet" ); - //DecryptionInterface dec = null; - //try { - // dec = (DecryptionInterface) (Class.forName(dClass).newInstance()); - // dec.init( p.getProperty("CredentialCodecKeyfile", "LocalKey")); - //} catch (Exception ee ) { - // errorLogger.error(DmaapbcLogMessageEnum.UNEXPECTED_CONDITION, "attempting to use " + dClass + " to decrypt " + encPwd ); - //} - //try { - // pwd = dec.decrypt( encPwd ); - //} catch( IOException io ) { - // errorLogger.error(DmaapbcLogMessageEnum.DECRYPT_IO_ERROR, dClass, encPwd ); - //} + pwd = decryptor.decrypt(encPwd); @@ -101,7 +97,11 @@ public class AafService extends BaseLoggingClass { int rc = -1; logger.info( "entry: addPerm() " ); String pURL = aafURL + "authz/perm"; - rc = aaf.postAaf( perm, pURL ); + if ( useAAF ) { + rc = aaf.postAaf( perm, pURL ); + } else { + rc = 201; + } switch( rc ) { case 401: case 403: @@ -127,7 +127,12 @@ public class AafService extends BaseLoggingClass { logger.info( "entry: addGrant() " ); String pURL = aafURL + "authz/role/perm"; - rc = aaf.postAaf( grant, pURL ); + if ( useAAF ) { + rc = aaf.postAaf( grant, pURL ); + } else { + rc = 201; + } + switch( rc ) { case 401: case 403: @@ -155,7 +160,12 @@ public class AafService extends BaseLoggingClass { logger.info( "entry: delGrant() " ); String pURL = aafURL + "authz/role/:" + grant.getRole() + "/perm"; - rc = aaf.delAaf( grant, pURL ); + + if ( useAAF ) { + rc = aaf.delAaf( grant, pURL ); + } else { + rc = 200; + } switch( rc ) { case 401: case 403: diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPermissionInterface.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPermissionInterface.java index acc5da9..fa695f9 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPermissionInterface.java +++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPermissionInterface.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.authentication; +package org.onap.dmaap.dbcapi.authentication; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPerms.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java index 478b772..6749932 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPerms.java +++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPerms.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.authentication; +package org.onap.dmaap.dbcapi.authentication; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPolicy.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java index a86f83f..33d0786 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/ApiPolicy.java +++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/ApiPolicy.java @@ -17,7 +17,7 @@ * limitations under the License. * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.authentication; +package org.onap.dmaap.dbcapi.authentication; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/AuthenticationErrorException.java b/src/main/java/org/onap/dmaap/dbcapi/authentication/AuthenticationErrorException.java index c740eac..5119c76 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/authentication/AuthenticationErrorException.java +++ b/src/main/java/org/onap/dmaap/dbcapi/authentication/AuthenticationErrorException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.authentication; +package org.onap.dmaap.dbcapi.authentication; public class AuthenticationErrorException extends Exception { /** diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/DrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java index c744021..9807fba 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/DrProvConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/DrProvConnection.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.client; +package org.onap.dmaap.dbcapi.client; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/MrProvConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java index 529cbf0..91ed1bb 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/MrProvConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrProvConnection.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.client; +package org.onap.dmaap.dbcapi.client; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/MrTopicConnection.java b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java index bfbe826..b79b33a 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/client/MrTopicConnection.java +++ b/src/main/java/org/onap/dmaap/dbcapi/client/MrTopicConnection.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.client; +package org.onap.dmaap.dbcapi.client; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/ConnWrapper.java b/src/main/java/org/onap/dmaap/dbcapi/database/ConnWrapper.java index 019caef..e0c7819 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/ConnWrapper.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/ConnWrapper.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.sql.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/ConnectionFactory.java b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java index 64a2959..1d93d68 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/ConnectionFactory.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/ConnectionFactory.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.sql.*; import java.util.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBException.java b/src/main/java/org/onap/dmaap/dbcapi/database/DBException.java index f73e510..6538167 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBException.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/DBException.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBFieldHandler.java b/src/main/java/org/onap/dmaap/dbcapi/database/DBFieldHandler.java index 52af453..072c548 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBFieldHandler.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/DBFieldHandler.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.lang.reflect.*; import java.sql.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBMap.java b/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java index 8b8e3ad..a9bf56e 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBMap.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/DBMap.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.sql.*; import java.util.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBSingleton.java b/src/main/java/org/onap/dmaap/dbcapi/database/DBSingleton.java index 8c158ca..9a34f58 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DBSingleton.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/DBSingleton.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.sql.*; import java.util.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DatabaseClass.java b/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java index baa86a6..9b7c8ff 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/DatabaseClass.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/DatabaseClass.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.util.*; import java.sql.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/LoadSchema.java b/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java index bbd6f18..6e64c4a 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/LoadSchema.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/LoadSchema.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.io.*; import java.sql.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/TableHandler.java b/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java index fe610ab..b43edc5 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/aaf/database/TableHandler.java +++ b/src/main/java/org/onap/dmaap/dbcapi/database/TableHandler.java @@ -18,7 +18,7 @@ * ============LICENSE_END========================================================= */ -package org.onap.dmaap.dbcapi.aaf.database; +package org.onap.dmaap.dbcapi.database; import java.util.*; import java.lang.reflect.*; diff --git a/src/main/java/org/onap/dmaap/dbcapi/model/MR_Client.java b/src/main/java/org/onap/dmaap/dbcapi/model/MR_Client.java index dc43cc0..580800c 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/model/MR_Client.java +++ b/src/main/java/org/onap/dmaap/dbcapi/model/MR_Client.java @@ -24,10 +24,7 @@ import java.util.Date; import javax.xml.bind.annotation.XmlRootElement; - - - -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.database.DatabaseClass; @XmlRootElement public class MR_Client extends DmaapObject { diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java index d990b09..ab0e262 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java +++ b/src/main/java/org/onap/dmaap/dbcapi/resources/AuthorizationFilter.java @@ -25,7 +25,7 @@ import java.io.IOException; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerRequestFilter; -import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException; +import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException; import org.onap.dmaap.dbcapi.service.ApiService; import org.onap.dmaap.dbcapi.util.DmaapConfig; diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java index 4796217..1a6310c 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java +++ b/src/main/java/org/onap/dmaap/dbcapi/resources/BridgeResource.java @@ -40,7 +40,7 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import javax.ws.rs.core.Response.Status; -import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException; +import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java b/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java index 417b18a..eead1de 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java +++ b/src/main/java/org/onap/dmaap/dbcapi/resources/FeedResource.java @@ -46,26 +46,7 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.log4j.Logger; - - - - - - - - - - - - - - - - - - - -import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException; +import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java index c0699d5..519fa4a 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java +++ b/src/main/java/org/onap/dmaap/dbcapi/server/JettyServer.java @@ -45,7 +45,7 @@ import org.eclipse.jetty.util.ssl.SslContextFactory; import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; -import org.onap.dmaap.dbcapi.aaf.database.LoadSchema; +import org.onap.dmaap.dbcapi.database.LoadSchema; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; /** * A Jetty server which supports: diff --git a/src/main/java/org/onap/dmaap/dbcapi/server/Main.java b/src/main/java/org/onap/dmaap/dbcapi/server/Main.java index 1ada428..c3340e6 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/server/Main.java +++ b/src/main/java/org/onap/dmaap/dbcapi/server/Main.java @@ -23,8 +23,8 @@ import java.net.InetAddress; import java.util.Properties; import java.util.UUID; -import org.onap.dmaap.dbcapi.aaf.authentication.ApiPerms; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.authentication.ApiPerms; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.*; import org.onap.dmaap.dbcapi.model.Dmaap; import org.onap.dmaap.dbcapi.util.DmaapConfig; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/ApiService.java b/src/main/java/org/onap/dmaap/dbcapi/service/ApiService.java index aab989d..e708043 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/ApiService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/ApiService.java @@ -41,8 +41,8 @@ import javax.ws.rs.core.Response.Status; import javax.xml.bind.DatatypeConverter; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; -import org.onap.dmaap.dbcapi.aaf.authentication.ApiPolicy; -import org.onap.dmaap.dbcapi.aaf.authentication.AuthenticationErrorException; +import org.onap.dmaap.dbcapi.authentication.ApiPolicy; +import org.onap.dmaap.dbcapi.authentication.AuthenticationErrorException; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.model.ApiError; import org.onap.dmaap.dbcapi.model.Dmaap; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java index b6d62a2..cf8c7c1 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/DR_NodeService.java @@ -27,8 +27,8 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; import org.apache.log4j.Logger; -import org.onap.dmaap.dbcapi.aaf.client.DrProvConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.DrProvConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.model.ApiError; import org.onap.dmaap.dbcapi.model.DR_Node; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DR_PubService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DR_PubService.java index ca60b8a..13717da 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/DR_PubService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/DR_PubService.java @@ -27,8 +27,8 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; import org.apache.log4j.Logger; -import org.onap.dmaap.dbcapi.aaf.client.DrProvConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.DrProvConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java index c3f8c9c..0fe1d9e 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/DR_SubService.java @@ -26,8 +26,8 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; -import org.onap.dmaap.dbcapi.aaf.client.DrProvConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.DrProvConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java index 23d44d1..de72ade 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/DcaeLocationService.java @@ -24,17 +24,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; - - - - - - - - - - -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.model.DcaeLocation; import org.onap.dmaap.dbcapi.model.DmaapObject.DmaapObject_Status; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java index 6f1294a..03410f3 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/DmaapService.java @@ -35,8 +35,8 @@ import org.onap.dmaap.dbcapi.aaf.AafService; import org.onap.dmaap.dbcapi.aaf.DmaapGrant; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType; -import org.onap.dmaap.dbcapi.aaf.authentication.ApiPerms; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.authentication.ApiPerms; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java b/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java index 5f1cfb8..8332a35 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/FeedService.java @@ -29,8 +29,8 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; import org.apache.log4j.Logger; -import org.onap.dmaap.dbcapi.aaf.client.DrProvConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.DrProvConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.model.ApiError; import org.onap.dmaap.dbcapi.model.DR_Pub; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClientService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClientService.java index 68b340f..40f86b6 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClientService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClientService.java @@ -38,8 +38,8 @@ import org.onap.dmaap.dbcapi.aaf.AafService; import org.onap.dmaap.dbcapi.aaf.DmaapGrant; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType; -import org.onap.dmaap.dbcapi.aaf.client.MrProvConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.MrProvConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.model.ApiError; import org.onap.dmaap.dbcapi.model.DcaeLocation; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java index d8eb91d..529723e 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/MR_ClusterService.java @@ -26,13 +26,7 @@ import java.util.Map; import javax.ws.rs.core.Response.Status; - - - - - - -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.model.ApiError; import org.onap.dmaap.dbcapi.model.DcaeLocation; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java b/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java index 6701328..29010b6 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/MirrorMakerService.java @@ -34,8 +34,8 @@ import java.util.Map; //import org.openecomp.dmaapbc.aaf.AndrewDecryptor; import org.onap.dmaap.dbcapi.aaf.AafDecrypt; -import org.onap.dmaap.dbcapi.aaf.client.MrTopicConnection; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.client.MrTopicConnection; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java index 7082b9b..d3c849c 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java +++ b/src/main/java/org/onap/dmaap/dbcapi/service/TopicService.java @@ -31,7 +31,7 @@ import javax.ws.rs.core.Response.Status; import org.onap.dmaap.dbcapi.aaf.AafService; import org.onap.dmaap.dbcapi.aaf.DmaapPerm; import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.logging.BaseLoggingClass; import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum; import org.onap.dmaap.dbcapi.model.ApiError; diff --git a/src/main/java/org/onap/dmaap/dbcapi/util/Graph.java b/src/main/java/org/onap/dmaap/dbcapi/util/Graph.java index 5c57ebc..f86569d 100644 --- a/src/main/java/org/onap/dmaap/dbcapi/util/Graph.java +++ b/src/main/java/org/onap/dmaap/dbcapi/util/Graph.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.onap.dmaap.dbcapi.aaf.database.DatabaseClass; +import org.onap.dmaap.dbcapi.database.DatabaseClass; import org.onap.dmaap.dbcapi.model.DcaeLocation; import org.onap.dmaap.dbcapi.model.MR_Client; 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.*; |