X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cadi%2Faaf%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fcadi%2Foauth%2FTokenClientFactory.java;h=21b65f1a2cc1f93d00db47c80686b4ada4991c6f;hb=7e966914050e66219689001ff4ab601a49eef0ac;hp=8a7118c753320d519359425ef22d3f241249db1e;hpb=4b5a7d721d994a49057e9bfb403c7bff1b376660;p=aaf%2Fauthz.git

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 8a7118c7..21b65f1a 100644
--- 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
@@ -63,10 +63,10 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
     private TokenClientFactory(Access pa) throws APIException, GeneralSecurityException, IOException, CadiException {
         super(pa, new RosettaEnv(pa.getProperties()),Token.class,"outgoing");
         
-        if(access.getProperty(Config.AAF_OAUTH2_TOKEN_URL,null)==null) {
+        if (access.getProperty(Config.AAF_OAUTH2_TOKEN_URL,null)==null) {
             access.getProperties().put(Config.AAF_OAUTH2_TOKEN_URL, Defaults.OAUTH2_TOKEN_URL); // Default to AAF
         }
-        if(access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL,null)==null) {
+        if (access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL,null)==null) {
             access.getProperties().put(Config.AAF_OAUTH2_INTROSPECT_URL, Defaults.OAUTH2_INTROSPECT_URL); // Default to AAF);
         }
 
@@ -75,7 +75,7 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
     }
     
     public synchronized static final TokenClientFactory instance(Access access) throws APIException, GeneralSecurityException, IOException, CadiException {
-        if(instance==null) {
+        if (instance==null) {
             instance = new TokenClientFactory(access);
         }
         return instance;
@@ -96,16 +96,16 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
     
     public<INTR> TokenClient newClient(final String tagOrURL, final int timeout) throws CadiException, LocatorException, APIException {
         AAFConHttp ach;
-        if(tagOrURL==null) {
+        if (tagOrURL==null) {
             throw new CadiException("parameter tagOrURL cannot be null.");
         } else {
             ach = aafcons.get(tagOrURL);
-            if(ach==null) {
+            if (ach==null) {
                 aafcons.put(tagOrURL, ach=new AAFConHttp(access,tagOrURL));
             }
         }
         char okind;
-        if( Config.AAF_OAUTH2_TOKEN_URL.equals(tagOrURL) ||
+        if ( Config.AAF_OAUTH2_TOKEN_URL.equals(tagOrURL) ||
             Config.AAF_OAUTH2_INTROSPECT_URL.equals(tagOrURL) ||
             tagOrURL.equals(access.getProperty(Config.AAF_OAUTH2_TOKEN_URL, null)) ||
             tagOrURL.equals(access.getProperty(Config.AAF_OAUTH2_INTROSPECT_URL, null))
@@ -136,19 +136,19 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
         try {
             StringBuilder sb = new StringBuilder(client_id);
             sb.append('_');
-            if(username!=null) {
+            if (username!=null) {
                 sb.append(username);
             }
             sb.append('_');
             sb.append(tokenSource);
             byte[] tohash=scope.getBytes();
-            if(hash!=null && hash.length>0) {
+            if (hash!=null && hash.length>0) {
                 byte temp[] = new byte[hash.length+tohash.length];
                 System.arraycopy(tohash, 0, temp, 0, tohash.length);
                 System.arraycopy(hash, 0, temp, tohash.length, hash.length);
                 tohash = temp;
             }
-            if(scope!=null && scope.length()>0) {
+            if (scope!=null && scope.length()>0) {
                 sb.append(Hash.toHexNo0x(Hash.hashSHA256(tohash)));
             }
             return sb.toString();
@@ -170,12 +170,12 @@ public class TokenClientFactory extends Persist<Token,TimedToken> {
     
     private static final Pattern locatePattern = Pattern.compile("https://.*/locate/.*");
     public Locator<URI> bestLocator(final String locatorURL ) throws LocatorException, URISyntaxException {
-        if(locatorURL==null) {
+        if (locatorURL==null) {
             throw new LocatorException("Cannot have a null locatorURL in bestLocator");
         }
-        if(locatorURL.startsWith("https://AAF_LOCATE_URL/") || locatePattern.matcher(locatorURL).matches()) {
+        if (locatorURL.startsWith("https://AAF_LOCATE_URL/") || locatePattern.matcher(locatorURL).matches()) {
             return new AAFLocator(hsi,new URI(locatorURL));
-        } else if(locatorURL.indexOf(',')>0) { // multiple URLs is a Property Locator
+        } else if (locatorURL.indexOf(',')>0) { // multiple URLs is a Property Locator
             return new PropertyLocator(locatorURL);
         } else {
             return new SingleEndpointLocator(locatorURL);