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/03/17 11:52:07 UTC
ant-ivy git commit: Suppress “deprecation” and “unused” warnings
Repository: ant-ivy
Updated Branches:
refs/heads/master e14481ce4 -> bc290628c
Suppress “deprecation” and “unused” warnings
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/bc290628
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/bc290628
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/bc290628
Branch: refs/heads/master
Commit: bc290628cff8bab1094dcbd7c5e412d8b2f918cb
Parents: e14481c
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Sat Mar 17 12:51:46 2018 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Sat Mar 17 12:51:46 2018 +0100
----------------------------------------------------------------------
.../org/apache/ivy/core/settings/IvySettings.java | 1 +
.../apache/ivy/core/settings/XmlSettingsParser.java | 2 ++
.../plugins/parser/m2/MavenVersionRangeParser.java | 12 +++++++++---
.../org/apache/ivy/plugins/parser/m2/PomReader.java | 9 +++++++++
.../ivy/plugins/repository/url/URLResource.java | 2 ++
src/java/org/apache/ivy/util/FileUtil.java | 3 +++
src/java/org/apache/ivy/util/XMLHelper.java | 2 ++
.../org/apache/ivy/util/url/AbstractURLHandler.java | 3 ++-
.../org/apache/ivy/util/url/ApacheURLLister.java | 1 +
.../org/apache/ivy/util/url/BasicURLHandler.java | 6 ++++++
.../org/apache/ivy/util/url/HttpClientHandler.java | 6 ++++++
.../ivy/util/url/TimeoutConstrainedURLHandler.java | 1 +
.../apache/ivy/util/url/URLHandlerDispatcher.java | 16 ++++++++++++++++
.../org/apache/ivy/util/url/URLHandlerRegistry.java | 3 +++
.../apache/ivy/plugins/repository/vfs/VfsURI.java | 3 +++
.../apache/ivy/util/url/AbstractURLHandlerTest.java | 2 ++
.../ivy/util/url/HttpclientURLHandlerTest.java | 2 +-
17 files changed, 69 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 984dc4f..6b96a6e 100644
--- a/src/java/org/apache/ivy/core/settings/IvySettings.java
+++ b/src/java/org/apache/ivy/core/settings/IvySettings.java
@@ -316,6 +316,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
*
* @param remote boolean
*/
+ @SuppressWarnings("deprecation")
public synchronized void configureRepositories(boolean remote) {
if (!repositoriesConfigured) {
Properties props = new Properties();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 f55e38c..0560432 100644
--- a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
+++ b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java
@@ -148,6 +148,7 @@ public class XmlSettingsParser extends DefaultHandler {
doParse(settings);
}
+ @SuppressWarnings("deprecation")
private void doParse(URL settingsUrl) throws IOException, ParseException {
this.settings = settingsUrl;
InputStream stream = null;
@@ -319,6 +320,7 @@ public class XmlSettingsParser extends DefaultHandler {
}
}
+ @SuppressWarnings("deprecation")
private void settingsStarted(String qName, Map<String, String> attributes) {
if ("conf".equals(qName) && !deprecatedMessagePrinted) {
Message.deprecated("'conf' is deprecated, use 'settings' instead (" + settings + ")");
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java b/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java
index f8ac980..dd28ca9 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/MavenVersionRangeParser.java
@@ -80,7 +80,6 @@ class MavenVersionRangeParser {
return parsedRange != null && parsedRange.accepts(valToCompare);
}
-
private static Range parse(final String rangeValue) {
if (rangeValue == null || rangeValue.trim().isEmpty()) {
return null;
@@ -156,8 +155,11 @@ class MavenVersionRangeParser {
private static final class BasicRange implements Range {
private final DeweyDecimal lowerBound;
+
private final DeweyDecimal upperBound;
+
private final boolean lowerInclusive;
+
private final boolean upperInclusive;
private BasicRange(final DeweyDecimal lowerBound, final boolean lowerInclusive,
@@ -216,6 +218,7 @@ class MavenVersionRangeParser {
*
* @param components an array of integer components.
*/
+ @SuppressWarnings("unused")
public DeweyDecimal(final int[] components) {
this.components = new int[components.length];
System.arraycopy(components, 0, this.components, 0, components.length);
@@ -242,11 +245,11 @@ class MavenVersionRangeParser {
components[i] = Integer.parseInt(component);
- //Strip '.' token
+ // Strip '.' token
if (tokenizer.hasMoreTokens()) {
tokenizer.nextToken();
- //If it ended in a dot, throw an exception
+ // If it ended in a dot, throw an exception
if (!tokenizer.hasMoreTokens()) {
throw new NumberFormatException("DeweyDecimal ended in a '.'");
}
@@ -259,6 +262,7 @@ class MavenVersionRangeParser {
*
* @return the number of components in dewey decimal
*/
+ @SuppressWarnings("unused")
public int getSize() {
return components.length;
}
@@ -269,6 +273,7 @@ class MavenVersionRangeParser {
* @param index the index of components
* @return the value of component at index
*/
+ @SuppressWarnings("unused")
public int get(final int index) {
return components[index];
}
@@ -393,6 +398,7 @@ class MavenVersionRangeParser {
* @return result
* @see java.lang.Comparable#compareTo(Object)
*/
+ @SuppressWarnings("unused")
public int compareTo(DeweyDecimal other) {
final int max = Math.max(other.components.length, components.length);
for (int i = 0; i < max; i++) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 cd1a1aa..4aeeb23 100644
--- a/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
+++ b/src/java/org/apache/ivy/plugins/parser/m2/PomReader.java
@@ -118,6 +118,7 @@ public class PomReader {
private final Element parentElement;
+ @SuppressWarnings("deprecation")
public PomReader(final URL descriptorURL, final Resource res) throws IOException, SAXException {
InputStream stream = new AddDTDFilterInputStream(
URLHandlerRegistry.getDefault().openStream(descriptorURL));
@@ -373,6 +374,7 @@ public class PomReader {
/*
* (non-Javadoc)
+ *
* @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getGroupId()
*/
public String getGroupId() {
@@ -382,6 +384,7 @@ public class PomReader {
/*
* (non-Javadoc)
+ *
* @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getArtifaceId()
*/
public String getArtifactId() {
@@ -391,6 +394,7 @@ public class PomReader {
/*
* (non-Javadoc)
+ *
* @see org.apache.ivy.plugins.parser.m2.PomDependencyMgt#getVersion()
*/
public String getVersion() {
@@ -539,12 +543,17 @@ public class PomReader {
private static final String ACTIVE_BY_DEFAULT_ELEMENT = "activeByDefault";
private static final String OS = "os";
+
private static final String FAMILY = "family";
+
private static final String VERSION = "version";
+
private static final String ARCH = "arch";
private static final String FILE = "file";
+
private static final String MISSING = "missing";
+
private static final String EXISTS = "exists";
private static final String JDK = "jdk";
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 caece13..1a3a3cd 100644
--- a/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
+++ b/src/java/org/apache/ivy/plugins/repository/url/URLResource.java
@@ -74,6 +74,7 @@ public class URLResource implements LocalizableResource {
return lastModified;
}
+ @SuppressWarnings("deprecation")
private void init() {
final URLHandler handler = URLHandlerRegistry.getDefault();
final URLInfo info;
@@ -114,6 +115,7 @@ public class URLResource implements LocalizableResource {
return url.getProtocol().equals("file");
}
+ @SuppressWarnings("deprecation")
public InputStream openStream() throws IOException {
final URLHandler handler = URLHandlerRegistry.getDefault();
if (handler instanceof TimeoutConstrainedURLHandler) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/FileUtil.java b/src/java/org/apache/ivy/util/FileUtil.java
index 89deffd..38168c0 100644
--- a/src/java/org/apache/ivy/util/FileUtil.java
+++ b/src/java/org/apache/ivy/util/FileUtil.java
@@ -200,6 +200,7 @@ public final class FileUtil {
return true;
}
+ @SuppressWarnings("deprecation")
public static void copy(final URL src, final File dest, final CopyProgressListener listener,
final TimeoutConstraint timeoutConstraint) throws IOException {
final URLHandler handler = URLHandlerRegistry.getDefault();
@@ -210,6 +211,7 @@ public final class FileUtil {
handler.download(src, dest, listener);
}
+ @SuppressWarnings("deprecation")
public static void copy(final File src, final URL dest, final CopyProgressListener listener,
final TimeoutConstraint timeoutConstraint) throws IOException {
final URLHandler handler = URLHandlerRegistry.getDefault();
@@ -680,6 +682,7 @@ public final class FileUtil {
private static final class DissectedPath {
private final String root;
+
private final String remainingPath;
private DissectedPath(final String root, final String remainingPath) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 2d21404..f733ad8 100644
--- a/src/java/org/apache/ivy/util/XMLHelper.java
+++ b/src/java/org/apache/ivy/util/XMLHelper.java
@@ -117,6 +117,7 @@ public abstract class XMLHelper {
}
public static void parse(URL xmlURL, URL schema, DefaultHandler handler, LexicalHandler lHandler)
+ @SuppressWarnings("deprecation")
throws SAXException, IOException, ParserConfigurationException {
InputStream xmlStream = URLHandlerRegistry.getDefault().openStream(xmlURL);
try {
@@ -142,6 +143,7 @@ public abstract class XMLHelper {
parse(xmlStream, schema, handler, lHandler, true);
}
+ @SuppressWarnings("deprecation")
public static void parse(InputSource xmlStream, URL schema, DefaultHandler handler,
LexicalHandler lHandler, boolean loadExternalDtds) throws SAXException, IOException,
ParserConfigurationException {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/AbstractURLHandler.java b/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
index fc040fe..36785a9 100644
--- a/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
+++ b/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
@@ -30,9 +30,11 @@ import java.util.zip.DataFormatException;
import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
+
import org.apache.ivy.Ivy;
import org.apache.ivy.core.settings.TimeoutConstraint;
+@SuppressWarnings("deprecation")
public abstract class AbstractURLHandler implements URLHandler {
private static final Pattern ESCAPE_PATTERN = Pattern.compile("%25([0-9a-fA-F][0-9a-fA-F])");
@@ -70,7 +72,6 @@ public abstract class AbstractURLHandler implements URLHandler {
return getURLInfo(url, timeout).getLastModified();
}
-
protected String getUserAgent() {
return System.getProperty("http.agent", "Apache Ivy/" + Ivy.getIvyVersion());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/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 6f6f731..5a48c78 100644
--- a/src/java/org/apache/ivy/util/url/ApacheURLLister.java
+++ b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
@@ -101,6 +101,7 @@ public class ApacheURLLister {
* @throws IOException
* If an error occurs retrieving the HTML.
*/
+ @SuppressWarnings("deprecation")
public List<URL> retrieveListing(URL url, boolean includeFiles, boolean includeDirectories)
throws IOException {
List<URL> urlList = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/BasicURLHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/BasicURLHandler.java b/src/java/org/apache/ivy/util/url/BasicURLHandler.java
index 0ffd0a4..2dd975b 100644
--- a/src/java/org/apache/ivy/util/url/BasicURLHandler.java
+++ b/src/java/org/apache/ivy/util/url/BasicURLHandler.java
@@ -50,31 +50,37 @@ public class BasicURLHandler extends AbstractURLHandler implements TimeoutConstr
}
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url) {
return this.getURLInfo(url, null);
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final int timeout) {
return this.getURLInfo(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public boolean isReachable(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).isReachable();
}
+ @SuppressWarnings("deprecation")
@Override
public long getContentLength(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).getContentLength();
}
+ @SuppressWarnings("deprecation")
@Override
public long getLastModified(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).getLastModified();
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final TimeoutConstraint timeoutConstraint) {
// Install the IvyAuthenticator
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/HttpClientHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/HttpClientHandler.java b/src/java/org/apache/ivy/util/url/HttpClientHandler.java
index b8bff16..e79e3b4 100644
--- a/src/java/org/apache/ivy/util/url/HttpClientHandler.java
+++ b/src/java/org/apache/ivy/util/url/HttpClientHandler.java
@@ -191,31 +191,37 @@ public class HttpClientHandler extends AbstractURLHandler implements TimeoutCons
}
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url) {
return this.getURLInfo(url, null);
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final int timeout) {
return this.getURLInfo(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public boolean isReachable(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).isReachable();
}
+ @SuppressWarnings("deprecation")
@Override
public long getContentLength(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).getContentLength();
}
+ @SuppressWarnings("deprecation")
@Override
public long getLastModified(final URL url, final TimeoutConstraint timeoutConstraint) {
return this.getURLInfo(url, timeoutConstraint).getLastModified();
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final TimeoutConstraint timeoutConstraint) {
final int connectionTimeout = (timeoutConstraint == null || timeoutConstraint.getConnectionTimeout() < 0) ? 0 : timeoutConstraint.getConnectionTimeout();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java b/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java
index 53a1849..db476ca 100644
--- a/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java
+++ b/src/java/org/apache/ivy/util/url/TimeoutConstrainedURLHandler.java
@@ -29,6 +29,7 @@ import java.net.URL;
* A enhanced version of {@link URLHandler} which respects {@link TimeoutConstraint}s on
* the operations dealing with download, upload, reachability checks etc...
*/
+@SuppressWarnings("deprecation")
public interface TimeoutConstrainedURLHandler extends URLHandler {
/**
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java b/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
index a75c4d3..df39507 100644
--- a/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
+++ b/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
@@ -33,8 +33,10 @@ import java.util.Map;
* general reachability checks
*/
public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
+ @SuppressWarnings("deprecation")
private final Map<String, URLHandler> handlers = new HashMap<>();
+ @SuppressWarnings("deprecation")
private URLHandler defaultHandler = new BasicURLHandler();
public URLHandlerDispatcher() {
@@ -50,6 +52,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
return this.isReachable(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public boolean isReachable(final URL url, final TimeoutConstraint timeoutConstraint) {
final URLHandler handler = this.getHandler(url.getProtocol());
@@ -69,6 +72,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
return this.getContentLength(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public long getContentLength(final URL url, final TimeoutConstraint timeoutConstraint) {
final URLHandler handler = this.getHandler(url.getProtocol());
@@ -88,6 +92,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
return this.getLastModified(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public long getLastModified(final URL url, final TimeoutConstraint timeoutConstraint) {
final URLHandler handler = this.getHandler(url.getProtocol());
@@ -97,16 +102,19 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
return handler.getLastModified(url, timeoutConstraint != null ? timeoutConstraint.getConnectionTimeout() : 0);
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url) {
return this.getURLInfo(url, null);
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final int timeout) {
return this.getURLInfo(url, createTimeoutConstraints(timeout));
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(final URL url, final TimeoutConstraint timeoutConstraint) {
final URLHandler handler = this.getHandler(url.getProtocol());
@@ -121,6 +129,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
return this.openStream(url, null);
}
+ @SuppressWarnings("deprecation")
@Override
public InputStream openStream(final URL url, final TimeoutConstraint timeoutConstraint) throws IOException {
final URLHandler handler = this.getHandler(url.getProtocol());
@@ -135,6 +144,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
this.download(src, dest, l, null);
}
+ @SuppressWarnings("deprecation")
@Override
public void download(final URL src, final File dest, final CopyProgressListener listener, final TimeoutConstraint timeoutConstraint) throws IOException {
final URLHandler handler = this.getHandler(src.getProtocol());
@@ -150,6 +160,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
this.upload(src, dest, l, null);
}
+ @SuppressWarnings("deprecation")
@Override
public void upload(final File src, final URL dest, final CopyProgressListener listener, final TimeoutConstraint timeoutConstraint) throws IOException {
final URLHandler handler = this.getHandler(dest.getProtocol());
@@ -160,6 +171,7 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
handler.upload(src, dest, listener);
}
+ @SuppressWarnings("deprecation")
public void setRequestMethod(int requestMethod) {
defaultHandler.setRequestMethod(requestMethod);
for (URLHandler handler : handlers.values()) {
@@ -167,19 +179,23 @@ public class URLHandlerDispatcher implements TimeoutConstrainedURLHandler {
}
}
+ @SuppressWarnings("deprecation")
public void setDownloader(String protocol, URLHandler downloader) {
handlers.put(protocol, downloader);
}
+ @SuppressWarnings("deprecation")
public URLHandler getHandler(String protocol) {
URLHandler downloader = handlers.get(protocol);
return downloader == null ? defaultHandler : downloader;
}
+ @SuppressWarnings("deprecation")
public URLHandler getDefault() {
return defaultHandler;
}
+ @SuppressWarnings("deprecation")
public void setDefault(URLHandler default1) {
defaultHandler = default1;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java b/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
index 5ade5c8..69ab628 100644
--- a/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
+++ b/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
@@ -28,12 +28,15 @@ public final class URLHandlerRegistry {
private URLHandlerRegistry() {
}
+ @SuppressWarnings("deprecation")
private static URLHandler defaultHandler = new BasicURLHandler();
+ @SuppressWarnings("deprecation")
public static URLHandler getDefault() {
return defaultHandler;
}
+ @SuppressWarnings("deprecation")
public static void setDefault(final URLHandler def) {
defaultHandler = def;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
index 1b4c024..e6851e1 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java
@@ -39,12 +39,15 @@ public class VfsURI {
private static final String SCHEME_FTP = "ftp";
+ @SuppressWarnings("unused")
private static final String SCHEME_HTTP = "http";
+ @SuppressWarnings("unused")
private static final String SCHEME_HTTPS = "https";
private static final String SCHEME_SFTP = "sftp";
+ @SuppressWarnings("unused")
private static final String SCHEME_WEBDAV = "webdav";
public static final String[] SUPPORTED_SCHEMES = new String[] {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
index 33644dc..cffd7b0 100644
--- a/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/AbstractURLHandlerTest.java
@@ -81,11 +81,13 @@ public class AbstractURLHandlerTest {
throw new UnsupportedOperationException();
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(URL url) {
throw new UnsupportedOperationException();
}
+ @SuppressWarnings("deprecation")
@Override
public URLInfo getURLInfo(URL url, int timeout) {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/bc290628/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
index 502eb6f..598508c 100644
--- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
+++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java
@@ -94,7 +94,7 @@ public class HttpclientURLHandlerTest {
* @throws Exception if something goes wrong
* @see <a href="https://issues.apache.org/jira/browse/IVY-390">IVY-390</a>
*/
- @SuppressWarnings("resource")
+ @SuppressWarnings({"resource", "deprecation"})
@Test
public void testGetURLInfo() throws Exception {
final TimeoutConstrainedURLHandler handler = new HttpClientHandler();