From f83c15c4a04a26c3d57423f3c67058ea38d5302f Mon Sep 17 00:00:00 2001 From: Instrumental Date: Wed, 6 Feb 2019 06:49:17 -0600 Subject: Refine Props, Batch Extend Issue-ID: AAF-740 Change-Id: I119c3e6573d59d6d182303dfd364342f0218b865 Signed-off-by: Instrumental --- .../src/main/java/org/onap/aaf/cadi/config/Config.java | 2 -- .../onap/aaf/cadi/config/RegistrationPropHolder.java | 18 +++++++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'cadi/core') 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 f265947a..fc972c8c 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 @@ -36,8 +36,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.servlet.Registration; - import org.onap.aaf.cadi.AbsUserCache; import org.onap.aaf.cadi.Access; import org.onap.aaf.cadi.Access.Level; 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 c8139646..b6cd533c 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 @@ -28,7 +28,7 @@ import org.onap.aaf.cadi.CadiException; import org.onap.aaf.cadi.util.Split; public class RegistrationPropHolder { - + private final String PUBLIC_NAME="%NS.%N"; private final Access access; public String hostname; private int port; @@ -38,6 +38,7 @@ public class RegistrationPropHolder { public Float longitude; public final String default_fqdn; public final String default_container_ns; + public final String default_name; public final String lentries; public final String lcontainer; @@ -74,6 +75,8 @@ public class RegistrationPropHolder { public_hostname = access.getProperty(Config.AAF_LOCATOR_PUBLIC_HOSTNAME, hostname); + default_name = access.getProperty(Config.AAF_LOCATOR_NAME, "%CNS.%NS.%N"); + latitude=null; String slatitude = access.getProperty(Config.CADI_LATITUDE, null); if(slatitude == null) { @@ -100,7 +103,7 @@ public class RegistrationPropHolder { } } - default_fqdn = access.getProperty(Config.AAF_LOCATOR_FQDN, public_hostname); + default_fqdn = access.getProperty(Config.AAF_LOCATOR_FQDN, hostname); default_container_ns = access.getProperty(Config.AAF_LOCATOR_CONTAINER_NS,""); if(errs.length()>0) { @@ -120,17 +123,18 @@ public class RegistrationPropHolder { if(public_hostname!=null && dot_le.isEmpty()) { str = public_hostname; } else { - str = access.getProperty(Config.AAF_LOCATOR_FQDN+dot_le, null); - if(str==null) { - str = access.getProperty(Config.AAF_LOCATOR_FQDN, hostname); - } + str = access.getProperty(Config.AAF_LOCATOR_FQDN+dot_le, default_fqdn); } return replacements(str,entry,dot_le); } public String getEntryName(final String entry, final String dot_le) { String str; - str = access.getProperty(Config.AAF_LOCATOR_NAME+dot_le, "%NS.%N"); + if(dot_le.isEmpty()) { + str = PUBLIC_NAME; + } else { + str = access.getProperty(Config.AAF_LOCATOR_NAME+dot_le, default_name); + } return replacements(str,entry,dot_le); } -- cgit 1.2.3-korg