Public and Private Locate entries

[aaf/authz.git] / auth / auth-service / src / main / java / org / onap / aaf / auth / service / AAF_Service.java

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
index 5253513..90d4744 100644 (file)
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/AAF_Service.java
@@ -185,9 +185,9 @@ public class AAF_Service extends AbsService<AuthzEnv,AuthzTrans> {
 
     @SuppressWarnings("unchecked")
     @Override
-    public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException {
+    public Registrant<AuthzEnv>[] registrants(final int actualPort) throws CadiException {
         return new Registrant[] {
-            new DirectRegistrar(access,question.locateDAO,app_name,app_interface_version,port)
+            new DirectRegistrar(access,question.locateDAO, actualPort)
         };
     }
 
@@ -211,11 +211,11 @@ public class AAF_Service extends AbsService<AuthzEnv,AuthzTrans> {
     public void route(HttpMethods meth, String path, API api, Code code) throws Exception {
         Class<?> respCls = facade.mapper().getClass(api); 
         if (respCls==null) throw new Exception("Unknown class associated with " + api.getClass().getName() + ' ' + api.name());
-        String application = applicationJSON(respCls, Config.AAF_DEFAULT_VERSION);
+        String application = applicationJSON(respCls, Config.AAF_DEFAULT_API_VERSION);
 
-        route(env,meth,path,code,application,"application/json;version="+Config.AAF_DEFAULT_VERSION,"*/*");
-        application = applicationXML(respCls, Config.AAF_DEFAULT_VERSION);
-        route(env,meth,path,code.clone(facade_XML,false),application,"text/xml;version=Config.AAF_DEFAULT_VERSION");
+        route(env,meth,path,code,application,"application/json;version="+Config.AAF_DEFAULT_API_VERSION,"*/*");
+        application = applicationXML(respCls, Config.AAF_DEFAULT_API_VERSION);
+        route(env,meth,path,code.clone(facade_XML,false),application,"text/xml;version="+Config.AAF_DEFAULT_API_VERSION);
     }
 
     /**
@@ -226,7 +226,7 @@ public class AAF_Service extends AbsService<AuthzEnv,AuthzTrans> {
             Log4JLogIt logIt = new Log4JLogIt(args, "authz");
             PropAccess propAccess = new PropAccess(logIt,args);
             
-             AbsService<AuthzEnv, AuthzTrans> service = new AAF_Service(new AuthzEnv(propAccess));
+            AbsService<AuthzEnv, AuthzTrans> service = new AAF_Service(new AuthzEnv(propAccess));
             JettyServiceStarter<AuthzEnv,AuthzTrans> jss = new JettyServiceStarter<AuthzEnv,AuthzTrans>(service);
             jss.start();
         } catch (Exception e) {