Fix testing results for Authn

[aaf/authz.git] / cadi / aaf / src / main / java / org / onap / aaf / cadi / oauth / TokenClientFactory.java

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
index 4f3fa87..28bf659 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/TokenClientFactory.java
@@ -43,6 +43,7 @@ import org.onap.aaf.cadi.aaf.v2_0.AAFLocator;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.config.SecurityInfoC;
 import org.onap.aaf.cadi.locator.PropertyLocator;
+import org.onap.aaf.cadi.locator.SingleEndpointLocator;
 import org.onap.aaf.cadi.oauth.TokenClient.AUTHN_METHOD;
 import org.onap.aaf.cadi.persist.Persist;
 import org.onap.aaf.cadi.principal.Kind;
@@ -53,7 +54,7 @@ import aafoauth.v2_0.Token;
 
 public class TokenClientFactory extends Persist<Token,TimedToken> {
        private static TokenClientFactory instance;
-       private Map<String,AAFConHttp> aafcons = new ConcurrentHashMap<String, AAFConHttp>();
+       private Map<String,AAFConHttp> aafcons = new ConcurrentHashMap<>();
        private SecurityInfoC<HttpURLConnection> hsi;
        // Package on purpose
        final Symm symm;
@@ -62,10 +63,10 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
                super(pa, new RosettaEnv(pa.getProperties()),Token.class,"outgoing");
                
                if(access.getProperty(Config.AAF_OAUTH2_TOKEN_URL,null)==null) {
-                       access.getProperties().put(Config.AAF_OAUTH2_TOKEN_URL, "https://AAF_LOCATE_URL/AAF_NS.token/2.0"); // Default to AAF
+                       access.getProperties().put(Config.AAF_OAUTH2_TOKEN_URL, "https://AAF_LOCATE_URL/AAF_NS.token:2.0"); // Default to AAF
                }
                if(access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL,null)==null) {
-                       access.getProperties().put(Config.AAF_OAUTH2_INTROSPECT_URL, "https://AAF_LOCATE_URL/AAF_NS.introspect/2.0"); // Default to AAF);
+                       access.getProperties().put(Config.AAF_OAUTH2_INTROSPECT_URL, "https://AAF_LOCATE_URL/AAF_NS.introspect:2.0"); // Default to AAF);
                }
 
                symm = Symm.encrypt.obtain();
@@ -173,8 +174,10 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
                }
                if(locatorURL.startsWith("https://AAF_LOCATE_URL/") || locatePattern.matcher(locatorURL).matches()) {
                        return new AAFLocator(hsi,new URI(locatorURL));
-               } else {
+               } else if(locatorURL.indexOf(',')>0) { // multiple URLs is a Property Locator
                        return new PropertyLocator(locatorURL);
+               } else {
+                       return new SingleEndpointLocator(locatorURL);
                }
                // Note: Removed DME2Locator... If DME2 client is needed, use DME2Clients
        }