You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by ja...@apache.org on 2017/06/18 13:46:41 UTC
ant-ivy git commit: Generics + foreach loops and Java 7 in util
(except Filter)
Repository: ant-ivy
Updated Branches:
refs/heads/master feb3c17f1 -> 1c23268d7
Generics + foreach loops and Java 7 in util (except Filter)
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/1c23268d
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/1c23268d
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/1c23268d
Branch: refs/heads/master
Commit: 1c23268d775b1d10c5f6fa55cfd07965949cf036
Parents: feb3c17
Author: twogee <g....@gmail.com>
Authored: Wed Jun 14 21:19:50 2017 +0200
Committer: Jaikiran Pai <ja...@apache.org>
Committed: Sun Jun 18 19:16:05 2017 +0530
----------------------------------------------------------------------
.../apache/ivy/util/AbstractMessageLogger.java | 6 +-
.../org/apache/ivy/util/ChecksumHelper.java | 25 ++-
.../org/apache/ivy/util/CollectionUtils.java | 4 +-
.../org/apache/ivy/util/ConfigurationUtils.java | 37 ++--
src/java/org/apache/ivy/util/Configurator.java | 195 ++++++++-----------
.../apache/ivy/util/ContextualSAXHandler.java | 4 +-
src/java/org/apache/ivy/util/Credentials.java | 2 +-
.../org/apache/ivy/util/CredentialsUtil.java | 2 +-
.../apache/ivy/util/EncryptedProperties.java | 10 +-
src/java/org/apache/ivy/util/FileUtil.java | 64 +++---
src/java/org/apache/ivy/util/HexEncoder.java | 8 +-
.../apache/ivy/util/MessageLoggerEngine.java | 10 +-
.../apache/ivy/util/MessageLoggerHelper.java | 11 +-
src/java/org/apache/ivy/util/StringUtils.java | 12 +-
src/java/org/apache/ivy/util/XMLHelper.java | 8 +-
.../org/apache/ivy/util/cli/CommandLine.java | 4 +-
.../apache/ivy/util/cli/CommandLineParser.java | 6 +-
src/java/org/apache/ivy/util/cli/Option.java | 16 +-
.../org/apache/ivy/util/cli/OptionBuilder.java | 6 +-
.../util/extendable/DefaultExtendableItem.java | 2 +-
.../util/extendable/ExtendableItemHelper.java | 4 +-
.../extendable/UnmodifiableExtendableItem.java | 6 +-
.../ivy/util/filter/ArtifactTypeFilter.java | 2 +-
.../apache/ivy/util/filter/FilterHelper.java | 8 +-
.../apache/ivy/util/url/ApacheURLLister.java | 2 +-
.../apache/ivy/util/url/BasicURLHandler.java | 5 +-
.../apache/ivy/util/url/CredentialsStore.java | 6 +-
.../apache/ivy/util/url/HttpClientHandler.java | 9 +-
.../ivy/util/url/URLHandlerDispatcher.java | 8 +-
.../apache/ivy/util/url/URLHandlerRegistry.java | 5 +-
.../ivy/core/publish/PublishEngineTest.java | 6 +-
.../ivy/core/publish/PublishEventsTest.java | 3 +-
.../plugins/repository/vfs/VfsResourceTest.java | 4 +-
.../ivy/plugins/resolver/ChainResolverTest.java | 10 +-
34 files changed, 233 insertions(+), 277 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/AbstractMessageLogger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/AbstractMessageLogger.java b/src/java/org/apache/ivy/util/AbstractMessageLogger.java
index 8a203dd..ee3ecd4 100644
--- a/src/java/org/apache/ivy/util/AbstractMessageLogger.java
+++ b/src/java/org/apache/ivy/util/AbstractMessageLogger.java
@@ -24,11 +24,11 @@ import java.util.List;
* An abstract base class to ease {@link MessageLogger} implementation.
*/
public abstract class AbstractMessageLogger implements MessageLogger {
- private List<String> problems = new ArrayList<String>();
+ private List<String> problems = new ArrayList<>();
- private List<String> warns = new ArrayList<String>();
+ private List<String> warns = new ArrayList<>();
- private List<String> errors = new ArrayList<String>();
+ private List<String> errors = new ArrayList<>();
private boolean showProgress = true;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/ChecksumHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/ChecksumHelper.java b/src/java/org/apache/ivy/util/ChecksumHelper.java
index d873e4c..6bc1369 100644
--- a/src/java/org/apache/ivy/util/ChecksumHelper.java
+++ b/src/java/org/apache/ivy/util/ChecksumHelper.java
@@ -33,7 +33,7 @@ public final class ChecksumHelper {
private static final int BUFFER_SIZE = 2048;
- private static Map algorithms = new HashMap();
+ private static final Map<String, String> algorithms = new HashMap<>();
static {
algorithms.put("md5", "MD5");
algorithms.put("sha1", "SHA-1");
@@ -94,11 +94,11 @@ public final class ChecksumHelper {
// IVY-1155: support some strange formats like this one:
// https://repo1.maven.org/maven2/org/apache/pdfbox/fontbox/0.8.0-incubator/fontbox-0.8.0-incubator.jar.md5
if (expected.endsWith(":")) {
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
char[] chars = csFileContent.substring(spaceIndex + 1).toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (!Character.isWhitespace(chars[i])) {
- result.append(chars[i]);
+ for (char ch : chars) {
+ if (!Character.isWhitespace(ch)) {
+ result.append(ch);
}
}
expected = result.toString();
@@ -120,9 +120,8 @@ public final class ChecksumHelper {
}
private static byte[] compute(File f, String algorithm) throws IOException {
- InputStream is = new FileInputStream(f);
- try {
+ try (InputStream is = new FileInputStream(f)) {
MessageDigest md = getMessageDigest(algorithm);
md.reset();
@@ -132,8 +131,6 @@ public final class ChecksumHelper {
md.update(buf, 0, len);
}
return md.digest();
- } finally {
- is.close();
}
}
@@ -142,7 +139,7 @@ public final class ChecksumHelper {
}
private static MessageDigest getMessageDigest(String algorithm) {
- String mdAlgorithm = (String) algorithms.get(algorithm);
+ String mdAlgorithm = algorithms.get(algorithm);
if (mdAlgorithm == null) {
throw new IllegalArgumentException("unknown algorithm " + algorithm);
}
@@ -171,16 +168,16 @@ public final class ChecksumHelper {
return null;
}
- StringBuffer out = new StringBuffer(in.length * 2);
+ StringBuilder out = new StringBuilder(in.length * 2);
// CheckStyle:MagicNumber OFF
- for (int i = 0; i < in.length; i++) {
- ch = (byte) (in[i] & 0xF0); // Strip off high nibble
+ for (byte bt : in) {
+ ch = (byte) (bt & 0xF0); // Strip off high nibble
ch = (byte) (ch >>> 4); // shift the bits down
ch = (byte) (ch & 0x0F); // must do this is high order bit is on!
out.append(CHARS[ch]); // convert the nibble to a String Character
- ch = (byte) (in[i] & 0x0F); // Strip off low nibble
+ ch = (byte) (bt & 0x0F); // Strip off low nibble
out.append(CHARS[ch]); // convert the nibble to a String Character
}
// CheckStyle:MagicNumber ON
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/CollectionUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/CollectionUtils.java b/src/java/org/apache/ivy/util/CollectionUtils.java
index d82e414..eca8a49 100644
--- a/src/java/org/apache/ivy/util/CollectionUtils.java
+++ b/src/java/org/apache/ivy/util/CollectionUtils.java
@@ -23,8 +23,8 @@ import java.util.List;
public class CollectionUtils {
- public static List toList(Iterator iterator) {
- List list = new ArrayList();
+ public static <T> List<T> toList(Iterator<T> iterator) {
+ List<T> list = new ArrayList<>();
while (iterator.hasNext()) {
list.add(iterator.next());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/ConfigurationUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/ConfigurationUtils.java b/src/java/org/apache/ivy/util/ConfigurationUtils.java
index 597942c..4bbb17c 100644
--- a/src/java/org/apache/ivy/util/ConfigurationUtils.java
+++ b/src/java/org/apache/ivy/util/ConfigurationUtils.java
@@ -18,7 +18,6 @@
package org.apache.ivy.util;
import java.util.Arrays;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -61,36 +60,36 @@ public final class ConfigurationUtils {
return md.getConfigurationsNames();
}
- Set result = new LinkedHashSet();
- Set excluded = new LinkedHashSet();
- for (int i = 0; i < confs.length; i++) {
- if ("*".equals(confs[i])) {
+ Set<String> result = new LinkedHashSet<>();
+ Set<String> excluded = new LinkedHashSet<>();
+ for (String conf : confs) {
+ if ("*".equals(conf)) {
result.addAll(Arrays.asList(md.getConfigurationsNames()));
- } else if ("*(public)".equals(confs[i])) {
+ } else if ("*(public)".equals(conf)) {
Configuration[] all = md.getConfigurations();
- for (int j = 0; j < all.length; j++) {
- if (all[j].getVisibility().equals(Visibility.PUBLIC)) {
- result.add(all[j].getName());
+ for (Configuration cf : all) {
+ if (cf.getVisibility().equals(Visibility.PUBLIC)) {
+ result.add(cf.getName());
}
}
- } else if ("*(private)".equals(confs[i])) {
+ } else if ("*(private)".equals(conf)) {
Configuration[] all = md.getConfigurations();
- for (int j = 0; j < all.length; j++) {
- if (all[j].getVisibility().equals(Visibility.PRIVATE)) {
- result.add(all[j].getName());
+ for (Configuration cf : all) {
+ if (cf.getVisibility().equals(Visibility.PRIVATE)) {
+ result.add(cf.getName());
}
}
- } else if (confs[i].startsWith("!")) {
- excluded.add(confs[i].substring(1));
+ } else if (conf.startsWith("!")) {
+ excluded.add(conf.substring(1));
} else {
- result.add(confs[i]);
+ result.add(conf);
}
}
- for (Iterator iter = excluded.iterator(); iter.hasNext();) {
- result.remove(iter.next());
+ for (String ex : excluded) {
+ result.remove(ex);
}
- return (String[]) result.toArray(new String[result.size()]);
+ return result.toArray(new String[result.size()]);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 4350049..893ed50 100644
--- a/src/java/org/apache/ivy/util/Configurator.java
+++ b/src/java/org/apache/ivy/util/Configurator.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -60,9 +59,9 @@ public class Configurator {
public static class Macro {
private MacroDef macrodef;
- private Map attValues = new HashMap();
+ private Map<String, String> attValues = new HashMap<>();
- private Map macroRecords = new HashMap();
+ private Map<String, List<MacroRecord>> macroRecords = new HashMap<>();
public Macro(MacroDef def) {
macrodef = def;
@@ -78,9 +77,9 @@ public class Configurator {
public MacroRecord recordCreateChild(String name) {
MacroRecord macroRecord = new MacroRecord(name);
- List records = (List) macroRecords.get(name);
+ List<MacroRecord> records = macroRecords.get(name);
if (records == null) {
- records = new ArrayList();
+ records = new ArrayList<>();
macroRecords.put(name, records);
}
records.add(macroRecord);
@@ -140,9 +139,9 @@ public class Configurator {
public static class MacroRecord {
private String name;
- private Map attributes = new LinkedHashMap();
+ private Map<String, String> attributes = new LinkedHashMap<>();
- private List children = new ArrayList();
+ private List<MacroRecord> children = new ArrayList<>();
private Object object;
@@ -170,11 +169,11 @@ public class Configurator {
return child;
}
- public Map getAttributes() {
+ public Map<String, String> getAttributes() {
return attributes;
}
- public List getChildren() {
+ public List<MacroRecord> getChildren() {
return children;
}
@@ -186,9 +185,9 @@ public class Configurator {
public static class MacroDef {
private String name;
- private Map attributes = new HashMap();
+ private Map<String, Attribute> attributes = new HashMap<>();
- private Map elements = new HashMap();
+ private Map<String, Element> elements = new HashMap<>();
private MacroRecord macroRecord;
@@ -197,13 +196,13 @@ public class Configurator {
}
public Attribute getAttribute(String attributeName) {
- return (Attribute) attributes.get(attributeName);
+ return attributes.get(attributeName);
}
- public Object play(Configurator conf, Map attValues, Map macroRecords) {
- for (Iterator iter = attributes.values().iterator(); iter.hasNext();) {
- Attribute att = (Attribute) iter.next();
- String val = (String) attValues.get(att.getName());
+ public Object play(Configurator conf, Map<String, String> attValues,
+ Map<String, List<MacroRecord>> macroRecords) {
+ for (Attribute att : attributes.values()) {
+ String val = attValues.get(att.getName());
if (val == null) {
if (att.getDefault() == null) {
throw new IllegalArgumentException("attribute " + att.getName()
@@ -216,8 +215,8 @@ public class Configurator {
return play(conf, macroRecord, attValues, macroRecords);
}
- private Object play(Configurator conf, MacroRecord macroRecord, Map attValues,
- Map childrenRecords) {
+ private Object play(Configurator conf, MacroRecord macroRecord, Map<String, String> attValues,
+ Map<String, List<MacroRecord>> childrenRecords) {
if (macroRecord.getObject() != null) {
// this is a recorded reference, we can add the referenced object directly
conf.addChild(macroRecord.getName(), macroRecord.getObject());
@@ -225,23 +224,19 @@ public class Configurator {
return macroRecord.getObject();
}
conf.startCreateChild(macroRecord.getName());
- Map attributes = macroRecord.getAttributes();
- for (Iterator iter = attributes.keySet().iterator(); iter.hasNext();) {
- String attName = (String) iter.next();
- String attValue = replaceParam((String) attributes.get(attName), attValues);
+ Map<String, String> attributes = macroRecord.getAttributes();
+ for (String attName : attributes.keySet()) {
+ String attValue = replaceParam(attributes.get(attName), attValues);
conf.setAttribute(attName, attValue);
}
- for (Iterator iter = macroRecord.getChildren().iterator(); iter.hasNext();) {
- MacroRecord child = (MacroRecord) iter.next();
- Element elt = (Element) elements.get(child.getName());
+ for (MacroRecord child : macroRecord.getChildren()) {
+ Element elt = elements.get(child.getName());
if (elt != null) {
- List elements = (List) childrenRecords.get(child.getName());
+ List<MacroRecord> elements = childrenRecords.get(child.getName());
if (elements != null) {
- for (Iterator iterator = elements.iterator(); iterator.hasNext();) {
- MacroRecord element = (MacroRecord) iterator.next();
- for (Iterator it2 = element.getChildren().iterator(); it2.hasNext();) {
- MacroRecord r = (MacroRecord) it2.next();
- play(conf, r, attValues, Collections.EMPTY_MAP);
+ for (MacroRecord element : elements) {
+ for (MacroRecord r : element.getChildren()) {
+ play(conf, r, attValues, Collections.<String, List<MacroRecord>>emptyMap());
}
}
} else if (!elt.isOptional()) {
@@ -256,7 +251,7 @@ public class Configurator {
return conf.endCreateChild();
}
- private String replaceParam(String string, Map attValues) {
+ private String replaceParam(String string, Map<String, String> attValues) {
return IvyPatternHelper.substituteParams(string, attValues);
}
@@ -301,24 +296,23 @@ public class Configurator {
private String objName;
- private Map createMethods = new HashMap();
+ private Map<String, Method> createMethods = new HashMap<>();
- private Map addMethods = new HashMap();
+ private Map<String, Method> addMethods = new HashMap<>();
- private Map addConfiguredMethods = new HashMap();
+ private Map<String, Method> addConfiguredMethods = new HashMap<>();
- private Map setMethods = new HashMap();
+ private Map<String, Method> setMethods = new HashMap<>();
- private Map typeAddMethods = new HashMap();
+ private Map<Class<?>, Method> typeAddMethods = new HashMap<>();
- private Map typeAddConfiguredMethods = new HashMap();
+ private Map<Class<?>, Method> typeAddConfiguredMethods = new HashMap<>();
public ObjectDescriptor(Object object, String objName) {
obj = object;
this.objName = objName;
Method[] methods = object.getClass().getMethods();
- for (int i = 0; i < methods.length; i++) {
- Method m = methods[i];
+ for (Method m : methods) {
if (m.getName().startsWith("create") && m.getParameterTypes().length == 0
&& !Void.TYPE.equals(m.getReturnType())) {
String name = StringUtils
@@ -330,7 +324,7 @@ public class Configurator {
} else if (m.getName().startsWith("addConfigured")
&& m.getParameterTypes().length == 1 && Void.TYPE.equals(m.getReturnType())) {
String name = StringUtils.uncapitalize(m.getName().substring(
- "addConfigured".length()));
+ "addConfigured".length()));
if (name.length() == 0) {
addAddConfiguredMethod(m);
}
@@ -375,7 +369,7 @@ public class Configurator {
}
public void addSetMethod(String name, Method m) {
- Method current = (Method) setMethods.get(name);
+ Method current = setMethods.get(name);
if (current != null && current.getParameterTypes()[0] == String.class) {
// setter methods with String attribute take precedence
return;
@@ -388,15 +382,15 @@ public class Configurator {
}
public Method getCreateMethod(String name) {
- return (Method) createMethods.get(name);
+ return createMethods.get(name);
}
public Method getAddMethod(String name) {
- return (Method) addMethods.get(name);
+ return addMethods.get(name);
}
public Method getAddConfiguredMethod(String name) {
- return (Method) addConfiguredMethods.get(name);
+ return addConfiguredMethods.get(name);
}
public Method getAddMethod(Class type) {
@@ -407,22 +401,21 @@ public class Configurator {
return getTypeMatchingMethod(type, typeAddConfiguredMethods);
}
- private Method getTypeMatchingMethod(Class type, Map typeMethods) {
- Method m = (Method) typeMethods.get(type);
+ private Method getTypeMatchingMethod(Class<?> type, Map<Class<?>, Method> typeMethods) {
+ Method m = typeMethods.get(type);
if (m != null) {
return m;
}
- for (Iterator iter = typeMethods.keySet().iterator(); iter.hasNext();) {
- Class clss = (Class) iter.next();
- if (clss.isAssignableFrom(type)) {
- return (Method) typeMethods.get(clss);
+ for (Class<?> clazz : typeMethods.keySet()) {
+ if (clazz.isAssignableFrom(type)) {
+ return typeMethods.get(clazz);
}
}
return null;
}
public Method getSetMethod(String name) {
- return (Method) setMethods.get(name);
+ return setMethods.get(name);
}
public String getObjectName() {
@@ -432,14 +425,14 @@ public class Configurator {
private FileResolver fileResolver = FileResolver.DEFAULT;
- private Map typedefs = new HashMap();
+ private Map<String, Class<?>> typedefs = new HashMap<>();
- private Map macrodefs = new HashMap();
+ private Map<String, MacroDef> macrodefs = new HashMap<>();
// stack in which the top is current configured object descriptor
- private Stack objectStack = new Stack();
+ private Stack<ObjectDescriptor> objectStack = new Stack<>();
- private static final List TRUE_VALUES = Arrays.asList(new String[] {"true", "yes", "on"});
+ private static final List TRUE_VALUES = Arrays.asList("true", "yes", "on");
public void typeDef(String name, String className) throws ClassNotFoundException {
typeDef(name, Class.forName(className));
@@ -469,7 +462,7 @@ public class Configurator {
if (objectStack.isEmpty()) {
throw new IllegalStateException("set root before creating child");
}
- ObjectDescriptor parentOD = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor parentOD = objectStack.peek();
Object parent = parentOD.getObject();
if (parent instanceof MacroDef) {
if (!"attribute".equals(name) && !"element".equals(name)) {
@@ -489,13 +482,13 @@ public class Configurator {
return record;
}
Object child = null;
- MacroDef macrodef = (MacroDef) macrodefs.get(name);
+ MacroDef macrodef = macrodefs.get(name);
if (macrodef != null) {
Macro macro = macrodef.createMacro();
setCurrent(macro, name);
return macro;
}
- Class childClass = (Class) typedefs.get(name);
+ Class childClass = typedefs.get(name);
Method addChild = null;
try {
if (childClass != null) {
@@ -503,7 +496,7 @@ public class Configurator {
} else {
addChild = parentOD.getCreateMethod(name);
if (addChild != null) {
- child = addChild.invoke(parent, new Object[0]);
+ child = addChild.invoke(parent);
setCurrent(child, name);
return child;
}
@@ -511,7 +504,7 @@ public class Configurator {
if (addChild != null) {
childClass = addChild.getParameterTypes()[0];
child = childClass.newInstance();
- addChild.invoke(parent, new Object[] {child});
+ addChild.invoke(parent, child);
setCurrent(child, name);
return child;
}
@@ -531,10 +524,8 @@ public class Configurator {
throw new IllegalArgumentException("no default constructor on " + childClass
+ " for adding " + name + " on " + parent.getClass());
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException("bad method found for "
- + name + " on " + parent.getClass());
- iae.initCause(ex);
- throw iae;
+ throw new IllegalArgumentException("bad method found for " + name + " on "
+ + parent.getClass(), ex);
}
throw new IllegalArgumentException("no appropriate method found for adding " + name
+ " on " + parent.getClass());
@@ -544,17 +535,15 @@ public class Configurator {
if (objectStack.isEmpty()) {
throw new IllegalStateException("set root before creating child");
}
- ObjectDescriptor parentOD = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor parentOD = objectStack.peek();
try {
addChild(parentOD, child.getClass(), name, child);
} catch (InstantiationException ex) {
throw new IllegalArgumentException("no default constructor on " + child.getClass()
+ " for adding " + name + " on " + parentOD.getObject().getClass());
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException("bad method found for "
- + name + " on " + parentOD.getObject().getClass());
- iae.initCause(ex);
- throw iae;
+ throw new IllegalArgumentException("bad method found for "
+ + name + " on " + parentOD.getObject().getClass(), ex);
}
}
@@ -572,7 +561,7 @@ public class Configurator {
if (child == null) {
child = childClass.newInstance();
}
- addChild.invoke(parent, new Object[] {child});
+ addChild.invoke(parent, child);
setCurrent(child, name);
return child;
}
@@ -596,7 +585,7 @@ public class Configurator {
if (objectStack.isEmpty()) {
return false;
}
- ObjectDescriptor od = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor od = objectStack.peek();
return (od.getObject() instanceof MacroDef);
}
@@ -604,7 +593,7 @@ public class Configurator {
if (objectStack.isEmpty()) {
throw new IllegalStateException("set root before setting attribute");
}
- ObjectDescriptor od = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor od = objectStack.peek();
if (od.getObject() instanceof Macro) {
((Macro) od.getObject()).defineAttribute(attributeName, value);
return;
@@ -616,21 +605,21 @@ public class Configurator {
Method m = od.getSetMethod(attributeName);
if (m == null) {
if (od.getObject() instanceof Map) {
- ((Map) od.getObject()).put(attributeName, value);
+ ((Map<String, String>) od.getObject()).put(attributeName, value);
return;
}
throw new IllegalArgumentException("no set method found for " + attributeName + " on "
+ od.getObject().getClass());
}
Object convertedValue = null;
- Class paramClass = m.getParameterTypes()[0];
+ Class<?> paramClass = m.getParameterTypes()[0];
try {
if (paramClass.equals(String.class)) {
convertedValue = value;
} else if (paramClass.equals(Boolean.class) || paramClass.equals(boolean.class)) {
- convertedValue = Boolean.valueOf(TRUE_VALUES.contains(value));
+ convertedValue = TRUE_VALUES.contains(value);
} else if (paramClass.equals(Character.class) || paramClass.equals(char.class)) {
- convertedValue = new Character(value.length() > 0 ? value.charAt(0) : ' ');
+ convertedValue = value.length() > 0 ? value.charAt(0) : ' ';
} else if (paramClass.equals(Short.class) || paramClass.equals(short.class)) {
convertedValue = Short.valueOf(value);
} else if (paramClass.equals(Integer.class) || paramClass.equals(int.class)) {
@@ -644,22 +633,18 @@ public class Configurator {
+ attributeName);
} else {
convertedValue = paramClass.getConstructor(new Class[] {String.class}).newInstance(
- new Object[] {value});
+ value);
}
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException("impossible to convert "
+ throw new IllegalArgumentException("impossible to convert "
+ value + " to " + paramClass + " for setting " + attributeName + " on "
- + od.getObject().getClass() + ": " + ex.getMessage());
- iae.initCause(ex);
- throw iae;
+ + od.getObject().getClass() + ": " + ex.getMessage(), ex);
}
try {
- m.invoke(od.getObject(), new Object[] {convertedValue});
+ m.invoke(od.getObject(), convertedValue);
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException("impossible to set "
- + attributeName + " to " + convertedValue + " on " + od.getObject().getClass());
- iae.initCause(ex);
- throw iae;
+ throw new IllegalArgumentException("impossible to set " + attributeName + " to "
+ + convertedValue + " on " + od.getObject().getClass(), ex);
}
}
@@ -667,15 +652,13 @@ public class Configurator {
if (objectStack.isEmpty()) {
throw new IllegalStateException("set root before adding text");
}
- ObjectDescriptor od = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor od = objectStack.peek();
try {
od.getObject().getClass().getMethod("addText", new Class[] {String.class})
- .invoke(od.getObject(), new Object[] {text});
+ .invoke(od.getObject(), text);
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException(
- "impossible to add text on " + od.getObject().getClass());
- iae.initCause(ex);
- throw iae;
+ throw new IllegalArgumentException("impossible to add text on "
+ + od.getObject().getClass(), ex);
}
}
@@ -686,7 +669,7 @@ public class Configurator {
if (objectStack.isEmpty()) {
throw new IllegalStateException("set root before ending child");
}
- ObjectDescriptor od = (ObjectDescriptor) objectStack.pop();
+ ObjectDescriptor od = objectStack.pop();
if (objectStack.isEmpty()) {
objectStack.push(od); // back to previous state
throw new IllegalStateException("cannot end root");
@@ -694,32 +677,26 @@ public class Configurator {
if (od.getObject() instanceof Macro) {
return ((Macro) od.getObject()).play(this);
}
- ObjectDescriptor parentOD = (ObjectDescriptor) objectStack.peek();
+ ObjectDescriptor parentOD = objectStack.peek();
String name = od.getObjectName();
- Class childClass = (Class) typedefs.get(name);
- Method m = null;
- if (childClass != null) {
- m = parentOD.getAddConfiguredMethod(childClass);
- } else {
- m = parentOD.getAddConfiguredMethod(name);
- }
+ Class<?> childClass = typedefs.get(name);
+ Method m = (childClass == null) ? parentOD.getAddConfiguredMethod(name)
+ : parentOD.getAddConfiguredMethod(childClass);
try {
if (m != null) {
- m.invoke(parentOD.getObject(), new Object[] {od.getObject()});
+ m.invoke(parentOD.getObject(), od.getObject());
}
return od.getObject();
} catch (Exception ex) {
- IllegalArgumentException iae = new IllegalArgumentException(
+ throw new IllegalArgumentException(
"impossible to add configured child for " + name + " on "
+ parentOD.getObject().getClass() + ": "
- + StringUtils.getErrorMessage(ex));
- iae.initCause(ex);
- throw iae;
+ + StringUtils.getErrorMessage(ex), ex);
}
}
public Object getCurrent() {
- return objectStack.isEmpty() ? null : ((ObjectDescriptor) objectStack.peek()).getObject();
+ return objectStack.isEmpty() ? null : objectStack.peek().getObject();
}
public int getDepth() {
@@ -750,7 +727,7 @@ public class Configurator {
}
public Class getTypeDef(String name) {
- return (Class) typedefs.get(name);
+ return typedefs.get(name);
}
public FileResolver getFileResolver() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 64992ae..cc8b513 100644
--- a/src/java/org/apache/ivy/util/ContextualSAXHandler.java
+++ b/src/java/org/apache/ivy/util/ContextualSAXHandler.java
@@ -25,7 +25,7 @@ import org.xml.sax.helpers.DefaultHandler;
public class ContextualSAXHandler extends DefaultHandler {
- private Stack<String> contextStack = new Stack<String>();
+ private Stack<String> contextStack = new Stack<>();
private StringBuffer buffer = new StringBuffer();
@@ -48,7 +48,7 @@ public class ContextualSAXHandler extends DefaultHandler {
}
protected String getContext() {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (String ctx : contextStack) {
buf.append(ctx).append("/");
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/Credentials.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/Credentials.java b/src/java/org/apache/ivy/util/Credentials.java
index 613c9c9..719e7af 100644
--- a/src/java/org/apache/ivy/util/Credentials.java
+++ b/src/java/org/apache/ivy/util/Credentials.java
@@ -74,7 +74,7 @@ public class Credentials {
if (passwd == null) {
return null;
}
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = passwd.length(); i > 0; i--) {
sb.append('*');
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/CredentialsUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/CredentialsUtil.java b/src/java/org/apache/ivy/util/CredentialsUtil.java
index 9b5b7e0..492bdea 100644
--- a/src/java/org/apache/ivy/util/CredentialsUtil.java
+++ b/src/java/org/apache/ivy/util/CredentialsUtil.java
@@ -104,7 +104,7 @@ public final class CredentialsUtil {
CredentialPanel credentialPanel = new CredentialPanel(c, passfile);
if (JOptionPane.showOptionDialog(null, credentialPanel, c.getHost() + " credentials",
JOptionPane.OK_CANCEL_OPTION, 0, new ImageIcon(Ivy.class.getResource("logo.png")),
- null, new Integer(JOptionPane.OK_OPTION)) == JOptionPane.OK_OPTION) {
+ null, JOptionPane.OK_OPTION) == JOptionPane.OK_OPTION) {
String username = credentialPanel.userNameField.getText();
String passwd = credentialPanel.passwordField.getText();
if (credentialPanel.rememberDataCB.isSelected()) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/EncryptedProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/EncryptedProperties.java b/src/java/org/apache/ivy/util/EncryptedProperties.java
index 2644372..32690fc 100644
--- a/src/java/org/apache/ivy/util/EncryptedProperties.java
+++ b/src/java/org/apache/ivy/util/EncryptedProperties.java
@@ -17,8 +17,8 @@
*/
package org.apache.ivy.util;
-import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.List;
import java.util.Properties;
@@ -56,10 +56,10 @@ public class EncryptedProperties extends Properties {
return super.contains(StringUtils.encrypt((String) value));
}
- public Collection values() {
- List ret = new ArrayList(super.values());
- for (int i = 0; i < ret.size(); i++) {
- ret.set(i, StringUtils.decrypt((String) ret.get(i)));
+ public Collection<Object> values() {
+ List<Object> ret = new LinkedList<>(super.values());
+ for (Object value : ret) {
+ ret.set(ret.indexOf(value), StringUtils.decrypt((String) value));
}
return ret;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/FileUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/FileUtil.java b/src/java/org/apache/ivy/util/FileUtil.java
index 4ba2dd0..6df726c 100644
--- a/src/java/org/apache/ivy/util/FileUtil.java
+++ b/src/java/org/apache/ivy/util/FileUtil.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
@@ -69,16 +68,17 @@ public final class FileUtil {
throws IOException {
// This pattern could be more forgiving if somebody wanted it to be... but this should
// satisfy 99+% of all needs, without letting unsafe operations be done.
- // If you paths is not supported, you then skip this mass option.
+ // If a path is not allowed, then skip this mass option.
// NOTE: A space inside the path is allowed (I can't control other programmers who like them
// in their working directory names)... but trailing spaces on file names will be checked
// otherwise and refused.
try {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
- Iterator<Entry<File, File>> keyItr = destToSrcMap.entrySet().iterator();
- while (keyItr.hasNext()) {
- Entry<File, File> entry = keyItr.next();
+ for (Entry<File, File> entry : destToSrcMap.entrySet()) {
+ if (sb.length() > 0) {
+ sb.append("\n");
+ }
File destFile = entry.getKey();
File srcFile = entry.getValue();
if (!ALLOWED_PATH_PATTERN.matcher(srcFile.getAbsolutePath()).matches()) {
@@ -91,10 +91,8 @@ public final class FileUtil {
}
// Add to our buffer of commands
- sb.append("ln -s -f \"").append(srcFile.getAbsolutePath()).append("\" \"").append(destFile.getAbsolutePath()).append("\";");
- if (keyItr.hasNext()) {
- sb.append("\n");
- }
+ sb.append(String.format("ln -s -f \"%s\" \"%s\";",
+ srcFile.getAbsolutePath(), destFile.getAbsolutePath()));
}
String commands = sb.toString();
@@ -112,7 +110,7 @@ public final class FileUtil {
InputStreamReader isr = new InputStreamReader(errorStream);
BufferedReader br = new BufferedReader(isr);
- StringBuffer error = new StringBuffer();
+ StringBuilder error = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
error.append(line);
@@ -143,7 +141,7 @@ public final class FileUtil {
InputStreamReader isr = new InputStreamReader(errorStream);
BufferedReader br = new BufferedReader(isr);
- StringBuffer error = new StringBuffer();
+ StringBuilder error = new StringBuilder();
String line;
while ((line = br.readLine()) != null) {
error.append(line);
@@ -254,21 +252,21 @@ public final class FileUtil {
// copy files one by one
File[] toCopy = src.listFiles();
if (toCopy != null) {
- for (int i = 0; i < toCopy.length; i++) {
+ for (File cf : toCopy) {
// compute the destination file
- File childDest = new File(dest, toCopy[i].getName());
+ File childDest = new File(dest, cf.getName());
// if file existing, 'mark' it as taken care of
existingChild.remove(childDest);
- if (toCopy[i].isDirectory()) {
- deepCopy(toCopy[i], childDest, l, overwrite);
+ if (cf.isDirectory()) {
+ deepCopy(cf, childDest, l, overwrite);
} else {
- copy(toCopy[i], childDest, l, overwrite);
+ copy(cf, childDest, l, overwrite);
}
}
}
// some file exist in the destination but not in the source: delete them
- for (int i = 0; i < existingChild.size(); i++) {
- forceDelete(existingChild.get(i));
+ for (File child : existingChild) {
+ forceDelete(child);
}
return true;
}
@@ -371,7 +369,7 @@ public final class FileUtil {
*/
public static String readEntirely(BufferedReader in) throws IOException {
try {
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String line = in.readLine();
while (line != null) {
@@ -411,7 +409,7 @@ public final class FileUtil {
*/
public static String readEntirely(InputStream is) throws IOException {
try {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
byte[] buffer = new byte[BUFFER_SIZE];
int c;
@@ -443,8 +441,8 @@ public final class FileUtil {
if (file.isDirectory()) {
File[] files = file.listFiles();
if (files != null) {
- for (int i = 0; i < files.length; i++) {
- if (!forceDelete(files[i])) {
+ for (File df : files) {
+ if (!forceDelete(df)) {
return false;
}
}
@@ -465,7 +463,7 @@ public final class FileUtil {
* @return List<File>
*/
public static List<File> getPathFiles(File root, File file) {
- List<File> ret = new ArrayList<File>();
+ List<File> ret = new ArrayList<>();
while (file != null && !file.getAbsolutePath().equals(root.getAbsolutePath())) {
ret.add(file);
file = file.getParentFile();
@@ -501,8 +499,8 @@ public final class FileUtil {
}
if (file.isDirectory()) {
File[] files = file.listFiles();
- for (int i = 0; i < files.length; i++) {
- listAll(files[i], list, ignore);
+ for (File lf : files) {
+ listAll(lf, list, ignore);
}
}
return list;
@@ -540,7 +538,7 @@ public final class FileUtil {
* @throws NullPointerException if path is null.
*/
public static File normalize(final String path) {
- final Stack<String> s = new Stack<String>();
+ final Stack<String> s = new Stack<>();
final DissectedPath dissectedPath = dissect(path);
s.push(dissectedPath.root);
@@ -560,7 +558,7 @@ public final class FileUtil {
s.push(thisToken);
}
}
- final StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < s.size(); i++) {
if (i > 1) {
// not before the filesystem root and not after it, since root
@@ -594,7 +592,7 @@ public final class FileUtil {
// filesystem root is the root and the rest of the path is the "remaining path"
final String root = filesystemRoot.getPath();
final String rest = pathToDissect.substring(root.length());
- final StringBuffer sbPath = new StringBuffer();
+ final StringBuilder sbPath = new StringBuilder();
// Eliminate consecutive slashes after the drive spec:
for (int i = 0; i < rest.length(); i++) {
final char currentChar = rest.charAt(i);
@@ -634,8 +632,8 @@ public final class FileUtil {
if (file.isDirectory()) {
File[] files = file.listFiles();
if (files != null) {
- for (int i = 0; i < files.length; i++) {
- l += getFileLength(files[i]);
+ for (File gf : files) {
+ l += getFileLength(gf);
}
}
} else {
@@ -751,8 +749,8 @@ public final class FileUtil {
@Override
public String toString() {
- return new StringBuilder("Dissected Path [root=").append(root).append(", remainingPath=")
- .append(remainingPath).append("]").toString();
+ return "Dissected Path [root=" + root + ", remainingPath=" +
+ remainingPath + "]";
}
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/HexEncoder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/HexEncoder.java b/src/java/org/apache/ivy/util/HexEncoder.java
index 436f1b1..5b6f78d 100644
--- a/src/java/org/apache/ivy/util/HexEncoder.java
+++ b/src/java/org/apache/ivy/util/HexEncoder.java
@@ -26,10 +26,10 @@ public class HexEncoder {
'b', 'c', 'd', 'e', 'f'};
public static String encode(byte[] packet) {
- StringBuffer chars = new StringBuffer(16);
- for (int i = 0; i < packet.length; i++) {
- int highBits = (packet[i] & 0xF0) >> 4;
- int lowBits = packet[i] & 0x0F;
+ StringBuilder chars = new StringBuilder(16);
+ for (byte bt : packet) {
+ int highBits = (bt & 0xF0) >> 4;
+ int lowBits = bt & 0x0F;
chars.append(ALPHABET[highBits]);
chars.append(ALPHABET[lowBits]);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/MessageLoggerEngine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/MessageLoggerEngine.java b/src/java/org/apache/ivy/util/MessageLoggerEngine.java
index c8ec767..8207de3 100644
--- a/src/java/org/apache/ivy/util/MessageLoggerEngine.java
+++ b/src/java/org/apache/ivy/util/MessageLoggerEngine.java
@@ -33,20 +33,20 @@ import java.util.Stack;
* </p>
*/
public class MessageLoggerEngine implements MessageLogger {
- private final ThreadLocal<Stack<MessageLogger>> loggerStacks = new ThreadLocal<Stack<MessageLogger>>();
+ private final ThreadLocal<Stack<MessageLogger>> loggerStacks = new ThreadLocal<>();
private MessageLogger defaultLogger = null;
- private List<String> problems = new ArrayList<String>();
+ private List<String> problems = new ArrayList<>();
- private List<String> warns = new ArrayList<String>();
+ private List<String> warns = new ArrayList<>();
- private List<String> errors = new ArrayList<String>();
+ private List<String> errors = new ArrayList<>();
private Stack<MessageLogger> getLoggerStack() {
Stack<MessageLogger> stack = loggerStacks.get();
if (stack == null) {
- stack = new Stack<MessageLogger>();
+ stack = new Stack<>();
loggerStacks.set(stack);
}
return stack;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/MessageLoggerHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/MessageLoggerHelper.java b/src/java/org/apache/ivy/util/MessageLoggerHelper.java
index c06f14a..beb4ad0 100644
--- a/src/java/org/apache/ivy/util/MessageLoggerHelper.java
+++ b/src/java/org/apache/ivy/util/MessageLoggerHelper.java
@@ -17,15 +17,14 @@
*/
package org.apache.ivy.util;
-import java.util.Iterator;
import java.util.List;
public final class MessageLoggerHelper {
public static void sumupProblems(MessageLogger logger) {
List myProblems = logger.getProblems();
if (myProblems.size() > 0) {
- List myWarns = logger.getWarns();
- List myErrors = logger.getErrors();
+ List<String> myWarns = logger.getWarns();
+ List<String> myErrors = logger.getErrors();
logger.info(""); // new line on info to isolate error summary
if (!myErrors.isEmpty()) {
logger.log(":: problems summary ::", Message.MSG_ERR);
@@ -34,15 +33,13 @@ public final class MessageLoggerHelper {
}
if (myWarns.size() > 0) {
logger.log(":::: WARNINGS", Message.MSG_WARN);
- for (Iterator iter = myWarns.iterator(); iter.hasNext();) {
- String msg = (String) iter.next();
+ for (String msg : myWarns) {
logger.log("\t" + msg + "\n", Message.MSG_WARN);
}
}
if (myErrors.size() > 0) {
logger.log(":::: ERRORS", Message.MSG_ERR);
- for (Iterator iter = myErrors.iterator(); iter.hasNext();) {
- String msg = (String) iter.next();
+ for (String msg : myErrors) {
logger.log("\t" + msg + "\n", Message.MSG_ERR);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/StringUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/StringUtils.java b/src/java/org/apache/ivy/util/StringUtils.java
index c179f8a..26ade15 100644
--- a/src/java/org/apache/ivy/util/StringUtils.java
+++ b/src/java/org/apache/ivy/util/StringUtils.java
@@ -98,9 +98,9 @@ public final class StringUtils {
* @return The concatenated string.
*/
public static String join(Object[] objs, String sep) {
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < objs.length; i++) {
- buf.append(objs[i]).append(sep);
+ StringBuilder buf = new StringBuilder();
+ for (Object obj : objs) {
+ buf.append(obj).append(sep);
}
if (objs.length > 0) {
buf.setLength(buf.length() - sep.length()); // delete sep
@@ -141,7 +141,7 @@ public final class StringUtils {
if (str == null) {
return null;
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < str.length(); i++) {
char c = str.charAt(i);
if (c >= SHIFTS.length) {
@@ -165,7 +165,7 @@ public final class StringUtils {
if (str == null) {
return null;
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
for (int i = 0; i < str.length(); i++) {
buf.append(decrypt(str.charAt(i)));
}
@@ -183,7 +183,7 @@ public final class StringUtils {
}
public static String repeat(String str, int count) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < count; i++) {
sb.append(str);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/XMLHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/XMLHelper.java b/src/java/org/apache/ivy/util/XMLHelper.java
index 894ccc8..a62f34a 100644
--- a/src/java/org/apache/ivy/util/XMLHelper.java
+++ b/src/java/org/apache/ivy/util/XMLHelper.java
@@ -195,11 +195,11 @@ public abstract class XMLHelper {
return null;
}
- StringBuffer result = new StringBuffer(text.length());
+ StringBuilder result = new StringBuilder(text.length());
char[] chars = text.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- switch (chars[i]) {
+ for (char ch : chars) {
+ switch (ch) {
case '&':
result.append("&");
break;
@@ -213,7 +213,7 @@ public abstract class XMLHelper {
result.append(""");
break;
default:
- result.append(chars[i]);
+ result.append(ch);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/cli/CommandLine.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/cli/CommandLine.java b/src/java/org/apache/ivy/util/cli/CommandLine.java
index 64e42b8..47d1105 100644
--- a/src/java/org/apache/ivy/util/cli/CommandLine.java
+++ b/src/java/org/apache/ivy/util/cli/CommandLine.java
@@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.Map;
public class CommandLine {
- private Map/* <String, String[]> */optionValues = new HashMap();
+ private final Map<String, String[]> optionValues = new HashMap<>();
private String[] leftOverArgs;
@@ -48,7 +48,7 @@ public class CommandLine {
}
public String[] getOptionValues(String option) {
- return (String[]) optionValues.get(option);
+ return optionValues.get(option);
}
public String[] getLeftOverArgs() {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 84877f0..e098b3b 100644
--- a/src/java/org/apache/ivy/util/cli/CommandLineParser.java
+++ b/src/java/org/apache/ivy/util/cli/CommandLineParser.java
@@ -33,9 +33,9 @@ public class CommandLineParser {
private static final int MAX_SPEC_WIDTH = 30;
- private Map<String, Option> options = new LinkedHashMap<String, Option>();
+ private Map<String, Option> options = new LinkedHashMap<>();
- private Map<String, List<Option>> categories = new LinkedHashMap<String, List<Option>>();
+ private Map<String, List<Option>> categories = new LinkedHashMap<>();
public CommandLineParser() {
}
@@ -115,7 +115,7 @@ public class CommandLineParser {
pw.print(StringUtils.repeat(" ", specWidth - specLength));
// print description
- StringBuffer desc = new StringBuffer((option.isDeprecated() ? "DEPRECATED: " : "")
+ StringBuilder desc = new StringBuilder((option.isDeprecated() ? "DEPRECATED: " : "")
+ option.getDescription());
int count = Math.min(desc.length(), width - Math.max(specLength, specWidth));
// see if we have enough space to start on the same line as the spec
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/cli/Option.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/cli/Option.java b/src/java/org/apache/ivy/util/cli/Option.java
index da91565..98f2a64 100644
--- a/src/java/org/apache/ivy/util/cli/Option.java
+++ b/src/java/org/apache/ivy/util/cli/Option.java
@@ -71,30 +71,30 @@ public class Option {
return deprecated;
}
- String[] parse(ListIterator iterator) throws ParseException {
+ String[] parse(ListIterator<String> iterator) throws ParseException {
if (isCountArgs()) {
String[] values = new String[args.length];
for (int i = 0; i < values.length; i++) {
if (!iterator.hasNext()) {
missingArgument(i);
}
- values[i] = (String) iterator.next();
+ values[i] = iterator.next();
if (values[i].startsWith("-")) {
missingArgument(i);
}
}
return values;
} else {
- List values = new ArrayList();
+ List<String> values = new ArrayList<>();
while (iterator.hasNext()) {
- String value = (String) iterator.next();
+ String value = iterator.next();
if (value.startsWith("-")) {
iterator.previous();
break;
}
values.add(value);
}
- return (String[]) values.toArray(new String[values.size()]);
+ return values.toArray(new String[values.size()]);
}
}
@@ -115,9 +115,9 @@ public class Option {
if (args.length == 0) {
return "";
}
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < args.length; i++) {
- sb.append("<").append(args[i]).append("> ");
+ StringBuilder sb = new StringBuilder();
+ for (String arg : args) {
+ sb.append("<").append(arg).append("> ");
}
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/cli/OptionBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/cli/OptionBuilder.java b/src/java/org/apache/ivy/util/cli/OptionBuilder.java
index 59f3250..68a5aef 100644
--- a/src/java/org/apache/ivy/util/cli/OptionBuilder.java
+++ b/src/java/org/apache/ivy/util/cli/OptionBuilder.java
@@ -21,9 +21,9 @@ import java.util.ArrayList;
import java.util.List;
public class OptionBuilder {
- private String name;
+ private final String name;
- private List/* <String> */args = new ArrayList();
+ private final List<String> args = new ArrayList<>();
private String description = "";
@@ -63,7 +63,7 @@ public class OptionBuilder {
}
public Option create() {
- return new Option(name, (String[]) args.toArray(new String[args.size()]), description,
+ return new Option(name, args.toArray(new String[args.size()]), description,
required, countArgs, deprecated);
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java b/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
index 5f47699..9aa7366 100644
--- a/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
+++ b/src/java/org/apache/ivy/util/extendable/DefaultExtendableItem.java
@@ -27,7 +27,7 @@ public class DefaultExtendableItem extends UnmodifiableExtendableItem {
this(null, null);
}
- public DefaultExtendableItem(Map stdAttributes, Map extraAttributes) {
+ public DefaultExtendableItem(Map<String, String> stdAttributes, Map<String, String> extraAttributes) {
super(stdAttributes, extraAttributes);
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 56eb3a0..09ce46c 100644
--- a/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
+++ b/src/java/org/apache/ivy/util/extendable/ExtendableItemHelper.java
@@ -31,7 +31,7 @@ public final class ExtendableItemHelper {
}
public static Map<String, String> getExtraAttributes(Attributes attributes, String prefix) {
- Map<String, String> ret = new HashMap<String, String>();
+ Map<String, String> ret = new HashMap<>();
for (int i = 0; i < attributes.getLength(); i++) {
if (attributes.getQName(i).startsWith(prefix)) {
ret.put(attributes.getQName(i).substring(prefix.length()), attributes.getValue(i));
@@ -51,7 +51,7 @@ public final class ExtendableItemHelper {
*/
public static Map<String, String> getExtraAttributes(ParserSettings settings,
Attributes attributes, String[] ignoredAttNames) {
- Map<String, String> ret = new HashMap<String, String>();
+ Map<String, String> ret = new HashMap<>();
Collection<String> ignored = Arrays.asList(ignoredAttNames);
for (int i = 0; i < attributes.getLength(); i++) {
if (!ignored.contains(attributes.getQName(i))) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 5bb170f..a042171 100644
--- a/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
+++ b/src/java/org/apache/ivy/util/extendable/UnmodifiableExtendableItem.java
@@ -23,12 +23,12 @@ import java.util.Map;
import java.util.Map.Entry;
public class UnmodifiableExtendableItem implements ExtendableItem {
- private final Map<String, String> attributes = new HashMap<String, String>();
+ private final Map<String, String> attributes = new HashMap<>();
private final Map<String, String> unmodifiableAttributesView = Collections
.unmodifiableMap(attributes);
- private final Map<String, String> extraAttributes = new HashMap<String, String>();
+ private final Map<String, String> extraAttributes = new HashMap<>();
private final Map<String, String> unmodifiableExtraAttributesView = Collections
.unmodifiableMap(extraAttributes);
@@ -37,7 +37,7 @@ public class UnmodifiableExtendableItem implements ExtendableItem {
* this is the only place where extra attributes are stored in qualified form. In all other maps
* they are stored unqualified.
*/
- private final Map<String, String> qualifiedExtraAttributes = new HashMap<String, String>();
+ private final Map<String, String> qualifiedExtraAttributes = new HashMap<>();
private final Map<String, String> unmodifiableQualifiedExtraAttributesView = Collections
.unmodifiableMap(qualifiedExtraAttributes);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java b/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
index f3a0165..597204b 100644
--- a/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
+++ b/src/java/org/apache/ivy/util/filter/ArtifactTypeFilter.java
@@ -26,7 +26,7 @@ public class ArtifactTypeFilter implements Filter<Artifact> {
private Collection<String> acceptedTypes;
public ArtifactTypeFilter(Collection<String> acceptedTypes) {
- this.acceptedTypes = new ArrayList<String>(acceptedTypes);
+ this.acceptedTypes = new ArrayList<>(acceptedTypes);
}
public boolean accept(Artifact art) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/filter/FilterHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/filter/FilterHelper.java b/src/java/org/apache/ivy/util/filter/FilterHelper.java
index 6022778..04e8011 100644
--- a/src/java/org/apache/ivy/util/filter/FilterHelper.java
+++ b/src/java/org/apache/ivy/util/filter/FilterHelper.java
@@ -42,9 +42,9 @@ public final class FilterHelper {
if (types == null || types.length == 0) {
return NO_FILTER;
}
- List<String> acceptedTypes = new ArrayList<String>(types.length);
- for (int i = 0; i < types.length; i++) {
- String current = types[i].trim();
+ List<String> acceptedTypes = new ArrayList<>(types.length);
+ for (String type : types) {
+ String current = type.trim();
if ("*".equals(current)) {
return NO_FILTER;
}
@@ -72,7 +72,7 @@ public final class FilterHelper {
if (filter == null) {
return col;
}
- Collection<T> ret = new ArrayList<T>(col);
+ Collection<T> ret = new ArrayList<>(col);
for (Iterator<T> iter = ret.iterator(); iter.hasNext();) {
T element = iter.next();
if (!filter.accept(element)) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/url/ApacheURLLister.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/ApacheURLLister.java b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
index 7243697..2001a3d 100644
--- a/src/java/org/apache/ivy/util/url/ApacheURLLister.java
+++ b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
@@ -101,7 +101,7 @@ public class ApacheURLLister {
*/
public List<URL> retrieveListing(URL url, boolean includeFiles, boolean includeDirectories)
throws IOException {
- List<URL> urlList = new ArrayList<URL>();
+ List<URL> urlList = new ArrayList<>();
// add trailing slash for relative urls
if (!url.getPath().endsWith("/") && !url.getPath().endsWith(".html")) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/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 50a0fbc..97ee90f 100644
--- a/src/java/org/apache/ivy/util/url/BasicURLHandler.java
+++ b/src/java/org/apache/ivy/util/url/BasicURLHandler.java
@@ -110,9 +110,8 @@ public class BasicURLHandler extends AbstractURLHandler {
String charSet = null;
if (contentType != null) {
- String[] elements = contentType.split(";");
- for (int i = 0; i < elements.length; i++) {
- String element = elements[i].trim();
+ for (String el : contentType.split(";")) {
+ String element = el.trim();
if (element.toLowerCase().startsWith("charset=")) {
charSet = element.substring("charset=".length());
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/url/CredentialsStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/CredentialsStore.java b/src/java/org/apache/ivy/util/url/CredentialsStore.java
index fa4c955..0ef12a2 100644
--- a/src/java/org/apache/ivy/util/url/CredentialsStore.java
+++ b/src/java/org/apache/ivy/util/url/CredentialsStore.java
@@ -32,9 +32,9 @@ public final class CredentialsStore {
/**
* A Map of Credentials objects keyed by the 'key' of the Credentials.
*/
- private static final Map KEYRING = new HashMap();
+ private static final Map<String, Credentials> KEYRING = new HashMap<>();
- private static final Set SECURED_HOSTS = new HashSet();
+ private static final Set<String> SECURED_HOSTS = new HashSet<>();
public static final CredentialsStore INSTANCE = new CredentialsStore();
@@ -54,7 +54,7 @@ public final class CredentialsStore {
public Credentials getCredentials(String realm, String host) {
String key = Credentials.buildKey(realm, host);
Message.debug("try to get credentials for: " + key);
- return (Credentials) KEYRING.get(key);
+ return KEYRING.get(key);
}
public boolean hasCredentials(String host) {
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/url/HttpClientHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/HttpClientHandler.java b/src/java/org/apache/ivy/util/url/HttpClientHandler.java
index a3bcac4..f0a0c96 100644
--- a/src/java/org/apache/ivy/util/url/HttpClientHandler.java
+++ b/src/java/org/apache/ivy/util/url/HttpClientHandler.java
@@ -223,7 +223,7 @@ public class HttpClientHandler extends AbstractURLHandler {
if (httpClientHelper == null) {
// use commons httpclient 3.0 if available
try {
- HttpMethodBase.class.getMethod("getResponseContentLength", new Class[0]);
+ HttpMethodBase.class.getMethod("getResponseContentLength");
httpClientHelper = new HttpClientHelper3x();
Message.verbose("using commons httpclient 3.x helper");
} catch (SecurityException e) {
@@ -280,7 +280,7 @@ public class HttpClientHandler extends AbstractURLHandler {
}
}));
- List authPrefs = new ArrayList(3);
+ List<String> authPrefs = new ArrayList<>(3);
authPrefs.add(AuthPolicy.DIGEST);
authPrefs.add(AuthPolicy.BASIC);
authPrefs.add(AuthPolicy.NTLM); // put it at the end to give less priority (IVY-213)
@@ -421,11 +421,8 @@ public class HttpClientHandler extends AbstractURLHandler {
}
public void writeRequest(OutputStream out) throws IOException {
- InputStream instream = new FileInputStream(file);
- try {
+ try (InputStream instream = new FileInputStream(file)) {
FileUtil.copy(instream, out, null, false);
- } finally {
- instream.close();
}
}
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java b/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
index be15009..2c89098 100644
--- a/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
+++ b/src/java/org/apache/ivy/util/url/URLHandlerDispatcher.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.Map;
import org.apache.ivy.util.CopyProgressListener;
@@ -31,7 +30,7 @@ import org.apache.ivy.util.CopyProgressListener;
* This class is used to dispatch downloading requests
*/
public class URLHandlerDispatcher implements URLHandler {
- private Map handlers = new HashMap();
+ private final Map<String, URLHandler> handlers = new HashMap<>();
private URLHandler defaultHandler = new BasicURLHandler();
@@ -84,8 +83,7 @@ public class URLHandlerDispatcher implements URLHandler {
public void setRequestMethod(int requestMethod) {
defaultHandler.setRequestMethod(requestMethod);
- for (Iterator it = handlers.values().iterator(); it.hasNext();) {
- URLHandler handler = (URLHandler) it.next();
+ for (URLHandler handler : handlers.values()) {
handler.setRequestMethod(requestMethod);
}
}
@@ -95,7 +93,7 @@ public class URLHandlerDispatcher implements URLHandler {
}
public URLHandler getHandler(String protocol) {
- URLHandler downloader = (URLHandler) handlers.get(protocol);
+ URLHandler downloader = handlers.get(protocol);
return downloader == null ? defaultHandler : downloader;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java b/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
index cd78811..6baa758 100644
--- a/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
+++ b/src/java/org/apache/ivy/util/url/URLHandlerRegistry.java
@@ -61,10 +61,7 @@ public final class URLHandlerRegistry {
+ e.getMessage());
Message.verbose("Using jdk url handling instead.");
return new BasicURLHandler();
- } catch (InstantiationException e) {
- Message.verbose("couldn't instantiate HttpClientHandler: using jdk url handling");
- return new BasicURLHandler();
- } catch (IllegalAccessException e) {
+ } catch (InstantiationException | IllegalAccessException e) {
Message.verbose("couldn't instantiate HttpClientHandler: using jdk url handling");
return new BasicURLHandler();
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
index d383305..a8d9dac 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEngineTest.java
@@ -93,10 +93,8 @@ public class PublishEngineTest {
new Thread() {
public void run() {
try {
- engine.publish(md, Arrays
- .asList(new String[] {"build/test/publish/module/[artifact].[ext]"}),
- resolver, new PublishOptions()
- .setSrcIvyPattern("build/test/publish/module/[artifact].[ext]"));
+ engine.publish(md, Arrays.asList("build/test/publish/module/[artifact].[ext]"),
+ resolver, new PublishOptions().setSrcIvyPattern("build/test/publish/module/[artifact].[ext]"));
synchronized (PublishEngineTest.this) {
counter[0]++;
}
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
index 86a1401..71b5ed2 100644
--- a/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
+++ b/test/java/org/apache/ivy/core/publish/PublishEventsTest.java
@@ -227,8 +227,7 @@ public class PublishEventsTest {
Collection<Artifact> missing = publishEngine.publish(publishModule.getModuleRevisionId(),
publishSources, "default", publishOptions);
assertEquals("one missing artifact", 1, missing.size());
- assertSameArtifact("missing artifact was returned", dataArtifact, (Artifact) missing
- .iterator().next());
+ assertSameArtifact("missing artifact was returned", dataArtifact, missing.iterator().next());
// if all tests passed, all of our counter variables should have been updated.
assertEquals("pre-publish trigger fired and passed all tests", 1, preTriggers);
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
index 89aae0f..5e9cd74 100644
--- a/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
+++ b/test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java
@@ -136,8 +136,8 @@ public class VfsResourceTest {
@Test
public void testListFolderChildren() throws Exception {
final String testFolder = "2/mod10.1";
- final List<String> expectedFiles = Arrays
- .asList(new String[] {"ivy-1.0.xml", "ivy-1.1.xml", "ivy-1.2.xml", "ivy-1.3.xml"});
+ final List<String> expectedFiles =
+ Arrays.asList("ivy-1.0.xml", "ivy-1.1.xml", "ivy-1.2.xml", "ivy-1.3.xml");
for (VfsURI baseVfsURI : helper.createVFSUriSet(testFolder)) {
List<String> expected = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/1c23268d/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
----------------------------------------------------------------------
diff --git a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
index 28d04f6..27e9415 100644
--- a/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
+++ b/test/java/org/apache/ivy/plugins/resolver/ChainResolverTest.java
@@ -157,7 +157,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("3", rmr.getResolver().getName());
- List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
+ List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@@ -197,7 +197,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
- List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
+ List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@@ -233,7 +233,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
- List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
+ List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
for (int i = 0; i < 5; i++) {
assertEquals(ddAsList, resolvers[i].askedDeps);
}
@@ -281,7 +281,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("5", rmr.getResolver().getName());
- List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
+ List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
for (MockResolver resolver : resolvers) {
assertEquals(ddAsList, resolver.askedDeps);
}
@@ -315,7 +315,7 @@ public class ChainResolverTest extends AbstractDependencyResolverTest {
ResolvedModuleRevision rmr = chain.getDependency(dd, data);
assertNotNull(rmr);
assertEquals("4", rmr.getResolver().getName());
- List ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
+ List<DependencyDescriptor> ddAsList = Arrays.asList(new DependencyDescriptor[] {dd});
for (int i = 0; i < 4; i++) {
assertEquals("invalid asked dependencies for " + resolvers[i], ddAsList,
resolvers[i].askedDeps);