--- /dev/null
+<?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>
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;
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);
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:
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:
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:
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.authentication;
+package org.onap.dmaap.dbcapi.authentication;
import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
* ============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;
* 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;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.authentication;
+package org.onap.dmaap.dbcapi.authentication;
public class AuthenticationErrorException extends Exception {
/**
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
import java.io.BufferedReader;
import java.io.IOException;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
import java.io.BufferedReader;
import java.io.IOException;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.client;
+package org.onap.dmaap.dbcapi.client;
import java.io.BufferedReader;
import java.io.IOException;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.sql.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.sql.*;
import java.util.*;
* ============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;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.lang.reflect.*;
import java.sql.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.sql.*;
import java.util.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.sql.*;
import java.util.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.util.*;
import java.sql.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.io.*;
import java.sql.*;
* ============LICENSE_END=========================================================
*/
-package org.onap.dmaap.dbcapi.aaf.database;
+package org.onap.dmaap.dbcapi.database;
import java.util.*;
import java.lang.reflect.*;
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 {
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;
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;
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;
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:
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;
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;
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;
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;
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;
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;
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;
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;
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;
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;
//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;
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;
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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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;
* 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;
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.*;
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.*;