[3/7] ant-ivy git commit: Add generics and Java 7 syntax to core
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/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 3fde263..9a508cd 100644
--- a/src/java/org/apache/ivy/core/search/SearchEngine.java
+++ b/src/java/org/apache/ivy/core/search/SearchEngine.java
@@ -57,13 +57,13 @@ public class SearchEngine {
* @return String[]
*/
public String[] listTokenValues(String token, Map
otherTokenValues) {
-Set entries = new LinkedHashSet();
+Set entries = new LinkedHashSet<>();
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] values = resolver.listTokenValues(new
String[] {token},
otherTokenValues);
-for (int i = 0; i < values.length; i++) {
-entries.add(values[i].get(token));
+for (Map value : values) {
+entries.add(value.get(token));
}
}
@@ -71,13 +71,13 @@ public class SearchEngine {
}
public OrganisationEntry[] listOrganisationEntries() {
-Set entries = new HashSet();
+Set entries = new HashSet<>();
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] orgs = resolver.listTokenValues(
new String[] {IvyPatternHelper.ORGANISATION_KEY}, new
HashMap());
-for (int i = 0; i < orgs.length; i++) {
-String org = orgs[i].get(IvyPatternHelper.ORGANISATION_KEY);
+for (Map oe : orgs) {
+String org = oe.get(IvyPatternHelper.ORGANISATION_KEY);
entries.add(new OrganisationEntry(resolver, org));
}
}
@@ -86,13 +86,13 @@ public class SearchEngine {
}
public String[] listOrganisations() {
-Set entries = new HashSet();
+Set entries = new HashSet<>();
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] orgs = resolver.listTokenValues(
new String[] {IvyPatternHelper.ORGANISATION_KEY}, new
HashMap());
-for (int i = 0; i < orgs.length; i++) {
-entries.add(orgs[i].get(IvyPatternHelper.ORGANISATION_KEY));
+for (Map org : orgs) {
+entries.add(org.get(IvyPatternHelper.ORGANISATION_KEY));
}
}
@@ -100,16 +100,16 @@ public class SearchEngine {
}
public ModuleEntry[] listModuleEntries(OrganisationEntry org) {
-Set entries = new HashSet();
+Set entries = new HashSet<>();
-Map tokenValues = new HashMap();
+Map tokenValues = new HashMap<>();
tokenValues.put(IvyPatternHelper.ORGANISATION_KEY,
org.getOrganisation());
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] modules = resolver.listTokenValues(
new String[] {IvyPatternHelper.MODULE_KEY}, tokenValues);
-for (int i = 0; i < modules.length; i++) {
-String module = modules[i].get(IvyPatternHelper.MODULE_KEY);
+for (Map me : modules) {
+String module = me.get(IvyPatternHelper.MODULE_KEY);
entries.add(new ModuleEntry(org, module));
}
}
@@ -118,16 +118,16 @@ public class SearchEngine {
}
public String[] listModules(String org) {
-Set entries = new HashSet();
+Set entries = new HashSet<>();
-Map tokenValues = new HashMap();
+Map tokenValues = new HashMap<>();
tokenValues.put(IvyPatternHelper.ORGANISATION_KEY, org);
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] modules = resolver.listTokenValues(
new String[] {IvyPatternHelper.MODULE_KEY}, tokenValues);
-for (int i = 0; i < modules.length; i++) {
-entries.add(modules[i].get(IvyPatternHelper.MODULE_KEY));
+for (Map module : modules) {
+entries.add(module.get(IvyPatternHelper.MODULE_KEY));
}
}
@@ -135,18 +135,17 @@ public class SearchEngine {
}
public RevisionEntry[] listRevisionEntries(ModuleEntry module) {
-Set entries = new HashSet();
+Set entries = new HashSet<>();
-Map tokenValues = new HashMap();
+Map tokenValues = new HashMap<>();
tokenValues.put(IvyPatternHelper.ORGANISATION_KEY,
module.getOrganisation());
tokenValues.put(IvyPatternHelper.MODULE_KEY, module.getModule());
for (DependencyResolver resolver : settings.getResolvers()) {
Map[] revisions = resolver.listTokenValues(
new String[] {IvyPatternHelper.REVISION_KEY}, tokenValues);
-for (int i = 0; i < revisions.length; i++) {
-String revision =
revision
[6/7] ant-ivy git commit: Add generics and Java 7 syntax to core
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/src/java/org/apache/ivy/core/check/CheckEngine.java
--
diff --git a/src/java/org/apache/ivy/core/check/CheckEngine.java
b/src/java/org/apache/ivy/core/check/CheckEngine.java
index 8f85f4b..d48df8a 100644
--- a/src/java/org/apache/ivy/core/check/CheckEngine.java
+++ b/src/java/org/apache/ivy/core/check/CheckEngine.java
@@ -22,7 +22,6 @@ import java.net.URL;
import java.text.ParseException;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import org.apache.ivy.core.module.descriptor.Artifact;
@@ -67,56 +66,47 @@ public class CheckEngine {
// check publications if possible
if (resolvername != null) {
DependencyResolver resolver =
settings.getResolver(resolvername);
-String[] confs = md.getConfigurationsNames();
-Set artifacts = new HashSet();
-for (int i = 0; i < confs.length; i++) {
-artifacts.addAll(Arrays.asList(md.getArtifacts(confs[i])));
+Set artifacts = new HashSet<>();
+for (String conf : md.getConfigurationsNames()) {
+artifacts.addAll(Arrays.asList(md.getArtifacts(conf)));
}
-for (Iterator iter = artifacts.iterator(); iter.hasNext();) {
-Artifact art = (Artifact) iter.next();
-if (!resolver.exists(art)) {
-Message.info("declared publication not found: " + art);
+for (Artifact artifact : artifacts) {
+if (!resolver.exists(artifact)) {
+Message.info("declared publication not found: " +
artifact);
result = false;
}
}
}
// check dependencies
-DependencyDescriptor[] dds = md.getDependencies();
ResolveData data = new ResolveData(resolveEngine, new
ResolveOptions());
-for (int i = 0; i < dds.length; i++) {
+for (DependencyDescriptor dd : md.getDependencies()) {
// check master confs
-String[] masterConfs = dds[i].getModuleConfigurations();
-for (int j = 0; j < masterConfs.length; j++) {
-if (!"*".equals(masterConfs[j].trim())
-&& md.getConfiguration(masterConfs[j]) == null) {
+for (String masterConf : dd.getModuleConfigurations()) {
+if (!"*".equals(masterConf.trim()) &&
md.getConfiguration(masterConf) == null) {
Message.info("dependency required in non existing conf
for " + ivyFile
-+ " \n\tin " + dds[i] + ": " + masterConfs[j]);
++ " \n\tin " + dd + ": " + masterConf);
result = false;
}
}
// resolve
-DependencyResolver resolver = settings
-.getResolver(dds[i].getDependencyRevisionId());
-ResolvedModuleRevision rmr = resolver.getDependency(dds[i],
data);
+DependencyResolver resolver =
settings.getResolver(dd.getDependencyRevisionId());
+ResolvedModuleRevision rmr = resolver.getDependency(dd, data);
if (rmr == null) {
-Message.info("dependency not found in " + ivyFile +
":\n\t" + dds[i]);
+Message.info("dependency not found in " + ivyFile +
":\n\t" + dd);
result = false;
} else {
-String[] depConfs = dds[i].getDependencyConfigurations(md
-.getConfigurationsNames());
-for (int j = 0; j < depConfs.length; j++) {
-if
(!Arrays.asList(rmr.getDescriptor().getConfigurationsNames()).contains(
-depConfs[j])) {
+for (String depConf :
dd.getDependencyConfigurations(md.getConfigurationsNames())) {
+if
(!Arrays.asList(rmr.getDescriptor().getConfigurationsNames())
+.contains(depConf)) {
Message.info("dependency configuration is missing
for " + ivyFile
-+ "\n\tin " + dds[i] + ": " + depConfs[j]);
++ "\n\tin " + dd + ": " + depConf);
result = false;
}
-Artifact[] arts =
rmr.getDescriptor().getArtifacts(depConfs[j]);
-for (int k = 0; k < arts.length; k++) {
-if (!resolver.exists(arts[k])) {
+for (Artifact art :
rmr.getDescriptor().getArtifacts(depConf))
[4/7] ant-ivy git commit: Add generics and Java 7 syntax to core
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/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 a26146f..47bc3e1 100644
--- a/src/java/org/apache/ivy/core/resolve/IvyNode.java
+++ b/src/java/org/apache/ivy/core/resolve/IvyNode.java
@@ -82,7 +82,7 @@ public class IvyNode implements Comparable {
private ModuleRevisionId id;
// set only when node has been built or updated from a DependencyDescriptor
-private Map dds = new HashMap();
+private Map dds = new HashMap<>();
// Set when data has been loaded only, or when constructed from a module
descriptor
private ModuleDescriptor md;
@@ -96,18 +96,18 @@ public class IvyNode implements Comparable {
private boolean searched = false;
-private Collection confsToFetch = new HashSet();
+private Collection confsToFetch = new HashSet<>();
-private Collection fetchedConfigurations = new HashSet();
+private Collection fetchedConfigurations = new HashSet<>();
-private Collection loadedRootModuleConfs = new HashSet();
+private Collection loadedRootModuleConfs = new HashSet<>();
// USAGE DATA
private IvyNodeUsage usage = new IvyNodeUsage(this);
// usage information merged from evicted nodes this node is "replacing"
-private Map mergedUsages = new
LinkedHashMap();
+private Map mergedUsages = new
LinkedHashMap<>();
public IvyNode(ResolveData data, IvyNode parent, DependencyDescriptor dd) {
id = dd.getDependencyRevisionId();
@@ -310,9 +310,9 @@ public class IvyNode implements Comparable {
confs = md.getPublicConfigurationsNames();
}
}
-Collection deps = new HashSet();
-for (int i = 0; i < confs.length; i++) {
-deps.addAll(getDependencies(rootModuleConf, confs[i],
requestedConf));
+Collection deps = new HashSet<>();
+for (String conf : confs) {
+deps.addAll(getDependencies(rootModuleConf, conf, requestedConf));
}
return deps;
}
@@ -336,10 +336,9 @@ public class IvyNode implements Comparable {
throw new IllegalStateException(
"impossible to get dependencies when data has not been
loaded");
}
-DependencyDescriptor[] dds = md.getDependencies();
// it's important to respect order => LinkedHashMap
-Map dependencies = new
LinkedHashMap();
-for (DependencyDescriptor dependencyDescriptor : dds) {
+Map dependencies = new LinkedHashMap<>();
+for (DependencyDescriptor dependencyDescriptor : md.getDependencies())
{
DependencyDescriptor dd = data.mediate(dependencyDescriptor);
String[] dependencyConfigurations =
dd.getDependencyConfigurations(conf, requestedConf);
if (dependencyConfigurations.length == 0) {
@@ -423,7 +422,7 @@ public class IvyNode implements Comparable {
// a circular dependency, we cannot be conclusive here
return null;
}
-return Boolean.valueOf(c.doesCallersExclude(rootModuleConf,
artifact, callersStack));
+return c.doesCallersExclude(rootModuleConf, artifact,
callersStack);
}
return Boolean.FALSE;
}
@@ -513,7 +512,7 @@ public class IvyNode implements Comparable {
// there are exclusions in the configuration
List exclusions =
Arrays.asList(conf.substring(2).split("\\!"));
-List ret = new
ArrayList(Arrays.asList(getDescriptor()
+List ret = new ArrayList<>(Arrays.asList(getDescriptor()
.getPublicConfigurationsNames()));
ret.removeAll(exclusions);
@@ -530,7 +529,7 @@ public class IvyNode implements Comparable {
* @return array of configuration names
*/
public String[] getRequiredConfigurations(IvyNode in, String inConf) {
-Collection req = new LinkedHashSet();
+Collection req = new LinkedHashSet<>();
addAllIfNotNull(req, usage.getRequiredConfigurations(in, inConf));
for (IvyNodeUsage usage : mergedUsages.values()) {
addAllIfNotNull(req, usage.getRequiredConfigurations(in, inConf));
@@ -550,7 +549,7 @@ public class IvyNode implements Comparable {
* @return array of configuration names
*/
public String[] getRequiredConfigurations() {
-Collection required = new ArrayList(confsToFetch.size()
+Collection required = new ArrayList<>(confsToFetch.size()
+ fetchedConfigurations.size());
required.addAll(fetchedConfigurations);
required.addAll(confsToFetch);
@@ -578,7 +577,7 @@ public class IvyNode implements Comparable {
* @return array of configuration names
*/
public String[] getC
[1/7] ant-ivy git commit: Add generics and Java 7 syntax to core
Repository: ant-ivy
Updated Branches:
refs/heads/master 844100aed -> 692071797
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
--
diff --git
a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
index b372479..04c06e4 100644
--- a/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
+++ b/test/java/org/apache/ivy/core/module/descriptor/IvyMakePomTest.java
@@ -17,6 +17,17 @@
package org.apache.ivy.core.module.descriptor;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.xml.xpath.XPathConstants;
+
import org.apache.ivy.TestHelper;
import org.apache.ivy.ant.IvyMakePom;
import org.apache.ivy.util.TestXmlHelper;
@@ -28,16 +39,6 @@ import org.junit.rules.TemporaryFolder;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import javax.xml.xpath.XPathConstants;
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
/**
* Tests {@link IvyMakePom}
*/
@@ -106,6 +107,7 @@ public class IvyMakePomTest {
private final String version;
private final String scope;
private final String classifier;
+@SuppressWarnings("unused")
private final boolean optional;
private PomDependency(final String groupId, final String artifactId,
final String version,
@@ -123,7 +125,6 @@ public class IvyMakePomTest {
this.optional = optional;
}
-
static PomDependency parse(final Node dependencyNode) {
if (dependencyNode == null) {
return null;
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
--
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
b/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
index ca257c5..7d0b8b3 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRevisionIdTest.java
@@ -78,18 +78,18 @@ public class ModuleRevisionIdTest {
testEncodeDecodeToString(ModuleRevisionId.newInstance("org", "name",
"revision"));
testEncodeDecodeToString(ModuleRevisionId.newInstance("org", "name",
""));
testEncodeDecodeToString(ModuleRevisionId.newInstance("org.apache",
"name-post", "1.0"));
-testEncodeDecodeToString(ModuleRevisionId.newInstance("org/apache",
"pre/name",
-"1.0-dev8/2"));
-Map extraAttributes = new HashMap();
+testEncodeDecodeToString(
+ModuleRevisionId.newInstance("org/apache", "pre/name",
"1.0-dev8/2"));
+Map extraAttributes = new HashMap<>();
extraAttributes.put("extra", "extravalue");
extraAttributes.put("att/name", "att/value");
extraAttributes.put("att.name", "att.value");
extraAttributes.put("atthttp://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
--
diff --git a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
index 0968438..68be4d3 100644
--- a/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
+++ b/test/java/org/apache/ivy/core/module/id/ModuleRulesTest.java
@@ -32,14 +32,14 @@ import org.junit.Before;
import org.junit.Test;
public class ModuleRulesTest {
-private ModuleRules rules;
+private ModuleRules rules;
-private Object[] rule;
+private String[] rule;
@Before
public void setUp() {
-rules = new ModuleRules();
-rule = new Object[10];
+rules = new ModuleRules();
+rule = new String[10];
for (int i = 0; i < rule.length; i++) {
rule[i] = "RULE_" + i;
}
@@ -76,9 +76,9 @@ public class ModuleRulesTest {
// test helpers
-private Filter acceptNone() {
-return new Filter() {
-public boolean accept(Object o) {
+private Filter acceptNone() {
+return new Filter() {
+public boolean accept(String o) {
return false;
}
@@ -88,11 +88,11 @@ public class ModuleRulesTest {
};
}
-private Filter acceptSecond() {
-return new
[2/7] ant-ivy git commit: Add generics and Java 7 syntax to core
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/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 db8c469..2f98464 100644
--- a/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
+++ b/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorWriter.java
@@ -109,24 +109,24 @@ public final class XmlModuleDescriptorWriter {
protected static void printDependency(ModuleDescriptor md,
DependencyDescriptor dep,
PrintWriter out) {
-out.print("");
-for (int k = 0; k < depConfs.length; k++) {
-out.print(XMLHelper.escape(depConfs[k]));
-if (k + 1 < depConfs.length) {
-out.print(",");
-}
-}
-if (j + 1 < modConfs.length) {
-out.print(";");
+StringBuilder sb = new StringBuilder();
+for (String modConf : dep.getModuleConfigurations()) {
+if (sb.length() > 0) {
+sb.append(";");
}
+sb.append(XMLHelper.escape(modConf)).append(
+
listToPrefixedString(dep.getDependencyConfigurations(modConf), "->"));
}
-out.print("\"");
+out.print(" conf=\"" + sb + "\"");
printExtraAttributes(dep, out, " ");
@@ -215,28 +208,17 @@ public final class XmlModuleDescriptorWriter {
ExcludeRule[] excludes = md.getAllExcludeRules();
if (excludes.length > 0) {
for (ExcludeRule exclude : excludes) {
-out.print("\t\t");
}
}
@@ -246,28 +228,17 @@ public final class XmlModuleDescriptorWriter {
ExcludeRule[] excludes) {
if (excludes.length > 0) {
for (ExcludeRule exclude : excludes) {
-out.print("\t\t\t");
}
}
@@ -277,23 +248,15 @@ public final class XmlModuleDescriptorWriter {
IncludeRule[] includes) {
if (includes.length > 0) {
for (IncludeRule include : includes) {
-out.print("\t\t\t");
}
}
@@ -303,20 +266,13 @@ public final class XmlModuleDescriptorWriter {
DependencyArtifactDescriptor[] depArtifacts) {
if (depArtifacts.length > 0) {
for (DependencyArtifactDescriptor depArtifact : depArtifacts) {
-out.print("\t\t\t");
@@ -324,6 +280,20 @@ public final class XmlModuleDescriptorWriter {
}
}
+private static String listToPrefixedString(String[] confs, String prefix) {
+StringBuilder sb = new StringBuilder(prefix);
+for (String conf : confs) {
+if (sb.length() > prefix.length()) {
+sb.append(",");
+}
+sb.append(XMLHelper.escape(conf));
+}
+if (prefix.endsWith("\"")) {
+sb.append("\"");
+}
+return sb.toString();
+}
+
/**
* Writes the extra attributes of the given {@link ExtendableItem} to the
given
* PrintWriter.
@@ -367,11 +337,11 @@ public final class XmlModuleDescriptorWriter {
out.println("\t");
Artifact[] artifacts = md.getAllArtifacts();
for (Artifact artifact : artifacts) {
-out.print("\t\t");
}
@@ -399,14 +369,7 @@ public final class XmlModuleDescriptorWriter {
}
String[] exts = conf.getExtends();
if (exts.length > 0) {
-out.print(" extends=\"");
-for (int j = 0; j < exts.length; j++) {
-out.print(XMLHelper.escape(exts[j]));
-if (j + 1 < exts.length) {
-out.print(",");
-}
-}
-out.print("\"");
+out.print(listToPrefixedString(exts, " extends=\""));
}
if (!conf.isTransitive()) {
out.print(" transitive=\"false\"");
@@ -451,9 +414,10 @@ public final class XmlModuleDescriptorWriter {
ExtendsDescriptor[] parents = md.getInheritedDescriptors();
for (ExtendsDescriptor parent : parents) {
ModuleRevisionId mrid = parent.getParentRevisionId();
-out.print("\t\t entry :
extraInfo.getAttributes().entrySet()) {
-out.print(" ");
-out.print(entry.getKey());
-out.print("=");
-out.print("\"");
-out.print(entry.getValue());
-out.print("\"");
+out.print(String.format(" %s=\"%s\"", entry.getKey(),
entry.getValue()));
}
boolean requireClosingTag = false;
if (extraInfo.getContent() != null &&
extraInfo.getContent().trim().length() > 0) {
@@ -536,19 +495,15 @@ public final class XmlModuleDescr
[5/7] ant-ivy git commit: Add generics and Java 7 syntax to core
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/69207179/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
--
diff --git
a/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
b/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
index 85b9c74..2d2b97b 100644
---
a/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
+++
b/src/java/org/apache/ivy/core/module/descriptor/DefaultModuleDescriptor.java
@@ -67,30 +67,30 @@ public class DefaultModuleDescriptor implements
ModuleDescriptor {
DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(
ModuleRevisionId.newInstance(mrid.getOrganisation(),
mrid.getName() + "-caller",
"working"), "integration", null, true);
-for (int i = 0; i < confs.length; i++) {
-moduleDescriptor.addConfiguration(new Configuration(confs[i]));
+for (String conf : confs) {
+moduleDescriptor.addConfiguration(new Configuration(conf));
}
moduleDescriptor.setLastModified(System.currentTimeMillis());
DefaultDependencyDescriptor dd = new
DefaultDependencyDescriptor(moduleDescriptor, mrid,
true, changing, transitive);
-for (int j = 0; j < confs.length; j++) {
-dd.addDependencyConfiguration(confs[j], confs[j]);
+for (String conf : confs) {
+dd.addDependencyConfiguration(conf, conf);
}
moduleDescriptor.addDependency(dd);
return moduleDescriptor;
}
-public static DefaultModuleDescriptor newCallerInstance(ModuleRevisionId[]
mrid,
+public static DefaultModuleDescriptor newCallerInstance(ModuleRevisionId[]
mrids,
boolean transitive, boolean changing) {
DefaultModuleDescriptor moduleDescriptor = new DefaultModuleDescriptor(
ModuleRevisionId.newInstance("caller", "all-caller",
"working"), "integration",
null, true);
moduleDescriptor.addConfiguration(new
Configuration(DEFAULT_CONFIGURATION));
moduleDescriptor.setLastModified(System.currentTimeMillis());
-for (int i = 0; i < mrid.length; i++) {
+for (ModuleRevisionId mrid : mrids) {
DefaultDependencyDescriptor dd = new
DefaultDependencyDescriptor(moduleDescriptor,
-mrid[i], true, changing, transitive);
+mrid, true, changing, transitive);
dd.addDependencyConfiguration(DEFAULT_CONFIGURATION, "*");
moduleDescriptor.addDependency(dd);
}
@@ -104,15 +104,14 @@ public class DefaultModuleDescriptor implements
ModuleDescriptor {
null, true);
moduleDescriptor.addConfiguration(new
Configuration(DEFAULT_CONFIGURATION));
if (artifacts != null && artifacts.length > 0) {
-for (int i = 0; i < artifacts.length; i++) {
+for (DependencyArtifactDescriptor artifact : artifacts) {
moduleDescriptor.addArtifact(DEFAULT_CONFIGURATION,
-new MDArtifact(moduleDescriptor, artifacts[i].getName(),
-artifacts[i].getType(), artifacts[i].getExt(),
artifacts[i].getUrl(),
-artifacts[i].getExtraAttributes()));
+new MDArtifact(moduleDescriptor, artifact.getName(),
artifact.getType(),
+artifact.getExt(), artifact.getUrl(),
artifact.getExtraAttributes()));
}
} else {
-moduleDescriptor.addArtifact(DEFAULT_CONFIGURATION, new
MDArtifact(moduleDescriptor,
-mrid.getName(), "jar", "jar"));
+moduleDescriptor.addArtifact(DEFAULT_CONFIGURATION,
+new MDArtifact(moduleDescriptor, mrid.getName(), "jar",
"jar"));
}
moduleDescriptor.setLastModified(System.currentTimeMillis());
return moduleDescriptor;
@@ -131,7 +130,7 @@ public class DefaultModuleDescriptor implements
ModuleDescriptor {
/**
* Transforms the given module descriptor of the given namespace and
return a new module
* descriptor in the system namespace. Note that dependency exclude
rules are not converted
- * in system namespace, because they aren't transformable (the name space
hasn't the ability to
+ * in system namespace, because they aren't transformable (the namespace
lacks the ability to
* convert regular expressions)
*
* @param md ModuleDescriptor
@@ -150,9 +149,8 @@ public class DefaultModuleDescriptor implements
ModuleDescriptor {
nmd.publicationDate = md.getPublicationDate();
nmd.resolvedPublicationDate = md.getResolvedPublicationDate();
-ExtendsDescriptor[] ed = md.getInheritedDescriptors();
-for (int i = 0; i < ed.length; ++i) {
-ModuleDescriptor parentM
[7/7] ant-ivy git commit: Add generics and Java 7 syntax to core
Add generics and Java 7 syntax to core This closes #52 pull request at github/apache/ant-ivy Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/69207179 Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/69207179 Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/69207179 Branch: refs/heads/master Commit: 6920717979fe3c0d29f4704404492e1c5c0d7c2c Parents: 844100a Author: twogee Authored: Thu Jul 6 08:04:24 2017 +0200 Committer: Jaikiran Pai Committed: Mon Jul 17 11:07:59 2017 +0530 -- .checkstyle | 1 + src/java/org/apache/ivy/Ivy14.java | 207 ++ src/java/org/apache/ivy/Main.java | 60 ++-- src/java/org/apache/ivy/ant/BuildOBRTask.java | 5 +- src/java/org/apache/ivy/ant/IvyBuildList.java | 11 +- src/java/org/apache/ivy/ant/IvyBuildNumber.java | 9 +- .../org/apache/ivy/ant/IvyCacheFileset.java | 6 +- src/java/org/apache/ivy/ant/IvyCacheTask.java | 3 +- src/java/org/apache/ivy/ant/IvyConfigure.java | 4 +- .../org/apache/ivy/ant/IvyDependencyTree.java | 3 +- .../ivy/ant/IvyDependencyUpdateChecker.java | 6 +- .../org/apache/ivy/ant/IvyPostResolveTask.java | 10 +- .../org/apache/ivy/ant/IvyRepositoryReport.java | 5 +- src/java/org/apache/ivy/ant/IvyRetrieve.java| 3 +- src/java/org/apache/ivy/core/IvyContext.java| 63 ++--- .../org/apache/ivy/core/IvyPatternHelper.java | 49 ++-- .../apache/ivy/core/cache/ArtifactOrigin.java | 2 +- .../cache/DefaultRepositoryCacheManager.java| 28 +- .../cache/DefaultResolutionCacheManager.java| 27 +- .../core/cache/ModuleDescriptorMemoryCache.java | 8 +- .../ivy/core/cache/ParserSettingsMonitor.java | 26 +- .../org/apache/ivy/core/check/CheckEngine.java | 50 ++-- .../apache/ivy/core/deliver/DeliverEngine.java | 47 ++-- .../org/apache/ivy/core/event/EventManager.java | 10 +- .../ivy/core/event/FilteredIvyListener.java | 6 +- .../org/apache/ivy/core/event/IvyEvent.java | 2 +- .../apache/ivy/core/event/IvyEventFilter.java | 42 ++- .../event/publish/EndArtifactPublishEvent.java | 3 - .../publish/StartArtifactPublishEvent.java | 3 - .../apache/ivy/core/install/InstallEngine.java | 49 ++-- .../ivy/core/install/InstallEngineSettings.java | 4 +- .../apache/ivy/core/install/InstallOptions.java | 9 +- .../module/descriptor/AbstractArtifact.java | 6 +- .../descriptor/AbstractIncludeExcludeRule.java | 7 +- .../core/module/descriptor/Configuration.java | 28 +- .../module/descriptor/ConfigurationGroup.java | 12 +- .../descriptor/ConfigurationIntersection.java | 12 +- .../core/module/descriptor/DefaultArtifact.java | 4 +- .../DefaultDependencyArtifactDescriptor.java| 6 +- .../descriptor/DefaultDependencyDescriptor.java | 276 +-- .../module/descriptor/DefaultExcludeRule.java | 2 +- .../descriptor/DefaultExtendsDescriptor.java| 6 +- .../module/descriptor/DefaultIncludeRule.java | 2 +- .../descriptor/DefaultModuleDescriptor.java | 159 +-- .../core/module/descriptor/ExtraInfoHolder.java | 4 +- .../ivy/core/module/descriptor/MDArtifact.java | 8 +- .../module/descriptor/ModuleDescriptor.java | 2 +- .../ivy/core/module/id/ArtifactRevisionId.java | 5 +- .../ivy/core/module/id/MatcherLookup.java | 40 +-- .../org/apache/ivy/core/module/id/ModuleId.java | 14 +- .../ivy/core/module/id/ModuleRevisionId.java| 10 +- .../apache/ivy/core/module/id/ModuleRules.java | 29 +- .../ivy/core/module/status/StatusManager.java | 44 ++- .../apache/ivy/core/pack/PackagingManager.java | 7 +- .../apache/ivy/core/pack/PackingRegistry.java | 2 +- .../org/apache/ivy/core/pack/ZipPacking.java| 12 +- .../apache/ivy/core/publish/PublishEngine.java | 22 +- .../ivy/core/report/ArtifactDownloadReport.java | 9 +- .../core/report/ConfigurationResolveReport.java | 35 +-- .../apache/ivy/core/report/DownloadReport.java | 15 +- .../apache/ivy/core/report/ResolveReport.java | 66 +++-- .../repository/RepositoryManagementEngine.java | 72 +++-- .../org/apache/ivy/core/resolve/IvyNode.java| 82 +++--- .../apache/ivy/core/resolve/IvyNodeCallers.java | 30 +- .../ivy/core/resolve/IvyNodeEviction.java | 50 ++-- .../apache/ivy/core/resolve/IvyNodeUsage.java | 30 +- .../apache/ivy/core/resolve/ResolveData.java| 57 ++-- .../apache/ivy/core/resolve/ResolveEngine.java | 180 ++-- .../apache/ivy/core/resolve/ResolveOptions.java | 7 +- .../org/apache/ivy/core/resolve/VisitData.java | 4 +- .../org/apache/ivy/core/resolve/VisitNode.java | 6 +- .../ivy/core/retrieve/RetrieveEngine.java | 71 +++-- .../ivy/core/retrieve/RetrieveOptions.java | 7 +- .../ivy/core/retrieve/RetrieveRepor
