X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=auth%2Fauth-batch%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Factions%2FEmail.java;h=0ac8f61d071bd92545d1f81b65677c31e83e20ba;hb=4b5a7d721d994a49057e9bfb403c7bff1b376660;hp=15dfed380d80efecaaa31ad0c5f523106570472c;hpb=824dc7b5fc0e1ccdf7f460479aff344727f0f01e;p=aaf%2Fauthz.git

diff --git a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java b/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java
index 15dfed38..0ac8f61d 100644
--- a/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java
+++ b/auth/auth-batch/src/main/java/org/onap/aaf/auth/actions/Email.java
@@ -34,184 +34,184 @@ import org.onap.aaf.auth.org.Organization.Identity;
 import org.onap.aaf.misc.env.util.Chrono;
 
 public class Email implements Action<Organization,Void, String>{
-	protected final List<String> toList;
-	protected final List<String> ccList;
-	private final String[] defaultCC;
-	protected String subject;
-	private String preamble;
-	private Message msg;
-	private String sig;
-	protected String lineIndent="  ";
-	private long lastSent=0L;
-
-	
-	public Email(String ... defaultCC) {
-		toList = new ArrayList<>();
-		this.defaultCC = defaultCC;
-		ccList = new ArrayList<>();
-		clear();
-	}
-	
-	public Email clear() {
-		toList.clear();
-		ccList.clear();
-		for(String s: defaultCC) {
-			ccList.add(s);
-		}
-		return this;
-	}
-	
-
-	public void indent(String indent) {
-		lineIndent = indent;
-	}
-	
-	public void preamble(String format, Object ... args) {
-		preamble = String.format(format, args);
-	}
-
-	public Email addTo(Identity id) {
-		if(id!=null && !toList.contains(id.email())) {
-				toList.add(id.email());
-		}
-		return this;
-	}
-
-	public Email addTo(Collection<String> users) {
-		for(String u : users) {
-			addTo(u);
-		}
-		return this;
-	}
-
-	public Email addTo(String email) {
-		if(!toList.contains(email)) {
-			toList.add(email);
-		}
-		return this;
-	}
-
-	public Email addCC(Identity id) {
-		if(id!=null && !ccList.contains(id.email())) {
-				ccList.add(id.email());
-		}
-		return this;
-	}
-
-	public Email addCC(String email) {
-		if(!ccList.contains(email)) {
-			ccList.add(email);
-		}
-		return this;
-	}
-
-	
-	public Email add(Identity id, boolean toSuper) throws OrganizationException {
-		Identity responsible = id.responsibleTo();
-		if(toSuper) {
-			addTo(responsible.email());
-			addCC(id.email());
-		} else {
-			addCC(responsible.email());
-			addTo(id.email());
-		}
-		return this;
-	}
-	
-	public Email subject(String format, Object ... args) {
-		if(format.contains("%s")) {
-			subject = String.format(format, args);
-		} else {
-			subject = format;
-		}
-		return this;
-	}
-	
-	
-	public Email signature(String format, Object ... args) {
-		sig = String.format(format, args);
-		return this;
-	}
-	
-	public void msg(Message msg) {
-		this.msg = msg;
-	}
-	
-	@Override
-	public Result<Void> exec(AuthzTrans trans, Organization org, String text) {
-		StringBuilder sb = new StringBuilder();
-		if(preamble!=null) {
-			sb.append(lineIndent);
-			sb.append(preamble);
-			sb.append("\n\n");
-		}
-		
-		if(msg!=null) {
-			msg.msg(sb,lineIndent);
-			sb.append("\n");
-		}
-
-		if(sig!=null) {
-			sb.append(sig);
-			sb.append("\n");
-		}
-		
-		long ct = System.currentTimeMillis();
-		long wait = ct-lastSent;
-		lastSent = ct;
-		if(wait < 100) { // 10 per second
-			try {
-				Thread.sleep(wait);
-			} catch (InterruptedException e) {
-				 Thread.currentThread().interrupt();
-			}
-		}
-		return exec(trans,org,sb);
-	}
-
-	protected Result<Void> exec(AuthzTrans trans, Organization org, StringBuilder sb) {
-		try {
-			/* int status = */
-			org.sendEmail(trans,
-				toList, 
-				ccList, 
-				subject, 
-				sb.toString(), 
-				false);
-		} catch (Exception e) {
-			return Result.err(Result.ERR_ActionNotCompleted,e.getMessage());
-		}
-		return Result.ok();
-
-	}
-
-	public void log(PrintStream ps, String text) {
-		ps.print(Chrono.dateTime());
-		boolean first = true;
-		for(String s : toList) {
-			if(first) {
-				first = false;
-				ps.print(": ");
-			} else {
-				ps.print(", ");
-			}
-			ps.print(s);
-		}
-		if(!ccList.isEmpty()) {
-			first=true;
-			for(String s : ccList) {
-				if(first) {
-					first = false;
-					ps.print(" [");
-				} else {
-					ps.print(", ");
-				}
-				ps.print(s);
-			}
-			ps.print(']');
-		}
-
-		ps.print(' ');
-		ps.println(text);
-	}
+    protected final List<String> toList;
+    protected final List<String> ccList;
+    private final String[] defaultCC;
+    protected String subject;
+    private String preamble;
+    private Message msg;
+    private String sig;
+    protected String lineIndent="  ";
+    private long lastSent=0L;
+
+    
+    public Email(String ... defaultCC) {
+        toList = new ArrayList<>();
+        this.defaultCC = defaultCC;
+        ccList = new ArrayList<>();
+        clear();
+    }
+    
+    public Email clear() {
+        toList.clear();
+        ccList.clear();
+        for(String s: defaultCC) {
+            ccList.add(s);
+        }
+        return this;
+    }
+    
+
+    public void indent(String indent) {
+        lineIndent = indent;
+    }
+    
+    public void preamble(String format, Object ... args) {
+        preamble = String.format(format, args);
+    }
+
+    public Email addTo(Identity id) {
+        if(id!=null && !toList.contains(id.email())) {
+                toList.add(id.email());
+        }
+        return this;
+    }
+
+    public Email addTo(Collection<String> users) {
+        for(String u : users) {
+            addTo(u);
+        }
+        return this;
+    }
+
+    public Email addTo(String email) {
+        if(!toList.contains(email)) {
+            toList.add(email);
+        }
+        return this;
+    }
+
+    public Email addCC(Identity id) {
+        if(id!=null && !ccList.contains(id.email())) {
+                ccList.add(id.email());
+        }
+        return this;
+    }
+
+    public Email addCC(String email) {
+        if(!ccList.contains(email)) {
+            ccList.add(email);
+        }
+        return this;
+    }
+
+    
+    public Email add(Identity id, boolean toSuper) throws OrganizationException {
+        Identity responsible = id.responsibleTo();
+        if(toSuper) {
+            addTo(responsible.email());
+            addCC(id.email());
+        } else {
+            addCC(responsible.email());
+            addTo(id.email());
+        }
+        return this;
+    }
+    
+    public Email subject(String format, Object ... args) {
+        if(format.contains("%s")) {
+            subject = String.format(format, args);
+        } else {
+            subject = format;
+        }
+        return this;
+    }
+    
+    
+    public Email signature(String format, Object ... args) {
+        sig = String.format(format, args);
+        return this;
+    }
+    
+    public void msg(Message msg) {
+        this.msg = msg;
+    }
+    
+    @Override
+    public Result<Void> exec(AuthzTrans trans, Organization org, String text) {
+        StringBuilder sb = new StringBuilder();
+        if(preamble!=null) {
+            sb.append(lineIndent);
+            sb.append(preamble);
+            sb.append("\n\n");
+        }
+        
+        if(msg!=null) {
+            msg.msg(sb,lineIndent);
+            sb.append("\n");
+        }
+
+        if(sig!=null) {
+            sb.append(sig);
+            sb.append("\n");
+        }
+        
+        long ct = System.currentTimeMillis();
+        long wait = ct-lastSent;
+        lastSent = ct;
+        if(wait < 100) { // 10 per second
+            try {
+                Thread.sleep(wait);
+            } catch (InterruptedException e) {
+                 Thread.currentThread().interrupt();
+            }
+        }
+        return exec(trans,org,sb);
+    }
+
+    protected Result<Void> exec(AuthzTrans trans, Organization org, StringBuilder sb) {
+        try {
+            /* int status = */
+            org.sendEmail(trans,
+                toList, 
+                ccList, 
+                subject, 
+                sb.toString(), 
+                false);
+        } catch (Exception e) {
+            return Result.err(Result.ERR_ActionNotCompleted,e.getMessage());
+        }
+        return Result.ok();
+
+    }
+
+    public void log(PrintStream ps, String text) {
+        ps.print(Chrono.dateTime());
+        boolean first = true;
+        for(String s : toList) {
+            if(first) {
+                first = false;
+                ps.print(": ");
+            } else {
+                ps.print(", ");
+            }
+            ps.print(s);
+        }
+        if(!ccList.isEmpty()) {
+            first=true;
+            for(String s : ccList) {
+                if(first) {
+                    first = false;
+                    ps.print(" [");
+                } else {
+                    ps.print(", ");
+                }
+                ps.print(s);
+            }
+            ps.print(']');
+        }
+
+        ps.print(' ');
+        ps.println(text);
+    }
 }