Repository: ant-ivy Updated Branches: refs/heads/master a9dd1573e -> 186fd1077
inline variables; adjust exceptions, annotations, and formatting Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/186fd107 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/186fd107 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/186fd107 Branch: refs/heads/master Commit: 186fd10776a0fd576d5deb733af654c7e20b3f30 Parents: a9dd157 Author: Gintas Grigelionis <gin...@apache.org> Authored: Thu Aug 17 14:10:42 2017 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Thu Aug 17 14:10:42 2017 +0200 ---------------------------------------------------------------------- asciidoc/concept.adoc | 2 +- src/java/org/apache/ivy/Ivy.java | 4 +-- src/java/org/apache/ivy/Main.java | 1 + src/java/org/apache/ivy/ant/BuildOBRTask.java | 5 ++- .../org/apache/ivy/ant/IvyArtifactReport.java | 6 ++-- src/java/org/apache/ivy/ant/IvyCacheTask.java | 3 +- src/java/org/apache/ivy/ant/IvyRetrieve.java | 1 + .../cache/DefaultRepositoryCacheManager.java | 32 +++++++------------- .../ivy/core/module/id/ModuleRevisionId.java | 5 ++- .../apache/ivy/core/publish/PublishEngine.java | 4 +-- .../core/report/ConfigurationResolveReport.java | 6 ++-- .../ivy/core/retrieve/RetrieveOptions.java | 4 +-- .../apache/ivy/core/settings/IvySettings.java | 3 +- .../core/settings/NamedTimeoutConstraint.java | 2 -- .../ivy/core/settings/XmlSettingsParser.java | 9 ++++-- .../org/apache/ivy/core/sort/ModuleInSort.java | 2 +- .../apache/ivy/osgi/core/BundleCapability.java | 2 +- .../apache/ivy/osgi/core/BundleRequirement.java | 2 +- .../org/apache/ivy/osgi/core/ExportPackage.java | 2 +- .../ivy/osgi/repo/AbstractOSGiResolver.java | 3 +- .../repo/ArtifactReportManifestIterable.java | 2 +- .../osgi/repo/BundleCapabilityAndLocation.java | 2 +- .../ivy/osgi/repo/FSManifestIterable.java | 5 +-- .../ivy/osgi/repo/ResolverManifestIterable.java | 2 +- .../org/apache/ivy/osgi/util/VersionRange.java | 4 +-- .../plugins/latest/WorkspaceLatestStrategy.java | 2 +- .../ivy/plugins/parser/m2/PomDependencyMgt.java | 2 +- .../parser/m2/PomModuleDescriptorBuilder.java | 8 ++--- .../parser/xml/XmlModuleDescriptorUpdater.java | 2 +- .../ivy/plugins/repository/url/URLResource.java | 1 + .../resolver/AbstractPatternsBasedResolver.java | 3 +- .../ivy/plugins/resolver/CacheResolver.java | 1 + .../ivy/plugins/resolver/ChainResolver.java | 4 --- .../ivy/plugins/resolver/IBiblioResolver.java | 2 +- .../resolver/packager/PackagerResolver.java | 5 +-- src/java/org/apache/ivy/util/Configurator.java | 2 -- .../org/apache/ivy/util/EncrytedProperties.java | 2 +- .../apache/ivy/util/cli/CommandLineParser.java | 6 ++-- .../apache/ivy/util/url/BasicURLHandler.java | 2 +- .../org/apache/ivy/LocalFileRepoOverHttp.java | 1 + test/java/org/apache/ivy/TestHelper.java | 1 + test/java/org/apache/ivy/ant/FileUtilTest.java | 2 -- .../apache/ivy/ant/IvyDependencyTreeTest.java | 1 - .../java/org/apache/ivy/ant/IvyInstallTest.java | 1 - .../apache/ivy/core/retrieve/RetrieveTest.java | 2 +- .../WarnCircularDependencyStrategyTest.java | 2 -- .../xml/XmlModuleDescriptorParserTest.java | 2 -- .../ivy/util/url/HttpclientURLHandlerTest.java | 2 ++ .../ivy/util/url/IvyAuthenticatorTest.java | 1 - 49 files changed, 71 insertions(+), 99 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/asciidoc/concept.adoc ---------------------------------------------------------------------- diff --git a/asciidoc/concept.adoc b/asciidoc/concept.adoc index 456021b..02aaeaa 100644 --- a/asciidoc/concept.adoc +++ b/asciidoc/concept.adoc @@ -91,7 +91,7 @@ the organisation name `[orgPath]`:: *__(since 2.3)__* + -the organisation name where '.' has been replaced by '/'. This can be used to configure maven2-like repositories. +the organisation name where '.' has been replaced by '/'. This can be used to configure Maven 2-like repositories. `[module]`:: the module name http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/Ivy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java index 424f010..d8f859b 100644 --- a/src/java/org/apache/ivy/Ivy.java +++ b/src/java/org/apache/ivy/Ivy.java @@ -118,7 +118,7 @@ public class Ivy { * * @see Ivy#execute(org.apache.ivy.Ivy.IvyCallback) */ - public static interface IvyCallback { + public interface IvyCallback { /** * Executes Ivy related job within an {@link IvyContext} * @@ -128,7 +128,7 @@ public class Ivy { * the {@link IvyContext} in which this callback is executed * @return the result of this job, <code>null</code> if there is no result */ - public Object doInIvyContext(Ivy ivy, IvyContext context); + Object doInIvyContext(Ivy ivy, IvyContext context); } private static final int KILO = 1024; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/Main.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/Main.java b/src/java/org/apache/ivy/Main.java index 44eacc4..22df2ee 100644 --- a/src/java/org/apache/ivy/Main.java +++ b/src/java/org/apache/ivy/Main.java @@ -226,6 +226,7 @@ public final class Main { } } + @SuppressWarnings("deprecation") static void run(CommandLineParser parser, String[] args) throws Exception { // parse the command line arguments CommandLine line = parser.parse(args); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/ant/BuildOBRTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/BuildOBRTask.java b/src/java/org/apache/ivy/ant/BuildOBRTask.java index 35945ac..538a115 100644 --- a/src/java/org/apache/ivy/ant/BuildOBRTask.java +++ b/src/java/org/apache/ivy/ant/BuildOBRTask.java @@ -105,8 +105,7 @@ public class BuildOBRTask extends IvyCacheTask { && !sourceTypes.isEmpty()) { StringBuilder buffer = new StringBuilder(getType()); for (String sourceType : sourceTypes) { - buffer.append(","); - buffer.append(sourceType); + buffer.append(",").append(sourceType); } setType(buffer.toString()); } @@ -158,7 +157,7 @@ public class BuildOBRTask extends IvyCacheTask { prepareAndCheck(); try { it = new ArtifactReportManifestIterable(getArtifactReports(), sourceTypes); - } catch (ParseException | IOException e) { + } catch (ParseException e) { throw new BuildException("Impossible to parse the artifact reports: " + e.getMessage(), e); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/ant/IvyArtifactReport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyArtifactReport.java b/src/java/org/apache/ivy/ant/IvyArtifactReport.java index aff8c4c..2dff0d4 100644 --- a/src/java/org/apache/ivy/ant/IvyArtifactReport.java +++ b/src/java/org/apache/ivy/ant/IvyArtifactReport.java @@ -168,8 +168,7 @@ public class IvyArtifactReport extends IvyPostResolveTask { } private TransformerHandler createTransformerHandler(FileOutputStream fileOutputStream) - throws TransformerFactoryConfigurationError, TransformerConfigurationException, - SAXException { + throws TransformerFactoryConfigurationError, TransformerConfigurationException { SAXTransformerFactory transformerFact = (SAXTransformerFactory) SAXTransformerFactory .newInstance(); TransformerHandler saxHandler = transformerFact.newTransformerHandler(); @@ -201,8 +200,7 @@ public class IvyArtifactReport extends IvyPostResolveTask { } private void writeOriginLocationIfPresent(RepositoryCacheManager cache, - TransformerHandler saxHandler, ArtifactDownloadReport artifact) throws IOException, - SAXException { + TransformerHandler saxHandler, ArtifactDownloadReport artifact) throws SAXException { ArtifactOrigin origin = artifact.getArtifactOrigin(); if (!ArtifactOrigin.isUnknown(origin)) { String originName = origin.getLocation(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/ant/IvyCacheTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyCacheTask.java b/src/java/org/apache/ivy/ant/IvyCacheTask.java index e382ce3..ee88b0e 100644 --- a/src/java/org/apache/ivy/ant/IvyCacheTask.java +++ b/src/java/org/apache/ivy/ant/IvyCacheTask.java @@ -18,7 +18,6 @@ package org.apache.ivy.ant; import java.io.File; -import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; import java.util.Arrays; @@ -43,7 +42,7 @@ import org.apache.tools.ant.BuildException; public abstract class IvyCacheTask extends IvyPostResolveTask { protected List<ArtifactDownloadReport> getArtifactReports() throws BuildException, - ParseException, IOException { + ParseException { List<ArtifactDownloadReport> ret = new ArrayList<>(); for (ArtifactDownloadReport artifactReport : getAllArtifactReports()) { if (getArtifactFilter().accept(artifactReport.getArtifact())) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/ant/IvyRetrieve.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyRetrieve.java b/src/java/org/apache/ivy/ant/IvyRetrieve.java index 3930617..5af053b 100644 --- a/src/java/org/apache/ivy/ant/IvyRetrieve.java +++ b/src/java/org/apache/ivy/ant/IvyRetrieve.java @@ -84,6 +84,7 @@ public class IvyRetrieve extends IvyPostResolveTask { this.setId = setId; } + @SuppressWarnings("deprecation") @Override public void doExecute() throws BuildException { prepareAndCheck(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java index 83f3cd1..4d30340 100644 --- a/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java +++ b/src/java/org/apache/ivy/core/cache/DefaultRepositoryCacheManager.java @@ -609,11 +609,10 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the unique prefix key as a string. */ private String getPrefixKey(Artifact artifact) { + // use just some visual cue; // use the hashcode as a uuid for the artifact (fingers crossed) - int hashCode = artifact.getId().hashCode(); - // use just some visual cue - return "artifact:" + artifact.getName() + "#" + artifact.getType() + "#" - + artifact.getExt() + "#" + hashCode; + return String.format("artifact:%s#%s#%s#%d", artifact.getName(), artifact.getType(), + artifact.getExt(), artifact.getId().hashCode()); } /** @@ -624,8 +623,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the key to be used to reference the artifact location. */ private String getLocationKey(Artifact artifact) { - String prefix = getPrefixKey(artifact); - return prefix + ".location"; + return getPrefixKey(artifact) + ".location"; } /** @@ -636,8 +634,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the key to be used to reference the artifact locality. */ private String getIsLocalKey(Artifact artifact) { - String prefix = getPrefixKey(artifact); - return prefix + ".is-local"; + return getPrefixKey(artifact) + ".is-local"; } /** @@ -648,8 +645,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the key to be used to reference the artifact's last check date. */ private String getLastCheckedKey(Artifact artifact) { - String prefix = getPrefixKey(artifact); - return prefix + ".lastchecked"; + return getPrefixKey(artifact) + ".lastchecked"; } /** @@ -660,8 +656,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the key to be used to reference the existence of the artifact. */ private String getExistsKey(Artifact artifact) { - String prefix = getPrefixKey(artifact); - return prefix + ".exists"; + return getPrefixKey(artifact) + ".exists"; } /** @@ -672,8 +667,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv * @return the key to be used to reference the original artifact. */ private String getOriginalKey(Artifact artifact) { - String prefix = getPrefixKey(artifact); - return prefix + ".original"; + return getPrefixKey(artifact) + ".original"; } private PropertiesFile getCachedDataFile(ModuleDescriptor md) { @@ -894,9 +888,8 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv } if (options.isCheckTTL()) { long expiration = Long.parseLong(resolvedTime) + getTTL(mrid); - if (expiration > 0 // negative expiration means that Long.MAX_VALUE has been - // exceeded - && System.currentTimeMillis() > expiration) { + // negative expiration means that Long.MAX_VALUE has been exceeded + if (expiration > 0 && System.currentTimeMillis() > expiration) { Message.verbose(getName() + ": cached resolved revision expired for " + mrid); return null; } @@ -1517,10 +1510,7 @@ public class DefaultRepositoryCacheManager implements RepositoryCacheManager, Iv private boolean isCheckmodified(DependencyDescriptor dd, ModuleRevisionId requestedRevisionId, CacheMetadataOptions options) { - if (options.isCheckmodified() != null) { - return options.isCheckmodified(); - } - return isCheckmodified(); + return options.isCheckmodified() == null ? isCheckmodified() : options.isCheckmodified(); } public void clean() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java b/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java index 9579159..e38ab52 100644 --- a/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java +++ b/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java @@ -265,10 +265,9 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem { attributes.putAll(getQualifiedExtraAttributes()); for (Entry<String, String> att : attributes.entrySet()) { - String attName = att.getKey(); String value = att.getValue(); - value = value == null ? NULL_ENCODE : value; - buf.append(ENCODE_PREFIX).append(attName).append(ENCODE_SEPARATOR) + value = (value == null) ? NULL_ENCODE : value; + buf.append(ENCODE_PREFIX).append(att.getKey()).append(ENCODE_SEPARATOR) .append(ENCODE_PREFIX).append(value).append(ENCODE_SEPARATOR); } return buf.toString(); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/publish/PublishEngine.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/publish/PublishEngine.java b/src/java/org/apache/ivy/core/publish/PublishEngine.java index 2a801b6..c6f7a21 100644 --- a/src/java/org/apache/ivy/core/publish/PublishEngine.java +++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java @@ -252,9 +252,7 @@ public class PublishEngine { resolver.beginPublishTransaction(md.getModuleRevisionId(), options.isOverwrite()); // for each declared published artifact in this descriptor, do: for (Entry<Artifact, File> entry : artifactsFiles.entrySet()) { - Artifact artifact = entry.getKey(); - File artifactFile = entry.getValue(); - publish(artifact, artifactFile, resolver, options.isOverwrite()); + publish(entry.getKey(), entry.getValue(), resolver, options.isOverwrite()); } resolver.commitPublishTransaction(); successfullyPublished = true; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java b/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java index 55f678d..65bbf9d 100644 --- a/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java +++ b/src/java/org/apache/ivy/core/report/ConfigurationResolveReport.java @@ -96,10 +96,8 @@ public class ConfigurationResolveReport { try { XmlReportParser parser = new XmlReportParser(); parser.parse(previousReportFile); - List<ModuleRevisionId> previousDeps = Arrays.asList(parser - .getDependencyRevisionIds()); - HashSet<ModuleRevisionId> previousDepSet = new HashSet<>( - previousDeps); + Set<ModuleRevisionId> previousDepSet = new HashSet<>( + Arrays.asList(parser.getDependencyRevisionIds())); hasChanged = !previousDepSet.equals(getModuleRevisionIds()); } catch (Exception e) { Message.warn("Error while parsing configuration resolve report " http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java b/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java index 8dba4d9..304a351 100644 --- a/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java +++ b/src/java/org/apache/ivy/core/retrieve/RetrieveOptions.java @@ -154,7 +154,7 @@ public class RetrieveOptions extends LogOptions { public boolean isMakeSymlinks() { // we also do a check on makeSymlinkInMass just to allow backward compatibility for a version - // or so, to allow users time to move away from symlinkinmass option + // or so, to allow users time to move away from symlinkmass option return makeSymlinks || makeSymlinksInMass; } @@ -172,11 +172,11 @@ public class RetrieveOptions extends LogOptions { return this; } - @Deprecated /** * @deprecated Starting 2.5, creating symlinks in mass is no longer supported and this * method plays no role in creation of symlinks. Use {@link #setMakeSymlinks(boolean)} instead */ + @Deprecated public RetrieveOptions setMakeSymlinksInMass(boolean makeSymlinksInMass) { this.makeSymlinksInMass = makeSymlinksInMass; Message.warn("symlinkmass option has been deprecated and will no longer be supported"); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/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 5eb0b3bc..f29fedd 100644 --- a/src/java/org/apache/ivy/core/settings/IvySettings.java +++ b/src/java/org/apache/ivy/core/settings/IvySettings.java @@ -599,10 +599,9 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P public synchronized void addAllVariables(Map<?, ?> variables, boolean overwrite) { for (Map.Entry<?, ?> entry : variables.entrySet()) { - String key = entry.getKey().toString(); Object val = entry.getValue(); if (val == null || val instanceof String) { - setVariable(key, (String) val, overwrite); + setVariable(entry.getKey().toString(), (String) val, overwrite); } } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java b/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java index 40cdad5..ddc3143 100644 --- a/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java +++ b/src/java/org/apache/ivy/core/settings/NamedTimeoutConstraint.java @@ -24,7 +24,6 @@ import org.apache.ivy.util.StringUtils; */ public class NamedTimeoutConstraint implements TimeoutConstraint { - private String name; private int connectionTimeout = -1; @@ -32,7 +31,6 @@ public class NamedTimeoutConstraint implements TimeoutConstraint { private int readTimeout = -1; public NamedTimeoutConstraint() { - } public NamedTimeoutConstraint(final String name) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/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 a8ca618..78240bb 100644 --- a/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java +++ b/src/java/org/apache/ivy/core/settings/XmlSettingsParser.java @@ -405,7 +405,8 @@ public class XmlSettingsParser extends DefaultHandler { if (!optionalInclude) { throw ioe; } - Message.verbose("Skipping inclusion of optional URL " + propFilePath + " due to IOException - " + ioe.getMessage()); + Message.verbose("Skipping inclusion of optional URL " + propFilePath + + " due to IOException - " + ioe.getMessage()); return; } Message.verbose("including url: " + settingsURL.toString()); @@ -435,7 +436,8 @@ public class XmlSettingsParser extends DefaultHandler { if (!optionalInclude) { throw ioe; } - Message.verbose("Skipping inclusion of optional file " + propFilePath + " due to IOException - " + ioe.getMessage()); + Message.verbose("Skipping inclusion of optional file " + propFilePath + + " due to IOException - " + ioe.getMessage()); return; } } @@ -445,7 +447,8 @@ public class XmlSettingsParser extends DefaultHandler { if (!optionalInclude) { throw ioe; } - Message.verbose("Skipping inclusion of optional settings URL " + settingsURL + " due to IOException - " + ioe.getMessage()); + Message.verbose("Skipping inclusion of optional settings URL " + settingsURL + + " due to IOException - " + ioe.getMessage()); return; } } finally { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/core/sort/ModuleInSort.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/sort/ModuleInSort.java b/src/java/org/apache/ivy/core/sort/ModuleInSort.java index 2ac1a20..1a928ea 100644 --- a/src/java/org/apache/ivy/core/sort/ModuleInSort.java +++ b/src/java/org/apache/ivy/core/sort/ModuleInSort.java @@ -113,7 +113,7 @@ class ModuleInSort { */ public boolean checkLoop(ModuleInSort futurCaller, CircularDependencyStrategy depStrategy) { if (caller != null) { - LinkedList<ModuleRevisionId> elemOfLoop = new LinkedList<>(); + List<ModuleRevisionId> elemOfLoop = new LinkedList<>(); elemOfLoop.add(this.module.getModuleRevisionId()); ModuleInSort stackEl = futurCaller; while (stackEl != this) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/core/BundleCapability.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/core/BundleCapability.java b/src/java/org/apache/ivy/osgi/core/BundleCapability.java index 96f493d..a4abc76 100644 --- a/src/java/org/apache/ivy/osgi/core/BundleCapability.java +++ b/src/java/org/apache/ivy/osgi/core/BundleCapability.java @@ -89,4 +89,4 @@ public class BundleCapability { return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/core/BundleRequirement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/core/BundleRequirement.java b/src/java/org/apache/ivy/osgi/core/BundleRequirement.java index 92b5dd3..d25021c 100644 --- a/src/java/org/apache/ivy/osgi/core/BundleRequirement.java +++ b/src/java/org/apache/ivy/osgi/core/BundleRequirement.java @@ -108,4 +108,4 @@ public class BundleRequirement { } return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/core/ExportPackage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/core/ExportPackage.java b/src/java/org/apache/ivy/osgi/core/ExportPackage.java index 19b9beb..7227c87 100644 --- a/src/java/org/apache/ivy/osgi/core/ExportPackage.java +++ b/src/java/org/apache/ivy/osgi/core/ExportPackage.java @@ -67,4 +67,4 @@ public class ExportPackage extends BundleCapability { return true; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java index c5f284b..d715614 100644 --- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java +++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java @@ -414,13 +414,12 @@ public abstract class AbstractOSGiResolver extends BasicResolver { Map<String, Object> criteria) { Map<String, String> stringCriteria = new HashMap<>(); for (Entry<String, Object> entry : criteria.entrySet()) { - String key = entry.getKey(); Object value = entry.getValue(); if (!(value instanceof String)) { // no support for matcher for now return Collections.emptySet(); } - stringCriteria.put(key, (String) value); + stringCriteria.put(entry.getKey(), (String) value); } if (tokens.isEmpty()) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java index 9140855..0935486 100644 --- a/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/ArtifactReportManifestIterable.java @@ -155,4 +155,4 @@ public class ArtifactReportManifestIterable implements Iterable<ManifestAndLocat } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/repo/BundleCapabilityAndLocation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/BundleCapabilityAndLocation.java b/src/java/org/apache/ivy/osgi/repo/BundleCapabilityAndLocation.java index 823245e..303386e 100644 --- a/src/java/org/apache/ivy/osgi/repo/BundleCapabilityAndLocation.java +++ b/src/java/org/apache/ivy/osgi/repo/BundleCapabilityAndLocation.java @@ -54,4 +54,4 @@ public class BundleCapabilityAndLocation { return version; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java index f2cb305..7c024c7 100644 --- a/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/FSManifestIterable.java @@ -22,6 +22,7 @@ import java.io.FileFilter; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FilenameFilter; +import java.io.IOException; import java.io.InputStream; import java.net.MalformedURLException; import java.net.URI; @@ -108,7 +109,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { return new FileInputStream(f); } - protected List<File> listBundleFiles(File dir) { + protected List<File> listBundleFiles(File dir) throws IOException { return Arrays.asList(dir.listFiles(new FileFilter() { public boolean accept(File f) { return f.isFile() && bundleFilter.accept(f.getParentFile(), f.getName()); @@ -116,7 +117,7 @@ public class FSManifestIterable extends AbstractFSManifestIterable<File> { })); } - protected List<File> listDirs(File dir) { + protected List<File> listDirs(File dir) throws IOException { return Arrays.asList(dir.listFiles(new FileFilter() { public boolean accept(File f) { return f.isDirectory() && (dirFilter == null || dirFilter.accept(f.getParentFile(), f.getName())); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java b/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java index fa1ddf8..be307b4 100644 --- a/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java +++ b/src/java/org/apache/ivy/osgi/repo/ResolverManifestIterable.java @@ -202,4 +202,4 @@ public class ResolverManifestIterable implements Iterable<ManifestAndLocation> { } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/osgi/util/VersionRange.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/osgi/util/VersionRange.java b/src/java/org/apache/ivy/osgi/util/VersionRange.java index 4d97562..5b75f3a 100644 --- a/src/java/org/apache/ivy/osgi/util/VersionRange.java +++ b/src/java/org/apache/ivy/osgi/util/VersionRange.java @@ -79,7 +79,7 @@ public class VersionRange { /** * Do the parsing * - * @throws ParseException + * @throws ParseException if something goes wrong */ void parse() throws ParseException { boolean range = parseStart(); @@ -306,7 +306,7 @@ public class VersionRange { return startVersion.equals(endVersion); } - public boolean contains(String versionStr) throws ParseException { + public boolean contains(String versionStr) { return contains(new Version(versionStr)); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java b/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java index d22b9ef..5e7aa01 100644 --- a/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java +++ b/src/java/org/apache/ivy/plugins/latest/WorkspaceLatestStrategy.java @@ -52,4 +52,4 @@ public class WorkspaceLatestStrategy extends AbstractLatestStrategy { return head; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java b/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java index 011e188..45e957c 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomDependencyMgt.java @@ -32,4 +32,4 @@ public interface PomDependencyMgt { public abstract String getScope(); public List<ModuleId> getExcludedModules(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java index bc93a23..5aa18fe 100644 --- a/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java +++ b/src/java/org/apache/ivy/plugins/parser/m2/PomModuleDescriptorBuilder.java @@ -399,7 +399,7 @@ public class PomModuleDescriptorBuilder { exclusionPrefix + index, excludedModule.getOrganisation() + EXTRA_INFO_DELIMITER + excludedModule.getName()); - index += 1; + index++; } } // dependency management info is also used for version mediation of transitive dependencies @@ -423,7 +423,7 @@ public class PomModuleDescriptorBuilder { if (pluginExtraInfo == null) { pluginExtraInfo = pluginValue; } else { - pluginExtraInfo = pluginExtraInfo + "|" + pluginValue; + pluginExtraInfo += "|" + pluginValue; } extraInfoByTagName.setContent(pluginExtraInfo); } @@ -655,8 +655,8 @@ public class PomModuleDescriptorBuilder { public static Map<String, String> extractPomProperties(List<ExtraInfoHolder> extraInfos) { Map<String, String> r = new HashMap<>(); for (ExtraInfoHolder extraInfoHolder : extraInfos) { - if ((extraInfoHolder.getName()).startsWith(PROPERTIES)) { - String prop = (extraInfoHolder.getName()).substring(PROPERTIES.length() + if (extraInfoHolder.getName().startsWith(PROPERTIES)) { + String prop = extraInfoHolder.getName().substring(PROPERTIES.length() + EXTRA_INFO_DELIMITER.length()); r.put(prop, extraInfoHolder.getContent()); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java index cdfcb85..aadfd99 100644 --- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java +++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java @@ -251,7 +251,7 @@ public final class XmlModuleDescriptorUpdater { private StringBuffer currentIndent = new StringBuffer(); - private ArrayList<String> indentLevels = new ArrayList<>(); // ArrayList<String> + private List<String> indentLevels = new ArrayList<>(); // ArrayList<String> // true if an ivy-module/info/description element has been found in the published descriptor private boolean hasDescription = false; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/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 6a1fb3e..0ec9870 100644 --- a/src/java/org/apache/ivy/plugins/repository/url/URLResource.java +++ b/src/java/org/apache/ivy/plugins/repository/url/URLResource.java @@ -32,6 +32,7 @@ import org.apache.ivy.util.url.URLHandlerRegistry; public class URLResource implements LocalizableResource { private final URL url; + private final TimeoutConstraint timeoutConstraint; private boolean init = false; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java index 68361f8..f1ab0ac 100644 --- a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java @@ -200,10 +200,9 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver { Map<String, String> tokenValues = new HashMap<>(); for (Entry<String, Object> entry : criteria.entrySet()) { - String key = entry.getKey(); Object value = entry.getValue(); if (value instanceof String) { - tokenValues.put(key, (String) value); + tokenValues.put(entry.getKey(), (String) value); } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java b/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java index 2102b90..beb7411 100644 --- a/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/CacheResolver.java @@ -42,6 +42,7 @@ import org.apache.ivy.plugins.repository.file.FileResource; import org.apache.ivy.plugins.resolver.util.ResolvedResource; import org.apache.ivy.util.Message; +@Deprecated public class CacheResolver extends FileSystemResolver { public CacheResolver() { } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java index 5581f41..840e4e6 100644 --- a/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/ChainResolver.java @@ -63,7 +63,6 @@ public class ChainResolver extends AbstractResolver { public long getLastModified() { return rmr.getPublicationDate().getTime(); } - } private boolean returnFirst = false; @@ -176,7 +175,6 @@ public class ChainResolver extends AbstractResolver { return result; } } - return null; } @@ -236,7 +234,6 @@ public class ChainResolver extends AbstractResolver { } public void publish(Artifact artifact, File src, boolean overwrite) throws IOException { - getFirstResolver().publish(artifact, src, overwrite); } @@ -345,5 +342,4 @@ public class ChainResolver extends AbstractResolver { public boolean isDual() { return dual; } - } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java index 184a28a..3cb930c 100644 --- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java @@ -189,7 +189,7 @@ public class IBiblioResolver extends URLResolver { // we have found a timestamp, so this is a snapshot unique version String rev = mrid.getRevision(); rev = rev.substring(0, rev.length() - "SNAPSHOT".length()); - rev = rev + timestamp.toString() + "-" + buildNumer.toString(); + rev += timestamp.toString() + "-" + buildNumer.toString(); return rev; } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/plugins/resolver/packager/PackagerResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/plugins/resolver/packager/PackagerResolver.java b/src/java/org/apache/ivy/plugins/resolver/packager/PackagerResolver.java index 7142c0d..4d012bc 100644 --- a/src/java/org/apache/ivy/plugins/resolver/packager/PackagerResolver.java +++ b/src/java/org/apache/ivy/plugins/resolver/packager/PackagerResolver.java @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import org.apache.ivy.core.module.descriptor.Artifact; @@ -49,7 +50,7 @@ public class PackagerResolver extends URLResolver { private static final String PACKAGER_ARTIFACT_EXT = "xml"; - private final HashMap<ModuleRevisionId, PackagerCacheEntry> packagerCache = new HashMap<>(); + private final Map<ModuleRevisionId, PackagerCacheEntry> packagerCache = new HashMap<>(); private File buildRoot; @@ -141,7 +142,7 @@ public class PackagerResolver extends URLResolver { * @param pattern String */ public void setPackagerPattern(String pattern) { - ArrayList<String> list = new ArrayList<>(); + List<String> list = new ArrayList<>(); list.add(pattern); setArtifactPatterns(list); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/util/Configurator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/Configurator.java b/src/java/org/apache/ivy/util/Configurator.java index c6b4082..961f3c6 100644 --- a/src/java/org/apache/ivy/util/Configurator.java +++ b/src/java/org/apache/ivy/util/Configurator.java @@ -457,7 +457,6 @@ public class Configurator { objectStack.push(new ObjectDescriptor(object, name)); } - @SuppressWarnings("rawtypes") public Object startCreateChild(String name) { if (objectStack.isEmpty()) { throw new IllegalStateException("set root before creating child"); @@ -547,7 +546,6 @@ public class Configurator { } } - @SuppressWarnings("rawtypes") private Object addChild(ObjectDescriptor parentOD, Class<?> childClass, String name, Object child) throws InstantiationException, IllegalAccessException, InvocationTargetException { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/util/EncrytedProperties.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/EncrytedProperties.java b/src/java/org/apache/ivy/util/EncrytedProperties.java index a2a998d..34e2117 100644 --- a/src/java/org/apache/ivy/util/EncrytedProperties.java +++ b/src/java/org/apache/ivy/util/EncrytedProperties.java @@ -23,4 +23,4 @@ package org.apache.ivy.util; @SuppressWarnings("serial") @Deprecated public class EncrytedProperties extends EncryptedProperties { -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/src/java/org/apache/ivy/util/cli/CommandLineParser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/util/cli/CommandLineParser.java b/src/java/org/apache/ivy/util/cli/CommandLineParser.java index ea9d1dd..31a770e 100644 --- a/src/java/org/apache/ivy/util/cli/CommandLineParser.java +++ b/src/java/org/apache/ivy/util/cli/CommandLineParser.java @@ -101,10 +101,8 @@ public class CommandLineParser { // print options help for (Entry<String, List<Option>> entry : categories.entrySet()) { - String category = entry.getKey(); - pw.println("==== " + category); - List<Option> options = entry.getValue(); - for (Option option : options) { + pw.println("==== " + entry.getKey()); + for (Option option : entry.getValue()) { if (option.isDeprecated() && !showDeprecated) { continue; } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/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 3a53822..d3b4647 100644 --- a/src/java/org/apache/ivy/util/url/BasicURLHandler.java +++ b/src/java/org/apache/ivy/util/url/BasicURLHandler.java @@ -289,7 +289,7 @@ public class BasicURLHandler extends AbstractURLHandler { conn.setRequestProperty("Content-length", Long.toString(src.length())); conn.setInstanceFollowRedirects(true); - try (final InputStream in = new FileInputStream(src);) { + try (final InputStream in = new FileInputStream(src)) { final OutputStream os = conn.getOutputStream(); FileUtil.copy(in, os, listener); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/LocalFileRepoOverHttp.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/LocalFileRepoOverHttp.java b/test/java/org/apache/ivy/LocalFileRepoOverHttp.java index c1fb17d..7b410bb 100644 --- a/test/java/org/apache/ivy/LocalFileRepoOverHttp.java +++ b/test/java/org/apache/ivy/LocalFileRepoOverHttp.java @@ -70,6 +70,7 @@ final class LocalFileRepoOverHttp implements HttpHandler { throw new IOException("Cannot handle " + httpExchange.getRequestMethod() + " HTTP method"); } final OutputStream responseStream = httpExchange.getResponseBody(); + @SuppressWarnings("unused") final int numBytes = this.serve(httpExchange, localFilePath, responseStream); responseStream.close(); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/TestHelper.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/TestHelper.java b/test/java/org/apache/ivy/TestHelper.java index 2cf7159..e206d3b 100644 --- a/test/java/org/apache/ivy/TestHelper.java +++ b/test/java/org/apache/ivy/TestHelper.java @@ -480,6 +480,7 @@ public class TestHelper { } final com.sun.net.httpserver.Authenticator.Result authResult = this.authenticator.authenticate(httpExchange); if(authResult instanceof com.sun.net.httpserver.Authenticator.Success) { + @SuppressWarnings("unused") final com.sun.net.httpserver.Authenticator.Success success = (com.sun.net.httpserver.Authenticator.Success)authResult; // auth succeeded - move to next filter chain.doFilter(httpExchange); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/ant/FileUtilTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/FileUtilTest.java b/test/java/org/apache/ivy/ant/FileUtilTest.java index 955462b..902d1a1 100644 --- a/test/java/org/apache/ivy/ant/FileUtilTest.java +++ b/test/java/org/apache/ivy/ant/FileUtilTest.java @@ -17,7 +17,6 @@ */ package org.apache.ivy.ant; - import org.apache.ivy.util.FileUtil; import org.junit.Test; @@ -47,7 +46,6 @@ public class FileUtilTest { assertTrue(normalizedIvySettingsFile.getAbsolutePath() + " isn't a file", normalizedIvySettingsFile.isFile()); } - /** * Tests that {@link FileUtil#normalize(String)} works as expected when passed a path that starts with * {@link File#listRoots() filesystem roots} http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java index c540945..bf41b27 100644 --- a/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java +++ b/test/java/org/apache/ivy/ant/IvyDependencyTreeTest.java @@ -117,7 +117,6 @@ public class IvyDependencyTreeTest extends AntTaskTestCase { assertLogContaining("\\- org1#mod1.2;2.2"); } - /** * Tests that dependency tree task doesn't run into an infinite loop due to circular dependencies * http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/ant/IvyInstallTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/ant/IvyInstallTest.java b/test/java/org/apache/ivy/ant/IvyInstallTest.java index 5376be6..1f24f7a 100644 --- a/test/java/org/apache/ivy/ant/IvyInstallTest.java +++ b/test/java/org/apache/ivy/ant/IvyInstallTest.java @@ -33,7 +33,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; - public class IvyInstallTest { private File cache; http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java index ffac56f..48d0fd4 100644 --- a/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java +++ b/test/java/org/apache/ivy/core/retrieve/RetrieveTest.java @@ -93,7 +93,6 @@ public class RetrieveTest { } } - @Before public void setUp() throws Exception { ivy = Ivy.newInstance(); @@ -264,6 +263,7 @@ public class RetrieveTest { * * @throws Exception */ + @SuppressWarnings("deprecation") @Test public void testRetrieveWithSymlinksMass() throws Exception { // mod1.1 depends on mod1.2 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java index 6e80127..c3f6524 100644 --- a/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java +++ b/test/java/org/apache/ivy/plugins/circular/WarnCircularDependencyStrategyTest.java @@ -30,7 +30,6 @@ import org.apache.ivy.util.MockMessageLogger; import org.junit.Before; import org.junit.Test; - import static org.junit.Assert.assertEquals; public class WarnCircularDependencyStrategyTest { @@ -39,7 +38,6 @@ public class WarnCircularDependencyStrategyTest { private MessageLoggerEngine loggerEngine; private MockMessageLogger mockMessageLogger; - @Before public void setUp() { // setup a new IvyContext for each test http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java index d000006..af2a6cd 100644 --- a/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java +++ b/test/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParserTest.java @@ -58,7 +58,6 @@ import org.apache.ivy.util.DefaultMessageLogger; import org.apache.ivy.util.FileUtil; import org.apache.ivy.util.Message; import org.apache.ivy.util.XMLHelper; - import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -1454,7 +1453,6 @@ public class XmlModuleDescriptorParserTest extends AbstractModuleDescriptorParse assertEquals("jar", artifacts[0].getType()); } - /** * Tests that when the <code>location</code> attribute of the <code>extends</code> element of a module descriptor * file, includes an {@link File#isAbsolute() absolute path} with characters that {@link java.net.URI} considers http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/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 24eb086..de82269 100644 --- a/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java +++ b/test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java @@ -48,6 +48,7 @@ public class HttpclientURLHandlerTest { private File testDir; private HttpClientHandler handler; + private final TimeoutConstraint defaultTimeoutConstraint; { @@ -79,6 +80,7 @@ public class HttpclientURLHandlerTest { assertFalse("URL resource was expected to be unreachable", handler.isReachable(new URL("http://www.google.fr/unknownpage.html"), defaultTimeoutConstraint)); } + @SuppressWarnings("resource") @Test public void testGetURLInfo() throws Exception { // IVY-390 http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/186fd107/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java ---------------------------------------------------------------------- diff --git a/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java b/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java index 2d826fa..9817576 100644 --- a/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java +++ b/test/java/org/apache/ivy/util/url/IvyAuthenticatorTest.java @@ -91,7 +91,6 @@ public class IvyAuthenticatorTest { assertTrue("Unexpected password", Arrays.equals("dummy".toCharArray(), auth.getPassword())); } - private class TestAuthenticator extends Authenticator { private String expectedHost;