X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aaf%2Fauthz.git;a=blobdiff_plain;f=auth%2Fauth-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fservice%2Fmapper%2FMapper.java;h=c66525dab632d5aede2532408e4bfc46db98e49d;hp=e7cedf967abf1018a0c9531918907176472fc08d;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e

diff --git a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper.java b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper.java
index e7cedf96..c66525da 100644
--- a/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper.java
+++ b/auth/auth-service/src/main/java/org/onap/aaf/auth/service/mapper/Mapper.java
@@ -41,82 +41,82 @@ import org.onap.aaf.auth.service.MayChange;
 import org.onap.aaf.misc.rosetta.Marshal;
 
 public interface Mapper<
-	NSS,
-	PERMS,
-	PERMKEY,
-	ROLES,
-	USERS,
-	USERROLES,
-	DELGS,
-	CERTS,
-	KEYS,
-	REQUEST,
-	HISTORY,
-	ERROR,
-	APPROVALS>
+    NSS,
+    PERMS,
+    PERMKEY,
+    ROLES,
+    USERS,
+    USERROLES,
+    DELGS,
+    CERTS,
+    KEYS,
+    REQUEST,
+    HISTORY,
+    ERROR,
+    APPROVALS>
 {
-	enum API{NSS,NS_REQ,	
-			 PERMS,PERM_KEY,PERM_REQ,
-			 ROLES,ROLE,ROLE_REQ,ROLE_PERM_REQ,
-			 USERS,USER_ROLE_REQ,USER_ROLES,
-			 CRED_REQ,CERTS,
-			 APPROVALS,
-			 DELGS,DELG_REQ,
-			 KEYS,
-			 HISTORY,
-			 ERROR,
-			 API,
-			 VOID};
-	public Class<?> getClass(API api);
-	public<A> Marshal<A> getMarshal(API api);
-	public<A> A newInstance(API api);
+    enum API{NSS,NS_REQ,    
+             PERMS,PERM_KEY,PERM_REQ,
+             ROLES,ROLE,ROLE_REQ,ROLE_PERM_REQ,
+             USERS,USER_ROLE_REQ,USER_ROLES,
+             CRED_REQ,CERTS,
+             APPROVALS,
+             DELGS,DELG_REQ,
+             KEYS,
+             HISTORY,
+             ERROR,
+             API,
+             VOID};
+    public Class<?> getClass(API api);
+    public<A> Marshal<A> getMarshal(API api);
+    public<A> A newInstance(API api);
 
-	public Result<PermDAO.Data> permkey(AuthzTrans trans, PERMKEY from);
-	public Result<PermDAO.Data> perm(AuthzTrans trans, REQUEST from);
-	public Result<RoleDAO.Data> role(AuthzTrans trans, REQUEST from);
-	public Result<Namespace> ns(AuthzTrans trans, REQUEST from);
-	public Result<CredDAO.Data> cred(AuthzTrans trans, REQUEST from, boolean requiresPass);
-	public Result<USERS> cred(List<CredDAO.Data> lcred, USERS to);
-	public Result<CERTS> cert(List<CertDAO.Data> lcert, CERTS to);
-	public Result<DelegateDAO.Data> delegate(AuthzTrans trans, REQUEST from);
-	public Result<DELGS> delegate(List<DelegateDAO.Data> lDelg);
-	public Result<APPROVALS> approvals(List<ApprovalDAO.Data> lAppr);
-	public Result<List<ApprovalDAO.Data>> approvals(APPROVALS apprs);
-	public Result<List<PermDAO.Data>> perms(AuthzTrans trans, PERMS perms);
-	
-	public Result<UserRoleDAO.Data> userRole(AuthzTrans trans, REQUEST from);
-	public Result<PermDAO.Data> permFromRPRequest(AuthzTrans trans, REQUEST from);
-	public REQUEST ungrantRequest(AuthzTrans trans, String role, String type, String instance, String action);
-	public Result<RoleDAO.Data> roleFromRPRequest(AuthzTrans trans, REQUEST from);
-	
-	/*
-	 * Check Requests of varying sorts for Future fields set
-	 */
-	public Result<FutureDAO.Data> future(AuthzTrans trans, String table, REQUEST from, Bytification content, boolean enableApproval, Memo memo, MayChange mc);
+    public Result<PermDAO.Data> permkey(AuthzTrans trans, PERMKEY from);
+    public Result<PermDAO.Data> perm(AuthzTrans trans, REQUEST from);
+    public Result<RoleDAO.Data> role(AuthzTrans trans, REQUEST from);
+    public Result<Namespace> ns(AuthzTrans trans, REQUEST from);
+    public Result<CredDAO.Data> cred(AuthzTrans trans, REQUEST from, boolean requiresPass);
+    public Result<USERS> cred(List<CredDAO.Data> lcred, USERS to);
+    public Result<CERTS> cert(List<CertDAO.Data> lcert, CERTS to);
+    public Result<DelegateDAO.Data> delegate(AuthzTrans trans, REQUEST from);
+    public Result<DELGS> delegate(List<DelegateDAO.Data> lDelg);
+    public Result<APPROVALS> approvals(List<ApprovalDAO.Data> lAppr);
+    public Result<List<ApprovalDAO.Data>> approvals(APPROVALS apprs);
+    public Result<List<PermDAO.Data>> perms(AuthzTrans trans, PERMS perms);
+    
+    public Result<UserRoleDAO.Data> userRole(AuthzTrans trans, REQUEST from);
+    public Result<PermDAO.Data> permFromRPRequest(AuthzTrans trans, REQUEST from);
+    public REQUEST ungrantRequest(AuthzTrans trans, String role, String type, String instance, String action);
+    public Result<RoleDAO.Data> roleFromRPRequest(AuthzTrans trans, REQUEST from);
+    
+    /*
+     * Check Requests of varying sorts for Future fields set
+     */
+    public Result<FutureDAO.Data> future(AuthzTrans trans, String table, REQUEST from, Bytification content, boolean enableApproval, Memo memo, MayChange mc);
 
-	public Result<NSS> nss(AuthzTrans trans, Namespace from, NSS to);
+    public Result<NSS> nss(AuthzTrans trans, Namespace from, NSS to);
 
-	// Note: Prevalidate if NS given is allowed to be seen before calling
-	public Result<NSS> nss(AuthzTrans trans, Collection<Namespace> from, NSS to);
-//	public Result<NSS> ns_attrib(AuthzTrans trans, Set<String> from, NSS to);
-	public Result<PERMS> perms(AuthzTrans trans, List<PermDAO.Data> from, PERMS to, boolean filter);
-	public Result<PERMS> perms(AuthzTrans trans, List<PermDAO.Data> from, PERMS to, String[] scopes, boolean filter);
-	public Result<ROLES> roles(AuthzTrans trans, List<RoleDAO.Data> from, ROLES roles, boolean filter);
-	// Note: Prevalidate if NS given is allowed to be seen before calling
-	public Result<USERS> users(AuthzTrans trans, Collection<UserRoleDAO.Data> from, USERS to);
-	public Result<USERROLES> userRoles(AuthzTrans trans, Collection<UserRoleDAO.Data> from, USERROLES to);
-	public Result<KEYS> keys(Collection<String> from);
+    // Note: Prevalidate if NS given is allowed to be seen before calling
+    public Result<NSS> nss(AuthzTrans trans, Collection<Namespace> from, NSS to);
+//    public Result<NSS> ns_attrib(AuthzTrans trans, Set<String> from, NSS to);
+    public Result<PERMS> perms(AuthzTrans trans, List<PermDAO.Data> from, PERMS to, boolean filter);
+    public Result<PERMS> perms(AuthzTrans trans, List<PermDAO.Data> from, PERMS to, String[] scopes, boolean filter);
+    public Result<ROLES> roles(AuthzTrans trans, List<RoleDAO.Data> from, ROLES roles, boolean filter);
+    // Note: Prevalidate if NS given is allowed to be seen before calling
+    public Result<USERS> users(AuthzTrans trans, Collection<UserRoleDAO.Data> from, USERS to);
+    public Result<USERROLES> userRoles(AuthzTrans trans, Collection<UserRoleDAO.Data> from, USERROLES to);
+    public Result<KEYS> keys(Collection<String> from);
 
-	public Result<HISTORY> history(AuthzTrans trans, List<HistoryDAO.Data> history, final int sort);
-	
-	public ERROR errorFromMessage(StringBuilder holder, String msgID, String text, String... detail);
-	
-	/*
-	 * A Memo Creator... Use to avoid creating superfluous Strings until needed.
-	 */
-	public static interface Memo {
-		public String get();
-	}
+    public Result<HISTORY> history(AuthzTrans trans, List<HistoryDAO.Data> history, final int sort);
+    
+    public ERROR errorFromMessage(StringBuilder holder, String msgID, String text, String... detail);
+    
+    /*
+     * A Memo Creator... Use to avoid creating superfluous Strings until needed.
+     */
+    public static interface Memo {
+        public String get();
+    }