fixup! squash! Adapts CollecTor to metrics-lib 1.9.0, which removed DescriptorFile. Build.xml still pointing to 1.8.2-dev Implements task-22652.task-22652

2 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/org/torproject/collector/sync/SyncPersistence.java b/src/main/java/org/torproject/collector/sync/SyncPersistence.java
index a82702c..5fd6dc6 100644
--- a/src/main/java/org/torproject/collector/sync/SyncPersistence.java
+++ b/src/main/java/org/torproject/collector/sync/SyncPersistence.java
@@ -32,7 +32,6 @@ import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.file.Path;
-import java.util.List;
 
 /** Provides persistence for descriptors based on the descriptor type. */
 public class SyncPersistence {
diff --git a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java
index eba208e..fe47f26 100644
--- a/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java
+++ b/src/test/java/org/torproject/collector/sync/SyncPersistenceTest.java
@@ -193,6 +193,7 @@ public class SyncPersistenceTest {
   private int outCount;
   private int recentCount;
   private String filename;
+  private File fileForName;
   private File recent;
   private File output;
   private String recentName;
@@ -205,6 +206,7 @@ public class SyncPersistenceTest {
     this.expectedRecentDir = subRecent;
     this.expectedOutputDir = subOutput;
     this.filename = fn;
+    this.fileForName = new File(fn);
     this.outCount = outCount;
     this.recentCount = recentCount;
   }
@@ -221,7 +223,7 @@ public class SyncPersistenceTest {
     DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
     SyncPersistence persist = new SyncPersistence(conf);
     persist.storeDescs(dp.parseDescriptors(bytesFromResource(),
-        new File(filename), filename), 1475694377000L);
+        fileForName, filename), 1475694377000L);
     persist.cleanDirectory();
     List<File> recentList = new ArrayList<>();
     Files.walkFileTree(recent.toPath(), new FileCollector(recentList));
@@ -239,7 +241,7 @@ public class SyncPersistenceTest {
     DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
     SyncPersistence persist = new SyncPersistence(conf);
     persist.storeDescs(dp.parseDescriptors(bytesFromResource(),
-        new File(filename), filename), 1475694377000L);
+        fileForName, filename), 1475694377000L);
     persist.cleanDirectory();
     List<File> recentList = new ArrayList<>();
     List<File> outputList = new ArrayList<>();
@@ -263,7 +265,7 @@ public class SyncPersistenceTest {
     DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
     SyncPersistence persist = new SyncPersistence(conf);
     persist.storeDescs(dp.parseDescriptors(bytesFromResource(),
-        new File(filename), filename), 1475694377000L);
+        fileForName, filename), 1475694377000L);
     persist.cleanDirectory();
     List<File> recentList = new ArrayList<>();
     Files.walkFileTree(recent.toPath(), new FileCollector(recentList));
@@ -288,7 +290,7 @@ public class SyncPersistenceTest {
     DescriptorParser dp = DescriptorSourceFactory.createDescriptorParser();
     SyncPersistence persist = new SyncPersistence(conf);
     persist.storeDescs(dp.parseDescriptors(bytesFromResource(),
-        new File(filename), filename), 1475694377000L);
+        fileForName, filename), 1475694377000L);
     persist.cleanDirectory();
     List<File> outputList = new ArrayList<>();
     Files.walkFileTree(output.toPath(), new FileCollector(outputList));