You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2020/02/22 11:23:49 UTC
[groovy] branch master updated: Improve the code like
`String.equals("")`
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git
The following commit(s) were added to refs/heads/master by this push:
new 69d03ee Improve the code like `String.equals("")`
69d03ee is described below
commit 69d03ee9d49289f4b5f239a2c6b9bc3a7156bc2e
Author: zhangt2333 <zh...@gmail.com>
AuthorDate: Sat Feb 22 18:35:25 2020 +0800
Improve the code like `String.equals("")`
---
src/main/java/groovy/namespace/QName.java | 2 +-
.../org/codehaus/groovy/ast/builder/AstBuilderTransformation.java | 2 +-
.../org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java | 2 +-
src/main/java/org/codehaus/groovy/syntax/ReadException.java | 2 +-
.../java/org/codehaus/groovy/transform/NewifyASTTransformation.java | 2 +-
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java | 4 ++--
.../groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java | 2 +-
.../java/org/apache/groovy/ast/builder/AstBuilderTransformation.java | 2 +-
.../src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java | 2 +-
.../groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java | 2 +-
subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java | 2 +-
.../src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/groovy/namespace/QName.java b/src/main/java/groovy/namespace/QName.java
index 2d43d79..09126b8 100644
--- a/src/main/java/groovy/namespace/QName.java
+++ b/src/main/java/groovy/namespace/QName.java
@@ -249,7 +249,7 @@ public class QName implements Serializable {
*/
public static QName valueOf(String s) {
- if ((s == null) || s.equals("")) {
+ if ((s == null) || s.isEmpty()) {
throw new IllegalArgumentException("invalid QName literal");
}
diff --git a/src/main/java/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java b/src/main/java/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
index 6d9030c..da06fcc 100644
--- a/src/main/java/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
+++ b/src/main/java/org/codehaus/groovy/ast/builder/AstBuilderTransformation.java
@@ -161,7 +161,7 @@ public class AstBuilderTransformation extends MethodCallTransformation {
// is method object correct type?
if (call.getObjectExpression() != null && call.getObjectExpression().getType() != null) {
String name = call.getObjectExpression().getType().getName();
- if (name != null && !"".equals(name) && factoryTargets.contains(name)) {
+ if (name != null && !name.isEmpty() && factoryTargets.contains(name)) {
// is one of the arguments a closure?
if (call.getArguments() != null && call.getArguments() instanceof TupleExpression) {
diff --git a/src/main/java/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java b/src/main/java/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
index 218a925..b067a5d 100644
--- a/src/main/java/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
+++ b/src/main/java/org/codehaus/groovy/runtime/powerassert/AssertionRenderer.java
@@ -154,7 +154,7 @@ public final class AssertionRenderer {
return String.format("%s (toString() == null)", javaLangObjectToString(value));
}
- if (toString.equals("")) {
+ if (toString.isEmpty()) {
if (hasStringLikeType(value)) return "\"\"";
return String.format("%s (toString() == \"\")", javaLangObjectToString(value));
}
diff --git a/src/main/java/org/codehaus/groovy/syntax/ReadException.java b/src/main/java/org/codehaus/groovy/syntax/ReadException.java
index 930b767..3d8b72f 100644
--- a/src/main/java/org/codehaus/groovy/syntax/ReadException.java
+++ b/src/main/java/org/codehaus/groovy/syntax/ReadException.java
@@ -45,7 +45,7 @@ public class ReadException extends GroovyException {
public String toString() {
String message = super.getMessage();
- if (message == null || message.trim().equals("")) {
+ if (message == null || message.trim().isEmpty()) {
message = cause.getMessage();
}
diff --git a/src/main/java/org/codehaus/groovy/transform/NewifyASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/NewifyASTTransformation.java
index 4cc060f..6e05e84 100644
--- a/src/main/java/org/codehaus/groovy/transform/NewifyASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/NewifyASTTransformation.java
@@ -233,7 +233,7 @@ public class NewifyASTTransformation extends ClassCodeExpressionTransformer impl
if (!(expr instanceof ConstantExpression)) { return null; }
final ConstantExpression constExpr = (ConstantExpression) expr;
final String text = constExpr.getText();
- if (constExpr.getValue() == null || text.equals("")) { return null; }
+ if (constExpr.getValue() == null || text.isEmpty()) { return null; }
try {
final Pattern pattern = Pattern.compile(text);
return pattern;
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
index fb5c467..73dbe0c 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovy.java
@@ -375,7 +375,7 @@ public class Groovy extends Java {
}
}
// Catch any statements not followed by ;
- if (!txt.toString().equals("")) {
+ if (!txt.toString().isEmpty()) {
execGroovy(txt.toString(), out);
}
}
@@ -390,7 +390,7 @@ public class Groovy extends Java {
log.debug("execGroovy()");
// Check and ignore empty statements
- if ("".equals(txt.trim())) {
+ if (txt.trim().isEmpty()) {
return;
}
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
index b5e408a..3e1c283 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovydoc.java
@@ -404,7 +404,7 @@ public class Groovydoc extends Task {
}
if (files.length > 0) {
- if ("".equals(dir)) {
+ if (dir.isEmpty()) {
log.warn(baseDir
+ " contains source files in the default package,"
+ " you must specify them as source files not packages.");
diff --git a/subprojects/groovy-astbuilder/src/main/java/org/apache/groovy/ast/builder/AstBuilderTransformation.java b/subprojects/groovy-astbuilder/src/main/java/org/apache/groovy/ast/builder/AstBuilderTransformation.java
index 63a6555..cbb9c48 100644
--- a/subprojects/groovy-astbuilder/src/main/java/org/apache/groovy/ast/builder/AstBuilderTransformation.java
+++ b/subprojects/groovy-astbuilder/src/main/java/org/apache/groovy/ast/builder/AstBuilderTransformation.java
@@ -160,7 +160,7 @@ public class AstBuilderTransformation extends MethodCallTransformation {
// is method object correct type?
if (call.getObjectExpression() != null && call.getObjectExpression().getType() != null) {
String name = call.getObjectExpression().getType().getName();
- if (name != null && !"".equals(name) && factoryTargets.contains(name)) {
+ if (name != null && !name.isEmpty() && factoryTargets.contains(name)) {
// is one of the arguments a closure?
if (call.getArguments() != null && call.getArguments() instanceof TupleExpression) {
diff --git a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
index 5722d4a..2c3e433 100644
--- a/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
+++ b/subprojects/groovy-bsf/src/main/java/org/codehaus/groovy/bsf/GroovyEngine.java
@@ -48,7 +48,7 @@ public class GroovyEngine extends BSFEngineImpl {
private static String convertToValidJavaClassname(String inName) {
if (inName == null) return "_";
if (inName.startsWith("scriptdef_")) inName = inName.substring(10);
- if (inName.equals("")) return "_";
+ if (inName.isEmpty()) return "_";
StringBuilder output = new StringBuilder(inName.length());
boolean firstChar = true;
diff --git a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
index 14d3747..b73f24c 100644
--- a/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
+++ b/subprojects/groovy-console/src/main/groovy/groovy/console/ui/text/StructuredSyntaxDocumentFilter.java
@@ -337,7 +337,7 @@ public class StructuredSyntaxDocumentFilter extends DocumentFilter {
// have to compile regexp first so that it will match
groupList.add(Pattern.compile(nextRegexp).pattern());
}
- if (!regexp.toString().equals("")) {
+ if (!regexp.toString().isEmpty()) {
matcher = Pattern.compile(regexp.substring(1)).matcher("");
iter = children.values().iterator();
diff --git a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
index e3782ee..557eb0b 100644
--- a/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
+++ b/subprojects/groovy-json/src/main/java/groovy/json/JsonSlurper.java
@@ -196,7 +196,7 @@ public class JsonSlurper {
* @return a data structure of lists and maps
*/
public Object parseText(String text) {
- if (text == null || "".equals(text)) {
+ if (text == null || text.isEmpty()) {
throw new IllegalArgumentException("Text must not be null or empty");
}
return createParser().parse(text);
diff --git a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
index 439e1ac..844295e 100644
--- a/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
+++ b/subprojects/groovy-templates/src/main/groovy/groovy/text/markup/MarkupTemplateEngine.java
@@ -290,7 +290,7 @@ public class MarkupTemplateEngine extends TemplateEngine {
}
public boolean hasLocale() {
- return locale != null && !"".equals(locale);
+ return locale != null && !locale.isEmpty();
}
}