You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/08/07 15:52:00 UTC
svn commit: r1511316 - in /commons/proper/compress/trunk/src:
main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
Author: ebourg
Date: Wed Aug 7 13:52:00 2013
New Revision: 1511316
URL: http://svn.apache.org/r1511316
Log:
Changed the return type of CpioArchiveInputStream.getNextEntry() to avoid casting to CpioArchiveEntry
Modified:
commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1511316&r1=1511315&r2=1511316&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java (original)
+++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java Wed Aug 7 13:52:00 2013
@@ -446,7 +446,7 @@ public class CpioArchiveInputStream exte
}
@Override
- public ArchiveEntry getNextEntry() throws IOException {
+ public CpioArchiveEntry getNextEntry() throws IOException {
return getNextCPIOEntry();
}
Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1511316&r1=1511315&r2=1511316&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java (original)
+++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java Wed Aug 7 13:52:00 2013
@@ -25,25 +25,24 @@ import org.apache.commons.compress.Abstr
public class CpioArchiveInputStreamTest extends AbstractTestCase {
public void testCpioUnarchive() throws Exception {
- StringBuffer expected = new StringBuffer();
+ StringBuilder expected = new StringBuilder();
expected.append("./test1.xml<?xml version=\"1.0\"?>\n");
expected.append("<empty/>./test2.xml<?xml version=\"1.0\"?>\n");
expected.append("<empty/>\n");
- CpioArchiveInputStream in =
- new CpioArchiveInputStream(new FileInputStream(getFile("bla.cpio")));
- CpioArchiveEntry entry= null;
+ CpioArchiveInputStream in = new CpioArchiveInputStream(new FileInputStream(getFile("bla.cpio")));
+ CpioArchiveEntry entry;
- StringBuffer result = new StringBuffer();
- while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) {
+ StringBuilder result = new StringBuilder();
+ while ((entry = in.getNextEntry()) != null) {
result.append(entry.getName());
int tmp;
while ((tmp = in.read()) != -1) {
result.append((char) tmp);
- }
- }
- in.close();
- assertEquals(result.toString(), expected.toString());
+ }
+ }
+ in.close();
+ assertEquals(result.toString(), expected.toString());
}
}
Re: svn commit: r1511316 - in /commons/proper/compress/trunk/src:
main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
Posted by Emmanuel Bourg <eb...@apache.org>.
Le 07/08/2013 16:41, sebb a écrit :
>
> -1
>
> Surely that will cause API breakage?
I don't think so, this is source and binary compatible, unless someone
extended the class and overrode the method, which is very unlikely.
I wrote a simple test and compiled it with Commons Compress 1.5:
CpioArchiveInputStream in = new CpioArchiveInputStream(new
FileInputStream("src/test/resources/bla.cpio"));
CpioArchiveEntry entry = (CpioArchiveEntry) in.getNextEntry();
System.out.println(entry.getName());
in.close();
I ran it with Commons Compress 1.6 on the classpath, it worked fine.
Emmanuel Bourg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1511316 - in /commons/proper/compress/trunk/src:
main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
Posted by sebb <se...@gmail.com>.
On 7 August 2013 14:52, <eb...@apache.org> wrote:
> Author: ebourg
> Date: Wed Aug 7 13:52:00 2013
> New Revision: 1511316
>
> URL: http://svn.apache.org/r1511316
> Log:
> Changed the return type of CpioArchiveInputStream.getNextEntry() to avoid casting to CpioArchiveEntry
-1
Surely that will cause API breakage?
> Modified:
> commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
> commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
>
> Modified: commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java
> URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java?rev=1511316&r1=1511315&r2=1511316&view=diff
> ==============================================================================
> --- commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java (original)
> +++ commons/proper/compress/trunk/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java Wed Aug 7 13:52:00 2013
> @@ -446,7 +446,7 @@ public class CpioArchiveInputStream exte
> }
>
> @Override
> - public ArchiveEntry getNextEntry() throws IOException {
> + public CpioArchiveEntry getNextEntry() throws IOException {
> return getNextCPIOEntry();
> }
>
>
> Modified: commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
> URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java?rev=1511316&r1=1511315&r2=1511316&view=diff
> ==============================================================================
> --- commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java (original)
> +++ commons/proper/compress/trunk/src/test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java Wed Aug 7 13:52:00 2013
> @@ -25,25 +25,24 @@ import org.apache.commons.compress.Abstr
> public class CpioArchiveInputStreamTest extends AbstractTestCase {
>
> public void testCpioUnarchive() throws Exception {
> - StringBuffer expected = new StringBuffer();
> + StringBuilder expected = new StringBuilder();
> expected.append("./test1.xml<?xml version=\"1.0\"?>\n");
> expected.append("<empty/>./test2.xml<?xml version=\"1.0\"?>\n");
> expected.append("<empty/>\n");
>
>
> - CpioArchiveInputStream in =
> - new CpioArchiveInputStream(new FileInputStream(getFile("bla.cpio")));
> - CpioArchiveEntry entry= null;
> + CpioArchiveInputStream in = new CpioArchiveInputStream(new FileInputStream(getFile("bla.cpio")));
> + CpioArchiveEntry entry;
>
> - StringBuffer result = new StringBuffer();
> - while ((entry = (CpioArchiveEntry) in.getNextEntry()) != null) {
> + StringBuilder result = new StringBuilder();
> + while ((entry = in.getNextEntry()) != null) {
> result.append(entry.getName());
> int tmp;
> while ((tmp = in.read()) != -1) {
> result.append((char) tmp);
> - }
> - }
> - in.close();
> - assertEquals(result.toString(), expected.toString());
> + }
> + }
> + in.close();
> + assertEquals(result.toString(), expected.toString());
> }
> }
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org
Re: svn commit: r1511316 - in /commons/proper/compress/trunk/src: main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStream.java test/java/org/apache/commons/compress/archivers/cpio/CpioArchiveInputStreamTest.java
Posted by Stefan Bodewig <bo...@apache.org>.
On 2013-08-07, <eb...@apache.org> wrote:
> Author: ebourg
> Date: Wed Aug 7 13:52:00 2013
> New Revision: 1511316
> URL: http://svn.apache.org/r1511316
> Log:
> Changed the return type of CpioArchiveInputStream.getNextEntry() to avoid casting to CpioArchiveEntry
please don't. Let's leave that for 2.0.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org