From 16a3102ca4ca4bc5369423e18b548cab3498603e Mon Sep 17 00:00:00 2001
From: Vladimir Eliezer Tokarev <vladimirelitokarev@gmail.com>
Date: Thu, 25 Feb 2016 21:56:46 -0800
Subject: [PATCH] Replaced part of the files according to Arbel Peled CR and
 remove unnessesry files

---
 bulletin-board-server/meerkat                 | Bin 21504 -> 23552 bytes
 .../Registry}/AccurateTimestamp.java          |   2 +-
 .../BooleanCallBack.java}                     |   9 +++++----
 .../Registry}/CollectionMessagesUtils.java    |   4 ++--
 .../Registry}/RegistryTags.java               |   2 +-
 .../{ => Registry}/RelevantDataCallBack.java  |  13 ++++++++-----
 .../src/main/java/meerkat/SimpleRegistry.java |  10 ++++------
 .../java/meerkat/VoterRegistryMessage.java    |   4 ++--
 .../src/main/java/util/VoterAdded.java        |  18 ------------------
 .../src/test/java/SimpleRegistryTest.java     |   8 ++++----
 10 files changed, 27 insertions(+), 43 deletions(-)
 rename voter-registry/src/main/java/{util => meerkat/Registry}/AccurateTimestamp.java (97%)
 rename voter-registry/src/main/java/meerkat/{BooleanHandler.java => Registry/BooleanCallBack.java} (81%)
 rename voter-registry/src/main/java/{util => meerkat/Registry}/CollectionMessagesUtils.java (98%)
 rename voter-registry/src/main/java/{util => meerkat/Registry}/RegistryTags.java (95%)
 rename voter-registry/src/main/java/meerkat/{ => Registry}/RelevantDataCallBack.java (87%)
 delete mode 100644 voter-registry/src/main/java/util/VoterAdded.java

diff --git a/bulletin-board-server/meerkat b/bulletin-board-server/meerkat
index ecd7fd376b92098b84fda44b3ab952ce2f713bcb..9709e188fa91b9f4c25f0843276851b6109a34b8 100644
GIT binary patch
delta 3420
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

delta 493
zcmX|+OKVeM5Qe{*H=1~eH96-*ErD`uBC&F8ViKFgO*NsYL9t$tETmo*5xne+cqu`m
z3rp15NO5CyQKXi}uV@h$CAt<76a*3d0a;X}E>gr37jA}!ml@u9rj}@GmhMH@HI-74
z`_3peTW6ml1gv<0ve3n<hZEAW%X%U%kQKkR)1sn646k^M|KI^TILHmU%NOYab#aAS
z^ci1yk-tz;?{{qS#c`Nqy6ouch9idDIu@1p)=((7cTZtBmCvO%dQBxxir>EN?LQ`+
z-2919qK^2t_L4KCJN;YOAar|Ands`ieH{cn4hIcyT4;*jN$7B8nPu5t)XmuWfG<Rj
zlAyZ{5tPJrAIeK}NUrV5=y&dS&i}ikjG_#kqXs>v5A>S{Jfq7j{F;9tfFw>~5;J&%
zZ~PNBMo__3$){rSs1T7m>9-O#cdRcA=L#cf54X!&IY3!?79Nl%yRYj5X_sUsQ<XVu
zP)5zc7g=A(^ix}59;adO5?9%#wkJ48x;<8816)_A!N+wkoMc@u-yj31DSX5NYXAM%
v%}OH}@Ab*T(UX0fIH5Sfhxigt^SpM(`$@)~HM!{(CyxJ;)o@fQCuaWw<Zg;g

diff --git a/voter-registry/src/main/java/util/AccurateTimestamp.java b/voter-registry/src/main/java/meerkat/Registry/AccurateTimestamp.java
similarity index 97%
rename from voter-registry/src/main/java/util/AccurateTimestamp.java
rename to voter-registry/src/main/java/meerkat/Registry/AccurateTimestamp.java
index e4cbd98..dd67a22 100644
--- a/voter-registry/src/main/java/util/AccurateTimestamp.java
+++ b/voter-registry/src/main/java/meerkat/Registry/AccurateTimestamp.java
@@ -1,4 +1,4 @@
-package util;
+package meerkat.Registry;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
diff --git a/voter-registry/src/main/java/meerkat/BooleanHandler.java b/voter-registry/src/main/java/meerkat/Registry/BooleanCallBack.java
similarity index 81%
rename from voter-registry/src/main/java/meerkat/BooleanHandler.java
rename to voter-registry/src/main/java/meerkat/Registry/BooleanCallBack.java
index 3710fdd..dbf6239 100644
--- a/voter-registry/src/main/java/meerkat/BooleanHandler.java
+++ b/voter-registry/src/main/java/meerkat/Registry/BooleanCallBack.java
@@ -1,19 +1,20 @@
-package meerkat;
+package meerkat.Registry;
 
+import meerkat.VoterRegistry;
 import meerkat.bulletinboard.BulletinBoardClient;
 
 /**
  * Created by Vladimir Eliezer Tokarev  on 2/19/2016.
  * Handles the the after post state of VoterRegistry methods (that uses bulletinBoardClient to communicate with the server)
  */
-public class BooleanHandler implements BulletinBoardClient.ClientCallback {
+public class BooleanCallBack implements BulletinBoardClient.ClientCallback {
     public VoterRegistry.RegistryCallBack callback;
 
     /**
-     * Init BooleanHandler
+     * Init BooleanCallBack
      * @param callback  voter registry callback object
      */
-    public BooleanHandler(VoterRegistry.RegistryCallBack callback) {
+    public BooleanCallBack(VoterRegistry.RegistryCallBack callback) {
         this.callback = callback;
     }
 
diff --git a/voter-registry/src/main/java/util/CollectionMessagesUtils.java b/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
similarity index 98%
rename from voter-registry/src/main/java/util/CollectionMessagesUtils.java
rename to voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
index 24c1c87..2904050 100644
--- a/voter-registry/src/main/java/util/CollectionMessagesUtils.java
+++ b/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
@@ -1,4 +1,4 @@
-package util;
+package meerkat.Registry;
 
 import meerkat.VoterRegistryMessage;
 import meerkat.protobuf.BulletinBoardAPI;
@@ -18,7 +18,7 @@ import java.util.stream.Collectors;
  */
 public abstract class CollectionMessagesUtils {
 
-    static class EmptyListException extends Exception {
+    public static class EmptyListException extends Exception {
         public EmptyListException(String message) {
             super(message);
         }
diff --git a/voter-registry/src/main/java/util/RegistryTags.java b/voter-registry/src/main/java/meerkat/Registry/RegistryTags.java
similarity index 95%
rename from voter-registry/src/main/java/util/RegistryTags.java
rename to voter-registry/src/main/java/meerkat/Registry/RegistryTags.java
index e70043b..9b2ea32 100644
--- a/voter-registry/src/main/java/util/RegistryTags.java
+++ b/voter-registry/src/main/java/meerkat/Registry/RegistryTags.java
@@ -1,4 +1,4 @@
-package util;
+package meerkat.Registry;
 
 /**
  * Created by Vladimir Eliezer Tokarev  on 1/9/2016.
diff --git a/voter-registry/src/main/java/meerkat/RelevantDataCallBack.java b/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
similarity index 87%
rename from voter-registry/src/main/java/meerkat/RelevantDataCallBack.java
rename to voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
index b91428b..6442b27 100644
--- a/voter-registry/src/main/java/meerkat/RelevantDataCallBack.java
+++ b/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
@@ -1,14 +1,15 @@
-package meerkat;
+package meerkat.Registry;
 
+import meerkat.VoterRegistry;
+import meerkat.VoterRegistryMessage;
 import meerkat.bulletinboard.BulletinBoardClient;
 import meerkat.protobuf.BulletinBoardAPI;
-import util.RegistryTags;
 
 import java.text.ParseException;
 import java.util.List;
 import java.util.Map;
 
-import static util.CollectionMessagesUtils.*;
+import static meerkat.Registry.CollectionMessagesUtils.*;
 
 /**
  * Created by Vladimir Eliezer Tokarev  on 2/19/2016.
@@ -18,7 +19,7 @@ public class RelevantDataCallBack implements BulletinBoardClient.ClientCallback<
     public VoterRegistry.RegistryCallBack callback;
 
     /**
-     * Init BooleanHandler
+     * Init BooleanCallBack
      * @param callback  voter registry callback object
      */
     public RelevantDataCallBack(VoterRegistry.RegistryCallBack callback) {
@@ -61,9 +62,11 @@ public class RelevantDataCallBack implements BulletinBoardClient.ClientCallback<
             }
         }
         try {
-            callback.HandleResult(GetLatestMessage(messages));
+            callback.HandleResult(CollectionMessagesUtils.GetLatestMessage(messages));
         } catch (ParseException e) {
             e.printStackTrace();
+        } catch (CollectionMessagesUtils.EmptyListException e) {
+            e.printStackTrace();
         }
     }
 
diff --git a/voter-registry/src/main/java/meerkat/SimpleRegistry.java b/voter-registry/src/main/java/meerkat/SimpleRegistry.java
index c9fd287..556fdd6 100644
--- a/voter-registry/src/main/java/meerkat/SimpleRegistry.java
+++ b/voter-registry/src/main/java/meerkat/SimpleRegistry.java
@@ -1,13 +1,11 @@
 package meerkat;
 
+import meerkat.Registry.*;
 import meerkat.bulletinboard.BulletinBoardClient;
 import meerkat.crypto.DigitalSignature;
 import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
 import meerkat.protobuf.BulletinBoardAPI.UnsignedBulletinBoardMessage;
 import meerkat.protobuf.Crypto;
-import util.AccurateTimestamp;
-import util.CollectionMessagesUtils;
-import util.RegistryTags;
 
 import java.security.SignatureException;
 import java.util.ArrayList;
@@ -72,7 +70,7 @@ public class SimpleRegistry  implements VoterRegistry{
 
         basicMessage.setData(voterInfo.getInfoBytes());
 
-        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanHandler(callback));
+        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanCallBack(callback));
     }
 
     public void AddToGroup(RegistryMessages.VoterGroup voterGroup, RegistryCallBack callback) {
@@ -83,7 +81,7 @@ public class SimpleRegistry  implements VoterRegistry{
                         .addTag(RegistryTags.GROUP_ACTION_TAG .toString() + RegistryTags.ADD_TO_GROUP_TAG)
                         .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + AccurateTimestamp.GetCurrentTimestampString());
 
-        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanHandler(callback));
+        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanCallBack(callback));
     }
 
     public void SetVoted(RegistryMessages.VoterID voterId, RegistryCallBack callback) {
@@ -93,7 +91,7 @@ public class SimpleRegistry  implements VoterRegistry{
                         .addTag(RegistryTags.VOTE_ACTION_TAG.toString())
                         .addTag(RegistryTags.ACTION_TIMESTAMP_TAG + AccurateTimestamp.GetCurrentTimestampString());
 
-        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanHandler(callback));
+        SafePost(CreateBulletinBoardMessage(basicMessage.build()), new BooleanCallBack(callback));
     }
 
     public void GetGroups(RegistryMessages.GroupID groupID, RegistryCallBack callback) {
diff --git a/voter-registry/src/main/java/meerkat/VoterRegistryMessage.java b/voter-registry/src/main/java/meerkat/VoterRegistryMessage.java
index f7f4ddc..5252159 100644
--- a/voter-registry/src/main/java/meerkat/VoterRegistryMessage.java
+++ b/voter-registry/src/main/java/meerkat/VoterRegistryMessage.java
@@ -1,8 +1,8 @@
 package meerkat;
 
 import meerkat.protobuf.BulletinBoardAPI;
-import util.AccurateTimestamp;
-import util.RegistryTags;
+import meerkat.Registry.AccurateTimestamp;
+import meerkat.Registry.RegistryTags;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
diff --git a/voter-registry/src/main/java/util/VoterAdded.java b/voter-registry/src/main/java/util/VoterAdded.java
deleted file mode 100644
index 36ce74b..0000000
--- a/voter-registry/src/main/java/util/VoterAdded.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package util;
-
-
-import meerkat.VoterRegistry;
-
-/**
- * Handles the return value of the AddVoter method of
- */
-public class VoterAdded implements VoterRegistry.RegistryCallBack<Boolean> {
-    public boolean Data;
-
-    @Override
-    public void HandleResult(Boolean result) {
-        Data = result;
-    }
-}
-
-
diff --git a/voter-registry/src/test/java/SimpleRegistryTest.java b/voter-registry/src/test/java/SimpleRegistryTest.java
index e2fa751..fb1a251 100644
--- a/voter-registry/src/test/java/SimpleRegistryTest.java
+++ b/voter-registry/src/test/java/SimpleRegistryTest.java
@@ -9,8 +9,8 @@ import meerkat.bulletinboard.ThreadedBulletinBoardClient;
 import meerkat.crypto.concrete.ECDSASignature;
 import meerkat.protobuf.BulletinBoardAPI;
 import meerkat.protobuf.Voting;
-import util.CollectionMessagesUtils;
-import util.RegistryTags;
+import meerkat.Registry.CollectionMessagesUtils;
+import meerkat.Registry.RegistryTags;
 
 import java.io.InputStream;
 import java.math.BigInteger;
@@ -20,7 +20,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Semaphore;
 
-import static util.CollectionMessagesUtils.ConvertToVoterRegistryMessages;
+import static meerkat.Registry.CollectionMessagesUtils.ConvertToVoterRegistryMessages;
 
 /**
  * TODO: add logs prints for the tests to be clear what they are
@@ -29,7 +29,7 @@ import static util.CollectionMessagesUtils.ConvertToVoterRegistryMessages;
 
 /**
  * Created by Vladimir Eliezer Tokarev on 1/16/2016.
- * Tests the Simple Registry contents
+ * Tests the Simple meerkat.Registry contents
  * NOTE: for most of this tests to pass there should run BulletinBoardServer
  * that should be reachable on BULLETIN_BOARD_SERVER_ADDRESS
  */