Author: rdonkin
Date: Sun Mar 31 11:09:20 2013
New Revision: 1462930
URL: http://svn.apache.org/r1462930
Log:
Consolidate file wrangling into FileSystem and delegate
Modified:
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/FileSystem.java
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java
Modified:
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/FileSystem.java
URL:
http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/FileSystem.java?rev=1462930&r1=1462929&r2=1462930&view=diff
==============================================================================
---
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/FileSystem.java
(original)
+++
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/FileSystem.java
Sun Mar 31 11:09:20 2013
@@ -22,11 +22,53 @@ import java.util.ArrayList;
import java.util.List;
import java.util.regex.Pattern;
-/**
- * @version $Rev$ $Date$
- */
+import org.apache.creadur.tentacles.filter.Filters;
+
public class FileSystem {
+ private final Filters filters;
+
+ public FileSystem() {
+ this.filters = new Filters();
+ }
+
+ public FileFilter filesOnly() {
+ return this.filters.filesOnly();
+ }
+
+ public FileFilter licensesOnly() {
+ return this.filters.licensesOnly();
+ }
+
+ public FileFilter noticesOnly() {
+ return this.filters.noticesOnly();
+ }
+
+ public FileFilter legalOnly() {
+ return this.filters.legalOnly();
+ }
+
+ public FileFilter licensesDeclaredIn(final File contents) {
+ return this.filters.licensesDeclaredIn(contents);
+
+ }
+
+ public FileFilter noticesDeclaredIn(final File contents) {
+ return this.filters.noticesDeclaredIn(contents);
+ }
+
+ public FileFilter legalDocumentsUndeclaredIn(final File contents) {
+ return this.filters.legalDocumentsUndeclaredIn(contents);
+ }
+
+ public FileFilter archivesInPath(final String repositoryPathNameFilter) {
+ return this.filters.archivesInPath(repositoryPathNameFilter);
+ }
+
+ public FileFilter legalDocumentsDeclaredIn(final File contents) {
+ return this.filters.legalDocumentsDeclaredIn(contents);
+ }
+
public List<File> collect(final File dir, final String regex) {
return collect(dir, Pattern.compile(regex));
}
Modified:
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java
URL:
http://svn.apache.org/viewvc/creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java?rev=1462930&r1=1462929&r2=1462930&view=diff
==============================================================================
---
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java
(original)
+++
creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles/Main.java
Sun Mar 31 11:09:20 2013
@@ -36,7 +36,6 @@ import java.util.Set;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-import org.apache.creadur.tentacles.filter.Filters;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -70,7 +69,6 @@ public class Main {
private final IOSystem ioSystem;
private final TentaclesResources tentaclesResources;
private final Templates templates;
- private final Filters filters;
public Main(final String... args) throws Exception {
this(new Configuration(args), Platform.aPlatform());
@@ -90,7 +88,6 @@ public class Main {
this.fileSystem = platform.getFileSystem();
this.ioSystem = platform.getIoSystem();
this.tentaclesResources = platform.getTentaclesResources();
- this.filters = new Filters();
this.templates = templates;
this.local =
@@ -126,7 +123,7 @@ public class Main {
final List<File> jars =
this.fileSystem.collect(this.repository,
- this.filters.filesOnly());
+ this.fileSystem.filesOnly());
final List<Archive> archives = new ArrayList<Archive>();
for (final File file : jars) {
@@ -160,7 +157,7 @@ public class Main {
for (final Archive archive : archives) {
final List<File> files =
this.fileSystem.collect(contents(archive.getFile()),
- this.filters.licensesOnly());
+ this.fileSystem.licensesOnly());
for (final File file : files) {
final License license = new License(this.ioSystem.slurp(file));
@@ -210,7 +207,7 @@ public class Main {
final File contents = contents(archive.getFile());
final List<File> files =
this.fileSystem.collect(contents,
- this.filters.licensesDeclaredIn(contents));
+ this.fileSystem.licensesDeclaredIn(contents));
for (final File file : files) {
@@ -248,7 +245,7 @@ public class Main {
final File contents = contents(archive.getFile());
final List<File> files =
this.fileSystem.collect(contents,
- this.filters.noticesDeclaredIn(contents));
+ this.fileSystem.noticesDeclaredIn(contents));
for (final File file : files) {
@@ -285,7 +282,7 @@ public class Main {
for (final Archive archive : archives) {
final List<File> files =
this.fileSystem.collect(contents(archive.getFile()),
- this.filters.noticesOnly());
+ this.fileSystem.noticesOnly());
for (final File file : files) {
final Notice notice = new Notice(this.ioSystem.slurp(file));
@@ -308,7 +305,8 @@ public class Main {
private List<URI> allNoticeFiles() {
final List<File> legal =
- this.fileSystem.collect(this.content,
this.filters.legalOnly());
+ this.fileSystem.collect(this.content,
+ this.fileSystem.legalOnly());
for (final File file : legal) {
log.info("Legal " + file);
}
@@ -341,7 +339,7 @@ public class Main {
final File file =
new File(this.configuration.getStagingRepositoryURI());
final List<File> collect =
- this.fileSystem.collect(file, this.filters
+ this.fileSystem.collect(file, this.fileSystem
.archivesInPath(this.configuration
.getFileRepositoryPathNameFilter()));
@@ -633,8 +631,9 @@ public class Main {
private Map<URI, URI> mapOther() {
final File jarContents = contents(this.file);
final List<File> legal =
- Main.this.fileSystem.collect(jarContents, Main.this.filters
- .legalDocumentsUndeclaredIn(jarContents));
+ Main.this.fileSystem.collect(jarContents,
+ Main.this.fileSystem
+ .legalDocumentsUndeclaredIn(jarContents));
final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
for (final File file : legal) {
@@ -650,8 +649,9 @@ public class Main {
private Map<URI, URI> map() {
final File jarContents = contents(this.file);
final List<File> legal =
- Main.this.fileSystem.collect(jarContents, Main.this.filters
- .legalDocumentsDeclaredIn(jarContents));
+ Main.this.fileSystem.collect(jarContents,
+ Main.this.fileSystem
+ .legalDocumentsDeclaredIn(jarContents));
final Map<URI, URI> map = new LinkedHashMap<URI, URI>();
for (final File file : legal) {
