Author: sebb
Date: Tue Dec 2 02:56:08 2014
New Revision: 1642800
URL: http://svn.apache.org/r1642800
Log:
Spurious spaces
Modified:
commons/proper/io/trunk/src/changes/changes.xml
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
Modified: commons/proper/io/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/changes/changes.xml?rev=1642800&r1=1642799&r2=1642800&view=diff
==============================================================================
--- commons/proper/io/trunk/src/changes/changes.xml (original)
+++ commons/proper/io/trunk/src/changes/changes.xml Tue Dec 2 02:56:08 2014
@@ -20,13 +20,13 @@
This file is used by the maven-changes-plugin to generate the release notes.
Useful ways of finding items to add to this file are:
-1. Add items when you fix a bug or add a feature (this makes the
+1. Add items when you fix a bug or add a feature (this makes the
release process easy :-).
2. Do a Jira search for tickets closed since the previous release.
3. Use the report generated by the maven-changelog-plugin to see all
-CVS commits. Set the project.properties' maven.changelog.range
+CVS commits. Set the project.properties' maven.changelog.range
property to the number of days since the last release.
@@ -64,7 +64,7 @@ The <action> type attribute can be add,u
<action issue="IO-435" dev="tn" type="fix" due-to="Dominik Stadler">
Document that FileUtils.deleteDirectory, directoryContains and
cleanDirectory
may throw an IllegalArgumentException in case the passed directory
does not
- exist or is not a directory.
+ exist or is not a directory.
</action>
<action issue="IO-426" dev="ggregory" type="add">
Add API IOUtils.closeQuietly(Closeable...)
@@ -111,19 +111,19 @@ The <action> type attribute can be add,u
</action>
<action issue="IO-330" dev="sebb" type="add">
IOUtils#toBufferedOutputStream/toBufferedWriter to conditionally wrap
the output
- Added overloaded buffer() methods - see also IO-233
+ Added overloaded buffer() methods - see also IO-233
</action>
<action issue="IO-381" dev="ggregory" type="add">
Add FileUtils.copyInputStreamToFile API with option to leave the
source open.
See copyInputStreamToFile(final InputStream source, final File
destination, boolean closeSource)
- </action>
+ </action>
<action issue="IO-380" dev="sebb" type="fix" due-to="claudio_ch">
FileUtils.copyInputStreamToFile should document it closes the input
source
- </action>
+ </action>
<action issue="IO-279" dev="sebb" type="fix">
Tailer erroneously considers file as new.
Fix to use file.lastModified() rather than System.currentTimeMillis()
- </action>
+ </action>
<action issue="IO-356" dev="sebb" type="fix">
CharSequenceInputStream#reset() behaves incorrectly in case when
buffer size is not dividable by data size.
Fix code so skip relates to the encoded bytes; reset now re-encodes
the data up to the point of the mark
@@ -135,231 +135,231 @@ The <action> type attribute can be add,u
<action issue="IO-328" dev="sebb" type="update">
getPrefixLength returns null if filename has leading slashes
Javadoc: add examples to show correct behaviour; add unit tests
- </action>
+ </action>
<action issue="IO-299" dev="sebb" type="update">
FileUtils.listFilesAndDirs includes original dir in results even when
it doesn't match filter
Javadoc: clarify that original dir is included in the results
- </action>
+ </action>
<action issue="IO-346" dev="sebb" type="add">
Add ByteArrayOutputStream.toInputStream()
</action>
<action issue="IO-368" dev="sebb" type="fix">
ClassLoaderObjectInputStream does not handle primitive typed members
- </action>
+ </action>
<action issue="IO-341" dev="sebb" type="add">
A constant for holding the BOM character (U+FEFF)
- </action>
+ </action>
<action issue="IO-314" dev="sebb" type="fix">
Deprecate all methods that use the default encoding
- </action>
+ </action>
<action issue="IO-338" dev="sebb" type="fix">
When a file is rotated, finish reading previous file prior to starting
new one
- </action>
+ </action>
<action issue="IO-354" dev="sebb" type="fix">
Commons IO Tailer does not respect UTF-8 Charset.
- </action>
+ </action>
<action issue="IO-323" dev="sebb" type="fix">
What should happen in FileUtils.sizeOf[Directory] when an overflow
takes place?
- Added Javadoc.
- </action>
+ Added Javadoc.
+ </action>
<action issue="IO-372" dev="sebb" type="fix">
- FileUtils.moveDirectory can produce misleading error message on
failiure
- </action>
+ FileUtils.moveDirectory can produce misleading error message on
failiure
+ </action>
<action issue="IO-375" dev="sebb" type="update">
- FilenameUtils.splitOnTokens(String text) check for '**' could be
simplified
- </action>
+ FilenameUtils.splitOnTokens(String text) check for '**' could be
simplified
+ </action>
<action issue="IO-374" dev="sebb" type="update">
WildcardFileFilter ctors should not use null to mean IOCase.SENSITIVE
when delegating to other ctors
- </action>
+ </action>
<action issue="IO-362" dev="ggregory" type="fix" due-to="mmadson,
ggregory">
IOUtils.contentEquals* methods returns false if input1 == input2,
should return true.
- </action>
+ </action>
<action issue="IO-361" dev="ggregory" type="add">
Add API FileUtils.forceMkdirsParent().
- </action>
+ </action>
<action issue="IO-360" dev="ggregory" type="add">
Add API Charsets.requiredCharsets().
- </action>
+ </action>
<action issue="IO-359" dev="ggregory" type="add" due-to="yukoba">
Add IOUtils.skip and skipFully(ReadableByteChannel, long).
- </action>
+ </action>
<action issue="IO-358" dev="ggregory" type="add" due-to="yukoba">
Add IOUtils.read and readFully(ReadableByteChannel, ByteBuffer buffer).
- </action>
+ </action>
<action issue="IO-357" dev="ggregory" type="fix" due-to="mortenh">
[Tailer] InterruptedException while the thread is sleeping is silently
ignored
- </action>
+ </action>
<action issue="IO-353" dev="ggregory" type="add" due-to="ggregory">
Add API IOUtils.copy(InputStream, OutputStream, int)
- </action>
+ </action>
<action issue="IO-349" dev="ggregory" type="add" due-to="scop">
Add API with array offset and length argument to
FileUtils.writeByteArrayToFile.
- </action>
+ </action>
<action issue="IO-352" dev="ggregory" type="fix" due-to="scop">
Spelling fixes.
- </action>
+ </action>
<action issue="IO-348" dev="ggregory" type="add" due-to="plcstpierre">
Missing information in IllegalArgumentException thrown by
org.apache.commons.io.FileUtils#validateListFilesParameters.
- </action>
+ </action>
<action issue="IO-345" dev="ggregory" type="add" due-to="mkresse">
Supply a hook method allowing Tailer actively determining stop
condition.
- </action>
+ </action>
<action issue="IO-436" dev="ggregory" type="fix"
due-to="christoph.schneegans">
Improper JavaDoc comment for FilenameUtils.indexOfExtension.
- </action>
+ </action>
<action issue="IO-437" dev="ggregory" type="add">
Make IOUtils.EOF public and reuse it in various classes.
- </action>
+ </action>
</release>
<!-- The release date is the date RC is cut -->
<release version="2.4" date="2012-06-12" description="New features and bug
fixes.">
<action issue="IO-343" dev="ggregory" type="fix" due-to="igorlash">
org.apache.commons.io.comparator Javadoc is inconsistent with real
code.
- </action>
+ </action>
<action issue="IO-336" dev="ggregory" type="fix" due-to="rleavelle">
Yottabyte (YB) incorrectly defined in FileUtils.
- </action>
+ </action>
<action issue="IO-269" dev="ggregory" type="add" due-to="sebb">
Tailer locks file from deletion/rename on Windows.
- </action>
+ </action>
<action issue="IO-279" dev="sebb" type="fix" due-to="Sergio Bossa, Chris
Baron">
Tailer erroneously considers file as new.
- </action>
+ </action>
<action issue="IO-335" dev="sebb" type="fix">
Tailer#readLines - incorrect CR handling.
- </action>
+ </action>
<action issue="IO-334" dev="sebb" type="fix">
FileUtils.toURLs throws NPE for null parameter; document the behavior.
- </action>
+ </action>
<action issue="IO-333" dev="ggregory" type="add" due-to="fmeschbe">
Export OSGi packages at version 1.x in addition to 2.x.
- </action>
+ </action>
<action issue="IO-320" dev="ggregory" type="add" due-to="ggregory">
Add XmlStreamReader support for UTF-32.
- </action>
+ </action>
<action issue="IO-331" dev="ggregory" type="add" due-to="ggregory">
BOMInputStream wrongly detects UTF-32LE_BOM files as UTF-16LE_BOM
files in method getBOM().
- </action>
+ </action>
<action issue="IO-332" dev="ggregory" type="fix" due-to="liangly">
Improve tailer's reading performance.
- </action>
+ </action>
<action issue="IO-279" dev="ggregory" type="fix">
Improve Tailer performance with buffered reads (see IO-332).
- </action>
+ </action>
<action issue="IO-329" dev="ggregory" type="fix" due-to="tivv">
FileUtils.writeLines uses unbuffered IO.
- </action>
+ </action>
<action issue="IO-327" dev="ggregory" type="add" due-to="ggregory">
Add byteCountToDisplaySize(BigInteger).
- </action>
+ </action>
<action issue="IO-326" dev="ggregory" type="add" due-to="ggregory,
kinow">
Add new FileUtils.sizeOf[Directory] APIs to return BigInteger.
- </action>
+ </action>
<action issue="IO-325" dev="ggregory" type="add" due-to="raviprak">
Add IOUtils.toByteArray methods to work with URL and URI.
- </action>
+ </action>
<action issue="IO-324" dev="ggregory" type="add" due-to="raviprak">
Add missing Charset sister APIs to method that take a String charset
name.
- </action>
+ </action>
<action issue="IO-319" dev="ggregory" type="fix" due-to="raviprak">
FileUtils.sizeOfDirectory follows symbolic links.
- </action>
+ </action>
</release>
<!-- The release date is the date RC is cut -->
<release version="2.3" date="2012-April-10" description="New features and
bug fixes.">
<action issue="IO-322" dev="ggregory" type="add" due-to="ggregory">
Add and use class Charsets.
- </action>
+ </action>
<action issue="IO-321" dev="ggregory" type="add" due-to="ggregory">
ByteOrderMark UTF_32LE is incorrect.
- </action>
+ </action>
<action issue="IO-318" dev="ggregory" type="add" due-to="ggregory">
Add Charset sister APIs to method that take a String charset name.
- </action>
+ </action>
</release>
<release version="2.2" date="2012-March-26" description="New features and
bug fixes.">
<action issue="IO-313" dev="ggregory" type="add" due-to="ggregory">
Add IOUTils.toBufferedReader(Reader)
- </action>
+ </action>
<!-- Note: the issue was not raised by Manoj, but arose from IO-305 and
tests he performed -->
<action issue="IO-308" dev="sebb" type="add" due-to="Manoj Mokashi">
Allow applications to provide buffer (or size) for copyLarge methods.
- </action>
+ </action>
<action issue="IO-311" dev="sebb" type="fix" due-to="Robert Muir">
IOUtils.read(InputStream/Reader) ignores the offset parameter
- </action>
+ </action>
<action issue="IO-312" dev="sebb" type="fix">
CharSequenceInputStream(CharSequence s, Charset charset, int
bufferSize) ignores bufferSize
- </action>
+ </action>
<action issue="IO-305" dev="sebb" type="add" due-to="Manoj Mokashi">
New copyLarge() method in IOUtils that takes additional offset, length
arguments
- </action>
+ </action>
<action issue="IO-300" dev="sebb" type="fix">
FileUtils.moveDirectoryToDirectory removes source directory if
destination is a sub-directory
- </action>
+ </action>
<action issue="IO-307" dev="sebb" type="fix">
ReaderInputStream#read(byte[] b, int off, int len) should check for
valid parameters
- </action>
+ </action>
<action issue="IO-287" dev="bayard" type="add" due-to="Ron Kuris, Gary
Gregory">
Use terabyte (TB), petabyte (PB) and exabyte (EB) in
FileUtils.byteCountToDisplaySize(long size)
- </action>
+ </action>
<action issue="IO-306" dev="sebb" type="fix">
ReaderInputStream#read(byte[] b, int off, int len) should always
return 0 for length == 0
- </action>
+ </action>
<action issue="IO-173" dev="sebb" type="add" due-to="Marcos VinÃcius da
Silva">
FileUtils.listFiles() doesn't return directories
- </action>
+ </action>
<action issue="IO-276" dev="sebb" type="fix" due-to="nkami">
"FileUtils#deleteDirectoryOnExit(File)" does not work
- </action>
+ </action>
<action issue="IO-273" dev="sebb" type="fix" due-to="sebb">
BoundedInputStream.read() treats max differently from
BoundedInputStream.read(byte[]...)
- </action>
+ </action>
<action issue="IO-297" dev="sebb" type="add" due-to="Oleg Kalnichevski">
CharSequenceInputStream to efficiently stream content of a CharSequence
- </action>
+ </action>
<action issue="IO-296" dev="sebb" type="update" due-to="Oleg
Kalnichevski">
ReaderInputStream optimization: more efficient reading of small chunks
of data
- </action>
+ </action>
<action issue="IO-298" dev="sebb" type="fix" due-to="Christian Schulte">
Various methods of class 'org.apache.commons.io.FileUtils' incorrectly
suppress 'java.io.IOException'
- </action>
+ </action>
<action issue="IO-304" dev="ggregory" type="add" due-to="liangly">
- The second constructor of Tailer class does not pass 'delay' to the
third one
- </action>
+ The second constructor of Tailer class does not pass 'delay' to the
third one
+ </action>
<action issue="IO-303" dev="ggregory" type="add" due-to="fabian.barney">
- TeeOutputStream does not call branch.close() when main.close() throws
an exception
- </action>
+ TeeOutputStream does not call branch.close() when main.close() throws
an exception
+ </action>
<action issue="IO-302" dev="ggregory" type="add" due-to="jsteuerwald,
detinho">
ArrayIndexOutOfBoundsException in BOMInputStream when reading a file
without BOM multiple times
- </action>
+ </action>
<action issue="IO-301" dev="ggregory" type="add" due-to="kaykay.unique">
- Add IOUtils.closeQuietly(Selector) necessary
- </action>
+ Add IOUtils.closeQuietly(Selector) necessary
+ </action>
<action issue="IO-292" dev="sebb" type="add" due-to="sebb">
IOUtils.closeQuietly() should take a ServerSocket as a parameter
- </action>
+ </action>
<action issue="IO-290" dev="sebb" type="add" due-to="sebb">
Add read/readFully methods to IOUtils
- </action>
+ </action>
<action issue="IO-288" dev="sebb" type="add" due-to="Georg Henzler">
Supply a ReversedLinesFileReader
- </action>
+ </action>
<action issue="IO-291" dev="ggregory" type="add" due-to="ggregory">
Add new function FileUtils.directoryContains.
- </action>
+ </action>
<action issue="IO-275" dev="sebb" type="add" due-to="CJ Aspromgos">
FileUtils.contentEquals and IOUtils.contentEquals - Add option to
ignore "line endings"
Added contentEqualsIgnoreEOL methods to both classes
- </action>
+ </action>
</release>
<release version="2.1" date="2011-Sep-28" description="New features and
bug fixes.">
<action dev="ggregory" type="add" issue="IO-285" due-to="ggregory">
Use standard Maven directory layout
- </action>
+ </action>
<action dev="ggregory" type="add" issue="IO-284" due-to="ggregory">
Add IOUtils API toString for URL and URI to get contents
- </action>
+ </action>
<action dev="ggregory" type="add" issue="IO-282" due-to="ggregory">
Add API FileUtils.copyFile(File input, OutputStream output)
</action>
Modified:
commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java?rev=1642800&r1=1642799&r2=1642800&view=diff
==============================================================================
--- commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
(original)
+++ commons/proper/io/trunk/src/main/java/org/apache/commons/io/IOUtils.java
Tue Dec 2 02:56:08 2014
@@ -94,7 +94,7 @@ public class IOUtils {
* Represents the end-of-file (or stream).
*/
public static final int EOF = -1;
-
+
/**
* The Unix directory separator character.
*/
@@ -289,7 +289,7 @@ public class IOUtils {
* finally blocks.
* <p>
* Example code:
- *
+ *
* <pre>
* Closeable closeable = null;
* try {
@@ -302,9 +302,9 @@ public class IOUtils {
* IOUtils.closeQuietly(closeable);
* }
* </pre>
- *
+ *
* Closing all streams:
- *
+ *
* <pre>
* try {
* return IOUtils.copy(inputStream, outputStream);
@@ -313,7 +313,7 @@ public class IOUtils {
* IOUtils.closeQuietly(outputStream);
* }
* </pre>
- *
+ *
* @param closeable
* the objects to close, may be null or already closed
* @since 2.0
@@ -343,7 +343,7 @@ public class IOUtils {
* and reporting close failure as well is not necessary or useful.
* <p>
* Example code:
- *
+ *
* <pre>
* Closeable closeable = null;
* try {
@@ -356,7 +356,7 @@ public class IOUtils {
* <b>IOUtils.closeQuietly(closeable); // In case normal close was
skipped due to Exception</b>
* }
* </pre>
- *
+ *
* Closing all streams:
* <br>TODO - fix this example, it is wrong; ought not to ignore
Exceptions here
* <pre>
@@ -366,7 +366,7 @@ public class IOUtils {
* IOUtils.closeQuietly(inputStream, outputStream);
* }
* </pre>
- *
+ *
* @param closeables
* the objects to close, may be null or already closed
* @since 2.5
@@ -3077,5 +3077,5 @@ public class IOUtils {
throw new EOFException("Length to read: " + expected + " actual: "
+ actual);
}
}
-
+
}
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java?rev=1642800&r1=1642799&r2=1642800&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/FileUtilsTestCase.java
Tue Dec 2 02:56:08 2014
@@ -2601,7 +2601,7 @@ public class FileUtilsTestCase extends F
@Override
public long length() {
return super.length() - 1;
- }
+ }
}
// This test relies on FileUtils.copyFile using File.length to check the
output size
Modified:
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java?rev=1642800&r1=1642799&r2=1642800&view=diff
==============================================================================
---
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
(original)
+++
commons/proper/io/trunk/src/test/java/org/apache/commons/io/IOUtilsTestCase.java
Tue Dec 2 02:56:08 2014
@@ -654,11 +654,11 @@ public class IOUtilsTestCase extends Fil
public void testReadFully_InputStream__ReturnByteArray() throws Exception {
final byte[] bytes = "abcd1234".getBytes("UTF-8");
final ByteArrayInputStream stream = new ByteArrayInputStream(bytes);
-
+
final byte[] result = IOUtils.readFully(stream, bytes.length);
-
+
IOUtils.closeQuietly(stream);
-
+
assertEqualContent(result, bytes);
}
