lee/heritrix3
1
0
Fork 0
mirror of https://github.com/internetarchive/heritrix3.git synced 2026-08-01 20:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup/consolidation/expansion of *Utils classes

Browse Source 
* IoUtils.java
    remove class that confusingly-overlaps with commons IOUtils; move remaining methods to ArchiveUtils or archive's FileUtils
* ArchiveUtils.java, FileUtils.java
    receive relocated methods; eliminated deprecated or unused methods
* JSONUtils.java
    new class to collect common JSON actions
* Iteratorable.java
    wrap Iterator as Iterable for foreach usage
* (many)
    update to use alternate utils methods
This commit is contained in:
gojomo
2009-11-19 22:39:53 +00:00
parent 300ce15a06
commit e42e2ed7f6
21 changed files with 314 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/src/test/java/org/archive/crawler/framework/CrawlControllerTest.java
+2 -5
View File
@@ -29,7 +29,7 @@ import org.archive.bdb.BdbModule;
import org.archive.modules.net.BdbServerCache;
import org.archive.spring.ConfigPath;
import org.archive.state.ModuleTestBase;
import org.archive.util.IoUtils;
import org.archive.util.ArchiveUtils;
/**
*
@@ -55,7 +55,7 @@ public class CrawlControllerTest extends ModuleTestBase {
fileWriter.write("http://www.pandemoniummovie.com");
fileWriter.close();
} finally {
IoUtils.close(fileWriter);
ArchiveUtils.closeQuietly(fileWriter);
}
File state = new File(tmp, "state");
@@ -69,11 +69,8 @@ public class CrawlControllerTest extends ModuleTestBase {
// def.set(bdb, BdbModule.DIR, state.getAbsolutePath());
bdb.start();
String cp = checkpoints.getAbsolutePath();
CrawlController controller = new CrawlController();
controller.setServerCache(new BdbServerCache());
controller.setCheckpointsDir(new ConfigPath("test",cp));
controller.start();
return controller;
}
engine/src/test/java/org/archive/crawler/selftest/Precedence1SelfTest.java
+2 -2
View File
@@ -24,7 +24,7 @@ import java.io.File;
import java.io.FileReader;
import org.archive.crawler.frontier.precedence.BaseUriPrecedencePolicy;
import org.archive.util.IoUtils;
import org.archive.util.ArchiveUtils;
/**
* Tests that operators can create precedence groups for URIs, and that URIs
@@ -158,7 +158,7 @@ public class Precedence1SelfTest extends SelfTestBase {
crawled = crawled + s + "\n";
}
} finally {
IoUtils.close(br);
ArchiveUtils.closeQuietly(br);
}
assertEquals(EXPECTED, crawled);