Add a MassMail Batch Program

Had to move Holder cover for change in WS/Bind to compile

Issue-ID: AAF-1059
Change-Id: I754515a6e65bd0665fa3e03dabd8f5a144241f6e
Signed-off-by: Instrumental <jonathan.gathman@att.com>

11 files changed, 26 insertions, 26 deletions

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
index caa1fcc1..8b91c74a 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFLurPerm.java
@@ -38,11 +38,11 @@ import org.onap.aaf.cadi.Permission;
 import org.onap.aaf.cadi.User;
 import org.onap.aaf.cadi.aaf.AAFPermission;
 import org.onap.aaf.cadi.client.Future;
-import org.onap.aaf.cadi.client.Holder;
 import org.onap.aaf.cadi.client.Rcli;
 import org.onap.aaf.cadi.client.Retryable;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.lur.LocalPermission;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.util.Timing;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.util.Split;
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java
index 775e2246..155c6fa3 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/configure/Factory.java
@@ -64,7 +64,7 @@ import javax.crypto.Cipher;
 import javax.crypto.NoSuchPaddingException;
 
 import org.onap.aaf.cadi.Symm;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.misc.env.Env;
 import org.onap.aaf.misc.env.TimeTaken;
 import org.onap.aaf.misc.env.Trans;
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/Persist.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/Persist.java
index ea539271..d2e01215 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/Persist.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/Persist.java
@@ -40,7 +40,7 @@ import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.Access.Level;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.client.Result;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.env.util.Chrono;
diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
index db9852ec..ca855258 100644
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/persist/PersistFile.java
@@ -43,7 +43,7 @@ import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Symm;
 import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.Symm.Encryption;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.misc.env.APIException;
 import org.onap.aaf.misc.rosetta.env.RosettaDF;
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_Persist.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_Persist.java
index 3e03eb73..1672ca19 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_Persist.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_Persist.java
@@ -43,7 +43,7 @@ import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.LocatorException;
 import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.client.Result;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.persist.Persist;
diff --git a/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_PersistFile.java b/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_PersistFile.java
index 25d8c474..797496a7 100644
--- a/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_PersistFile.java
+++ b/cadi/aaf/src/test/java/org/onap/aaf/cadi/persist/test/JU_PersistFile.java
@@ -43,7 +43,7 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.PropAccess;
-import org.onap.aaf.cadi.client.Holder;
+import org.onap.aaf.cadi.util.Holder;
 import org.onap.aaf.cadi.config.Config;
 import org.onap.aaf.cadi.persist.PersistFile;
 import org.onap.aaf.misc.env.APIException;
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
index 7ad1921c..62b458ab 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/MapBathConverter.java
@@ -29,14 +29,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import javax.xml.ws.Holder;
-
 import org.onap.aaf.cadi.Access;
 import org.onap.aaf.cadi.Access.Level;
 import org.onap.aaf.cadi.CadiException;
 import org.onap.aaf.cadi.Symm;
 import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.cadi.util.CSV.Visitor;
+import org.onap.aaf.cadi.util.Holder;
 
 /**
  * This Filter is designed to help MIGRATE users from systems that don't match the FQI style.
@@ -119,7 +118,7 @@ public class MapBathConverter {
                 throw new CadiException("Invalid Authentication Credential for " + cred);
             }
             if(hpass!=null) {
-                hpass.value = cred.substring(colon+1);
+                hpass.set(cred.substring(colon+1));
             }
             return cred.substring(0, colon);
         } else {
@@ -144,7 +143,7 @@ public class MapBathConverter {
         Holder<String> hpass=null;
         try {
             if(bath.startsWith(BASIC)) {
-                cred = idFromBasic(bath,(hpass=new Holder<String>()));
+                cred = idFromBasic(bath,(hpass=new Holder<String>(null)));
                 if(rv==null) {
                     rv = map.get(cred);
                 }
@@ -161,7 +160,7 @@ public class MapBathConverter {
                 } else {
                     if(hpass!=null) {
                         tcred = rv;
-                        rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.value);
+                        rv = BASIC + Symm.base64noSplit.encode(rv+':'+hpass.get());
                     }
                 }
                 if(tcred != null) {
diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java
index 0f69b5b0..439bca87 100644
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/filter/SideChain.java
@@ -29,7 +29,8 @@ import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
-import javax.xml.ws.Holder;
+
+import org.onap.aaf.cadi.util.Holder;
 
 /**
  * Add various Filters by CADI Property not in the official Chain
@@ -53,20 +54,20 @@ public class SideChain {
         FilterChain truth = new FilterChain() {
             @Override
             public void doFilter(ServletRequest request, ServletResponse response) throws IOException, ServletException {
-               hbool.value=Boolean.TRUE;
+               hbool.set(Boolean.TRUE);
             }
             public String toString() {
-                return hbool.value.toString();
+                return hbool.get().toString();
             }
         };
         for(Filter f : sideChain) {
-            hbool.value=Boolean.FALSE;
+            hbool.set(Boolean.FALSE);
             f.doFilter(request, response, truth);
-            if(!hbool.value) {
+            if(!hbool.get()) {
                 return;
             }
         }
-        if(hbool.value) {
+        if(hbool.get()) {
             chain.doFilter(request, response);
         }
     }
diff --git a/cadi/client/src/main/java/org/onap/aaf/cadi/client/Holder.java b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Holder.java
index 8744e896..3280e471 100644
--- a/cadi/client/src/main/java/org/onap/aaf/cadi/client/Holder.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/util/Holder.java
@@ -19,7 +19,7 @@
  *
  */
 
-package org.onap.aaf.cadi.client;
+package org.onap.aaf.cadi.util;
 
 /**
  * Use to set Variables outside of Anonymous classes.
diff --git a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
index 1681f435..fa62fe4e 100644
--- a/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_CSV.java
@@ -27,8 +27,6 @@ import java.io.PrintStream;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.ws.Holder;
-
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -40,6 +38,7 @@ import org.onap.aaf.cadi.PropAccess;
 import org.onap.aaf.cadi.util.CSV;
 import org.onap.aaf.cadi.util.CSV.Visitor;
 import org.onap.aaf.cadi.util.CSV.Writer;
+import org.onap.aaf.cadi.util.Holder;
 
 public class JU_CSV {
 
@@ -110,7 +109,8 @@ public class JU_CSV {
             public void visit(List<String> row) {
                 for(String s: row) {
 //                    System.out.println(hi.value + ") " + s);
-                    Assert.assertEquals(expected.get(hi.value++),s);
+                    Assert.assertEquals(expected.get(hi.get()),s);
+                    hi.set(hi.get()+1); // increment
                 }
             }
         });
diff --git a/cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_Holder.java b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java
index d8c5a598..d1fa94b8 100644
--- a/cadi/client/src/test/java/org/onap/aaf/cadi/client/test/JU_Holder.java
+++ b/cadi/core/src/test/java/org/onap/aaf/cadi/util/test/JU_Holder.java
@@ -20,13 +20,13 @@
  * *
  ******************************************************************************/
 
-package org.onap.aaf.cadi.client.test;
+package org.onap.aaf.cadi.util.test;
 
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.*;
-import org.junit.Test;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
 
-import org.onap.aaf.cadi.client.Holder;
+import org.junit.Test;
+import org.onap.aaf.cadi.util.Holder;
 
 public class JU_Holder {