You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by gi...@apache.org on 2018/05/18 04:34:12 UTC
ant git commit: Tidy up the code
Repository: ant
Updated Branches:
refs/heads/master 3f5a4d875 -> c069b5007
Tidy up the code
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/c069b500
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/c069b500
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/c069b500
Branch: refs/heads/master
Commit: c069b5007f243464c90461c5b478d192f5dff945
Parents: 3f5a4d8
Author: Gintas Grigelionis <gi...@apache.org>
Authored: Fri May 18 06:33:57 2018 +0200
Committer: Gintas Grigelionis <gi...@apache.org>
Committed: Fri May 18 06:33:57 2018 +0200
----------------------------------------------------------------------
src/main/org/apache/tools/ant/taskdefs/DependSet.java | 3 +--
src/main/org/apache/tools/ant/taskdefs/Recorder.java | 1 -
src/main/org/apache/tools/ant/taskdefs/Replace.java | 3 +--
.../org/apache/tools/ant/taskdefs/condition/Or.java | 2 --
.../org/apache/tools/ant/taskdefs/condition/Xor.java | 2 --
.../ant/taskdefs/optional/junit/FailureRecorder.java | 4 +---
.../org/apache/tools/ant/types/AbstractFileSet.java | 13 +++++--------
src/main/org/apache/tools/ant/types/Commandline.java | 6 +++---
8 files changed, 11 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/DependSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/DependSet.java b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
index 45c8274..721dbfb 100644
--- a/src/main/org/apache/tools/ant/taskdefs/DependSet.java
+++ b/src/main/org/apache/tools/ant/taskdefs/DependSet.java
@@ -264,8 +264,7 @@ public class DependSet extends MatchingTask {
}
private Resource getXest(ResourceCollection rc, ResourceComparator c) {
- return StreamUtils.iteratorAsStream(rc.iterator())
- .min(c::compare).orElse(null);
+ return StreamUtils.iteratorAsStream(rc.iterator()).min(c).orElse(null);
}
private Resource getOldest(ResourceCollection rc) {
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/Recorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Recorder.java b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
index 8a7d821..66152d3 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Recorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Recorder.java
@@ -18,7 +18,6 @@
package org.apache.tools.ant.taskdefs;
import java.util.Hashtable;
-import java.util.Map;
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildException;
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/Replace.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/Replace.java b/src/main/org/apache/tools/ant/taskdefs/Replace.java
index 2cfaa8b..b32b4b8 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Replace.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Replace.java
@@ -33,7 +33,6 @@ import java.util.ArrayList;
import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import java.util.Objects;
import java.util.Properties;
import org.apache.tools.ant.BuildException;
@@ -937,7 +936,7 @@ public class Replace extends MatchingTask {
*/
private Iterator<String> getOrderedIterator(Properties props) {
List<String> keys = new ArrayList<>(props.stringPropertyNames());
- keys.sort(Comparator.<String>comparingInt(s -> s.length()).reversed());
+ keys.sort(Comparator.<String>comparingInt(String::length).reversed());
return keys.iterator();
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
index 65c64be..8f05d18 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Or.java
@@ -18,8 +18,6 @@
package org.apache.tools.ant.taskdefs.condition;
-import java.util.Collections;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.util.StreamUtils;
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
index 7e31633..ec3e213 100644
--- a/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
+++ b/src/main/org/apache/tools/ant/taskdefs/condition/Xor.java
@@ -17,8 +17,6 @@
*/
package org.apache.tools.ant.taskdefs.condition;
-import java.util.Collections;
-
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.util.StreamUtils;
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
index 20d9825..e82af1d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/FailureRecorder.java
@@ -149,10 +149,8 @@ public class FailureRecorder extends ProjectComponent implements JUnitResultForm
// store project reference for logging
super.setProject(project);
// check if already registered
- boolean alreadyRegistered = project.getBuildListeners().stream()
- .anyMatch(FailureRecorder.class::isInstance);
// register if needed
- if (!alreadyRegistered) {
+ if (!project.getBuildListeners().stream().anyMatch(FailureRecorder.class::isInstance)) {
verbose("Register FailureRecorder (@" + this.hashCode() + ") as BuildListener");
project.addBuildListener(this);
}
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/types/AbstractFileSet.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/AbstractFileSet.java b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
index 9a585bb..7c0651a 100644
--- a/src/main/org/apache/tools/ant/types/AbstractFileSet.java
+++ b/src/main/org/apache/tools/ant/types/AbstractFileSet.java
@@ -903,8 +903,8 @@ public abstract class AbstractFileSet extends DataType
try {
AbstractFileSet fs = (AbstractFileSet) super.clone();
fs.defaultPatterns = (PatternSet) defaultPatterns.clone();
- fs.additionalPatterns = additionalPatterns.stream().map(
- PatternSet::clone).map(PatternSet.class::cast).collect(Collectors.toList());
+ fs.additionalPatterns = additionalPatterns.stream().map(PatternSet::clone)
+ .map(PatternSet.class::cast).collect(Collectors.toList());
fs.selectors = new ArrayList<>(selectors);
return fs;
} catch (CloneNotSupportedException e) {
@@ -963,12 +963,9 @@ public abstract class AbstractFileSet extends DataType
if (isReference()) {
super.dieOnCircularReference(stk, p);
} else {
- selectors.stream().filter(DataType.class::isInstance).forEach(fileSelector ->
- pushAndInvokeCircularReferenceCheck((DataType) fileSelector, stk, p)
- );
- for (PatternSet ps : additionalPatterns) {
- pushAndInvokeCircularReferenceCheck(ps, stk, p);
- }
+ selectors.stream().filter(DataType.class::isInstance).map(DataType.class::cast)
+ .forEach(type -> pushAndInvokeCircularReferenceCheck(type, stk, p));
+ additionalPatterns.forEach(ps -> pushAndInvokeCircularReferenceCheck(ps, stk, p));
setChecked(true);
}
}
http://git-wip-us.apache.org/repos/asf/ant/blob/c069b500/src/main/org/apache/tools/ant/types/Commandline.java
----------------------------------------------------------------------
diff --git a/src/main/org/apache/tools/ant/types/Commandline.java b/src/main/org/apache/tools/ant/types/Commandline.java
index 2fe0d52..81440fa 100644
--- a/src/main/org/apache/tools/ant/types/Commandline.java
+++ b/src/main/org/apache/tools/ant/types/Commandline.java
@@ -224,9 +224,9 @@ public class Commandline implements Cloneable {
*/
public int getPosition() {
if (realPos == -1) {
- realPos = (executable == null ? 0 : 1) + (int)
- arguments.stream().limit(position).map(Argument::getParts)
- .flatMap(Stream::of).count();
+ realPos = (executable == null ? 0 : 1)
+ + (int) arguments.stream().limit(position)
+ .map(Argument::getParts).flatMap(Stream::of).count();
}
return realPos;
}