Repository: ant-ivy Updated Branches: refs/heads/master 041e9565a -> 9235380f0
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/ant/IvyResources.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyResources.java b/src/java/org/apache/ivy/ant/IvyResources.java index 41ec043..b185080 100644 --- a/src/java/org/apache/ivy/ant/IvyResources.java +++ b/src/java/org/apache/ivy/ant/IvyResources.java @@ -27,6 +27,7 @@ import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.Reference; +import org.apache.tools.ant.types.Resource; import org.apache.tools.ant.types.ResourceCollection; import org.apache.tools.ant.types.resources.BaseResourceCollectionWrapper; import org.apache.tools.ant.types.resources.FileResource; @@ -38,7 +39,7 @@ public class IvyResources extends IvyCacheTask implements ResourceCollection { */ private class IvyBaseResourceCollectionWrapper extends BaseResourceCollectionWrapper { - protected Collection getCollection() { + protected Collection<Resource> getCollection() { return resolveResources(null); } @@ -81,7 +82,7 @@ public class IvyResources extends IvyCacheTask implements ResourceCollection { return true; } - public Iterator iterator() { + public Iterator<Resource> iterator() { return wrapper.iterator(); } @@ -91,16 +92,15 @@ public class IvyResources extends IvyCacheTask implements ResourceCollection { // convert the ivy reports into an Ant Resource collection - private Collection resolveResources(String id) throws BuildException { + private Collection<Resource> resolveResources(String id) throws BuildException { prepareAndCheck(); try { - List/* <FileResource> */resources = new ArrayList(); + List<Resource> resources = new ArrayList<>(); if (id != null) { getProject().addReference(id, this); } - for (Iterator iter = getArtifactReports().iterator(); iter.hasNext();) { - ArtifactDownloadReport a = (ArtifactDownloadReport) iter.next(); - resources.add(new FileResource(a.getLocalFile())); + for (ArtifactDownloadReport adr : getArtifactReports()) { + resources.add(new FileResource(adr.getLocalFile())); } return resources; } catch (Exception ex) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/ant/IvyRetrieve.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyRetrieve.java b/src/java/org/apache/ivy/ant/IvyRetrieve.java index c783827..0fc0f7f 100644 --- a/src/java/org/apache/ivy/ant/IvyRetrieve.java +++ b/src/java/org/apache/ivy/ant/IvyRetrieve.java @@ -137,8 +137,8 @@ public class IvyRetrieve extends IvyPostResolveTask { } protected Collection<String> getAllowedLogOptions() { - return Arrays.asList(new String[] {LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, - LogOptions.LOG_QUIET}); + return Arrays.asList(LogOptions.LOG_DEFAULT, LogOptions.LOG_DOWNLOAD_ONLY, + LogOptions.LOG_QUIET); } public String getIvypattern() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/ant/IvyTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyTask.java b/src/java/org/apache/ivy/ant/IvyTask.java index a421447..e3adb85 100644 --- a/src/java/org/apache/ivy/ant/IvyTask.java +++ b/src/java/org/apache/ivy/ant/IvyTask.java @@ -121,12 +121,12 @@ public abstract class IvyTask extends Task { return (String[]) getReference("ivy.resolved.configurations.ref", org, module, strict); } - protected Object getResolvedDescriptor(String resolveId) { + protected <T> T getResolvedDescriptor(String resolveId) { return getResolvedDescriptor(resolveId, true); } - protected Object getResolvedDescriptor(String resolveId, boolean strict) { - Object result = getProject().getReference("ivy.resolved.descriptor." + resolveId); + protected <T> T getResolvedDescriptor(String resolveId, boolean strict) { + T result = getProject().getReference("ivy.resolved.descriptor." + resolveId); if (strict && (result == null)) { throw new BuildException("ModuleDescriptor for resolve with id '" + resolveId + "' not found."); @@ -134,16 +134,16 @@ public abstract class IvyTask extends Task { return result; } - protected Object getResolvedDescriptor(String org, String module) { + protected <T> T getResolvedDescriptor(String org, String module) { return getResolvedDescriptor(org, module, false); } - protected Object getResolvedDescriptor(String org, String module, boolean strict) { + protected <T> T getResolvedDescriptor(String org, String module, boolean strict) { return getReference("ivy.resolved.descriptor", org, module, strict); } - private Object getReference(String prefix, String org, String module, boolean strict) { - Object reference = null; + private <T> T getReference(String prefix, String org, String module, boolean strict) { + T reference = null; if (org != null && module != null) { reference = getProject().getReference(prefix + "." + org + "." + module); } @@ -157,9 +157,9 @@ public abstract class IvyTask extends Task { ResolveReport result = null; if (resolveId == null) { - result = (ResolveReport) getReference("ivy.resolved.report", org, module, false); + result = getReference("ivy.resolved.report", org, module, false); } else { - result = (ResolveReport) getReference("ivy.resolved.report." + resolveId, null, null, + result = getReference("ivy.resolved.report." + resolveId, null, null, false); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/ant/IvyVar.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyVar.java b/src/java/org/apache/ivy/ant/IvyVar.java index cd8d670..dd1738f 100644 --- a/src/java/org/apache/ivy/ant/IvyVar.java +++ b/src/java/org/apache/ivy/ant/IvyVar.java @@ -21,7 +21,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.net.URL; -import java.util.Iterator; +import java.util.Map; import java.util.Properties; import org.apache.ivy.Ivy; @@ -110,10 +110,8 @@ public class IvyVar extends IvyTask { } } } - for (Iterator iter = props.keySet().iterator(); iter.hasNext();) { - String name = (String) iter.next(); - String value = (String) props.get(name); - settings.setVariable(getVarName(name), value); + for (Map.Entry<Object, Object> entry : props.entrySet()) { + settings.setVariable(getVarName((String) entry.getKey()), (String) entry.getValue()); } } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/core/event/IvyEvent.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/event/IvyEvent.java b/src/java/org/apache/ivy/core/event/IvyEvent.java index 02ab78e..68e13b3 100644 --- a/src/java/org/apache/ivy/core/event/IvyEvent.java +++ b/src/java/org/apache/ivy/core/event/IvyEvent.java @@ -46,7 +46,7 @@ public class IvyEvent { private String name; - private Map attributes = new HashMap(); + private Map<String, String> attributes = new HashMap<>(); protected IvyEvent(String name) { this.source = IvyContext.getContext().getEventManager(); @@ -101,8 +101,8 @@ public class IvyEvent { * * @return the attributes of this event, as a Map(String,String) */ - public Map getAttributes() { - return new HashMap(attributes); + public Map<String, String> getAttributes() { + return new HashMap<>(attributes); } public String toString() { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java b/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java index 68da2c9..3ba7b87 100644 --- a/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java +++ b/src/java/org/apache/ivy/core/settings/IvyVariableContainerImpl.java @@ -25,15 +25,15 @@ import org.apache.ivy.util.Message; public class IvyVariableContainerImpl implements IvyVariableContainer { - private Map variables; + private Map<String, String> variables; private String envPrefix; public IvyVariableContainerImpl() { - this.variables = new HashMap(); + this.variables = new HashMap<>(); } - public IvyVariableContainerImpl(Map variables) { + public IvyVariableContainerImpl(Map<String, String> variables) { this.variables = variables; } @@ -64,7 +64,7 @@ public class IvyVariableContainerImpl implements IvyVariableContainer { return IvyPatternHelper.substituteVariables(value, this); } - protected Map getVariables() { + protected Map<String, String> getVariables() { return variables; } @@ -82,7 +82,7 @@ public class IvyVariableContainerImpl implements IvyVariableContainer { if ((envPrefix != null) && name.startsWith(envPrefix)) { val = System.getenv(name.substring(envPrefix.length())); } else { - val = (String) variables.get(name); + val = variables.get(name); } return val; @@ -95,7 +95,7 @@ public class IvyVariableContainerImpl implements IvyVariableContainer { } catch (CloneNotSupportedException e) { throw new RuntimeException("unable to clone a " + this.getClass()); } - clone.variables = new HashMap(this.variables); + clone.variables = new HashMap<>(this.variables); return clone; } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java b/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java index 81736b1..ecb0cbd 100644 --- a/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java +++ b/src/java/org/apache/ivy/tools/analyser/JarJarDependencyAnalyser.java @@ -28,6 +28,7 @@ import java.util.Map; import org.apache.ivy.core.module.descriptor.DefaultDependencyDescriptor; import org.apache.ivy.core.module.descriptor.DefaultModuleDescriptor; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; +import org.apache.ivy.core.module.id.ModuleRevisionId; import org.apache.ivy.util.Message; public class JarJarDependencyAnalyser implements DependencyAnalyser { @@ -39,10 +40,10 @@ public class JarJarDependencyAnalyser implements DependencyAnalyser { public ModuleDescriptor[] analyze(JarModule[] modules) { - StringBuffer jarjarCmd = new StringBuffer("java -jar \"").append( + StringBuilder jarjarCmd = new StringBuilder("java -jar \"").append( jarjarjarLocation.getAbsolutePath()).append("\" --find --level=jar "); - Map jarModulesMap = new HashMap(); - Map mds = new HashMap(); + Map<String, JarModule> jarModulesMap = new HashMap<>(); + Map<ModuleRevisionId, DefaultModuleDescriptor> mds = new HashMap<>(); for (int i = 0; i < modules.length; i++) { jarModulesMap.put(modules[i].getJar().getAbsolutePath(), modules[i]); @@ -63,15 +64,15 @@ public class JarJarDependencyAnalyser implements DependencyAnalyser { String line; while ((line = r.readLine()) != null) { String[] deps = line.split(" -> "); - JarModule module = (JarModule) jarModulesMap.get(deps[0]); - JarModule dependency = (JarModule) jarModulesMap.get(deps[1]); + JarModule module = jarModulesMap.get(deps[0]); + JarModule dependency = jarModulesMap.get(deps[1]); if (module.getMrid().getModuleId().equals(dependency.getMrid().getModuleId())) { continue; } Message.verbose(module.getMrid() + " depends on " + dependency.getMrid()); - DefaultModuleDescriptor md = (DefaultModuleDescriptor) mds.get(module.getMrid()); + DefaultModuleDescriptor md = mds.get(module.getMrid()); DefaultDependencyDescriptor dd = new DefaultDependencyDescriptor(md, dependency.getMrid(), false, false, true); @@ -82,7 +83,7 @@ public class JarJarDependencyAnalyser implements DependencyAnalyser { } catch (IOException e) { Message.debug(e); } - return (ModuleDescriptor[]) mds.values().toArray(new ModuleDescriptor[mds.values().size()]); + return mds.values().toArray(new ModuleDescriptor[mds.values().size()]); } public static void main(String[] args) { http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java b/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java index 8cbd262..9e216ae 100644 --- a/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java +++ b/src/java/org/apache/ivy/tools/analyser/JarModuleFinder.java @@ -39,24 +39,20 @@ public class JarModuleFinder { } public JarModule[] findJarModules() { - List ret = new ArrayList(); + List<JarModule> ret = new ArrayList<>(); URLLister lister = new FileURLLister(); try { - String[] orgs = ResolverHelper.listTokenValues(lister, pattern, "organisation"); - for (int i = 0; i < orgs.length; i++) { + for (String org : ResolverHelper.listTokenValues(lister, pattern, "organisation")) { String orgPattern = IvyPatternHelper.substituteToken(pattern, - IvyPatternHelper.ORGANISATION_KEY, orgs[i]); - String[] modules = ResolverHelper.listTokenValues(lister, orgPattern, "module"); - for (int j = 0; j < modules.length; j++) { + IvyPatternHelper.ORGANISATION_KEY, org); + for (String module : ResolverHelper.listTokenValues(lister, orgPattern, "module")) { String modPattern = IvyPatternHelper.substituteToken(orgPattern, - IvyPatternHelper.MODULE_KEY, modules[j]); - String[] revs = ResolverHelper.listTokenValues(lister, modPattern, "revision"); - for (int k = 0; k < revs.length; k++) { - File jar = new File(IvyPatternHelper.substitute(filePattern, orgs[i], - modules[j], revs[k], modules[j], "jar", "jar")); + IvyPatternHelper.MODULE_KEY, module); + for (String rev : ResolverHelper.listTokenValues(lister, modPattern, "revision")) { + File jar = new File(IvyPatternHelper.substitute(filePattern, org, + module, rev, module, "jar", "jar")); if (jar.exists()) { - ret.add(new JarModule(ModuleRevisionId.newInstance(orgs[i], modules[j], - revs[k]), jar)); + ret.add(new JarModule(ModuleRevisionId.newInstance(org, module, rev), jar)); } } } @@ -66,15 +62,15 @@ public class JarModuleFinder { Message.debug(e); // TODO: handle exception } - return (JarModule[]) ret.toArray(new JarModule[ret.size()]); + return ret.toArray(new JarModule[ret.size()]); } public static void main(String[] args) { JarModule[] mods = new JarModuleFinder( "D:/temp/test2/ivyrep/[organisation]/[module]/[revision]/[artifact].[ext]") .findJarModules(); - for (int i = 0; i < mods.length; i++) { - System.out.println(mods[i]); + for (JarModule mod : mods) { + System.out.println(mod); } } } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/9235380f/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java b/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java index aa34a45..eb45fa0 100644 --- a/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java +++ b/src/java/org/apache/ivy/tools/analyser/RepositoryAnalyser.java @@ -31,14 +31,14 @@ public class RepositoryAnalyser { JarModuleFinder finder = new JarModuleFinder(pattern); ModuleDescriptor[] mds = depAnalyser.analyze(finder.findJarModules()); Message.info("found " + mds.length + " modules"); - for (int i = 0; i < mds.length; i++) { + for (ModuleDescriptor md : mds) { File ivyFile = new File(IvyPatternHelper.substitute( - pattern, - DefaultArtifact.newIvyArtifact(mds[i].getModuleRevisionId(), - mds[i].getPublicationDate()))); + pattern, + DefaultArtifact.newIvyArtifact(md.getModuleRevisionId(), + md.getPublicationDate()))); try { Message.info("generating " + ivyFile); - XmlModuleDescriptorWriter.write(mds[i], ivyFile); + XmlModuleDescriptorWriter.write(md, ivyFile); } catch (IOException e) { Message.debug(e); }
