You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2021/09/25 11:33:23 UTC
[ant] branch master updated: Unnecessary boxing/conversion
This is an automated email from the ASF dual-hosted git repository.
bodewig pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ant.git
The following commit(s) were added to refs/heads/master by this push:
new e9bd11f Unnecessary boxing/conversion
new 158043f Merge pull request #139 from twogee/useless-boxing
e9bd11f is described below
commit e9bd11fa782e30db2ff7c3ed78e1e5b435042205
Author: twogee <g....@gmail.com>
AuthorDate: Sat Oct 3 17:11:12 2020 +0200
Unnecessary boxing/conversion
---
src/main/org/apache/tools/ant/filters/SortFilter.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java | 6 +++---
src/main/org/apache/tools/ant/taskdefs/AugmentReference.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/Concat.java | 2 +-
src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java | 6 +++---
.../ant/taskdefs/optional/ejb/GenericDeploymentTool.java | 2 +-
.../ant/taskdefs/optional/junit/AggregateTransformer.java | 2 +-
.../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 12 ++++++------
src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java | 2 +-
.../tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java | 2 +-
src/main/org/apache/tools/ant/types/Mapper.java | 2 +-
.../apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java | 2 +-
.../org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java | 3 +--
13 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/src/main/org/apache/tools/ant/filters/SortFilter.java b/src/main/org/apache/tools/ant/filters/SortFilter.java
index d1cb6fd..1478db3 100644
--- a/src/main/org/apache/tools/ant/filters/SortFilter.java
+++ b/src/main/org/apache/tools/ant/filters/SortFilter.java
@@ -317,7 +317,7 @@ public final class SortFilter extends BaseParamFilterReader
for (Parameter param : params) {
final String paramName = param.getName();
if (REVERSE_KEY.equals(paramName)) {
- setReverse(Boolean.valueOf(param.getValue()));
+ setReverse(Boolean.parseBoolean(param.getValue()));
} else if (COMPARATOR_KEY.equals(paramName)) {
try {
String className = param.getValue();
diff --git a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
index 11b8926..4dc2a77 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AbstractCvsTask.java
@@ -306,14 +306,14 @@ public abstract class AbstractCvsTask extends Task {
var.setKey("CVS_PASSFILE");
var.setValue(String.valueOf(passFile));
env.addVariable(var);
- log("Using cvs passfile: " + String.valueOf(passFile),
+ log("Using cvs passfile: " + passFile,
Project.MSG_VERBOSE);
} else if (!passFile.canRead()) {
- log("cvs passfile: " + String.valueOf(passFile)
+ log("cvs passfile: " + passFile
+ " ignored as it is not readable",
Project.MSG_WARN);
} else {
- log("cvs passfile: " + String.valueOf(passFile)
+ log("cvs passfile: " + passFile
+ " ignored as it is not a file",
Project.MSG_WARN);
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java b/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
index 6a76697..3ddfb92 100644
--- a/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
+++ b/src/main/org/apache/tools/ant/taskdefs/AugmentReference.java
@@ -46,7 +46,7 @@ public class AugmentReference extends Task implements TypeAdapter {
hijackId();
if (getProject().hasReference(id)) {
Object result = getProject().getReference(id);
- log("project reference " + id + "=" + String.valueOf(result), Project.MSG_DEBUG);
+ log("project reference " + id + "=" + result, Project.MSG_DEBUG);
return result;
}
throw new BuildException("Unknown reference \"" + id + "\"");
diff --git a/src/main/org/apache/tools/ant/taskdefs/Concat.java b/src/main/org/apache/tools/ant/taskdefs/Concat.java
index db232c4..09127a9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/Concat.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Concat.java
@@ -504,7 +504,7 @@ public class Concat extends Task implements ResourceCollection {
@Override
public String getName() {
return resourceName == null
- ? "concat (" + String.valueOf(c) + ")" : resourceName;
+ ? "concat (" + c + ")" : resourceName;
}
}
diff --git a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
index 62237ef..1ea0903 100644
--- a/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
+++ b/src/main/org/apache/tools/ant/taskdefs/RecorderEntry.java
@@ -272,12 +272,12 @@ public class RecorderEntry implements BuildLogger, SubBuildListener {
if (minutes > 0) {
- return Long.toString(minutes) + " minute"
+ return minutes + " minute"
+ (minutes == 1 ? " " : "s ")
- + Long.toString(seconds % 60) + " second"
+ + seconds % 60 + " second"
+ (seconds % 60 == 1 ? "" : "s");
} else {
- return Long.toString(seconds) + " second"
+ return seconds + " second"
+ (seconds % 60 == 1 ? "" : "s");
}
// CheckStyle:MagicNumber ON
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
index 3ae626e..228fbc9 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/ejb/GenericDeploymentTool.java
@@ -434,7 +434,7 @@ public class GenericDeploymentTool implements EJBDeploymentTool {
log("building "
+ jarFile.getName()
+ " with "
- + String.valueOf(ejbFiles.size())
+ + ejbFiles.size()
+ " files",
Project.MSG_INFO);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
index bc66880..7ad3ed5 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/AggregateTransformer.java
@@ -260,7 +260,7 @@ public class AggregateTransformer {
xsltTask.setIn(((XMLResultAggregator) task).getDestinationFile());
File outputFile;
if (FRAMES.equals(format)) {
- String tempFileProperty = getClass().getName() + String.valueOf(counter++); //NOSONAR
+ String tempFileProperty = getClass().getName() + counter++; //NOSONAR
File tmp = FILE_UTILS.resolveFile(project.getBaseDir(), project
.getProperty("java.io.tmpdir"));
tempFileTask.setDestDir(tmp);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index de5c31d..ef1e293 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -1174,7 +1174,7 @@ public class JUnitTask extends Task {
cmd.createArgument().setValue(Constants.TESTSFILE + casesFile);
}
- cmd.createArgument().setValue(Constants.SKIP_NON_TESTS + String.valueOf(test.isSkipNonTests()));
+ cmd.createArgument().setValue(Constants.SKIP_NON_TESTS + test.isSkipNonTests());
cmd.createArgument().setValue(Constants.FILTERTRACE + test.getFiltertrace());
cmd.createArgument().setValue(Constants.HALT_ON_ERROR + test.getHaltonerror());
cmd.createArgument().setValue(Constants.HALT_ON_FAILURE
@@ -1184,17 +1184,17 @@ public class JUnitTask extends Task {
checkIncludeSummary(cmd);
cmd.createArgument().setValue(Constants.SHOWOUTPUT
- + String.valueOf(showOutput));
+ + showOutput);
cmd.createArgument().setValue(Constants.OUTPUT_TO_FORMATTERS
- + String.valueOf(outputToFormatters));
+ + outputToFormatters);
cmd.createArgument().setValue(Constants.LOG_FAILED_TESTS
- + String.valueOf(logFailedTests));
+ + logFailedTests);
cmd.createArgument().setValue(Constants.THREADID
- + String.valueOf(test.getThread()));
+ + test.getThread());
// #31885
cmd.createArgument().setValue(Constants.LOGTESTLISTENEREVENTS
- + String.valueOf(getEnableTestListenerEvents()));
+ + getEnableTestListenerEvents());
StringBuilder formatterArg = new StringBuilder(STRING_BUFFER_SIZE);
final FormatterElement[] feArray = mergeFormatters(test);
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
index 5e2c935..57f9ae0 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java
@@ -2056,7 +2056,7 @@ public class FTP extends Task implements FTPTaskConfig {
final int maxIterations = 1000;
for (int counter = 1; counter < maxIterations; counter++) {
File localFile = FILE_UTILS.createTempFile(getProject(),
- "ant" + Integer.toString(counter), ".tmp",
+ "ant" + counter, ".tmp",
null, false, false);
String fileName = localFile.getName();
boolean found = false;
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
index db63d95..3d45cb1 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/net/FTPTaskMirrorImpl.java
@@ -1372,7 +1372,7 @@ public class FTPTaskMirrorImpl implements FTPTaskMirror {
final int maxIterations = 1000;
for (int counter = 1; counter < maxIterations; counter++) {
File localFile = FILE_UTILS.createTempFile(task.getProject(),
- "ant" + Integer.toString(counter), ".tmp",
+ "ant" + counter, ".tmp",
null, false, false);
String fileName = localFile.getName();
boolean found = false;
diff --git a/src/main/org/apache/tools/ant/types/Mapper.java b/src/main/org/apache/tools/ant/types/Mapper.java
index 46dfabf..bcb756c 100644
--- a/src/main/org/apache/tools/ant/types/Mapper.java
+++ b/src/main/org/apache/tools/ant/types/Mapper.java
@@ -87,7 +87,7 @@ public class Mapper extends DataType {
if (m instanceof ContainerMapper) {
container = (ContainerMapper) m;
} else {
- throw new BuildException(String.valueOf(m)
+ throw new BuildException(m
+ " mapper implementation does not support nested mappers!");
}
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
index c28b6e1..e6b73c8 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
@@ -49,7 +49,7 @@ public class ExecStreamRedirectorTest {
@Before
public void setUp() throws IOException {
buildRule.configureProject("src/etc/testcases/taskdefs/exec/exec-with-redirector.xml");
- outputDir = folder.newFolder(String.valueOf("temp-" + System.nanoTime()));
+ outputDir = folder.newFolder("temp-" + System.nanoTime());
buildRule.getProject().setUserProperty("output", outputDir.toString());
buildRule.executeTarget("setUp");
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
index b6875d0..a8eb350 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/sos/SOSTest.java
@@ -337,8 +337,7 @@ public class SOSTest {
int length = sTestCmdLine.length;
assertEquals("number of arguments doesn't match", length, sGeneratedCmdLine.length);
for (int i = 0; i < length; i++) {
- assertEquals("arg # " + String.valueOf(i),
- sTestCmdLine[i], sGeneratedCmdLine[i]);
+ assertEquals("arg # " + i, sTestCmdLine[i], sGeneratedCmdLine[i]);
}
}
}