Replacing com.android.annotations.* with JSR305 annotations.

Test: Ran bazel build

Change-Id: Iea73e46d3fd090bead2978f4960722cff59bcaaf

7 files changed, 39 insertions, 43 deletions

diff --git a/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java b/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java
index 71610ef..fb1d322 100644
--- a/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java
+++ b/src/test/java/com/android/apkzlib/sign/SignatureTestUtils.java
@@ -19,7 +19,6 @@ package com.android.apkzlib.sign;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-import com.android.annotations.NonNull;
 import com.android.apkzlib.utils.ApkZLibPair;
 import java.math.BigInteger;
 import java.security.KeyPair;
@@ -30,6 +29,7 @@ import java.security.cert.X509Certificate;
 import java.security.interfaces.ECPublicKey;
 import java.security.interfaces.RSAPublicKey;
 import java.util.Date;
+import javax.annotation.Nonnull;
 import javax.security.auth.x500.X500Principal;
 import org.bouncycastle.asn1.x500.X500Name;
 import org.bouncycastle.asn1.x509.SubjectPublicKeyInfo;
@@ -54,7 +54,7 @@ public class SignatureTestUtils {
      * @return the pair with the private key and certificate
      * @throws Exception failed to generate the signature data
      */
-    @NonNull
+    @Nonnull
     public static ApkZLibPair<PrivateKey, X509Certificate> generateSignaturePre18()
             throws Exception {
         return generateSignature("RSA", "SHA1withRSA");
@@ -66,7 +66,7 @@ public class SignatureTestUtils {
      * @return the pair with the private key and certificate
      * @throws Exception failed to generate the signature data
      */
-    @NonNull
+    @Nonnull
     public static ApkZLibPair<PrivateKey, X509Certificate> generateSignaturePos18()
             throws Exception {
         return generateSignature("EC", "SHA256withECDSA");
@@ -80,10 +80,10 @@ public class SignatureTestUtils {
      * @return the pair with the private key and certificate
      * @throws Exception failed to generate the signature data
      */
-    @NonNull
+    @Nonnull
     public static ApkZLibPair<PrivateKey, X509Certificate> generateSignature(
-            @NonNull String sign,
-            @NonNull String full)
+            @Nonnull String sign,
+            @Nonnull String full)
             throws Exception {
         // http://stackoverflow.com/questions/28538785/
         // easy-way-to-generate-a-self-signed-certificate-for-java-security-keystore-using
diff --git a/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java b/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java
index 380bb51..916ef46 100644
--- a/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java
+++ b/src/test/java/com/android/apkzlib/utils/ApkZFileTestUtils.java
@@ -18,7 +18,6 @@ package com.android.apkzlib.utils;
 
 import static org.junit.Assert.assertTrue;
 
-import com.android.annotations.NonNull;
 import com.android.testutils.TestResources;
 import com.google.common.base.Preconditions;
 import com.google.common.io.ByteSource;
@@ -27,6 +26,7 @@ import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;
 import java.io.RandomAccessFile;
+import javax.annotation.Nonnull;
 
 /**
  * Utility functions for tests.
@@ -42,8 +42,8 @@ public final class ApkZFileTestUtils {
      * @return the bytes read
      * @throws Exception failed to read the file
      */
-    @NonNull
-    public static byte[] readSegment(@NonNull File file, long start, int length) throws Exception {
+    @Nonnull
+    public static byte[] readSegment(@Nonnull File file, long start, int length) throws Exception {
         Preconditions.checkArgument(start >= 0, "start < 0");
         Preconditions.checkArgument(length >= 0, "length < 0");
 
@@ -72,8 +72,8 @@ public final class ApkZFileTestUtils {
      * @param path the path
      * @return the test resource
      */
-    @NonNull
-    public static File getResource(@NonNull String path) {
+    @Nonnull
+    public static File getResource(@Nonnull String path) {
         File resource = TestResources.getFile(ApkZFileTestUtils.class, path);
         assertTrue(resource.exists());
         return resource;
@@ -85,8 +85,8 @@ public final class ApkZFileTestUtils {
      * @param path the path
      * @return the test resource
      */
-    @NonNull
-    public static ByteSource getResourceBytes(@NonNull String path) {
+    @Nonnull
+    public static ByteSource getResourceBytes(@Nonnull String path) {
         return Resources.asByteSource(Resources.getResource(ApkZFileTestUtils.class, path));
     }
 
diff --git a/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java b/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java
index 8d01f0d..84be460 100644
--- a/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileNotificationTest.java
@@ -21,21 +21,19 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
 import com.android.apkzlib.utils.ApkZLibPair;
 import com.android.apkzlib.utils.IOExceptionRunnable;
 import com.google.common.collect.Lists;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-import org.mockito.Mockito;
-
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 import java.util.List;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.mockito.Mockito;
 
 public class ZFileNotificationTest {
     private static class KeepListener extends ZFileExtension {
@@ -77,7 +75,7 @@ public class ZFileNotificationTest {
 
         @Nullable
         @Override
-        public IOExceptionRunnable added(@NonNull StoredEntry entry,
+        public IOExceptionRunnable added(@Nonnull StoredEntry entry,
                 @Nullable StoredEntry replaced) {
             added.add(new ApkZLibPair<>(entry, replaced));
             return returnRunnable;
@@ -85,7 +83,7 @@ public class ZFileNotificationTest {
 
         @Nullable
         @Override
-        public IOExceptionRunnable removed(@NonNull StoredEntry entry) {
+        public IOExceptionRunnable removed(@Nonnull StoredEntry entry) {
             removed.add(entry);
             return returnRunnable;
         }
diff --git a/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java b/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java
index 6ad7bd1..869f73a 100644
--- a/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileSortTest.java
@@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
-import com.android.annotations.Nullable;
 import java.io.ByteArrayInputStream;
 import java.io.File;
+import javax.annotation.Nullable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/test/java/com/android/apkzlib/zip/ZFileTest.java b/src/test/java/com/android/apkzlib/zip/ZFileTest.java
index 3619691..742b9bd 100644
--- a/src/test/java/com/android/apkzlib/zip/ZFileTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZFileTest.java
@@ -27,7 +27,6 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.android.annotations.NonNull;
 import com.android.apkzlib.zip.compress.DeflateExecutionCompressor;
 import com.android.apkzlib.zip.utils.CloseableByteSource;
 import com.android.apkzlib.zip.utils.RandomAccessFileUtils;
@@ -38,11 +37,6 @@ import com.google.common.hash.Hashing;
 import com.google.common.io.ByteStreams;
 import com.google.common.io.Closer;
 import com.google.common.io.Files;
-
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TemporaryFolder;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -59,6 +53,10 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipInputStream;
 import java.util.zip.ZipOutputStream;
+import javax.annotation.Nonnull;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 public class ZFileTest {
     @Rule
@@ -1027,9 +1025,9 @@ public class ZFileTest {
         boolean[] done = new boolean[1];
         options.setCompressor(new DeflateExecutionCompressor(executor, options.getTracker(),
                 Deflater.BEST_COMPRESSION) {
-            @NonNull
+            @Nonnull
             @Override
-            protected CompressionResult immediateCompress(@NonNull CloseableByteSource source)
+            protected CompressionResult immediateCompress(@Nonnull CloseableByteSource source)
                     throws Exception {
                 Thread.sleep(500);
                 CompressionResult cr = super.immediateCompress(source);
diff --git a/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java b/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java
index 9c67cff..aaff18b 100644
--- a/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java
+++ b/src/test/java/com/android/apkzlib/zip/ZipTestUtils.java
@@ -18,11 +18,11 @@ package com.android.apkzlib.zip;
 
 import static org.junit.Assert.assertFalse;
 
-import com.android.annotations.NonNull;
 import com.android.apkzlib.utils.ApkZFileTestUtils;
 import com.google.common.io.Files;
 import java.io.File;
 import java.io.IOException;
+import javax.annotation.Nonnull;
 import org.junit.rules.TemporaryFolder;
 
 /**
@@ -37,8 +37,8 @@ class ZipTestUtils {
      * @return the resource data
      * @throws IOException I/O failed
      */
-    @NonNull
-    static byte[] rsrcBytes(@NonNull String rsrcName) throws IOException {
+    @Nonnull
+    static byte[] rsrcBytes(@Nonnull String rsrcName) throws IOException {
         return ApkZFileTestUtils.getResourceBytes("/testData/packaging/" + rsrcName).read();
     }
 
@@ -52,7 +52,7 @@ class ZipTestUtils {
      * @return the file that was created with the resource
      * @throws IOException failed to clone the resource
      */
-    static File cloneRsrc(@NonNull String rsrcName, @NonNull TemporaryFolder folder)
+    static File cloneRsrc(@Nonnull String rsrcName, @Nonnull TemporaryFolder folder)
             throws IOException {
         String cloneName;
         if (rsrcName.contains("/")) {
@@ -77,9 +77,9 @@ class ZipTestUtils {
      * @throws IOException failed to clone the resource
      */
     static File cloneRsrc(
-            @NonNull String rsrcName,
-            @NonNull TemporaryFolder folder,
-            @NonNull String cloneName)
+            @Nonnull String rsrcName,
+            @Nonnull TemporaryFolder folder,
+            @Nonnull String cloneName)
             throws IOException {
         File result = new File(folder.getRoot(), cloneName);
         assertFalse(result.exists());
diff --git a/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java b/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java
index b9dbc8d..e45f117 100644
--- a/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java
+++ b/src/test/java/com/android/apkzlib/zip/ZipToolsTest.java
@@ -22,8 +22,6 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.android.annotations.NonNull;
-import com.android.annotations.Nullable;
 import com.google.common.base.Charsets;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
@@ -38,6 +36,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
@@ -67,7 +67,7 @@ public class ZipToolsTest {
     public String mName;
 
     @Rule
-    @NonNull
+    @Nonnull
     public TemporaryFolder mTemporaryFolder = new TemporaryFolder();
 
     @Parameterized.Parameters(name = "{4} {index}")
@@ -104,7 +104,7 @@ public class ZipToolsTest {
         return zfile;
     }
 
-    private static void assertFileInZip(@NonNull ZFile zfile, @NonNull String name) throws Exception {
+    private static void assertFileInZip(@Nonnull ZFile zfile, @Nonnull String name) throws Exception {
         StoredEntry root = zfile.get(name);
         assertNotNull(root);