Modify how annotation comparator get files

- Files to compare are passed as method parameters rather than as constructor
parameters. It will be homogeneous with dex comparator.

Change-Id: I6823da467c5f6fed26caf3e40c3a36d0b205d8b2

5 files changed, 13 insertions, 19 deletions

diff --git a/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java b/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java
index 088c0d9f..7df6d111 100644
--- a/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java
+++ b/dexcomparator/src/com/android/jack/DexAnnotationsComparator.java
@@ -73,10 +73,6 @@ public class DexAnnotationsComparator {
   @Nonnull
   private final Logger logger;
   @Nonnull
-  private final DexFile referenceDexFile;
-  @Nonnull
-  private final DexFile candidateDexFile;
-  @Nonnull
   private static final Level ERROR_LEVEL = Level.SEVERE;
   @Nonnull
   private static final Level DEBUG_LEVEL = Level.FINE;
@@ -86,17 +82,16 @@ public class DexAnnotationsComparator {
   private static final boolean TOLERATE_MISSING_INITS = true;
   private static final boolean TOLERATE_MISSING_CLINITS = true;
 
-  public DexAnnotationsComparator(
-      @Nonnull File referenceFile, @Nonnull File candidateFile) throws IOException {
+  public DexAnnotationsComparator() {
     logger = Logger.getLogger(this.getClass().getName());
     logger.setLevel(ERROR_LEVEL);
-
-    referenceDexFile = new DexFile(referenceFile);
-    candidateDexFile = new DexFile(candidateFile);
   }
 
   @SuppressWarnings("unchecked")
-  public void compare() throws DifferenceFoundException {
+  public void compare(@Nonnull File referenceFile, @Nonnull File candidateFile)
+      throws DifferenceFoundException, IOException {
+    DexFile referenceDexFile = new DexFile(referenceFile);
+    DexFile candidateDexFile = new DexFile(candidateFile);
 
     /* Reuse delegate instance for maximum memory saving */
     CompareElementAnnotation compareElementAnnotation =
diff --git a/dexcomparator/src/com/android/jack/DexComparator.java b/dexcomparator/src/com/android/jack/DexComparator.java
index 2e980544..5b0aeb7f 100644
--- a/dexcomparator/src/com/android/jack/DexComparator.java
+++ b/dexcomparator/src/com/android/jack/DexComparator.java
@@ -1021,5 +1021,4 @@ public class DexComparator {
       return position;
     }
   }
-
 }
diff --git a/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java b/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
index 131220a1..9060077d 100644
--- a/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
+++ b/dexcomparator/testing/com/android/jack/dexcomparator/test/AnnotationComparisonTest.java
@@ -48,7 +48,7 @@ public class AnnotationComparisonTest {
     File dex2 = File.createTempFile("dex2", ".dex");
     dex2.deleteOnExit();
     TestTools.compileToDexWithJack(a2, dex2);
-    new DexAnnotationsComparator(dex1, dex2).compare();
+    new DexAnnotationsComparator().compare(dex1, dex2);
   }
 
   @Test
@@ -63,7 +63,7 @@ public class AnnotationComparisonTest {
     File dex2 = File.createTempFile("dex2", ".dex");
     dex2.deleteOnExit();
     TestTools.compileToDexWithJack(a2, dex2);
-    new DexAnnotationsComparator(dex1, dex2).compare();
+    new DexAnnotationsComparator().compare(dex1, dex2);
   }
 
   @Test
@@ -83,7 +83,7 @@ public class AnnotationComparisonTest {
     sourceList2.add(new File(testSource2, sourcePath2));
     TestTools.compileToDexWithJack(sourceList2, dex2);
     try {
-      new DexAnnotationsComparator(dex1, dex2).compare();
+      new DexAnnotationsComparator().compare(dex1, dex2);
       Assert.fail();
     } catch (DifferenceFoundException e) {
     }
@@ -100,7 +100,7 @@ public class AnnotationComparisonTest {
     sourceList1.add(new File(testSource1, sourcePath1));
     sourceList1.add(new File(testSource1, sourcePath2));
     TestTools.compileToDexWithJack(sourceList1, dex1);
-    new DexAnnotationsComparator(dex1, dex1).compare();
+    new DexAnnotationsComparator().compare(dex1, dex1);
   }
 
 }
diff --git a/jack/tests/com/android/jack/AnnotationTestTools.java b/jack/tests/com/android/jack/AnnotationTestTools.java
index 1152cbb2..75c229b6 100644
--- a/jack/tests/com/android/jack/AnnotationTestTools.java
+++ b/jack/tests/com/android/jack/AnnotationTestTools.java
@@ -79,7 +79,7 @@ public class AnnotationTestTools {
         jarjarRules).dexFile;
 
     // Compare Jack Dex file to reference
-    DexAnnotationsComparator comparator = new DexAnnotationsComparator(refDex, jackDex);
-    comparator.compare();
+    DexAnnotationsComparator comparator = new DexAnnotationsComparator();
+    comparator.compare(refDex, jackDex);
   }
 }
diff --git a/jack/tests/com/android/jack/tools/merger/MergerTestTools.java b/jack/tests/com/android/jack/tools/merger/MergerTestTools.java
index ef2c4a9f..5f378577 100644
--- a/jack/tests/com/android/jack/tools/merger/MergerTestTools.java
+++ b/jack/tests/com/android/jack/tools/merger/MergerTestTools.java
@@ -58,7 +58,7 @@ public class MergerTestTools {
     new DexComparator().compare(monoDex, oneDexPerTypeMerged, false, true,
         false /* compareDebugInfoBinary */, true, 0);
 
-    new DexAnnotationsComparator(monoDex, oneDexPerTypeMerged).compare();
+    new DexAnnotationsComparator().compare(monoDex, oneDexPerTypeMerged);
 
     return diff(monoDex, oneDexPerTypeMerged);
   }
@@ -86,7 +86,7 @@ public class MergerTestTools {
     new DexComparator().compare(monoDex, oneDexPerTypeMerged, false, true,
         false /* compareDebugInfoBinary */, true, 0);
 
-    new DexAnnotationsComparator(monoDex, oneDexPerTypeMerged).compare();
+    new DexAnnotationsComparator().compare(monoDex, oneDexPerTypeMerged);
 
     return diff(monoDex, oneDexPerTypeMerged);
   }