Make Rappor usable in Android framework

- Removed java dependency
- Change package to com.google.android.rappor.* to avoid conflict

Test: NULL

Change-Id: I6b883bc00a878075fadc3e288d79e1f0f513c304

5 files changed, 26 insertions, 13 deletions

diff --git a/README.android b/README.android
index 272665d..30aae43 100644
--- a/README.android
+++ b/README.android
@@ -8,4 +8,6 @@ here:
 - Removed all non-java client library files.
 
 - Modified client/java/com/google/rappor/HmacDrbg.java, client/java/com/google/rappor/Encoder.java
-  to remove Guava dependency.
+  to remove Guava, javax dependency.
+
+- Moved package from com.google.rappor.* to com.google.android.rappor.* to avoid source conflict with 3rd party library.
diff --git a/client/java/com/google/rappor/Encoder.java b/client/java/com/google/android/rappor/Encoder.java
index 5163f21..18177b6 100644
--- a/client/java/com/google/rappor/Encoder.java
+++ b/client/java/com/google/android/rappor/Encoder.java
@@ -1,4 +1,4 @@
-package com.google.rappor;
+package com.google.android.rappor;
 
 // BEGIN android-changed: Removed guava dependency
 // import static com.google.common.base.Preconditions.checkArgument;
@@ -13,8 +13,10 @@ import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.util.BitSet;
 
-import javax.annotation.Nullable;
-import javax.annotation.concurrent.GuardedBy;
+// BEGIN android-changed: Remove javax
+// import javax.annotation.Nullable;
+// import javax.annotation.concurrent.GuardedBy;
+// END android-changed
 
 /**
  * Encodes reports using the RAPPOR differentially-private encoding algorithm.
@@ -163,7 +165,9 @@ public class Encoder {
    * <p>This object is stateful; access must be synchronized.  The reset method must be
    * called before each use.
    */
-  @GuardedBy("this")
+// BEGIN android-changed: Remove javax
+//  @GuardedBy("this")
+// END android-changed
   private final MessageDigest sha256;
 
   /**
@@ -172,7 +176,9 @@ public class Encoder {
    * <p>This object is stateful; access must be synchronized.  The reset method must be
    * called before each use.
    */
-  @GuardedBy("this")
+// BEGIN android-changed: Remove javax
+//  @GuardedBy("this")
+// END android-changed
   private final MessageDigest md5;
 
   /**
@@ -248,9 +254,14 @@ public class Encoder {
    *     string.
    */
   public Encoder(
-      @Nullable SecureRandom random,
-      @Nullable MessageDigest md5,
-      @Nullable MessageDigest sha256,
+// BEGIN android-changed: Remove javax
+//      @Nullable SecureRandom random,
+//      @Nullable MessageDigest md5,
+//      @Nullable MessageDigest sha256,
+      SecureRandom random,
+      MessageDigest md5,
+      MessageDigest sha256,
+// END android-changed
       byte[] userSecret,
       String encoderId,
       int numBits,
@@ -580,7 +591,7 @@ public class Encoder {
   }
 
   // BEGIN android-changed: Added guava methods
-  private static void checkArgument(boolean expression, @Nullable Object errorMessage) {
+  private static void checkArgument(boolean expression, Object errorMessage) {
     if (!expression) {
       throw new IllegalArgumentException(String.valueOf(errorMessage));
     }
diff --git a/client/java/com/google/rappor/HmacDrbg.java b/client/java/com/google/android/rappor/HmacDrbg.java
index b6f0e4f..db99700 100644
--- a/client/java/com/google/rappor/HmacDrbg.java
+++ b/client/java/com/google/android/rappor/HmacDrbg.java
@@ -1,4 +1,4 @@
-package com.google.rappor;
+package com.google.android.rappor;
 
 // BEGIN android-changed: Removed guava dependency
 // import com.google.common.hash.HashFunction;
diff --git a/client/javatest/com/google/rappor/EncoderTest.java b/client/javatest/com/google/android/rappor/EncoderTest.java
index 316f8c2..17714f8 100644
--- a/client/javatest/com/google/rappor/EncoderTest.java
+++ b/client/javatest/com/google/android/rappor/EncoderTest.java
@@ -1,4 +1,4 @@
-package com.google.rappor;
+package com.google.android.rappor;
 
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.lessThanOrEqualTo;
diff --git a/client/javatest/com/google/rappor/HmacDrbgTest.java b/client/javatest/com/google/android/rappor/HmacDrbgTest.java
index a14ae7e..e8b0f49 100644
--- a/client/javatest/com/google/rappor/HmacDrbgTest.java
+++ b/client/javatest/com/google/android/rappor/HmacDrbgTest.java
@@ -1,4 +1,4 @@
-package com.google.rappor;
+package com.google.android.rappor;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;