Add a MassMail Batch Program

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

diff --git a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper.java b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper.java
index 55100e2..fb0eb86 100644 (file)
--- a/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper.java
+++ b/auth/auth-oauth/src/main/java/org/onap/aaf/auth/oauth/mapper/Mapper.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.
@@ -27,21 +27,21 @@ import org.onap.aaf.auth.dao.cass.OAuthTokenDAO;
 import org.onap.aaf.auth.layer.Result;
 import org.onap.aaf.auth.oauth.service.OCreds;
 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;
 
 public interface Mapper<TOKEN_REQ,TOKEN,INTROSPECT,ERROR> extends MapperIntrospect<INTROSPECT>
-{      
-       public enum API{TOKEN_REQ, TOKEN,INTROSPECT, ERROR,VOID};
-       
-       public Class<?> getClass(API api);
-       public<A> A newInstance(API api);
+{
+    public enum API{TOKEN_REQ, TOKEN,INTROSPECT, ERROR,VOID};
+
+    public Class<?> getClass(API api);
+    public<A> A newInstance(API api);
+
+    public ERROR errorFromMessage(StringBuilder holder, String msgID, String text, Object ... detail);
+    public TOKEN_REQ tokenReqFromParams(HttpServletRequest req);
+    public OCreds credsFromReq(TOKEN_REQ tokReq);
 
-       public ERROR errorFromMessage(StringBuilder holder, String msgID, String text, String... detail);
-       public TOKEN_REQ tokenReqFromParams(HttpServletRequest req);
-       public OCreds credsFromReq(TOKEN_REQ tokReq);
-       
-       public OAuthTokenDAO.Data clientTokenReq(TOKEN_REQ tokReq, Holder<GRANT_TYPE> hgt);
-       public Result<TOKEN> tokenFromData(Result<OAuthTokenDAO.Data> rs);
-       public INTROSPECT fromPrincipal(OAuth2Principal p);
+    public OAuthTokenDAO.Data clientTokenReq(TOKEN_REQ tokReq, Holder<GRANT_TYPE> hgt);
+    public Result<TOKEN> tokenFromData(Result<OAuthTokenDAO.Data> rs);
+    public INTROSPECT fromPrincipal(OAuth2Principal p);
 }