Merge "AAFcli.java -Declare "value" on a separate line"

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

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/HRenewingTokenSS.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/HRenewingTokenSS.java
index 100b58e..10a975b 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/HRenewingTokenSS.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/oauth/HRenewingTokenSS.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,11 +40,11 @@ public class HRenewingTokenSS extends HAuthorizationHeader {
     private final TokenClient tc;
     private final String[] scopes;
     private final String tokenURL;
-    
+
     public HRenewingTokenSS(final PropAccess access, final String tokenURL, final String ... nss) throws CadiException, IOException, GeneralSecurityException {
         this(access,SecurityInfoC.instance(access, HttpURLConnection.class),tokenURL,nss);
     }
-    
+
     public HRenewingTokenSS(final PropAccess access, final SecurityInfoC<HttpURLConnection> si, final String tokenURL, final String ... nss) throws CadiException, IOException, GeneralSecurityException {
         super(si,null,null/*Note: HeadValue overloaded */);
         this.tokenURL = tokenURL;
@@ -54,15 +54,15 @@ public class HRenewingTokenSS extends HAuthorizationHeader {
             tc.client_creds(access);
             setUser(tc.client_id());
             String defaultNS = FQI.reverseDomain(tc.client_id());
-            if(nss.length>0) {
+            if (nss.length>0) {
                 boolean hasDefault = false;
-                for(String ns : nss) {
-                    if(ns.equals(defaultNS)) {
+                for (String ns : nss) {
+                    if (ns.equals(defaultNS)) {
                         hasDefault = true;
                     }
                 }
-                if(hasDefault) {
-                    scopes=nss;        
+                if (hasDefault) {
+                    scopes=nss;
                 } else {
                     String[] nssPlus = new String[nss.length+1];
                     nssPlus[0]=defaultNS;
@@ -86,7 +86,7 @@ public class HRenewingTokenSS extends HAuthorizationHeader {
         Result<TimedToken> token;
         try {
             token = tc.getToken(Kind.OAUTH,scopes);
-            if(token.isOK()) {
+            if (token.isOK()) {
                 return "Bearer " + token.value.getAccessToken();
             } else {
                 throw new IOException("Token cannot be obtained: " + token.code + '-' + token.error);