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 2017/11/10 20:53:34 UTC
[1/2] ant-ivy git commit: StringBuffer -> StringBuilder
Repository: ant-ivy
Updated Branches:
refs/heads/master 896daf14e -> 4272bf28b
StringBuffer -> StringBuilder
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/3ac2567b
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/3ac2567b
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/3ac2567b
Branch: refs/heads/master
Commit: 3ac2567bcab0d108d52160f9dda91464bbb594cd
Parents: 896daf1
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 21:46:47 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 21:46:47 2017 +0100
----------------------------------------------------------------------
.../org/apache/ivy/ant/AntMessageLogger.java | 2 +-
.../ivy/osgi/core/ManifestHeaderValue.java | 2 +-
.../apache/ivy/osgi/obr/xml/OBRXMLWriter.java | 4 ++--
.../apache/ivy/osgi/util/DelegatingHandler.java | 2 +-
.../parser/AbstractModuleDescriptorParser.java | 4 ++--
.../parser/xml/XmlModuleDescriptorParser.java | 10 +++++-----
.../parser/xml/XmlModuleDescriptorUpdater.java | 2 +-
.../ivy/plugins/report/LogReportOutputter.java | 8 ++++----
.../plugins/repository/ssh/SshRepository.java | 20 ++++++++++----------
.../repository/vsftp/VsftpRepository.java | 6 +++---
.../ivy/plugins/resolver/IBiblioResolver.java | 4 ++--
.../ivy/plugins/resolver/VfsResolver.java | 2 +-
.../apache/ivy/util/ContextualSAXHandler.java | 2 +-
.../ivy/ant/testutil/AntTestListener.java | 2 +-
14 files changed, 35 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/ant/AntMessageLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/AntMessageLogger.java b/src/java/org/apache/ivy/ant/AntMessageLogger.java
index f6eedfb..2d21f11 100644
--- a/src/java/org/apache/ivy/ant/AntMessageLogger.java
+++ b/src/java/org/apache/ivy/ant/AntMessageLogger.java
@@ -103,7 +103,7 @@ public class AntMessageLogger extends AbstractMessageLogger {
private long lastProgressFlush = 0;
- private StringBuffer buf = new StringBuffer();
+ private StringBuilder buf = new StringBuilder();
/**
* Constructs a new AntMessageImpl instance.
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/osgi/core/ManifestHeaderValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/ManifestHeaderValue.java b/src/java/org/apache/ivy/osgi/core/ManifestHeaderValue.java
index 843d3e1..3819baf 100644
--- a/src/java/org/apache/ivy/osgi/core/ManifestHeaderValue.java
+++ b/src/java/org/apache/ivy/osgi/core/ManifestHeaderValue.java
@@ -96,7 +96,7 @@ public class ManifestHeaderValue {
/**
* buffer
*/
- private StringBuffer buffer = new StringBuffer();
+ private StringBuilder buffer = new StringBuilder();
/**
* position in the source
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java
index 1518d7d..784381a 100644
--- a/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java
+++ b/src/java/org/apache/ivy/osgi/obr/xml/OBRXMLWriter.java
@@ -221,7 +221,7 @@ public class OBRXMLWriter {
}
private static String buildFilter(BundleRequirement requirement) {
- StringBuffer filter = new StringBuffer();
+ StringBuilder filter = new StringBuilder();
VersionRange v = requirement.getVersion();
if (v != null) {
appendVersion(filter, v);
@@ -237,7 +237,7 @@ public class OBRXMLWriter {
return filter.toString();
}
- private static void appendVersion(StringBuffer filter, VersionRange v) {
+ private static void appendVersion(StringBuilder filter, VersionRange v) {
filter.append("(&");
Version start = v.getStartVersion();
if (start != null) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
index a52642d..1fd27eb 100644
--- a/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
+++ b/src/java/org/apache/ivy/osgi/util/DelegatingHandler.java
@@ -50,7 +50,7 @@ public class DelegatingHandler extends DefaultHandler implements DTDHandler, Con
private boolean skipOnError = false;
- private StringBuffer charBuffer = new StringBuffer();
+ private StringBuilder charBuffer = new StringBuilder();
private boolean bufferingChar = false;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
index f224770..903e432 100644
--- a/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
+++ b/src/java/org/apache/ivy/plugins/parser/AbstractModuleDescriptorParser.java
@@ -330,8 +330,8 @@ public abstract class AbstractModuleDescriptorParser implements ModuleDescriptor
} // getLocationString(SAXParseException):String
protected String getDefaultConf() {
- return defaultConf != null ? defaultConf
- : (defaultConfMapping != null ? defaultConfMapping : DEFAULT_CONF_MAPPING);
+ return (defaultConf != null) ? defaultConf
+ : (defaultConfMapping != null) ? defaultConfMapping : DEFAULT_CONF_MAPPING;
}
protected void setDefaultConf(String defaultConf) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
index c43873e..17b2d23 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
@@ -240,7 +240,7 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
private boolean artifactsDeclared = false;
- private StringBuffer buffer;
+ private StringBuilder buffer;
private String descriptorVersion;
@@ -324,14 +324,14 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
} else if (state == State.INFO && "description".equals(qName)) {
getMd().setHomePage(settings.substitute(attributes.getValue("homepage")));
state = State.DESCRIPTION;
- buffer = new StringBuffer();
+ buffer = new StringBuilder();
} else if (state == State.INFO && "ivyauthor".equals(qName)) {
// nothing to do, we don't store this
} else if (state == State.INFO && "repository".equals(qName)) {
// nothing to do, we don't store this
} else if (state == State.EXTRA_INFO || state == State.INFO
&& isOtherNamespace(qName)) {
- buffer = new StringBuffer();
+ buffer = new StringBuilder();
state = State.EXTRA_INFO;
ExtraInfoHolder extraInfo = new ExtraInfoHolder();
extraInfo.setName(qName);
@@ -1322,11 +1322,11 @@ public class XmlModuleDescriptorParser extends AbstractModuleDescriptorParser {
this.artifactsDeclared = artifactsDeclared;
}
- protected StringBuffer getBuffer() {
+ protected StringBuilder getBuffer() {
return buffer;
}
- protected void setBuffer(StringBuffer buffer) {
+ protected void setBuffer(StringBuilder buffer) {
this.buffer = buffer;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/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 3751cf4..a1b8dba 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorUpdater.java
@@ -255,7 +255,7 @@ public final class XmlModuleDescriptorUpdater {
// true when we're reading indent whitespace
private boolean indenting;
- private StringBuffer currentIndent = new StringBuffer();
+ private StringBuilder currentIndent = new StringBuilder();
private List<String> indentLevels = new ArrayList<>(); // ArrayList<String>
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java b/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java
index 49ff22c..4b12621 100644
--- a/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java
+++ b/src/java/org/apache/ivy/plugins/report/LogReportOutputter.java
@@ -103,7 +103,7 @@ public class LogReportOutputter implements ReportOutputter {
char[] sep = new char[69];
Arrays.fill(sep, '-');
Message.rawinfo("\t" + new String(sep));
- StringBuffer line = new StringBuffer("\t");
+ StringBuilder line = new StringBuilder("\t");
append(line, "", 18);
append(line, "modules", 31);
line.append("|");
@@ -111,7 +111,7 @@ public class LogReportOutputter implements ReportOutputter {
line.append("|");
Message.rawinfo(line.toString());
- line = new StringBuffer("\t");
+ line = new StringBuilder("\t");
append(line, "conf", 18);
append(line, "number", 7);
append(line, "search", 7);
@@ -160,7 +160,7 @@ public class LogReportOutputter implements ReportOutputter {
}
public void output(ConfigurationResolveReport report) {
- StringBuffer line = new StringBuffer("\t");
+ StringBuilder line = new StringBuilder("\t");
// CheckStyle:MagicNumber| OFF
append(line, report.getConfiguration(), 18);
append(line, String.valueOf(report.getNodesNumber()), 7);
@@ -176,7 +176,7 @@ public class LogReportOutputter implements ReportOutputter {
Message.rawinfo(line.toString());
}
- private void append(StringBuffer line, Object o, int limit) {
+ private void append(StringBuilder line, Object o, int limit) {
String v = String.valueOf(o);
if (v.length() >= limit) {
v = v.substring(0, limit);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java b/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
index a839724..d8e62a9 100644
--- a/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
+++ b/src/java/org/apache/ivy/plugins/repository/ssh/SshRepository.java
@@ -114,14 +114,14 @@ public class SshRepository extends AbstractSshBasedRepository {
* @param channel
* Channel to read from
* @param strStdout
- * StringBuffer that receives Session Stdout output
+ * StringBuilder that receives Session Stdout output
* @param strStderr
- * StringBuffer that receives Session Stderr output
+ * StringBuilder that receives Session Stderr output
* @throws IOException
* in case of trouble with the network
*/
- private void readSessionOutput(ChannelExec channel, StringBuffer strStdout,
- StringBuffer strStderr) throws IOException {
+ private void readSessionOutput(ChannelExec channel, StringBuilder strStdout,
+ StringBuilder strStderr) throws IOException {
InputStream stdout = channel.getInputStream();
InputStream stderr = channel.getErrStream();
@@ -182,8 +182,8 @@ public class SshRepository extends AbstractSshBasedRepository {
}
String fullCmd = replaceArgument(listCommand, parentUri.getPath());
channel.setCommand(fullCmd);
- StringBuffer stdOut = new StringBuffer();
- StringBuffer stdErr = new StringBuffer();
+ StringBuilder stdOut = new StringBuilder();
+ StringBuilder stdErr = new StringBuilder();
readSessionOutput(channel, stdOut, stdErr);
if (channel.getExitStatus() != 0) {
Message.error("Ssh ListCommand exited with status != 0");
@@ -307,8 +307,8 @@ public class SshRepository extends AbstractSshBasedRepository {
String mkdir = replaceArgument(createDirCommand, trimmed);
Message.debug("SShRepository: trying to create path: " + mkdir);
channel.setCommand(mkdir);
- StringBuffer stdOut = new StringBuffer();
- StringBuffer stdErr = new StringBuffer();
+ StringBuilder stdOut = new StringBuilder();
+ StringBuilder stdErr = new StringBuilder();
readSessionOutput(channel, stdOut, stdErr);
} finally {
if (channel != null) {
@@ -332,8 +332,8 @@ public class SshRepository extends AbstractSshBasedRepository {
channel = getExecChannel(session);
String fullCmd = replaceArgument(existCommand, filePath);
channel.setCommand(fullCmd);
- StringBuffer stdOut = new StringBuffer();
- StringBuffer stdErr = new StringBuffer();
+ StringBuilder stdOut = new StringBuilder();
+ StringBuilder stdErr = new StringBuilder();
readSessionOutput(channel, stdOut, stdErr);
return channel.getExitStatus() == 0;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java b/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java
index 7615b91..d2802ed 100644
--- a/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java
+++ b/src/java/org/apache/ivy/plugins/repository/vsftp/VsftpRepository.java
@@ -100,7 +100,7 @@ public class VsftpRepository extends AbstractRepository {
private PrintWriter out;
- private volatile StringBuffer errors = new StringBuffer();
+ private volatile StringBuilder errors = new StringBuilder();
private long readTimeout = DEFAULT_READ_TIMEOUT;
@@ -383,7 +383,7 @@ public class VsftpRepository extends AbstractRepository {
@SuppressWarnings("deprecation")
protected synchronized String readResponse(final boolean sendErrorAsResponse, long timeout)
throws IOException {
- final StringBuffer response = new StringBuffer();
+ final StringBuilder response = new StringBuilder();
final IOException[] exc = new IOException[1];
final boolean[] done = new boolean[1];
Runnable r = new Runnable() {
@@ -729,7 +729,7 @@ public class VsftpRepository extends AbstractRepository {
this.username = username;
}
- private static StringBuffer chomp(StringBuffer str) {
+ private static StringBuilder chomp(StringBuilder str) {
if (str == null || str.length() == 0) {
return str;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/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 6d6facb..92cf71a 100644
--- a/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/IBiblioResolver.java
@@ -216,8 +216,8 @@ public class IBiblioResolver extends URLResolver {
return null;
}
try (final InputStream metadataStream = metadata.openStream()) {
- final StringBuffer timestamp = new StringBuffer();
- final StringBuffer buildNumber = new StringBuffer();
+ final StringBuilder timestamp = new StringBuilder();
+ final StringBuilder buildNumber = new StringBuilder();
XMLHelper.parse(metadataStream, null, new ContextualSAXHandler() {
@Override
public void endElement(String uri, String localName, String qName)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java b/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
index 6df0753..382e6c8 100644
--- a/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
@@ -45,7 +45,7 @@ public class VfsResolver extends RepositoryResolver {
}
public static String prepareForDisplay(String name) {
- StringBuffer s = new StringBuffer(name);
+ StringBuilder s = new StringBuilder(name);
Matcher m = URL_PATTERN.matcher(s);
if (m.matches()) {
final String password = m.group(PASSWORD_GROUP);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/src/java/org/apache/ivy/util/ContextualSAXHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/ContextualSAXHandler.java b/src/java/org/apache/ivy/util/ContextualSAXHandler.java
index e036b27..c60ed43 100644
--- a/src/java/org/apache/ivy/util/ContextualSAXHandler.java
+++ b/src/java/org/apache/ivy/util/ContextualSAXHandler.java
@@ -29,7 +29,7 @@ public class ContextualSAXHandler extends DefaultHandler {
private Stack<String> contextStack = new Stack<>();
- private StringBuffer buffer = new StringBuffer();
+ private StringBuilder buffer = new StringBuilder();
@Override
public void characters(char[] ch, int start, int length) throws SAXException {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/3ac2567b/test/java/org/apache/ivy/ant/testutil/AntTestListener.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/ant/testutil/AntTestListener.java b/test/java/org/apache/ivy/ant/testutil/AntTestListener.java
index 73866d2..f670ead 100644
--- a/test/java/org/apache/ivy/ant/testutil/AntTestListener.java
+++ b/test/java/org/apache/ivy/ant/testutil/AntTestListener.java
@@ -26,7 +26,7 @@ import org.apache.tools.ant.BuildListener;
public class AntTestListener implements BuildListener {
private int logLevel;
- private StringBuffer buildLog = new StringBuffer();
+ private StringBuilder buildLog = new StringBuilder();
/**
* Constructs a test listener which will ignore log events above the given level.
[2/2] ant-ivy git commit: Entry -> Map.Entry
Posted by gi...@apache.org.
Entry -> Map.Entry
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/4272bf28
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/4272bf28
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/4272bf28
Branch: refs/heads/master
Commit: 4272bf28b26cb1e4bb33750e938fb02e97caf2ac
Parents: 3ac2567
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri Nov 10 21:52:04 2017 +0100
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri Nov 10 21:52:04 2017 +0100
----------------------------------------------------------------------
src/java/org/apache/ivy/ant/AntWorkspaceResolver.java | 3 +--
.../org/apache/ivy/ant/IvyAntVariableContainer.java | 3 +--
.../apache/ivy/core/module/id/ModuleRevisionId.java | 3 +--
.../org/apache/ivy/core/module/id/ModuleRules.java | 13 ++++++-------
.../org/apache/ivy/core/publish/PublishEngine.java | 3 +--
src/java/org/apache/ivy/core/report/ResolveReport.java | 3 +--
src/java/org/apache/ivy/core/resolve/IvyNode.java | 3 +--
src/java/org/apache/ivy/core/resolve/ResolveData.java | 11 +++++------
.../org/apache/ivy/core/retrieve/RetrieveEngine.java | 5 ++---
src/java/org/apache/ivy/core/search/SearchEngine.java | 5 ++---
src/java/org/apache/ivy/core/settings/IvySettings.java | 5 ++---
.../org/apache/ivy/osgi/core/BundleInfoAdapter.java | 3 +--
.../osgi/core/ExecutionEnvironmentProfileProvider.java | 3 +--
.../apache/ivy/osgi/core/ManifestHeaderElement.java | 9 ++++-----
src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java | 5 ++---
.../org/apache/ivy/osgi/repo/AbstractOSGiResolver.java | 9 ++++-----
.../org/apache/ivy/plugins/matcher/MapMatcher.java | 5 ++---
.../plugins/parser/xml/XmlModuleDescriptorWriter.java | 3 +--
.../resolver/AbstractPatternsBasedResolver.java | 3 +--
.../org/apache/ivy/util/cli/CommandLineParser.java | 3 +--
.../ivy/util/extendable/ExtendableItemHelper.java | 3 +--
.../util/extendable/UnmodifiableExtendableItem.java | 3 +--
22 files changed, 42 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
index 5166a7b..ffa739d 100644
--- a/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
+++ b/src/java/org/apache/ivy/ant/AntWorkspaceResolver.java
@@ -27,7 +27,6 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.core.module.descriptor.Artifact;
import org.apache.ivy.core.module.descriptor.DefaultArtifact;
@@ -156,7 +155,7 @@ public class AntWorkspaceResolver extends DataType {
public ResolvedModuleRevision getDependency(DependencyDescriptor dd, ResolveData data)
throws ParseException {
- for (Entry<ModuleDescriptor, File> md : getModuleDescriptors().entrySet()) {
+ for (Map.Entry<ModuleDescriptor, File> md : getModuleDescriptors().entrySet()) {
ResolvedModuleRevision rmr = checkCandidate(dd, md.getKey(),
getProjectName(md.getValue()));
if (rmr != null) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java b/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
index e1c1d54..ed9664b 100644
--- a/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
+++ b/src/java/org/apache/ivy/ant/IvyAntVariableContainer.java
@@ -19,7 +19,6 @@ package org.apache.ivy.ant;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.core.settings.IvyVariableContainer;
import org.apache.ivy.core.settings.IvyVariableContainerImpl;
@@ -74,7 +73,7 @@ class IvyAntVariableContainer extends IvyVariableContainerImpl implements IvyVar
public void updateProject(String id) {
Map<String, String> r = new HashMap<>(super.getVariables());
r.putAll(overwrittenProperties);
- for (Entry<String, String> entry : r.entrySet()) {
+ for (Map.Entry<String, String> entry : r.entrySet()) {
setPropertyIfNotSet(entry.getKey(), entry.getValue());
if (id != null) {
setPropertyIfNotSet(entry.getKey() + "." + id, entry.getValue());
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 e38ab52..8bb19ed 100644
--- a/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
+++ b/src/java/org/apache/ivy/core/module/id/ModuleRevisionId.java
@@ -20,7 +20,6 @@ package org.apache.ivy.core.module.id;
import java.lang.ref.WeakReference;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.WeakHashMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -264,7 +263,7 @@ public class ModuleRevisionId extends UnmodifiableExtendableItem {
attributes.keySet().removeAll(getExtraAttributes().keySet());
attributes.putAll(getQualifiedExtraAttributes());
- for (Entry<String, String> att : attributes.entrySet()) {
+ for (Map.Entry<String, String> att : attributes.entrySet()) {
String value = att.getValue();
value = (value == null) ? NULL_ENCODE : value;
buf.append(ENCODE_PREFIX).append(att.getKey()).append(ENCODE_SEPARATOR)
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/module/id/ModuleRules.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/module/id/ModuleRules.java b/src/java/org/apache/ivy/core/module/id/ModuleRules.java
index fe6851c..abfec94 100644
--- a/src/java/org/apache/ivy/core/module/id/ModuleRules.java
+++ b/src/java/org/apache/ivy/core/module/id/ModuleRules.java
@@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.plugins.matcher.MapMatcher;
import org.apache.ivy.util.Checks;
@@ -221,12 +220,12 @@ public class ModuleRules<T> {
public void dump(String prefix) {
if (rules.isEmpty()) {
Message.debug(prefix + "NONE");
- } else {
- for (Entry<MapMatcher, T> entry : rules.entrySet()) {
- MapMatcher midm = entry.getKey();
- T rule = entry.getValue();
- Message.debug(prefix + midm + " -> " + rule);
- }
+ return;
+ }
+ for (Map.Entry<MapMatcher, T> entry : rules.entrySet()) {
+ MapMatcher midm = entry.getKey();
+ T rule = entry.getValue();
+ Message.debug(prefix + midm + " -> " + rule);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 c6f7a21..8ed4ee5 100644
--- a/src/java/org/apache/ivy/core/publish/PublishEngine.java
+++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java
@@ -29,7 +29,6 @@ import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.IvyContext;
@@ -251,7 +250,7 @@ public class PublishEngine {
try {
resolver.beginPublishTransaction(md.getModuleRevisionId(), options.isOverwrite());
// for each declared published artifact in this descriptor, do:
- for (Entry<Artifact, File> entry : artifactsFiles.entrySet()) {
+ for (Map.Entry<Artifact, File> entry : artifactsFiles.entrySet()) {
publish(entry.getKey(), entry.getValue(), resolver, options.isOverwrite());
}
resolver.commitPublishTransaction();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/report/ResolveReport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/report/ResolveReport.java b/src/java/org/apache/ivy/core/report/ResolveReport.java
index e9eec57..1b40769 100644
--- a/src/java/org/apache/ivy/core/report/ResolveReport.java
+++ b/src/java/org/apache/ivy/core/report/ResolveReport.java
@@ -27,7 +27,6 @@ import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.cache.ResolutionCacheManager;
@@ -364,7 +363,7 @@ public class ResolveReport {
md.getStatus(), new Date());
// copy namespaces
- for (Entry<String, String> ns : md.getExtraAttributesNamespaces().entrySet()) {
+ for (Map.Entry<String, String> ns : md.getExtraAttributesNamespaces().entrySet()) {
fixedmd.addExtraAttributeNamespace(ns.getKey(), ns.getValue());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/resolve/IvyNode.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/resolve/IvyNode.java b/src/java/org/apache/ivy/core/resolve/IvyNode.java
index c68ee3a..50f1b09 100644
--- a/src/java/org/apache/ivy/core/resolve/IvyNode.java
+++ b/src/java/org/apache/ivy/core/resolve/IvyNode.java
@@ -29,7 +29,6 @@ import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.Stack;
import java.util.regex.Matcher;
@@ -909,7 +908,7 @@ public class IvyNode implements Comparable<IvyNode> {
private static Collection<Artifact> findArtifactsMatching(IncludeRule rule,
Map<ArtifactId, Artifact> allArtifacts) {
Collection<Artifact> ret = new ArrayList<>();
- for (Entry<ArtifactId, Artifact> entry : allArtifacts.entrySet()) {
+ for (Map.Entry<ArtifactId, Artifact> entry : allArtifacts.entrySet()) {
if (MatcherHelper.matches(rule.getMatcher(), rule.getId(), entry.getKey())) {
ret.add(entry.getValue());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/resolve/ResolveData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/resolve/ResolveData.java b/src/java/org/apache/ivy/core/resolve/ResolveData.java
index 920e97d..f7e80fe 100644
--- a/src/java/org/apache/ivy/core/resolve/ResolveData.java
+++ b/src/java/org/apache/ivy/core/resolve/ResolveData.java
@@ -25,7 +25,6 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.core.event.EventManager;
import org.apache.ivy.core.module.descriptor.DependencyDescriptor;
@@ -98,7 +97,7 @@ public class ResolveData {
if (result == null) {
// search again, now ignore the missing extra attributes
- for (Entry<ModuleRevisionId, VisitData> entry : visitData.entrySet()) {
+ for (Map.Entry<ModuleRevisionId, VisitData> entry : visitData.entrySet()) {
ModuleRevisionId current = entry.getKey();
if (isSubMap(mrid.getAttributes(), current.getAttributes())) {
@@ -125,7 +124,7 @@ public class ResolveData {
Map<K, V> smallest = map1Size < map2Size ? map1 : map2;
Map<K, V> largest = map1Size < map2Size ? map2 : map1;
- for (Entry<K, V> entry : smallest.entrySet()) {
+ for (Map.Entry<K, V> entry : smallest.entrySet()) {
if (!largest.containsKey(entry.getKey())) {
return false;
@@ -244,9 +243,9 @@ public class ResolveData {
}
void blacklist(IvyNode node) {
- Iterator<Entry<ModuleRevisionId, VisitData>> iter = visitData.entrySet().iterator();
+ Iterator<Map.Entry<ModuleRevisionId, VisitData>> iter = visitData.entrySet().iterator();
while (iter.hasNext()) {
- Entry<ModuleRevisionId, VisitData> entry = iter.next();
+ Map.Entry<ModuleRevisionId, VisitData> entry = iter.next();
if (entry.getValue().getNode() == node && !node.getResolvedId().equals(entry.getKey())) {
// this visit data was associated with the blacklisted node,
// we discard this association
@@ -262,7 +261,7 @@ public class ResolveData {
if (node == null) {
// search again, now ignore the extra attributes
// TODO: maybe we should search the node that has at least the same attributes as mrid
- for (Entry<ModuleRevisionId, VisitData> entry : visitData.entrySet()) {
+ for (Map.Entry<ModuleRevisionId, VisitData> entry : visitData.entrySet()) {
ModuleRevisionId current = entry.getKey();
if (current.getModuleId().equals(mrid.getModuleId())
&& current.getRevision().equals(mrid.getRevision())) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java b/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
index e5d44e0..73e21fd 100644
--- a/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
+++ b/src/java/org/apache/ivy/core/retrieve/RetrieveEngine.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.IvyContext;
@@ -134,7 +133,7 @@ public class RetrieveEngine {
// do retrieve
long totalCopiedSize = 0;
- for (Entry<ArtifactDownloadReport, Set<String>> artifactAndPaths : artifactsToCopy
+ for (Map.Entry<ArtifactDownloadReport, Set<String>> artifactAndPaths : artifactsToCopy
.entrySet()) {
ArtifactDownloadReport artifact = artifactAndPaths.getKey();
File archive = artifact.getLocalFile();
@@ -393,7 +392,7 @@ public class RetrieveEngine {
}
// resolve conflicts if any
- for (Entry<String, Set<ArtifactRevisionId>> entry : conflictsMap.entrySet()) {
+ for (Map.Entry<String, Set<ArtifactRevisionId>> entry : conflictsMap.entrySet()) {
String copyDest = entry.getKey();
Set<ArtifactRevisionId> artifacts = entry.getValue();
Set<String> conflictsConfs = conflictsConfMap.get(copyDest);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/core/search/SearchEngine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/search/SearchEngine.java b/src/java/org/apache/ivy/core/search/SearchEngine.java
index 9a508cd..30a014d 100644
--- a/src/java/org/apache/ivy/core/search/SearchEngine.java
+++ b/src/java/org/apache/ivy/core/search/SearchEngine.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.IvyPatternHelper;
@@ -221,7 +220,7 @@ public class SearchEngine {
List<ModuleRevisionId> ret = new ArrayList<>();
Map<String, Object> criteria = new HashMap<>();
- for (Entry<String, String> entry : moduleCrit.getAttributes().entrySet()) {
+ for (Map.Entry<String, String> entry : moduleCrit.getAttributes().entrySet()) {
addMatcher(matcher, entry.getValue(), criteria, entry.getKey());
}
@@ -277,7 +276,7 @@ public class SearchEngine {
public ModuleRevisionId[] listModules(DependencyResolver resolver, ModuleRevisionId moduleCrit,
PatternMatcher matcher) {
Map<String, Object> criteria = new HashMap<>();
- for (Entry<String, String> entry : moduleCrit.getAttributes().entrySet()) {
+ for (Map.Entry<String, String> entry : moduleCrit.getAttributes().entrySet()) {
addMatcher(matcher, entry.getValue(), criteria, entry.getKey());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 1fa2be8..c895709 100644
--- a/src/java/org/apache/ivy/core/settings/IvySettings.java
+++ b/src/java/org/apache/ivy/core/settings/IvySettings.java
@@ -111,7 +111,6 @@ import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import static org.apache.ivy.util.StringUtils.splitToArray;
@@ -372,7 +371,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
}
public synchronized void typeDefs(Properties p, boolean silentFail) {
- for (Entry<Object, Object> entry : p.entrySet()) {
+ for (Map.Entry<Object, Object> entry : p.entrySet()) {
typeDef(entry.getKey().toString(), entry.getValue().toString(), silentFail);
}
}
@@ -631,7 +630,7 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
*/
public synchronized Map<String, String> substitute(Map<String, String> strings) {
Map<String, String> substituted = new LinkedHashMap<>();
- for (Entry<String, String> entry : strings.entrySet()) {
+ for (Map.Entry<String, String> entry : strings.entrySet()) {
substituted.put(entry.getKey(), substitute(entry.getValue()));
}
return substituted;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java b/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
index ee56614..72ae950 100644
--- a/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
+++ b/src/java/org/apache/ivy/osgi/core/BundleInfoAdapter.java
@@ -27,7 +27,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.jar.Manifest;
@@ -170,7 +169,7 @@ public class BundleInfoAdapter {
}
if (manifest != null) {
- for (Entry<Object, Object> entries : manifest.getMainAttributes().entrySet()) {
+ for (Map.Entry<Object, Object> entries : manifest.getMainAttributes().entrySet()) {
md.addExtraInfo(new ExtraInfoHolder(entries.getKey().toString(), entries.getValue()
.toString()));
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileProvider.java b/src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileProvider.java
index 26afd93..dfb1fcc 100644
--- a/src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileProvider.java
+++ b/src/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileProvider.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Properties;
import org.apache.ivy.util.Message;
@@ -75,7 +74,7 @@ public class ExecutionEnvironmentProfileProvider {
defaultProfilesFile.close();
}
Map<String, ExecutionEnvironmentProfile> profiles = new HashMap<>();
- for (Entry<Object, Object> prop : props.entrySet()) {
+ for (Map.Entry<Object, Object> prop : props.entrySet()) {
String propName = (String) prop.getKey();
if (propName.endsWith(".pkglist")) {
String profileName = propName.substring(0, propName.length() - 8);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/osgi/core/ManifestHeaderElement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/core/ManifestHeaderElement.java b/src/java/org/apache/ivy/osgi/core/ManifestHeaderElement.java
index efca83f..3894eaf 100644
--- a/src/java/org/apache/ivy/osgi/core/ManifestHeaderElement.java
+++ b/src/java/org/apache/ivy/osgi/core/ManifestHeaderElement.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
public class ManifestHeaderElement {
private List<String> values = new ArrayList<>();
@@ -70,7 +69,7 @@ public class ManifestHeaderElement {
if (other.directives.size() != directives.size()) {
return false;
}
- for (Entry<String, String> directive : directives.entrySet()) {
+ for (Map.Entry<String, String> directive : directives.entrySet()) {
if (!directive.getValue().equals(other.directives.get(directive.getKey()))) {
return false;
}
@@ -78,7 +77,7 @@ public class ManifestHeaderElement {
if (other.attributes.size() != attributes.size()) {
return false;
}
- for (Entry<String, String> attribute : attributes.entrySet()) {
+ for (Map.Entry<String, String> attribute : attributes.entrySet()) {
if (!attribute.getValue().equals(other.attributes.get(attribute.getKey()))) {
return false;
}
@@ -94,10 +93,10 @@ public class ManifestHeaderElement {
}
sb.append(value);
}
- for (Entry<String, String> directive : directives.entrySet()) {
+ for (Map.Entry<String, String> directive : directives.entrySet()) {
sb.append(";").append(directive.getKey()).append(":=").append(directive.getValue());
}
- for (Entry<String, String> attribute : attributes.entrySet()) {
+ for (Map.Entry<String, String> attribute : attributes.entrySet()) {
sb.append(";").append(attribute.getKey()).append("=").append(attribute.getValue());
}
return sb.toString();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
index 9e037f3..505ba7d 100644
--- a/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
+++ b/src/java/org/apache/ivy/osgi/p2/P2ArtifactParser.java
@@ -27,7 +27,6 @@ import java.text.ParseException;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Map.Entry;
import javax.xml.parsers.ParserConfigurationException;
@@ -82,7 +81,7 @@ public class P2ArtifactParser implements XMLInputParser {
addChild(new MappingsHandler(), new ChildElementHandler<MappingsHandler>() {
@Override
public void childHandled(MappingsHandler child) {
- for (Entry<String, String> entry : child.outputByFilter.entrySet()) {
+ for (Map.Entry<String, String> entry : child.outputByFilter.entrySet()) {
OSGiFilter filter;
try {
filter = OSGiFilterParser.parse(entry.getKey());
@@ -193,7 +192,7 @@ public class P2ArtifactParser implements XMLInputParser {
private String getPattern(P2Artifact p2Artifact, Map<String, String> properties) {
Map<String, String> props = new HashMap<>(properties);
props.put("classifier", p2Artifact.getClassifier());
- for (Entry<OSGiFilter, String> pattern : artifactPatterns.entrySet()) {
+ for (Map.Entry<OSGiFilter, String> pattern : artifactPatterns.entrySet()) {
if (pattern.getKey().eval(props)) {
return pattern.getValue();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 d715614..e38172d 100644
--- a/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
+++ b/src/java/org/apache/ivy/osgi/repo/AbstractOSGiResolver.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.IvyPatternHelper;
@@ -256,7 +255,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
if (requirementStrategy == RequirementStrategy.first) {
Message.warn("Ambiguity for the '" + osgiType + "' requirement "
+ mrid.getName() + ";version=" + mrid.getRevision());
- for (Entry<String, List<MDResolvedResource>> entry : matching.entrySet()) {
+ for (Map.Entry<String, List<MDResolvedResource>> entry : matching.entrySet()) {
Message.warn("\t" + entry.getKey());
for (MDResolvedResource c : entry.getValue()) {
Message.warn("\t\t" + c.getRevision()
@@ -266,7 +265,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
} else if (requirementStrategy == RequirementStrategy.noambiguity) {
Message.error("Ambiguity for the '" + osgiType + "' requirement "
+ mrid.getName() + ";version=" + mrid.getRevision());
- for (Entry<String, List<MDResolvedResource>> entry : matching.entrySet()) {
+ for (Map.Entry<String, List<MDResolvedResource>> entry : matching.entrySet()) {
Message.error("\t" + entry.getKey());
for (MDResolvedResource c : entry.getValue()) {
Message.error("\t\t" + c.getRevision()
@@ -386,7 +385,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
// no revision, all match then
capabilityValues.addAll(moduleByCapabilityValue.keySet());
} else {
- for (Entry<String, Set<ModuleDescriptor>> entry : moduleByCapabilityValue.entrySet()) {
+ for (Map.Entry<String, Set<ModuleDescriptor>> entry : moduleByCapabilityValue.entrySet()) {
boolean moduleMatchRev = false;
for (ModuleDescriptor md : entry.getValue()) {
moduleMatchRev = rev.equals(md.getRevision());
@@ -413,7 +412,7 @@ public abstract class AbstractOSGiResolver extends BasicResolver {
private Set<Map<String, String>> listTokenValues(Set<String> tokens,
Map<String, Object> criteria) {
Map<String, String> stringCriteria = new HashMap<>();
- for (Entry<String, Object> entry : criteria.entrySet()) {
+ for (Map.Entry<String, Object> entry : criteria.entrySet()) {
Object value = entry.getValue();
if (!(value instanceof String)) {
// no support for matcher for now
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java b/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java
index e90512e..cd14a3f 100644
--- a/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java
+++ b/src/java/org/apache/ivy/plugins/matcher/MapMatcher.java
@@ -20,7 +20,6 @@ package org.apache.ivy.plugins.matcher;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
public class MapMatcher {
private Map<String, Matcher> matchers = new HashMap<>();
@@ -32,7 +31,7 @@ public class MapMatcher {
public MapMatcher(Map<String, String> attributes, PatternMatcher pm) {
this.attributes = attributes;
this.pm = pm;
- for (Entry<String, String> entry : attributes.entrySet()) {
+ for (Map.Entry<String, String> entry : attributes.entrySet()) {
String value = entry.getValue();
if (value != null) {
matchers.put(entry.getKey(), pm.getMatcher(value));
@@ -41,7 +40,7 @@ public class MapMatcher {
}
public boolean matches(Map<String, String> m) {
- for (Entry<String, Matcher> entry : matchers.entrySet()) {
+ for (Map.Entry<String, Matcher> entry : matchers.entrySet()) {
Matcher matcher = entry.getValue();
String value = m.get(entry.getKey());
if ((value == null) || !matcher.matches(value)) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
index 2a043d0..bac3180 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
@@ -24,7 +24,6 @@ import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.util.Arrays;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.core.IvyPatternHelper;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -466,7 +465,7 @@ public final class XmlModuleDescriptorWriter {
}
out.print("<");
out.print(extraInfo.getName());
- for (Entry<String, String> entry : extraInfo.getAttributes().entrySet()) {
+ for (Map.Entry<String, String> entry : extraInfo.getAttributes().entrySet()) {
out.print(String.format(" %s=\"%s\"", entry.getKey(), entry.getValue()));
}
boolean requireClosingTag = false;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 f1ab0ac..cb0d606 100644
--- a/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
+++ b/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
@@ -27,7 +27,6 @@ import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import org.apache.ivy.core.IvyPatternHelper;
@@ -199,7 +198,7 @@ public abstract class AbstractPatternsBasedResolver extends BasicResolver {
Set<String> tokenSet = new HashSet<>(Arrays.asList(tokens));
Map<String, String> tokenValues = new HashMap<>();
- for (Entry<String, Object> entry : criteria.entrySet()) {
+ for (Map.Entry<String, Object> entry : criteria.entrySet()) {
Object value = entry.getValue();
if (value instanceof String) {
tokenValues.put(entry.getKey(), (String) value);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/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 31a770e..67bb3ad 100644
--- a/src/java/org/apache/ivy/util/cli/CommandLineParser.java
+++ b/src/java/org/apache/ivy/util/cli/CommandLineParser.java
@@ -25,7 +25,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.util.StringUtils;
@@ -100,7 +99,7 @@ public class CommandLineParser {
}
// print options help
- for (Entry<String, List<Option>> entry : categories.entrySet()) {
+ for (Map.Entry<String, List<Option>> entry : categories.entrySet()) {
pw.println("==== " + entry.getKey());
for (Option option : entry.getValue()) {
if (option.isDeprecated() && !showDeprecated) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java b/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
index bf43e9c..8dee1ec 100644
--- a/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
+++ b/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
@@ -21,7 +21,6 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import org.apache.ivy.plugins.parser.ParserSettings;
import org.xml.sax.Attributes;
@@ -75,7 +74,7 @@ public final class ExtendableItemHelper {
public static void fillExtraAttributes(ParserSettings settings, DefaultExtendableItem item,
Attributes attributes, List<String> ignoredAttNames) {
Map<String, String> att = getExtraAttributes(settings, attributes, ignoredAttNames);
- for (Entry<String, String> entry : att.entrySet()) {
+ for (Map.Entry<String, String> entry : att.entrySet()) {
item.setExtraAttribute(entry.getKey(), entry.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/4272bf28/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java b/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
index a042171..3fc4f8d 100644
--- a/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
+++ b/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
@@ -20,7 +20,6 @@ package org.apache.ivy.util.extendable;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Map.Entry;
public class UnmodifiableExtendableItem implements ExtendableItem {
private final Map<String, String> attributes = new HashMap<>();
@@ -48,7 +47,7 @@ public class UnmodifiableExtendableItem implements ExtendableItem {
this.attributes.putAll(stdAttributes);
}
if (extraAttributes != null) {
- for (Entry<String, String> extraAtt : extraAttributes.entrySet()) {
+ for (Map.Entry<String, String> extraAtt : extraAttributes.entrySet()) {
setExtraAttribute(extraAtt.getKey(), extraAtt.getValue());
}
}