You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by bo...@apache.org on 2018/05/07 12:10:10 UTC
[1/2] commons-compress git commit: whitespace
Repository: commons-compress
Updated Branches:
refs/heads/master 446555b16 -> 81398f69f
whitespace
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/58eb1a78
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/58eb1a78
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/58eb1a78
Branch: refs/heads/master
Commit: 58eb1a7882d0959552febdfcce287f5d4a2b76a8
Parents: 446555b
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon May 7 12:11:25 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon May 7 12:11:25 2018 +0200
----------------------------------------------------------------------
src/site/xdoc/examples.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/58eb1a78/src/site/xdoc/examples.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/examples.xml b/src/site/xdoc/examples.xml
index 7c26f3a..3f841b7 100644
--- a/src/site/xdoc/examples.xml
+++ b/src/site/xdoc/examples.xml
@@ -944,7 +944,7 @@ in.close();
]]></source>
</subsection>
-
+
<subsection name="Z">
<p>Uncompressing a given Z compressed file (you would
@@ -1009,15 +1009,15 @@ in.close();
</section>
<section name="Extending Commons Compress">
-
+
<p>
Starting in release 1.13, it is now possible to add Compressor- and ArchiverStream implementations using the
Java's <a href="https://docs.oracle.com/javase/7/docs/api/java/util/ServiceLoader.html">ServiceLoader</a>
mechanism.
</p>
-
+
<subsection name="Extending Commons Compress Compressors">
-
+
<p>
To provide your own compressor, you must make available on the classpath a file called
<code>META-INF/services/org.apache.commons.compress.compressors.CompressorStreamProvider</code>.
@@ -1034,7 +1034,7 @@ in.close();
<a href="apidocs/org/apache/commons/compress/compressors/CompressorStreamProvider.html">org.apache.commons.compress.compressors.CompressorStreamProvider</a>.
</p>
</subsection>
-
+
<subsection name="Extending Commons Compress Archivers">
<p>
@@ -1053,7 +1053,7 @@ in.close();
<a href="apidocs/org/apache/commons/compress/archivers/ArchiveStreamProvider.html">org.apache.commons.compress.archivers.ArchiveStreamProvider</a>.
</p>
</subsection>
-
+
</section>
</body>
</document>
[2/2] commons-compress git commit: avoid "new File*putStream"
constructor
Posted by bo...@apache.org.
avoid "new File*putStream" constructor
Project: http://git-wip-us.apache.org/repos/asf/commons-compress/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-compress/commit/81398f69
Tree: http://git-wip-us.apache.org/repos/asf/commons-compress/tree/81398f69
Diff: http://git-wip-us.apache.org/repos/asf/commons-compress/diff/81398f69
Branch: refs/heads/master
Commit: 81398f69f131da572f24995d4e43b343ffc737f1
Parents: 58eb1a7
Author: Stefan Bodewig <bo...@apache.org>
Authored: Mon May 7 14:09:37 2018 +0200
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Mon May 7 14:09:37 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/commons/compress/archivers/Archiver.java | 7 ++++---
.../java/org/apache/commons/compress/archivers/Expander.java | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/81398f69/src/main/java/org/apache/commons/compress/archivers/Archiver.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/Archiver.java b/src/main/java/org/apache/commons/compress/archivers/Archiver.java
index 4e82640..798591e 100644
--- a/src/main/java/org/apache/commons/compress/archivers/Archiver.java
+++ b/src/main/java/org/apache/commons/compress/archivers/Archiver.java
@@ -29,6 +29,7 @@ import java.io.OutputStream;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.SeekableByteChannel;
+import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import org.apache.commons.compress.archivers.sevenz.SevenZOutputFile;
@@ -98,7 +99,7 @@ public class Archiver {
}
return;
}
- try (OutputStream o = new FileOutputStream(target)) {
+ try (OutputStream o = Files.newOutputStream(target.toPath())) {
create(format, o, directory, filter);
}
}
@@ -214,7 +215,7 @@ public class Archiver {
public void accept(File source, ArchiveEntry e) throws IOException {
target.putArchiveEntry(e);
if (!e.isDirectory()) {
- try (InputStream in = new BufferedInputStream(new FileInputStream(source))) {
+ try (InputStream in = new BufferedInputStream(Files.newInputStream(source.toPath()))) {
IOUtils.copy(in, target);
}
}
@@ -261,7 +262,7 @@ public class Archiver {
final byte[] buffer = new byte[8024];
int n = 0;
long count = 0;
- try (InputStream in = new BufferedInputStream(new FileInputStream(source))) {
+ try (InputStream in = new BufferedInputStream(Files.newInputStream(source.toPath()))) {
while (-1 != (n = in.read(buffer))) {
target.write(buffer, 0, n);
count += n;
http://git-wip-us.apache.org/repos/asf/commons-compress/blob/81398f69/src/main/java/org/apache/commons/compress/archivers/Expander.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/compress/archivers/Expander.java b/src/main/java/org/apache/commons/compress/archivers/Expander.java
index 82b958e..f726de7 100644
--- a/src/main/java/org/apache/commons/compress/archivers/Expander.java
+++ b/src/main/java/org/apache/commons/compress/archivers/Expander.java
@@ -28,6 +28,7 @@ import java.io.OutputStream;
import java.nio.channels.Channels;
import java.nio.channels.FileChannel;
import java.nio.channels.SeekableByteChannel;
+import java.nio.file.Files;
import java.nio.file.StandardOpenOption;
import java.util.Enumeration;
@@ -110,7 +111,7 @@ public class Expander {
public void expand(File archive, File targetDirectory, ArchiveEntryFilter filter)
throws IOException, ArchiveException {
String format = null;
- try (InputStream i = new BufferedInputStream(new FileInputStream(archive))) {
+ try (InputStream i = new BufferedInputStream(Files.newInputStream(archive.toPath()))) {
format = new ArchiveStreamFactory().detect(i);
}
expand(format, archive, targetDirectory, filter);
@@ -136,7 +137,7 @@ public class Expander {
}
return;
}
- try (InputStream i = new BufferedInputStream(new FileInputStream(archive))) {
+ try (InputStream i = new BufferedInputStream(Files.newInputStream(archive.toPath()))) {
expand(format, i, targetDirectory, filter);
}
}
@@ -396,7 +397,7 @@ public class Expander {
f.mkdirs();
} else {
f.getParentFile().mkdirs();
- try (OutputStream o = new FileOutputStream(f)) {
+ try (OutputStream o = Files.newOutputStream(f.toPath())) {
writer.writeEntryDataTo(nextEntry, o);
}
}