X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Fbatch%2Fapprovalsets%2FApprovalSet.java;h=f7bf3248a9a3361b69b7b68ca7a3040dfea23fe7;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=45617f8b755321425d4e6307019e22a6555e9ceb;hpb=e3163b2d5609753f874e2f52fd5ef67fa063af7a;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/ApprovalSet.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/ApprovalSet.java
index 45617f8b..f7bf3248 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/ApprovalSet.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/batch/approvalsets/ApprovalSet.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.
@@ -31,71 +31,70 @@ import org.onap.aaf.auth.dao.cass.ApprovalDAO;
 import org.onap.aaf.auth.dao.cass.FutureDAO;
 import org.onap.aaf.auth.env.AuthzTrans;
 import org.onap.aaf.auth.layer.Result;
-import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.misc.env.util.Chrono;
 
 public class ApprovalSet {
-	private DataView dataview;
-	protected FutureDAO.Data fdd;
-	protected List<ApprovalDAO.Data> ladd;
-	
-	public ApprovalSet(final GregorianCalendar start, final String target, final DataView dv) throws CadiException {
-		dataview = dv;
-		fdd = new FutureDAO.Data();
-		fdd.id = Chrono.dateToUUID(System.currentTimeMillis());
-		fdd.target = target;
-		fdd.start = start.getTime();
-		ladd = new ArrayList<>();
-	}
-	
-	protected void setConstruct(final ByteBuffer bytes) {
-		fdd.construct = bytes;
-	}
+    private DataView dataview;
+    protected FutureDAO.Data fdd;
+    protected List<ApprovalDAO.Data> ladd;
+
+    public ApprovalSet(final GregorianCalendar start, final String target, final DataView dv) {
+        dataview = dv;
+        fdd = new FutureDAO.Data();
+        fdd.id = Chrono.dateToUUID(System.currentTimeMillis());
+        fdd.target = target;
+        fdd.start = start.getTime();
+        ladd = new ArrayList<>();
+    }
+
+    protected void setConstruct(final ByteBuffer bytes) {
+        fdd.construct = bytes;
+    }
+
+    protected void setMemo(final String memo) {
+        fdd.memo = memo;
+    }
+
+    protected void setExpires(final GregorianCalendar expires) {
+        fdd.expires = expires.getTime();
+    }
+
+    public Result<Void> write(AuthzTrans trans) {
+        StringBuilder errs = null;
+        if(ladd == null || ladd.isEmpty()) {
+            errs = new StringBuilder("No Approvers for ");
+            errs .append(fdd.memo);
+        } else {
+            Result<FutureDAO.Data> rf = dataview.insert(trans, fdd);
+            if(rf.notOK()) {
+                errs = new StringBuilder();
+                errs.append(rf.errorString());
+            } else {
+                for(ApprovalDAO.Data add : ladd) {
+                    Result<ApprovalDAO.Data> af = dataview.insert(trans, add);
+                    if(af.notOK()) {
+                        if(errs==null) {
+                            errs = new StringBuilder();
+                        } else {
+                            errs.append('\n');
+                        }
+                        errs.append(af.errorString());
+                    }
+                }
+            }
+        }
+        return errs==null?Result.ok():Result.err(Result.ERR_Backend,errs.toString());
+    }
 
-	protected void setMemo(final String memo) {
-		fdd.memo = memo;
-	}
-	
-	protected void setExpires(final GregorianCalendar expires) {
-		fdd.expires = expires.getTime();
-	}
-	
-	public Result<Void> write(AuthzTrans trans) {
-		StringBuilder errs = null;
-		if(ladd == null || ladd.isEmpty()) {
-			errs = new StringBuilder("No Approvers for ");
-			errs .append(fdd.memo);
-		} else {
-			Result<FutureDAO.Data> rf = dataview.insert(trans, fdd);
-			if(rf.notOK()) {
-				errs = new StringBuilder();
-				errs.append(rf.errorString());
-			} else {
-				for(ApprovalDAO.Data add : ladd) {
-					Result<ApprovalDAO.Data> af = dataview.insert(trans, add);
-					if(af.notOK()) {
-						if(errs==null) {
-							errs = new StringBuilder();
-						} else {
-							errs.append('\n');
-						}
-						errs.append(af.errorString());
-					}
-				}
-			}
-		}
-		return errs==null?Result.ok():Result.err(Result.ERR_Backend,errs.toString());
-	}
+    public boolean hasApprovals() {
+        return !ladd.isEmpty();
+    }
 
-	public boolean hasApprovals() {
-		return !ladd.isEmpty();
-	}
-	
-	public Set<String> approvers() {
-		Set<String> rv = new HashSet<>();
-		for(ApprovalDAO.Data app : ladd) {
-			rv.add(app.approver);
-		}
-		return rv;
-	}
+    public Set<String> approvers() {
+        Set<String> rv = new HashSet<>();
+        for(ApprovalDAO.Data app : ladd) {
+            rv.add(app.approver);
+        }
+        return rv;
+    }
 }
\ No newline at end of file