X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdbcapi%2Fservice%2FApiService.java;h=48f81db6c1826a2622edbc80badb938af863cf1d;hb=d6ac6f8b10e90411dd650d6f7a9ee51179e39bfc;hp=aab989d8ffa316c70895c54a330dfe2d300bfb0c;hpb=a05efb7b7b3cfc77f5e3fda11e8434834829f56a;p=dmaap%2Fdbcapi.git

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..48f81db 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;
@@ -88,7 +88,7 @@ public class ApiService extends BaseLoggingClass {
 	}
 
 	 private String apiNamespace;
-	 private boolean usePE;
+
 	 private String uri;
 	 private String uriPath;
 	 private String method;
@@ -114,11 +114,12 @@ public class ApiService extends BaseLoggingClass {
 		
 		if (apiNamespace == null) {
 			DmaapConfig p = (DmaapConfig)DmaapConfig.getConfig();
-			usePE = "true".equalsIgnoreCase(p.getProperty("UsePE", "false"));
 			apiNamespace = p.getProperty("ApiNamespace", "org.openecomp.dmaapBC.api");
+			logger.info( "config param usePE has been deprecated.  Use ApiPermission.Class property instead.");
 		}
 		apiPolicy = new ApiPolicy();
-		logger.info( "usePE=" + usePE + " apiNamespace=" + apiNamespace);	
+
+		logger.info(  "apiNamespace=" + apiNamespace);	
 	}
 
 	public ApiService setAuth( String auth ) {
@@ -164,6 +165,7 @@ public class ApiService extends BaseLoggingClass {
 
 	// test for presence of a required field
 	public void required( String name, Object val, String expr ) throws RequiredFieldException {
+		err.setCode(0);
 		if ( val == null  ) {
 			err.setCode(Status.BAD_REQUEST.getStatusCode());
 			err.setMessage("missing required field");
@@ -295,7 +297,7 @@ public class ApiService extends BaseLoggingClass {
 		if ( env == null || env.isEmpty() ) {
 			env = "boot";
 		}
-		if ( ! usePE ) return;  // skip authorization if not enabled
+		if ( ! apiPolicy.getUseAuthClass() ) return;  // skip authorization if not enabled
 		if ( authorization == null || authorization.isEmpty()) {
 			String errmsg = "No basic authorization value provided ";
 			err.setMessage(errmsg);