From 72d5e8aca11fd6967385613405c65609033fa405 Mon Sep 17 00:00:00 2001 From: Tal Moran Date: Tue, 28 Jun 2016 02:11:01 +0300 Subject: [PATCH] Use apache.commons instead of sun.com...whatever --- voter-registry/build.gradle | 5 +++++ voter-registry/gradlew | 0 .../{getVoterCallback.java => GetVoterCallback.java} | 0 .../main/java/meerkat/registry/MessageCollectionUtils.java | 3 ++- 4 files changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 120000 voter-registry/gradlew rename voter-registry/src/main/java/meerkat/registry/AsyncRegistryCallbacks/{getVoterCallback.java => GetVoterCallback.java} (100%) diff --git a/voter-registry/build.gradle b/voter-registry/build.gradle index 6c68706..42cd46e 100644 --- a/voter-registry/build.gradle +++ b/voter-registry/build.gradle @@ -42,6 +42,11 @@ dependencies { // Meerkat common compile project(':meerkat-common') compile project(':bulletin-board-client') + // TODO: Why do we need dependency on server? + compile project(':bulletin-board-server') + + // Apache commons + compile 'org.apache.commons:commons-lang3:3.4' // Logging compile 'org.slf4j:slf4j-api:1.7.7' diff --git a/voter-registry/gradlew b/voter-registry/gradlew deleted file mode 100644 index 502f5a2..0000000 --- a/voter-registry/gradlew +++ /dev/null @@ -1 +0,0 @@ -../gradlew \ No newline at end of file diff --git a/voter-registry/gradlew b/voter-registry/gradlew new file mode 120000 index 0000000..502f5a2 --- /dev/null +++ b/voter-registry/gradlew @@ -0,0 +1 @@ +../gradlew \ No newline at end of file diff --git a/voter-registry/src/main/java/meerkat/registry/AsyncRegistryCallbacks/getVoterCallback.java b/voter-registry/src/main/java/meerkat/registry/AsyncRegistryCallbacks/GetVoterCallback.java similarity index 100% rename from voter-registry/src/main/java/meerkat/registry/AsyncRegistryCallbacks/getVoterCallback.java rename to voter-registry/src/main/java/meerkat/registry/AsyncRegistryCallbacks/GetVoterCallback.java diff --git a/voter-registry/src/main/java/meerkat/registry/MessageCollectionUtils.java b/voter-registry/src/main/java/meerkat/registry/MessageCollectionUtils.java index cb86274..0b6c83f 100644 --- a/voter-registry/src/main/java/meerkat/registry/MessageCollectionUtils.java +++ b/voter-registry/src/main/java/meerkat/registry/MessageCollectionUtils.java @@ -1,9 +1,10 @@ package meerkat.registry; -import com.sun.deploy.util.StringUtils; + import meerkat.protobuf.BulletinBoardAPI.FilterType; import meerkat.protobuf.BulletinBoardAPI.MessageFilter; import meerkat.protobuf.BulletinBoardAPI.MessageFilterList; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import java.util.List;