You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@creadur.apache.org by rd...@apache.org on 2009/05/21 21:44:18 UTC
svn commit: r777231 - in /incubator/rat/main/trunk:
apache-rat-core/src/main/java/org/apache/rat/document/
apache-rat-core/src/main/java/org/apache/rat/document/impl/
apache-rat-core/src/test/java/org/apache/rat/document/
apache-rat-plugin/src/main/jav...
Author: rdonkin
Date: Thu May 21 19:44:17 2009
New Revision: 777231
URL: http://svn.apache.org/viewvc?rev=777231&view=rev
Log:
RAT-53 Switch towards InputStream. Don't have heuristics for encoding so really Reader isn't appropraite. Plus, that's what's needed for mime magic. https://issues.apache.org/jira/browse/RAT-53
Modified:
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/IDocument.java Thu May 21 19:44:17 2009
@@ -19,6 +19,7 @@
package org.apache.rat.document;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
public interface IDocument {
@@ -33,6 +34,13 @@
* a composite archive
*/
public Reader reader() throws IOException;
+
+ /**
+ * Streams the document's contents.
+ * @return not null
+ * @throws IOException when stream could not be opened
+ */
+ public InputStream inputStream() throws IOException;
/**
* Gets data describing this resource.
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/FileDocument.java Thu May 21 19:44:17 2009
@@ -19,8 +19,10 @@
package org.apache.rat.document.impl;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
import org.apache.rat.document.IDocument;
@@ -57,4 +59,8 @@
public MetaData getMetaData() {
return metaData;
}
+
+ public InputStream inputStream() throws IOException {
+ return new FileInputStream(file);
+ }
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/main/java/org/apache/rat/document/impl/MonolithicFileDocument.java Thu May 21 19:44:17 2009
@@ -19,8 +19,10 @@
package org.apache.rat.document.impl;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
@@ -42,8 +44,12 @@
}
return new AbstractMonolithicDocument(url.toExternalForm()){
public Reader reader() throws IOException {
- return new InputStreamReader(url.openStream(), "UTF-8");
+ return new InputStreamReader(inputStream(), "UTF-8");
}
+
+ public InputStream inputStream() throws IOException {
+ return url.openStream();
+ }
};
}
@@ -55,4 +61,8 @@
public Reader reader() throws IOException {
return new FileReader(file);
}
+
+ public InputStream inputStream() throws IOException {
+ return new FileInputStream(file);
+ }
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockDocument.java Thu May 21 19:44:17 2009
@@ -19,6 +19,7 @@
package org.apache.rat.document;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
public class MockDocument implements IDocument {
@@ -56,4 +57,9 @@
public MetaData getMetaData() {
return metaData;
}
+
+
+ public InputStream inputStream() throws IOException {
+ throw new UnsupportedOperationException();
+ }
}
Modified: incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java (original)
+++ incubator/rat/main/trunk/apache-rat-core/src/test/java/org/apache/rat/document/MockLocation.java Thu May 21 19:44:17 2009
@@ -19,6 +19,7 @@
package org.apache.rat.document;
import java.io.IOException;
+import java.io.InputStream;
import java.io.Reader;
public class MockLocation implements IDocument {
@@ -50,7 +51,6 @@
}
public boolean isComposite() {
- // TODO Auto-generated method stub
return false;
}
@@ -61,4 +61,9 @@
public MetaData getMetaData() {
return metaData;
}
+
+
+ public InputStream inputStream() throws IOException {
+ throw new UnsupportedOperationException();
+ }
}
Modified: incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java (original)
+++ incubator/rat/main/trunk/apache-rat-plugin/src/main/java/org/apache/rat/mp/FilesReportable.java Thu May 21 19:44:17 2009
@@ -97,5 +97,9 @@
public MetaData getMetaData() {
return metaData;
}
+
+ public InputStream inputStream() throws IOException {
+ return new FileInputStream(file);
+ }
}
}
Modified: incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java
URL: http://svn.apache.org/viewvc/incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java?rev=777231&r1=777230&r2=777231&view=diff
==============================================================================
--- incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java (original)
+++ incubator/rat/main/trunk/apache-rat-tasks/src/main/java/org/apache/rat/anttasks/ResourceCollectionContainer.java Thu May 21 19:44:17 2009
@@ -102,5 +102,9 @@
public MetaData getMetaData() {
return metaData;
}
+
+ public InputStream inputStream() throws IOException {
+ return resource.getInputStream();
+ }
}
}