use Java 5 constructs Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/89a0de6a Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/89a0de6a Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/89a0de6a
Branch: refs/heads/master Commit: 89a0de6a8968ffaad64422377a1fc67da93b843c Parents: 05b14fd Author: Nicolas Lalevée <[email protected]> Authored: Sun Jan 18 17:19:20 2015 +0100 Committer: Nicolas Lalevée <[email protected]> Committed: Sun Jan 18 17:19:20 2015 +0100 ---------------------------------------------------------------------- src/java/org/apache/ivy/Ivy.java | 6 ++-- src/java/org/apache/ivy/ant/IvyPublish.java | 29 +++++++-------- src/java/org/apache/ivy/ant/IvyTask.java | 2 ++ .../apache/ivy/core/publish/PublishEngine.java | 38 +++++++++----------- 4 files changed, 36 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/Ivy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/Ivy.java b/src/java/org/apache/ivy/Ivy.java index 6cbd02c..fc190ed 100644 --- a/src/java/org/apache/ivy/Ivy.java +++ b/src/java/org/apache/ivy/Ivy.java @@ -37,6 +37,7 @@ import org.apache.ivy.core.deliver.DeliverOptions; import org.apache.ivy.core.event.EventManager; import org.apache.ivy.core.install.InstallEngine; import org.apache.ivy.core.install.InstallOptions; +import org.apache.ivy.core.module.descriptor.Artifact; import org.apache.ivy.core.module.descriptor.ModuleDescriptor; import org.apache.ivy.core.module.id.ModuleId; import org.apache.ivy.core.module.id.ModuleRevisionId; @@ -614,8 +615,9 @@ public class Ivy { // PUBLISH // /////////////////////////////////////////////////////////////////////// - public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern, - String resolverName, PublishOptions options) throws IOException { + public Collection<Artifact> publish(ModuleRevisionId mrid, + Collection<String> srcArtifactPattern, String resolverName, PublishOptions options) + throws IOException { pushContext(); try { return publishEngine.publish(mrid, srcArtifactPattern, resolverName, options); http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/ant/IvyPublish.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/ant/IvyPublish.java b/src/java/org/apache/ivy/ant/IvyPublish.java index d46b701..04df76e 100644 --- a/src/java/org/apache/ivy/ant/IvyPublish.java +++ b/src/java/org/apache/ivy/ant/IvyPublish.java @@ -61,7 +61,7 @@ public class IvyPublish extends IvyTask { private String publishResolverName = null; - private List artifactspattern = new ArrayList(); + private List<String> artifactspattern = new ArrayList<String>(); private File deliveryList; @@ -81,7 +81,7 @@ public class IvyPublish extends IvyTask { private boolean forcedeliver; - private Collection artifacts = new ArrayList(); + private Collection<Artifact> artifacts = new ArrayList<Artifact>(); private String pubBranch; @@ -190,7 +190,7 @@ public class IvyPublish extends IvyTask { } public String getArtifactspattern() { - return (String) (artifactspattern.isEmpty() ? null : artifactspattern.get(0)); + return artifactspattern.isEmpty() ? null : artifactspattern.get(0); } public void setArtifactspattern(String artifactsPattern) { @@ -222,6 +222,7 @@ public class IvyPublish extends IvyTask { this.merge = merge; } + @Override public void doExecute() throws BuildException { Ivy ivy = getIvyInstance(); IvySettings settings = ivy.getSettings(); @@ -312,14 +313,10 @@ public class IvyPublish extends IvyTask { mrid, artifactspattern, publishResolverName, - new PublishOptions() - .setPubrevision(getPubrevision()) - .setPubbranch(getPubbranch()) - .setSrcIvyPattern(publishivy ? srcivypattern : null) - .setStatus(getStatus()) + new PublishOptions().setPubrevision(getPubrevision()).setPubbranch(getPubbranch()) + .setSrcIvyPattern(publishivy ? srcivypattern : null).setStatus(getStatus()) .setPubdate(pubdate) - .setExtraArtifacts( - (Artifact[]) artifacts.toArray(new Artifact[artifacts.size()])) + .setExtraArtifacts(artifacts.toArray(new Artifact[artifacts.size()])) .setValidate(doValidate(settings)).setOverwrite(overwrite) .setUpdate(update).setMerge(merge).setWarnOnMissing(warnonmissing) .setHaltOnMissing(haltonmissing).setConfs(splitConfs(conf))); @@ -392,7 +389,7 @@ public class IvyPublish extends IvyTask { private String type; - private Map extra = new HashMap(); + private Map<String, String> extra = new HashMap<String, String>(); public String[] getConfigurations() { return null; @@ -439,22 +436,22 @@ public class IvyPublish extends IvyTask { } public String getAttribute(String attName) { - return (String) extra.get(attName); + return extra.get(attName); } - public Map getAttributes() { + public Map<String, String> getAttributes() { return extra; } public String getExtraAttribute(String attName) { - return (String) extra.get(attName); + return extra.get(attName); } - public Map getExtraAttributes() { + public Map<String, String> getExtraAttributes() { return extra; } - public Map getQualifiedExtraAttributes() { + public Map<String, String> getQualifiedExtraAttributes() { return extra; } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/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 3533480..6d65c34 100644 --- a/src/java/org/apache/ivy/ant/IvyTask.java +++ b/src/java/org/apache/ivy/ant/IvyTask.java @@ -265,6 +265,7 @@ public abstract class IvyTask extends Task { /** * Ant task execute. Calls prepareTask, doExecute, finalzeTask */ + @Override public final void execute() throws BuildException { try { prepareTask(); @@ -282,6 +283,7 @@ public abstract class IvyTask extends Task { */ public abstract void doExecute() throws BuildException; + @Override public String toString() { return getClass().getName() + ":" + getTaskName(); } http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/89a0de6a/src/java/org/apache/ivy/core/publish/PublishEngine.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/ivy/core/publish/PublishEngine.java b/src/java/org/apache/ivy/core/publish/PublishEngine.java index 4fa43a2..6b42a35 100644 --- a/src/java/org/apache/ivy/core/publish/PublishEngine.java +++ b/src/java/org/apache/ivy/core/publish/PublishEngine.java @@ -26,7 +26,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.HashSet; -import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; @@ -75,8 +74,9 @@ public class PublishEngine { * the name, type, ext url and extra attributes of the artifacts are really used. Other methods * can return null safely. */ - public Collection publish(ModuleRevisionId mrid, Collection srcArtifactPattern, - String resolverName, PublishOptions options) throws IOException { + public Collection<Artifact> publish(ModuleRevisionId mrid, + Collection<String> srcArtifactPattern, String resolverName, PublishOptions options) + throws IOException { Message.info(":: publishing :: " + mrid.getModuleId()); Message.verbose("\tvalidate = " + options.isValidate()); long start = System.currentTimeMillis(); @@ -111,7 +111,8 @@ public class PublishEngine { tmp.deleteOnExit(); String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md); - Set confsToRemove = new HashSet(Arrays.asList(md.getConfigurationsNames())); + Set<String> confsToRemove = new HashSet<String>(Arrays.asList(md + .getConfigurationsNames())); confsToRemove.removeAll(Arrays.asList(confs)); try { @@ -131,8 +132,7 @@ public class PublishEngine { .setMerge(options.isMerge()) .setMergedDescriptor(md) .setConfsToExclude( - (String[]) confsToRemove.toArray(new String[confsToRemove - .size()]))); + confsToRemove.toArray(new String[confsToRemove.size()]))); ivyFile = tmp; // we parse the new file to get updated module descriptor md = XmlModuleDescriptorParser.getInstance().parseDescriptor(settings, @@ -169,15 +169,15 @@ public class PublishEngine { } // collect all declared artifacts of this module - Collection missing = publish(md, srcArtifactPattern, resolver, options); + Collection<Artifact> missing = publish(md, srcArtifactPattern, resolver, options); Message.verbose("\tpublish done (" + (System.currentTimeMillis() - start) + "ms)"); return missing; } - public Collection publish(ModuleDescriptor md, Collection srcArtifactPattern, + public Collection<Artifact> publish(ModuleDescriptor md, Collection<String> srcArtifactPattern, DependencyResolver resolver, PublishOptions options) throws IOException { - Collection missing = new ArrayList(); - Set artifactsSet = new LinkedHashSet(); + Collection<Artifact> missing = new ArrayList<Artifact>(); + Set<Artifact> artifactsSet = new LinkedHashSet<Artifact>(); String[] confs = ConfigurationUtils.replaceWildcards(options.getConfs(), md); for (int i = 0; i < confs.length; i++) { @@ -195,11 +195,9 @@ public class PublishEngine { } } // now collects artifacts files - Map/* <Artifact,File> */artifactsFiles = new LinkedHashMap(); - for (Iterator iter = artifactsSet.iterator(); iter.hasNext();) { - Artifact artifact = (Artifact) iter.next(); - for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) { - String pattern = (String) iterator.next(); + Map<Artifact, File> artifactsFiles = new LinkedHashMap<Artifact, File>(); + for (Artifact artifact : artifactsSet) { + for (String pattern : srcArtifactPattern) { File artifactFile = settings.resolveFile(IvyPatternHelper.substitute( settings.substitute(pattern), artifact)); if (artifactFile.exists()) { @@ -210,8 +208,7 @@ public class PublishEngine { if (!artifactsFiles.containsKey(artifact)) { StringBuffer sb = new StringBuffer(); sb.append("missing artifact " + artifact + ":\n"); - for (Iterator iterator = srcArtifactPattern.iterator(); iterator.hasNext();) { - String pattern = (String) iterator.next(); + for (String pattern : srcArtifactPattern) { sb.append("\t" + settings.resolveFile(IvyPatternHelper.substitute(pattern, artifact)) + " file does not exist\n"); @@ -253,10 +250,9 @@ public class PublishEngine { try { resolver.beginPublishTransaction(md.getModuleRevisionId(), options.isOverwrite()); // for each declared published artifact in this descriptor, do: - for (Iterator iter = artifactsFiles.entrySet().iterator(); iter.hasNext();) { - Map.Entry entry = (Entry) iter.next(); - Artifact artifact = (Artifact) entry.getKey(); - File artifactFile = (File) entry.getValue(); + for (Entry<Artifact, File> entry : artifactsFiles.entrySet()) { + Artifact artifact = entry.getKey(); + File artifactFile = entry.getValue(); publish(artifact, artifactFile, resolver, options.isOverwrite()); } resolver.commitPublishTransaction();
