From 84fc74efbdd3b8343aaeba13df42accefe5493db Mon Sep 17 00:00:00 2001 From: Instrumental Date: Fri, 28 Jun 2019 17:16:33 -0500 Subject: [PATCH] Updates for DirectLocator Issue-ID: AAF-857 Change-Id: I55cdedad9dfaf4be8c785aa5f503f71fe4504070 Signed-off-by: Instrumental --- .../org/onap/aaf/auth/direct/DirectAAFLocator.java | 8 +++++--- .../java/org/onap/aaf/auth/locate/AAF_Locate.java | 4 ++-- .../org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java | 3 +++ .../main/java/org/onap/aaf/cadi/config/Config.java | 21 ++++++++++++++++++--- .../aaf/cadi/config/RegistrationPropHolder.java | 5 +++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java index 98459672..2f1d150c 100644 --- a/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java +++ b/auth/auth-cass/src/main/java/org/onap/aaf/auth/direct/DirectAAFLocator.java @@ -73,9 +73,11 @@ public class DirectAAFLocator extends AbsAAFLocator { } try { - String aaf_url = access.getProperty(Config.AAF_URL, null); - if(aaf_url==null) { - aaf_url = "https://"+Config.AAF_LOCATE_URL_TAG+"/%NS."+name; + String aaf_url; + if(name.indexOf('.')>=0) { + aaf_url = "https://"+Config.AAF_LOCATE_URL_TAG+'/'+name+':'+version; + } else { + aaf_url = "https://"+Config.AAF_LOCATE_URL_TAG+"/%NS."+name+':'+version; } RegistrationPropHolder rph = new RegistrationPropHolder(access,0); aaf_url = rph.replacements(getClass().getSimpleName(),aaf_url, null,null); 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 26d0cc37..5ebabed7 100644 --- 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 @@ -199,8 +199,8 @@ public class AAF_Locate extends AbsService { } catch (UnknownHostException | CadiException e) { throw new LocatorException(e); } - gui_locator = AbsAAFLocator.create(rph.getPublicEntryName("gui", rph.default_container), - Config.AAF_DEFAULT_API_VERSION); + String url = rph.getPublicEntryName("gui", rph.default_container); + gui_locator = AbsAAFLocator.create(url,Config.AAF_DEFAULT_API_VERSION); } return gui_locator; } diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java index 3941b155..e43250a0 100644 --- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java +++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AbsAAFLocator.java @@ -122,6 +122,9 @@ public abstract class AbsAAFLocator implements Locator } public static Locator create(final String name, final String version) throws LocatorException { + if(locatorCreator==null) { + throw new LocatorException("LocatorCreator is not set"); + } return locatorCreator.create(name, version); } diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java index adb69184..2655b4ce 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/Config.java @@ -855,15 +855,30 @@ public class Config { Method aalMth = aalCls.getMethod("create", String.class,String.class); int colon = _url.lastIndexOf(':'); if(colon>=0) { - String version = _url.substring(colon+1); - int slash = _url.lastIndexOf('/',colon); + int slash = _url.indexOf('/',colon); + String version; + if(slash<0) { + version = _url.substring(colon+1); + } else { + version = _url.substring(colon+1,slash); + } + slash = _url.lastIndexOf('/',colon); if(slash>=0) { Object aal = aalMth.invoke(null/*static*/, _url.substring(slash+1, colon),version); return (Locator)aal; } } } catch (ClassNotFoundException | NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { - access.log(Level.DEBUG, "Configured AbsAAFLocator not found. Continuing Locator creation"); + String msg; + char quote; + if(e.getCause()!=null) { + msg=e.getCause().getMessage(); + quote='"'; + } else { + msg = "-"; + quote=' '; + } + access.printf(Level.DEBUG, "Configured AbsAAFLocator not found%c%s%cContinuing Locator creation ",quote,msg,quote); } // String url = _url.replace("/AAF_NS.", "/%C%CID%AAF_NS."); // String root_ns = access.getProperty(Config.AAF_ROOT_NS, null); diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java b/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java index 50f17e88..2a8760f4 100644 --- a/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java +++ b/cadi/core/src/main/java/org/onap/aaf/cadi/config/RegistrationPropHolder.java @@ -263,9 +263,10 @@ public class RegistrationPropHolder { if(value.indexOf("%NS")>=0) { str = getNS(dot_le); if(str==null || str.isEmpty()) { - value = value.replace("%NS"+'.', str); + value = value.replace("%NS"+'.', ""); + } else { + value = value.replace("%NS", str); } - value = value.replace("%NS", str); } // aaf_root_ns -- 2.16.6