You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/11/19 16:04:17 UTC
[1/2] ant git commit: Refactor getZipEntryStream
Repository: ant
Updated Branches:
refs/heads/master aff7eefe1 -> bd82d189a
Refactor getZipEntryStream
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2c2cdb09
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2c2cdb09
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2c2cdb09
Branch: refs/heads/master
Commit: 2c2cdb090ebdecbed8f737af3045f1edfbe3ad2a
Parents: aff7eef
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Nov 19 09:24:54 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Nov 19 17:03:21 2018 +0100
----------------------------------------------------------------------
.../taskdefs/optional/depend/AntAnalyzer.java | 23 ++-------
.../tools/ant/types/resources/ZipResource.java | 51 ++++++++++++--------
src/main/org/apache/tools/zip/ZipFile.java | 4 ++
3 files changed, 39 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/2c2cdb09/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
index 9aa3b78..7297907 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/depend/AntAnalyzer.java
@@ -26,10 +26,10 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.Vector;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
+import org.apache.tools.ant.types.resources.ZipResource;
import org.apache.tools.ant.util.depend.AbstractAnalyzer;
+import org.apache.tools.zip.ZipFile;
/**
* An analyzer which uses the depend task's bytecode classes to analyze
@@ -72,7 +72,8 @@ public class AntAnalyzer extends AbstractAnalyzer {
try (InputStream inStream = container.getName().endsWith(".class")
? Files.newInputStream(Paths.get(container.getPath()))
- : getZipEntryStream(new ZipFile(container.getPath()), classname)) {
+ : ZipResource.getZipEntryStream(new ZipFile(container.getPath(), "UTF-8"),
+ classname.replace('.', '/') + ".class")) {
ClassFile classFile = new ClassFile();
classFile.read(inStream);
analyzedDeps.addAll(classFile.getClassRefs());
@@ -97,22 +98,6 @@ public class AntAnalyzer extends AbstractAnalyzer {
classes.addAll(dependencies);
}
- private InputStream getZipEntryStream(ZipFile zipFile, String classname) throws IOException {
- InputStream zipEntryStream = zipFile.getInputStream(new ZipEntry(
- classname.replace('.', '/') + ".class"));
- return new InputStream() {
- @Override
- public int read() throws IOException {
- return zipEntryStream.read();
- }
- @Override
- public void close() throws IOException {
- zipEntryStream.close();
- zipFile.close();
- }
- };
- }
-
/**
* Indicate if this analyzer can determine dependent files.
*
http://git-wip-us.apache.org/repos/asf/ant/blob/2c2cdb09/src/main/org/apache/tools/ant/types/resources/ZipResource.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/resources/ZipResource.java b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
index b1c1b90..acd2ed4 100644
--- a/src/main/org/apache/tools/ant/types/resources/ZipResource.java
+++ b/src/main/org/apache/tools/ant/types/resources/ZipResource.java
@@ -129,26 +129,7 @@ public class ZipResource extends ArchiveResource {
if (isReference()) {
return getCheckedRef().getInputStream();
}
- final ZipFile z = new ZipFile(getZipfile(), getEncoding());
- ZipEntry ze = z.getEntry(getName());
- if (ze == null) {
- z.close();
- throw new BuildException("no entry " + getName() + " in "
- + getArchive());
- }
- return new FilterInputStream(z.getInputStream(ze)) {
- public void close() throws IOException {
- FileUtils.close(in);
- z.close();
- }
- protected void finalize() throws Throwable {
- try {
- close();
- } finally {
- super.finalize();
- }
- }
- };
+ return getZipEntryStream(new ZipFile(getZipfile(), getEncoding()), getName());
}
/**
@@ -193,6 +174,36 @@ public class ZipResource extends ArchiveResource {
}
/**
+ * Return an InputStream for reading the contents of a ZipEntry
+ * with autoclose.
+ * @param zipFile a org.apache.tools.zip.ZipFile
+ * @param zipEntry String a name of a zip entry
+ * @return an InputStream object
+ * @throws IOException if the entry cannot be read
+ */
+ public static InputStream getZipEntryStream(ZipFile zipFile,
+ String zipEntry) throws IOException {
+ ZipEntry ze = zipFile.getEntry(zipEntry);
+ if (ze == null) {
+ zipFile.close();
+ throw new BuildException("no entry " + zipEntry + " in " + zipFile.getName());
+ }
+ return new FilterInputStream(zipFile.getInputStream(ze)) {
+ public void close() throws IOException {
+ FileUtils.close(in);
+ zipFile.close();
+ }
+ protected void finalize() throws Throwable {
+ try {
+ close();
+ } finally {
+ super.finalize();
+ }
+ }
+ };
+ }
+
+ /**
* fetches information from the named entry inside the archive.
*/
protected void fetchEntry() {
http://git-wip-us.apache.org/repos/asf/ant/blob/2c2cdb09/src/main/org/apache/tools/zip/ZipFile.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/zip/ZipFile.java b/src/main/org/apache/tools/zip/ZipFile.java
index 6dd69bf..141234e 100644
--- a/src/main/org/apache/tools/zip/ZipFile.java
+++ b/src/main/org/apache/tools/zip/ZipFile.java
@@ -395,6 +395,10 @@ public class ZipFile implements Closeable {
}
}
+ public String getName() {
+ return archiveName;
+ }
+
/**
* Ensures that the close method of this zipfile is called when
* there are no more references to it.
[2/2] ant git commit: Remove unused imports
Posted by gi...@apache.org.
Remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/bd82d189
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/bd82d189
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/bd82d189
Branch: refs/heads/master
Commit: bd82d189ad5bb32cb5b0a537113eae14dac32f1f
Parents: 2c2cdb0
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Mon Nov 19 17:04:01 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Mon Nov 19 17:04:01 2018 +0100
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/EchoXML.java | 1 -
.../org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java | 2 --
src/main/org/apache/tools/ant/util/FileUtils.java | 2 --
src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java | 1 -
src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java | 1 -
src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java | 1 -
src/tests/junit/org/apache/tools/ant/types/CharSetTest.java | 1 -
7 files changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
index 571386d..c0ae05f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
+++ b/src/main/org/apache/tools/ant/taskdefs/EchoXML.java
@@ -18,7 +18,6 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
-import java.io.IOException;
import java.io.OutputStream;
import org.apache.tools.ant.BuildException;
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/main/org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java
index ce25c38..28083c3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java
@@ -39,10 +39,8 @@ import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
-import java.util.stream.Collectors;
/**
* A MatchingTask which relies on Java ImageIO to read existing image files
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/main/org/apache/tools/ant/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/util/FileUtils.java b/src/main/org/apache/tools/ant/util/FileUtils.java
index e6e7344..ebd6c87 100644
--- a/src/main/org/apache/tools/ant/util/FileUtils.java
+++ b/src/main/org/apache/tools/ant/util/FileUtils.java
@@ -39,10 +39,8 @@ import java.nio.file.StandardOpenOption;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.HashMap;
import java.util.List;
import java.util.Locale;
-import java.util.Map;
import java.util.Optional;
import java.util.Random;
import java.util.Stack;
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
index cefad94..1c6c6a9 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/BZip2Test.java
@@ -26,7 +26,6 @@ import org.junit.Test;
import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java
index a799e8b..1a2d47b 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/FixCrLfTest.java
@@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs;
import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
index 909091a..de94d89 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ReplaceTest.java
@@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs;
import java.io.BufferedInputStream;
import java.io.File;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.file.Files;
http://git-wip-us.apache.org/repos/asf/ant/blob/bd82d189/src/tests/junit/org/apache/tools/ant/types/CharSetTest.java
----------------------------------------------------------------------
diff --git a/src/tests/junit/org/apache/tools/ant/types/CharSetTest.java b/src/tests/junit/org/apache/tools/ant/types/CharSetTest.java
index 16dda9f..11212f4 100644
--- a/src/tests/junit/org/apache/tools/ant/types/CharSetTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/CharSetTest.java
@@ -26,7 +26,6 @@ import org.junit.runners.Parameterized;
import java.util.Arrays;
import java.util.Collection;
-import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.equalToIgnoringCase;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;