Add a MassMail Batch Program

[aaf/authz.git] / auth / auth-oauth / src / main / java / org / onap / aaf / auth / oauth / mapper / Mapper1_0.java

diff --git a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper1_0.java b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper1_0.java
index 4be079e..154654c 100644 (file)
--- a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper1_0.java
+++ b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper1_0.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.
@@ -34,7 +34,7 @@ import org.onap.aaf.auth.oauth.service.OAuthService;
 import org.onap.aaf.auth.oauth.service.OCreds;
 import org.onap.aaf.auth.oauth.service.OAuthService.CLIENT_TYPE;
 import org.onap.aaf.auth.oauth.service.OAuthService.GRANT_TYPE;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.oauth.OAuth2Principal;
 import org.onap.aaf.cadi.util.Vars;
 import org.onap.aaf.misc.env.util.Split;
@@ -49,7 +49,7 @@ public class Mapper1_0 extends MapperIntrospect1_0 implements Mapper<TokenReques
     @Override
     public Class<?> getClass(API api) {
         switch(api) {
-            case TOKEN_REQ:        return TokenRequest.class; 
+            case TOKEN_REQ:        return TokenRequest.class;
             case TOKEN:         return Token.class;
             case INTROSPECT:     return Introspect.class;
             case ERROR:         return Error.class;
@@ -73,13 +73,13 @@ public class Mapper1_0 extends MapperIntrospect1_0 implements Mapper<TokenReques
 
     //////////////  Mapping Functions /////////////
     @Override
-    public Error errorFromMessage(StringBuilder holder, String msgID, String text, String... var) {
+    public Error errorFromMessage(StringBuilder holder, String msgID, String text, Object ... var) {
         Error err = new Error();
         err.setMessageId(msgID);
         // AT&T Restful Error Format requires numbers "%" placements
         err.setText(Vars.convert(holder, text, var));
-        for(String s : var) {
-            err.getVariables().add(s);
+        for (Object s : var) {
+            err.getVariables().add(s.toString());
         }
         return err;
     }
@@ -89,57 +89,57 @@ public class Mapper1_0 extends MapperIntrospect1_0 implements Mapper<TokenReques
         TokenRequest tr = new TokenRequest();
         boolean data = false;
         Map<String, String[]> map = req.getParameterMap();
-        for(Entry<String, String[]> es : map.entrySet()) {
+        for (Entry<String, String[]> es : map.entrySet()) {
             switch(es.getKey()) {
                 case "client_id":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setClientId(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "client_secret":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setClientSecret(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "username":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setUsername(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "password":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setPassword(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "scope":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setScope(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "grant_type":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setGrantType(es.getValue()[0]);
                         data = true;
                     }
                     break;
                 case "refresh_token":
-                    if(es.getValue().length==1) {
+                    if (es.getValue().length==1) {
                         tr.setRefreshToken(es.getValue()[0]);
                         data = true;
                     }
                     break;
 
-            }    
+            }
         }
         return data?tr:null;
     }
-    
-    
+
+
 
     /* (non-Javadoc)
      * @see org.onap.aaf.auth.oauth.mapper.Mapper#credsFromReq(javax.servlet.http.HttpServletRequest)
@@ -156,19 +156,19 @@ public class Mapper1_0 extends MapperIntrospect1_0 implements Mapper<TokenReques
     @Override
     public Data clientTokenReq(TokenRequest tokReq, Holder<GRANT_TYPE> hgt) {
         OAuthTokenDAO.Data tdd = new OAuthTokenDAO.Data();
-        tdd.client_id = tokReq.getClientId(); 
+        tdd.client_id = tokReq.getClientId();
         tdd.user = tokReq.getUsername();
-        if(tokReq.getRefreshToken()!=null) {
+        if (tokReq.getRefreshToken()!=null) {
             tdd.refresh=tokReq.getRefreshToken();
         }
-        
-        for(GRANT_TYPE ttt : GRANT_TYPE.values()) {
-            if(ttt.name().equals(tokReq.getGrantType())) {
+
+        for (GRANT_TYPE ttt : GRANT_TYPE.values()) {
+            if (ttt.name().equals(tokReq.getGrantType())) {
                 hgt.set(ttt);
                 break;
             }
         }
-        
+
         switch(hgt.get()) {
             case client_credentials:
             case password:
@@ -179,26 +179,26 @@ public class Mapper1_0 extends MapperIntrospect1_0 implements Mapper<TokenReques
                 tdd.type = CLIENT_TYPE.unknown.ordinal();
                 break;
         }
-        String scopes=tokReq.getScope(); 
-        if(scopes!=null) {
+        String scopes=tokReq.getScope();
+        if (scopes!=null) {
             Set<String> ss = tdd.scopes(true);
-            for(String s: Split.split(' ', tokReq.getScope())) {
+            for (String s: Split.split(' ', tokReq.getScope())) {
                 ss.add(s);
             }
         }
-        
+
         tdd.state = tokReq.getState();
         return tdd;
     }
 
     @Override
     public Result<Token> tokenFromData(Result<Data> rd) {
-        if(rd.notOK()) {
+        if (rd.notOK()) {
             return Result.err(rd);
         }
         Data d = rd.value;
         Token token = new Token();
-        if(OAuthService.TOKEN_TYPE.values().length>d.type) {
+        if (OAuthService.TOKEN_TYPE.values().length>d.type) {
             token.setTokenType(OAuthService.TOKEN_TYPE.values()[d.type].name());
         } else {
             token.setTokenType("Invalid");