switch Internal/External Locator Names for Dublin

[aaf/authz.git] / auth / auth-locate / src / main / java / org / onap / aaf / auth / locate / AAF_Locate.java

diff --git a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
index 545b6b4..26bdb69 100644 (file)
--- a/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
+++ b/auth/auth-locate/src/main/java/org/onap/aaf/auth/locate/AAF_Locate.java
@@ -23,6 +23,7 @@
 package org.onap.aaf.auth.locate;
 
 import java.net.URI;
+import java.net.UnknownHostException;
 import java.util.Map;
 
 import javax.servlet.Filter;
@@ -58,17 +59,15 @@ import org.onap.aaf.cadi.aaf.v2_0.AAFLurPerm;
 import org.onap.aaf.cadi.aaf.v2_0.AAFTrustChecker;
 import org.onap.aaf.cadi.aaf.v2_0.AbsAAFLocator;
 import org.onap.aaf.cadi.config.Config;
+import org.onap.aaf.cadi.config.RegistrationPropHolder;
 import org.onap.aaf.cadi.register.Registrant;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.Data;
 import org.onap.aaf.misc.env.Env;
-import org.onap.aaf.misc.rosetta.env.RosettaEnv;
 
 import com.datastax.driver.core.Cluster;
 
 public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
-    private static final String DOT_LOCATOR = ".locator";
-
     private static final String USER_PERMS = "userPerms";
     private LocateFacade_1_1 facade; // this is the default Facade
     private LocateFacade_1_1 facade_1_1_XML;
@@ -81,8 +80,6 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     public final LocateDAO locateDAO;
     public final ConfigDAO configDAO;
     private Locator<URI> dal;
-    private final String aaf_service_name;
-    private final String aaf_gui_name;
 
     
     /**
@@ -96,8 +93,6 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
      */
     public AAF_Locate(final AuthzEnv env) throws Exception {
         super(env.access(), env);
-        aaf_service_name = app_name.replace(DOT_LOCATOR, ".service");
-        aaf_gui_name = app_name.replace(DOT_LOCATOR, ".gui");
         
         expireIn = Long.parseLong(env.getProperty(Config.AAF_USER_EXPIRES, Config.AAF_USER_EXPIRES_DEF));
 
@@ -120,7 +115,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
         facade_1_1_XML = LocateFacadeFactory.v1_1(env,this,trans,Data.TYPE.XML);
 
         synchronized(env) {
-            if(cacheUser == null) {
+            if (cacheUser == null) {
                 cacheUser = Cache.obtain(USER_PERMS);
                 Cache.startCleansing(env, USER_PERMS);
             }
@@ -163,7 +158,7 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
         String version = "1.0";
         // Get Correct API Class from Mapper
         Class<?> respCls = facade.mapper().getClass(api); 
-        if(respCls==null) throw new Exception("Unknown class associated with " + api.getClass().getName() + ' ' + api.name());
+        if (respCls==null) throw new Exception("Unknown class associated with " + api.getClass().getName() + ' ' + api.name());
         // setup Application API HTML ContentTypes for JSON and Route
         String application = applicationJSON(respCls, version);
         route(env,meth,path,code,application,"application/json;version="+version,"*/*","*");
@@ -186,8 +181,8 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     @Override
     protected AAFConHttp _newAAFConHttp() throws CadiException {
         try {
-            if(dal==null) {
-                dal = AbsAAFLocator.create(aaf_service_name,Config.AAF_DEFAULT_VERSION);
+            if (dal==null) {
+                dal = AbsAAFLocator.create("%AAF_NS.service",Config.AAF_DEFAULT_API_VERSION);
             }
             // utilize pre-constructed DirectAAFLocator
             return new AAFConHttp(env.access(),dal);
@@ -197,8 +192,15 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     }
 
     public Locator<URI> getGUILocator() throws LocatorException {
-        if(gui_locator==null) {
-            gui_locator = AbsAAFLocator.create(aaf_gui_name,Config.AAF_DEFAULT_VERSION);
+        if (gui_locator==null) {
+               RegistrationPropHolder rph;
+               try {
+                                rph = new RegistrationPropHolder(access, 0);
+                       } catch (UnknownHostException | CadiException e) {
+                               throw new LocatorException(e);
+                       }
+            gui_locator = AbsAAFLocator.create(rph.getPublicEntryName("gui", rph.default_container),
+               Config.AAF_DEFAULT_API_VERSION);
         }
         return gui_locator;
     }
@@ -221,14 +223,14 @@ public class AAF_Locate extends AbsService<AuthzEnv, AuthzTrans> {
     @Override
     public Registrant<AuthzEnv>[] registrants(final int port) throws CadiException {
         return new Registrant[] {
-            new DirectRegistrar(access,locateDAO,app_name,app_version,port)
+            new DirectRegistrar(access,locateDAO,port)
         };
     }
 
     @Override
     public void destroy() {
         Cache.stopTimer();
-        if(cluster!=null) {
+        if (cluster!=null) {
             cluster.close();
         }
         super.destroy();