You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/08/31 12:43:04 UTC
[1/2] ant-ivy git commit: refactoring and suppressed warnings fixes
Repository: ant-ivy
Updated Branches:
refs/heads/master 37f70ab67 -> cc7509b75
refactoring and suppressed warnings fixes
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/08fc7320
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/08fc7320
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/08fc7320
Branch: refs/heads/master
Commit: 08fc7320de07cc41318fc7505a2f3ccc2a6b04d4
Parents: 37f70ab
Author: twogee <g....@gmail.com>
Authored: Mon Aug 7 18:13:23 2017 +0200
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Aug 31 18:09:18 2017 +0530
----------------------------------------------------------------------
src/java/org/apache/ivy/osgi/core/ManifestParser.java | 2 +-
.../org/apache/ivy/plugins/repository/ssh/Scp.java | 12 +-----------
.../java/org/apache/ivy/osgi/obr/OBRResolverTest.java | 14 ++++++++------
3 files changed, 10 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08fc7320/src/java/org/apache/ivy/osgi/core/ManifestParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/ManifestParser.java b/src/java/org/apache/ivy/osgi/core/ManifestParser.java
index c07596f..8125a66 100644
--- a/src/java/org/apache/ivy/osgi/core/ManifestParser.java
+++ b/src/java/org/apache/ivy/osgi/core/ManifestParser.java
@@ -75,9 +75,9 @@ public class ManifestParser {
public static BundleInfo parseJarManifest(InputStream jarStream) throws IOException,
ParseException {
- @SuppressWarnings("resource")
JarInputStream jis = new JarInputStream(jarStream);
Manifest manifest = jis.getManifest();
+ jis.close();
if (manifest == null) {
return null;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08fc7320/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java b/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
index 0723e25..cd278fe 100644
--- a/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
+++ b/src/java/org/apache/ivy/plugins/repository/ssh/Scp.java
@@ -275,7 +275,6 @@ public class Scp {
fileInfo.setLastModified(modtime);
}
- @SuppressWarnings("resource")
private void sendFile(Channel channel, String localFile, String remoteName, String mode)
throws IOException, RemoteScpException {
byte[] buffer = new byte[BUFFER_SIZE];
@@ -310,11 +309,7 @@ public class Scp {
readResponse(is);
- FileInputStream fis = null;
-
- try {
- fis = new FileInputStream(f);
-
+ try (FileInputStream fis = new FileInputStream(f)) {
while (remain > 0) {
int trans;
if (remain > buffer.length) {
@@ -332,11 +327,6 @@ public class Scp {
}
fis.close();
- } catch (IOException e) {
- if (fis != null) {
- fis.close();
- }
- throw (e);
}
os.write(0);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/08fc7320/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
index e18cd61..3dc994b 100644
--- a/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
+++ b/test/java/org/apache/ivy/osgi/obr/OBRResolverTest.java
@@ -313,11 +313,12 @@ public class OBRResolverTest {
genericTestResolve(jarName, conf, expectedMrids, null);
}
- @SuppressWarnings("resource")
private void genericTestResolve(String jarName, String conf, ModuleRevisionId[] expectedMrids,
ModuleRevisionId[] expected2Mrids) throws Exception {
- Manifest manifest = new JarInputStream(new FileInputStream("test/test-repo/bundlerepo/"
- + jarName)).getManifest();
+ JarInputStream jis = new JarInputStream(
+ new FileInputStream("test/test-repo/bundlerepo/" + jarName));
+ Manifest manifest = jis.getManifest();
+ jis.close();
BundleInfo bundleInfo = ManifestParser.parseManifest(manifest);
bundleInfo.addArtifact(new BundleArtifact(false, new File("test/test-repo/bundlerepo/"
+ jarName).toURI(), null));
@@ -346,10 +347,11 @@ public class OBRResolverTest {
assertEquals(expected, actual);
}
- @SuppressWarnings("resource")
private void genericTestFailingResolve(String jarName, String conf) throws Exception {
- Manifest manifest = new JarInputStream(new FileInputStream("test/test-repo/bundlerepo/"
- + jarName)).getManifest();
+ JarInputStream jis = new JarInputStream(
+ new FileInputStream("test/test-repo/bundlerepo/" + jarName));
+ Manifest manifest = jis.getManifest();
+ jis.close();
BundleInfo bundleInfo = ManifestParser.parseManifest(manifest);
bundleInfo.addArtifact(new BundleArtifact(false, new File("test/test-repo/bundlerepo/"
+ jarName).toURI(), null));
[2/2] ant-ivy git commit: follow up on deprecations
Posted by ja...@apache.org.
follow up on deprecations
This closes #53 PR at github/apache/ant-ivy
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/cc7509b7
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/cc7509b7
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/cc7509b7
Branch: refs/heads/master
Commit: cc7509b7578f0edcab46177cf05b1bb7de8fcf6d
Parents: 08fc732
Author: twogee <g....@gmail.com>
Authored: Mon Aug 7 18:14:03 2017 +0200
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Thu Aug 31 18:11:31 2017 +0530
----------------------------------------------------------------------
src/java/org/apache/ivy/core/settings/IvySettings.java | 2 +-
src/java/org/apache/ivy/core/settings/XmlSettingsParser.java | 2 +-
src/java/org/apache/ivy/plugins/parser/m2/PomReader.java | 2 +-
src/java/org/apache/ivy/plugins/repository/url/URLResource.java | 2 +-
src/java/org/apache/ivy/util/XMLHelper.java | 4 ++--
src/java/org/apache/ivy/util/url/ApacheURLLister.java | 4 ++--
6 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/core/settings/IvySettings.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/settings/IvySettings.java b/src/java/org/apache/ivy/core/settings/IvySettings.java
index f29fedd..9fa9860 100644
--- a/src/java/org/apache/ivy/core/settings/IvySettings.java
+++ b/src/java/org/apache/ivy/core/settings/IvySettings.java
@@ -323,7 +323,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
try {
URL url = new URL("http://ant.apache.org/ivy/repository.properties");
Message.verbose("configuring repositories with " + url);
- props.load(URLHandlerRegistry.getDefault().openStream(url));
+ props.load(URLHandlerRegistry.getDefault().openStream(url, null));
configured = true;
} catch (Exception ex) {
Message.verbose("unable to use remote repository configuration", ex);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
index 78240bb..11da2db 100644
--- a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
+++ b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
@@ -150,7 +150,7 @@ public class XmlSettingsParser extends DefaultHandler {
this.settings = settingsUrl;
InputStream stream = null;
try {
- stream = URLHandlerRegistry.getDefault().openStream(settingsUrl);
+ stream = URLHandlerRegistry.getDefault().openStream(settingsUrl, null);
InputSource inSrc = new InputSource(stream);
inSrc.setSystemId(settingsUrl.toExternalForm());
SAXParserFactory.newInstance().newSAXParser().parse(settingsUrl.toExternalForm(), this);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
index 3d6fbb3..a82d3fe 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
@@ -119,7 +119,7 @@ public class PomReader {
public PomReader(final URL descriptorURL, final Resource res) throws IOException, SAXException {
InputStream stream = new AddDTDFilterInputStream(
- URLHandlerRegistry.getDefault().openStream(descriptorURL));
+ URLHandlerRegistry.getDefault().openStream(descriptorURL, null));
InputSource source = new InputSource(stream);
source.setSystemId(XMLHelper.toSystemId(descriptorURL));
try {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/repository/url/URLResource.java b/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
index 0ec9870..05c616f 100644
--- a/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
+++ b/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
@@ -107,7 +107,7 @@ public class URLResource implements LocalizableResource {
}
public InputStream openStream() throws IOException {
- return URLHandlerRegistry.getDefault().openStream(url);
+ return URLHandlerRegistry.getDefault().openStream(url, null);
}
public File getFile() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/util/XMLHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/XMLHelper.java b/src/java/org/apache/ivy/util/XMLHelper.java
index 7112f45..679a214 100644
--- a/src/java/org/apache/ivy/util/XMLHelper.java
+++ b/src/java/org/apache/ivy/util/XMLHelper.java
@@ -118,7 +118,7 @@ public abstract class XMLHelper {
public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
throws SAXException, IOException, ParserConfigurationException {
- InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);
+ InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL, null);
try {
InputSource inSrc = new InputSource(xmlStream);
inSrc.setSystemId(toSystemId(xmlURL));
@@ -148,7 +148,7 @@ public abstract class XMLHelper {
InputStream schemaStream = null;
try {
if (schema != null) {
- schemaStream = URLHandlerRegistry.getDefault().openStream(schema);
+ schemaStream = URLHandlerRegistry.getDefault().openStream(schema, null);
}
SAXParser parser = XMLHelper.newSAXParser(schema, schemaStream, loadExternalDtds);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/cc7509b7/src/java/org/apache/ivy/util/url/ApacheURLLister.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/ApacheURLLister.java b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
index 2001a3d..1e4b022 100644
--- a/src/java/org/apache/ivy/util/url/ApacheURLLister.java
+++ b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
@@ -109,14 +109,14 @@ public class ApacheURLLister {
}
URLHandler urlHandler = URLHandlerRegistry.getDefault();
- URLInfo urlInfo = urlHandler.getURLInfo(url);
+ URLInfo urlInfo = urlHandler.getURLInfo(url, null);
if (urlInfo == URLHandler.UNAVAILABLE) {
return urlList; // not found => return empty list
}
// here, urlInfo is valid
String charset = urlInfo.getBodyCharset();
- InputStream contentStream = urlHandler.openStream(url);
+ InputStream contentStream = urlHandler.openStream(url, null);
BufferedReader r = null;
if (charset == null) {
r = new BufferedReader(new InputStreamReader(contentStream));