From 64a9356dc214f29241bbe4b3ebfd8ed41dc366b1 Mon Sep 17 00:00:00 2001
From: Vladimir Eliezer Tokarev <vladimirelitokarev@gmail.com>
Date: Fri, 26 Feb 2016 05:52:03 -0800
Subject: [PATCH] Change part of the code (java 8 usage) for gralde to be able
 to run the test and not fail.

---
 bulletin-board-server/meerkat                 | Bin 81920 -> 97280 bytes
 .../Registry/CollectionMessagesUtils.java     |  24 ++++++++++--------
 .../Registry/RelevantDataCallBack.java        |   1 +
 .../src/test/java/SimpleRegistryTest.java     |  24 ++++++++++++------
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/bulletin-board-server/meerkat b/bulletin-board-server/meerkat
index 1b73e91920474f1344df3b9508598f00b8544959..7257000a698a55e7a2a986ccdd81a57f7410f6f8 100644
GIT binary patch
delta 13188
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

delta 2733
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

diff --git a/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java b/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
index c52f071..33b8ca5 100644
--- a/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
+++ b/voter-registry/src/main/java/meerkat/Registry/CollectionMessagesUtils.java
@@ -7,11 +7,7 @@ import meerkat.protobuf.BulletinBoardAPI.MessageFilter;
 import meerkat.protobuf.BulletinBoardAPI.MessageFilterList;
 
 import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+import java.util.*;
 
 /**
  * TODO: add logging to this utils
@@ -34,9 +30,13 @@ public abstract class CollectionMessagesUtils {
      * @param messages list<VoterRegistryMessage>
      * @return List<VoterRegistryMessage>
      */
-   public static List<VoterRegistryMessage> ConvertToVoterRegistryMessages(
-           List<BulletinBoardMessage> messages){
-       return messages.stream().map(VoterRegistryMessage::new).collect(Collectors.toList());
+   public static List<VoterRegistryMessage> ConvertToVoterRegistryMessages(List<BulletinBoardMessage> messages){
+       List<VoterRegistryMessage> voterMessages = new ArrayList<>();
+       for (int i = 0 ; i < messages.size() ; i++)
+       {
+           voterMessages.add(new VoterRegistryMessage(messages.get(i)));
+       }
+       return voterMessages;
    }
 
     /**
@@ -71,11 +71,13 @@ public abstract class CollectionMessagesUtils {
      */
      public static List<String> GetListOfGroupIds(Map<String, VoterRegistryMessage>  groupIdToMessage) {
          List<String> groupsIds = new ArrayList<>();
-
-         groupIdToMessage.values().stream().filter(VoterRegistryMessage::IsGroupAdding).forEach(message -> {
+         Iterator entries = groupIdToMessage.entrySet().iterator();
+         while (entries.hasNext()) {
+             Map.Entry tuple = (Map.Entry) entries.next();
+             VoterRegistryMessage message = (VoterRegistryMessage) tuple.getValue();
              String groupId = message.GetWantedTagFromBasicMessage(RegistryTags.GROUP_ID_TAG.toString());
              groupsIds.add(groupId);
-         });
+         }
          return groupsIds;
      }
 
diff --git a/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java b/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
index c6cff8f..47308e0 100644
--- a/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
+++ b/voter-registry/src/main/java/meerkat/Registry/RelevantDataCallBack.java
@@ -79,6 +79,7 @@ public class RelevantDataCallBack implements ClientCallback<List<BulletinBoardMe
     public void handleCallback(List<BulletinBoardMessage> msg) {
         try {
             List<VoterRegistryMessage>  messages = ConvertToVoterRegistryMessages(validate(msg));
+
             if(isAddToGroupsList(msg)) {
                 Map<String, VoterRegistryMessage> map = GetLatestGroupsActions(messages);
                 List<String> groupsOfUser = GetListOfGroupIds(map);
diff --git a/voter-registry/src/test/java/SimpleRegistryTest.java b/voter-registry/src/test/java/SimpleRegistryTest.java
index 9b75d29..60ce8c3 100644
--- a/voter-registry/src/test/java/SimpleRegistryTest.java
+++ b/voter-registry/src/test/java/SimpleRegistryTest.java
@@ -2,15 +2,17 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import junit.framework.TestCase;
 import meerkat.Registry.CollectionMessagesUtils;
 import meerkat.Registry.RegistryTags;
-import meerkat.VoterRegistry;
 import meerkat.SimpleRegistry;
-import meerkat.protobuf.VoterRegistry.*;
 import meerkat.VoterRegistryMessage;
 import meerkat.bulletinboard.BulletinBoardClient;
 import meerkat.bulletinboard.ThreadedBulletinBoardClient;
 import meerkat.crypto.concrete.ECDSASignature;
 import meerkat.protobuf.BulletinBoardAPI.BulletinBoardMessage;
 import meerkat.protobuf.BulletinBoardAPI.MessageFilterList;
+import meerkat.protobuf.VoterRegistry.GroupID;
+import meerkat.protobuf.VoterRegistry.VoterGroup;
+import meerkat.protobuf.VoterRegistry.VoterID;
+import meerkat.protobuf.VoterRegistry.VoterInfo;
 import meerkat.protobuf.Voting;
 
 import java.io.InputStream;
@@ -45,7 +47,7 @@ public class SimpleRegistryTest extends TestCase {
     public static String KEYFILE_PASSWORD = "secret";
     Semaphore jobSemaphore;
 
-    class DummyRegistryCallBackHandler<T> implements VoterRegistry.RegistryCallBack<T>{
+    class DummyRegistryCallBackHandler<T> implements meerkat.VoterRegistry.RegistryCallBack<T>{
         public int counter;
         public T data;
 
@@ -167,7 +169,8 @@ public class SimpleRegistryTest extends TestCase {
 
         String id = new BigInteger(130, random).toString(32);
         String data = new BigInteger(130, random).toString(32);
-        VoterInfo voterInfo = VoterInfo.newBuilder().setId(VoterID.newBuilder().setId(id)).setInfo(data).build();
+        VoterInfo voterInfo = VoterInfo.newBuilder().
+                setId(VoterID.newBuilder().setId(id)).setInfo(data).build();
 
         SimpleRegistry registry = new SimpleRegistry(signer, bulletinBoardClient, certStream);
         registry.AddVoter(voterInfo, handler);
@@ -223,7 +226,8 @@ public class SimpleRegistryTest extends TestCase {
 
         String voterId = new BigInteger(130, random).toString(32);
         String groupId = new BigInteger(130, random).toString(32);
-        VoterGroup voterInfo = VoterGroup.newBuilder().setVoterId(VoterID.newBuilder().setId(voterId))
+        VoterGroup voterInfo = VoterGroup.newBuilder()
+                .setVoterId(VoterID.newBuilder().setId(voterId))
                 .setGroupId(GroupID.newBuilder().setId(groupId)).build();
 
         SimpleRegistry registry = new SimpleRegistry(signer, bulletinBoardClient, certStream);
@@ -256,7 +260,8 @@ public class SimpleRegistryTest extends TestCase {
 
         String voterId = new BigInteger(130, random).toString(32);
         String groupId = new BigInteger(130, random).toString(32);
-        VoterGroup voterInfo = VoterGroup.newBuilder().setVoterId(VoterID.newBuilder().setId(voterId))
+        VoterGroup voterInfo = VoterGroup.newBuilder()
+                .setVoterId(VoterID.newBuilder().setId(voterId))
                 .setGroupId(GroupID.newBuilder().setId(groupId)).build();
 
         this.certStream = getClass().getResourceAsStream(CERT1_PEM_EXAMPLE);
@@ -285,7 +290,8 @@ public class SimpleRegistryTest extends TestCase {
 
         String id = new BigInteger(130, random).toString(32);
         String data = new BigInteger(130, random).toString(32);
-        VoterInfo voterInfo = VoterInfo.newBuilder().setId(VoterID.newBuilder().setId(id)).setInfo(data).build();
+        VoterInfo voterInfo = VoterInfo.newBuilder().
+                setId(VoterID.newBuilder().setId(id)).setInfo(data).build();
 
         SimpleRegistry registry = new SimpleRegistry(signer, bulletinBoardClient,  certStream);
         registry.AddVoter(voterInfo, handler);
@@ -296,9 +302,11 @@ public class SimpleRegistryTest extends TestCase {
         DummyRegistryCallBackHandler<VoterRegistryMessage> personalHandler = new DummyRegistryCallBackHandler<>();
         registry.GetPersonIDDetails(VoterID.newBuilder().setId(id).build(), personalHandler);
 
-        jobSemaphore.acquire();
+
+        jobSemaphore.acquire(1);
         assertEquals(RegistryTags.ID_TAG + id,
                 personalHandler.data.GetWantedTagFromBasicMessage(RegistryTags.ID_TAG.toString()));
         assertEquals(data,personalHandler.data.base.getData().toStringUtf8());
     }
 }
+