Return-Path: X-Original-To: apmail-creadur-commits-archive@www.apache.org Delivered-To: apmail-creadur-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B2FFF217 for ; Sun, 31 Mar 2013 11:32:14 +0000 (UTC) Received: (qmail 42766 invoked by uid 500); 31 Mar 2013 11:32:12 -0000 Delivered-To: apmail-creadur-commits-archive@creadur.apache.org Received: (qmail 42692 invoked by uid 500); 31 Mar 2013 11:32:10 -0000 Mailing-List: contact commits-help@creadur.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@creadur.apache.org Delivered-To: mailing list commits@creadur.apache.org Received: (qmail 42609 invoked by uid 99); 31 Mar 2013 11:32:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Mar 2013 11:32:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 31 Mar 2013 11:32:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 536FC238899C; Sun, 31 Mar 2013 11:31:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1462932 - in /creadur/tentacles/trunk/src/main/java/org/apache/creadur/tentacles: FileSystem.java Main.java Date: Sun, 31 Mar 2013 11:31:45 -0000 To: commits@creadur.apache.org From: rdonkin@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130331113145.536FC238899C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rdonkin Date: Sun Mar 31 11:31:44 2013 New Revision: 1462932 URL: http://svn.apache.org/r1462932 Log: Move toward more specific interface 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=1462932&r1=1462931&r2=1462932&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:31:44 2013 @@ -32,41 +32,14 @@ public class FileSystem { this.filters = new Filters(); } - public FileFilter filesOnly() { - return this.filters.filesOnly(); + public List legalDocumentsUndeclaredIn(final File contents) { + return collect(contents, + this.filters.legalDocumentsUndeclaredIn(contents)); } - 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 legalDocumentsDeclaredIn(final File contents) { + return collect(contents, + this.filters.legalDocumentsDeclaredIn(contents)); } public List collect(final File dir, final String regex) { @@ -115,4 +88,29 @@ public class FileSystem { final boolean isDirectory = file.isDirectory(); assert isDirectory : "Not a directory: " + file; } + + public List documentsFrom(final File repository) { + return collect(repository, this.filters.filesOnly()); + } + + public List licensesFrom(final File directory) { + return collect(directory, this.filters.licensesOnly()); + } + + public List noticesOnly(final File directory) { + return collect(directory, this.filters.noticesOnly()); + } + + public List licensesDeclaredIn(final File contents) { + return collect(contents, this.filters.licensesDeclaredIn(contents)); + } + + public List noticesDeclaredIn(final File contents) { + return collect(contents, this.filters.noticesDeclaredIn(contents)); + } + + public List archivesInPath(final File file, + final String fileRepositoryPathNameFilter) { + return collect(file, this.filters.archivesInPath(fileRepositoryPathNameFilter)); + } } 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=1462932&r1=1462931&r2=1462932&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:31:44 2013 @@ -121,9 +121,7 @@ public class Main { prepare(); - final List jars = - this.fileSystem.collect(this.repository, - this.fileSystem.filesOnly()); + final List jars = this.fileSystem.documentsFrom(this.repository); final List archives = new ArrayList(); for (final File file : jars) { @@ -156,8 +154,7 @@ public class Main { for (final Archive archive : archives) { final List files = - this.fileSystem.collect(contents(archive.getFile()), - this.fileSystem.licensesOnly()); + this.fileSystem.licensesFrom(contents(archive.getFile())); for (final File file : files) { final License license = new License(this.ioSystem.slurp(file)); @@ -205,9 +202,7 @@ public class Main { new HashSet(archive.getLicenses()); final File contents = contents(archive.getFile()); - final List files = - this.fileSystem.collect(contents, - this.fileSystem.licensesDeclaredIn(contents)); + final List files = this.fileSystem.licensesDeclaredIn(contents); for (final File file : files) { @@ -244,8 +239,7 @@ public class Main { final File contents = contents(archive.getFile()); final List files = - this.fileSystem.collect(contents, - this.fileSystem.noticesDeclaredIn(contents)); + this.fileSystem.noticesDeclaredIn(contents); for (final File file : files) { @@ -280,10 +274,9 @@ public class Main { final Map notices = new HashMap(); for (final Archive archive : archives) { - final List files = - this.fileSystem.collect(contents(archive.getFile()), - this.fileSystem.noticesOnly()); - for (final File file : files) { + final List noticeDocuments = + this.fileSystem.noticesOnly(contents(archive.getFile())); + for (final File file : noticeDocuments) { final Notice notice = new Notice(this.ioSystem.slurp(file)); Notice existing = notices.get(notice); @@ -303,24 +296,6 @@ public class Main { .write(new File(this.local, "notices.html")); } - private List allNoticeFiles() { - final List legal = - this.fileSystem.collect(this.content, - this.fileSystem.legalOnly()); - for (final File file : legal) { - log.info("Legal " + file); - } - - final URI uri = this.local.toURI(); - final List uris = new ArrayList(); - for (final File file : legal) { - final URI full = file.toURI(); - final URI relativize = uri.relativize(full); - uris.add(relativize); - } - return uris; - } - private void prepare() throws URISyntaxException, IOException { final Set files = new HashSet(); @@ -339,9 +314,8 @@ public class Main { final File file = new File(this.configuration.getStagingRepositoryURI()); final List collect = - this.fileSystem.collect(file, this.fileSystem - .archivesInPath(this.configuration - .getFileRepositoryPathNameFilter())); + this.fileSystem.archivesInPath(file, this.configuration + .getFileRepositoryPathNameFilter()); for (final File f : collect) { files.add(copyToMirror(f)); @@ -631,9 +605,8 @@ public class Main { private Map mapOther() { final File jarContents = contents(this.file); final List legal = - Main.this.fileSystem.collect(jarContents, - Main.this.fileSystem - .legalDocumentsUndeclaredIn(jarContents)); + Main.this.fileSystem + .legalDocumentsUndeclaredIn(jarContents); final Map map = new LinkedHashMap(); for (final File file : legal) { @@ -649,9 +622,7 @@ public class Main { private Map map() { final File jarContents = contents(this.file); final List legal = - Main.this.fileSystem.collect(jarContents, - Main.this.fileSystem - .legalDocumentsDeclaredIn(jarContents)); + Main.this.fileSystem.legalDocumentsDeclaredIn(jarContents); final Map map = new LinkedHashMap(); for (final File file : legal) {