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 71709ed6b4 Trivial refactor: replace `size()` and `length()` with
`isEmpty()`
71709ed6b4 is described below
commit 71709ed6b4f467affcd804db2b6aebe9b9275c38
Author: Daniel Sun <sun...@apache.org>
AuthorDate: Sun Jun 1 01:04:17 2025 +0900
Trivial refactor: replace `size()` and `length()` with `isEmpty()`
---
src/main/java/groovy/grape/GrabAnnotationTransformation.java | 2 +-
src/main/java/groovy/lang/ExpandoMetaClass.java | 10 +++++-----
src/main/java/groovy/namespace/QName.java | 6 +++---
src/main/java/groovy/ui/GroovyMain.java | 2 +-
src/main/java/groovy/util/Node.java | 2 +-
src/main/java/org/codehaus/groovy/ast/ClassHelper.java | 2 +-
.../java/org/codehaus/groovy/ast/expr/LambdaExpression.java | 2 +-
.../org/codehaus/groovy/classgen/FinalVariableAnalyzer.java | 4 ++--
.../org/codehaus/groovy/control/CompilerConfiguration.java | 2 +-
src/main/java/org/codehaus/groovy/control/ResolveVisitor.java | 2 +-
src/main/java/org/codehaus/groovy/control/XStreamUtils.java | 2 +-
.../java/org/codehaus/groovy/runtime/StringGroovyMethods.java | 2 +-
.../codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java | 2 +-
.../org/codehaus/groovy/runtime/powerassert/SourceText.java | 2 +-
src/main/java/org/codehaus/groovy/syntax/ASTHelper.java | 4 ++--
src/main/java/org/codehaus/groovy/syntax/CSTNode.java | 2 +-
src/main/java/org/codehaus/groovy/tools/GrapeUtil.java | 2 +-
.../java/org/codehaus/groovy/tools/LoaderConfiguration.java | 4 ++--
src/main/java/org/codehaus/groovy/tools/Utilities.java | 4 ++--
.../codehaus/groovy/transform/ASTTransformationVisitor.java | 2 +-
.../codehaus/groovy/transform/BuilderASTTransformation.java | 2 +-
.../codehaus/groovy/transform/ImmutableASTTransformation.java | 2 +-
.../groovy/transform/ReadWriteLockASTTransformation.java | 2 +-
.../groovy/transform/SynchronizedASTTransformation.java | 2 +-
.../codehaus/groovy/transform/tailrec/InWhileLoopWrapper.java | 2 +-
.../transform/tailrec/TailRecursiveASTTransformation.java | 2 +-
.../org/codehaus/groovy/transform/trait/TraitComposer.java | 2 +-
27 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
index 1190c95b8b..887b0a3591 100644
--- a/src/main/java/groovy/grape/GrabAnnotationTransformation.java
+++ b/src/main/java/groovy/grape/GrabAnnotationTransformation.java
@@ -243,7 +243,7 @@ public class GrabAnnotationTransformation extends
ClassCodeVisitorSupport implem
for (AnnotationNode node : grabResolverAnnotations) {
Map<String, Object> grabResolverMap = new HashMap<String,
Object>();
String sval = getMemberStringValue(node, "value");
- if (sval != null && sval.length() > 0) {
+ if (sval != null && !sval.isEmpty()) {
for (String s : GRABRESOLVER_REQUIRED) {
String mval = getMemberStringValue(node, s);
if (mval != null && mval.isEmpty()) mval = null;
diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java
b/src/main/java/groovy/lang/ExpandoMetaClass.java
index ac2347f690..51215b27a0 100644
--- a/src/main/java/groovy/lang/ExpandoMetaClass.java
+++ b/src/main/java/groovy/lang/ExpandoMetaClass.java
@@ -1242,7 +1242,7 @@ public class ExpandoMetaClass extends MetaClassImpl
implements GroovyObject {
* Either the first or second letter must be upperCase for that to be true.
*/
private static boolean isPropertyName(String name) {
- return ((name.length() > 0) && Character.isUpperCase(name.charAt(0)))
|| ((name.length() > 1) && Character.isUpperCase(name.charAt(1)));
+ return ((!name.isEmpty()) && Character.isUpperCase(name.charAt(0))) ||
((name.length() > 1) && Character.isUpperCase(name.charAt(1)));
}
/**
@@ -1253,7 +1253,7 @@ public class ExpandoMetaClass extends MetaClassImpl
implements GroovyObject {
* @return True if it is a javabean property method
*/
private boolean isGetter(String name, CachedClass[] args) {
- if (name == null || name.length() == 0 || args == null) return false;
+ if (name == null || name.isEmpty() || args == null) return false;
if (args.length != 0) return false;
if (name.startsWith("get")) {
@@ -1274,7 +1274,7 @@ public class ExpandoMetaClass extends MetaClassImpl
implements GroovyObject {
* @return The property name equivalent
*/
private String getPropertyForGetter(String getterName) {
- if (getterName == null || getterName.length() == 0) return null;
+ if (getterName == null || getterName.isEmpty()) return null;
if (getterName.startsWith("get")) {
String prop = getterName.substring(3);
@@ -1294,7 +1294,7 @@ public class ExpandoMetaClass extends MetaClassImpl
implements GroovyObject {
* @return The property name equivalent
*/
public String getPropertyForSetter(String setterName) {
- if (setterName == null || setterName.length() == 0) return null;
+ if (setterName == null || setterName.isEmpty()) return null;
if (setterName.startsWith("set")) {
String prop = setterName.substring(3);
@@ -1304,7 +1304,7 @@ public class ExpandoMetaClass extends MetaClassImpl
implements GroovyObject {
}
public boolean isSetter(String name, CachedClass[] args) {
- if (name == null || name.length() == 0 || args == null) return false;
+ if (name == null || name.isEmpty() || args == null) return false;
if (name.startsWith("set")) {
if (args.length != 1) return false;
diff --git a/src/main/java/groovy/namespace/QName.java
b/src/main/java/groovy/namespace/QName.java
index 4ba0fb0b3d..d6c6613122 100644
--- a/src/main/java/groovy/namespace/QName.java
+++ b/src/main/java/groovy/namespace/QName.java
@@ -179,7 +179,7 @@ public class QName implements Serializable {
} else if (o instanceof String) {
final String string = (String)o;
- if (string.length() == 0) return false;
+ if (string.isEmpty()) return false;
int lastColonIndex = string.lastIndexOf(':');
if (lastColonIndex < 0 || lastColonIndex == string.length() - 1)
return false;
final String stringPrefix = string.substring(0,lastColonIndex);
@@ -219,10 +219,10 @@ public class QName implements Serializable {
return localPart.equals(qName.localPart) || "*".equals(localPart)
|| "*".equals(qName.localPart);
} else if (o instanceof String) {
final String string = (String)o;
- if (string.length() == 0) return false;
+ if (string.isEmpty()) return false;
// try matching against 'prefix:localname'
int lastColonIndex = string.lastIndexOf(':');
- if (lastColonIndex < 0 && prefix.length() == 0) return
string.equals(localPart);
+ if (lastColonIndex < 0 && prefix.isEmpty()) return
string.equals(localPart);
if (lastColonIndex < 0 || lastColonIndex == string.length() - 1)
return false;
final String stringPrefix = string.substring(0,lastColonIndex);
final String stringLocalPart = string.substring(lastColonIndex +
1);
diff --git a/src/main/java/groovy/ui/GroovyMain.java
b/src/main/java/groovy/ui/GroovyMain.java
index 0697345d66..fa291a7287 100644
--- a/src/main/java/groovy/ui/GroovyMain.java
+++ b/src/main/java/groovy/ui/GroovyMain.java
@@ -283,7 +283,7 @@ public class GroovyMain {
main.processSockets = port != null;
if (main.processSockets) {
- String p = port.trim().length() > 0 ? port : "1960"; //
default port to listen to
+ String p = !port.trim().isEmpty() ? port : "1960"; // default
port to listen to
main.port = Integer.parseInt(p);
}
diff --git a/src/main/java/groovy/util/Node.java
b/src/main/java/groovy/util/Node.java
index 613f8dfeb5..1edb31d5ab 100644
--- a/src/main/java/groovy/util/Node.java
+++ b/src/main/java/groovy/util/Node.java
@@ -883,6 +883,6 @@ public class Node implements Serializable, Cloneable {
private boolean textIsEmptyOrNull() {
String t = text();
- return null == t || 0 == t.length();
+ return null == t || t.isEmpty();
}
}
diff --git a/src/main/java/org/codehaus/groovy/ast/ClassHelper.java
b/src/main/java/org/codehaus/groovy/ast/ClassHelper.java
index b79a07ec51..653a11ec23 100644
--- a/src/main/java/org/codehaus/groovy/ast/ClassHelper.java
+++ b/src/main/java/org/codehaus/groovy/ast/ClassHelper.java
@@ -293,7 +293,7 @@ public class ClassHelper {
* @param name of the class the ClassNode is representing
*/
public static ClassNode make(String name) {
- if (name == null || name.length() == 0) return dynamicType();
+ if (name == null || name.isEmpty()) return dynamicType();
for (int i = 0; i < primitiveClassNames.length; i++) {
if (primitiveClassNames[i].equals(name)) return types[i];
diff --git a/src/main/java/org/codehaus/groovy/ast/expr/LambdaExpression.java
b/src/main/java/org/codehaus/groovy/ast/expr/LambdaExpression.java
index 86a1446907..cd6031873c 100644
--- a/src/main/java/org/codehaus/groovy/ast/expr/LambdaExpression.java
+++ b/src/main/java/org/codehaus/groovy/ast/expr/LambdaExpression.java
@@ -49,7 +49,7 @@ public class LambdaExpression extends ClosureExpression {
@Override
public String getText() {
String paramText =
AstToTextHelper.getParametersText(this.getParameters());
- if (paramText.length() > 0) {
+ if (!paramText.isEmpty()) {
return "(" + paramText + ") -> { ... }";
} else {
return "() -> { ... }";
diff --git
a/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java
b/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java
index bc92c77c2b..b38bd17ffa 100644
--- a/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java
+++ b/src/main/java/org/codehaus/groovy/classgen/FinalVariableAnalyzer.java
@@ -448,7 +448,7 @@ public class FinalVariableAnalyzer extends
ClassCodeVisitorSupport {
return false;
}
BlockStatement bs = (BlockStatement) block;
- if (bs.getStatements().size() == 0) {
+ if (bs.getStatements().isEmpty()) {
return false;
}
Statement last = DefaultGroovyMethods.last(bs.getStatements());
@@ -469,7 +469,7 @@ public class FinalVariableAnalyzer extends
ClassCodeVisitorSupport {
return false;
}
BlockStatement block = (BlockStatement) statement; // currently only
possibility
- if (block.getStatements().size() == 0) {
+ if (block.getStatements().isEmpty()) {
return true;
}
Statement last = DefaultGroovyMethods.last(block.getStatements());
diff --git
a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
index 385e5867a0..a23a5873b6 100644
--- a/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/control/CompilerConfiguration.java
@@ -903,7 +903,7 @@ public class CompilerConfiguration {
}
private void setTargetDirectorySafe(final String directory) {
- if (directory != null && directory.length() > 0) {
+ if (directory != null && !directory.isEmpty()) {
this.targetDirectory = new File(directory);
} else {
this.targetDirectory = null;
diff --git a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
index cb33be6cb6..1d60c8ec70 100644
--- a/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
+++ b/src/main/java/org/codehaus/groovy/control/ResolveVisitor.java
@@ -1061,7 +1061,7 @@ public class ResolveVisitor extends
ClassCodeExpressionTransformer {
}
private static boolean testVanillaNameForClass(final String name) {
- if (name == null || name.length() == 0) return false;
+ if (name == null || name.isEmpty()) return false;
return !Character.isLowerCase(name.charAt(0));
}
diff --git a/src/main/java/org/codehaus/groovy/control/XStreamUtils.java
b/src/main/java/org/codehaus/groovy/control/XStreamUtils.java
index 3f7ccd39f5..1369e414fa 100644
--- a/src/main/java/org/codehaus/groovy/control/XStreamUtils.java
+++ b/src/main/java/org/codehaus/groovy/control/XStreamUtils.java
@@ -29,7 +29,7 @@ import java.net.URI;
public abstract class XStreamUtils {
public static void serialize(final String name, final Object ast) {
- if (name == null || name.length() == 0) return;
+ if (name == null || name.isEmpty()) return;
XStream xstream = new XStream(new StaxDriver());
FileWriter astFileWriter = null;
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
index df6e6aa59d..419f61deac 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringGroovyMethods.java
@@ -3098,7 +3098,7 @@ public class StringGroovyMethods extends
DefaultGroovyMethodsSupport {
*/
public static String stripMargin(final CharSequence self, final
CharSequence marginChar) {
String mc = marginChar.toString();
- if (mc.length() == 0) return stripMargin(self, '|');
+ if (mc.isEmpty()) return stripMargin(self, '|');
// TODO IllegalArgumentException for marginChar.length() > 1 ? Or
support String as marker?
return stripMargin(self, mc.charAt(0));
}
diff --git
a/src/main/java/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
b/src/main/java/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
index 2891ee4dc5..0e001bebd5 100644
--- a/src/main/java/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
+++ b/src/main/java/org/codehaus/groovy/runtime/m12n/MetaInfExtensionModule.java
@@ -83,7 +83,7 @@ public class MetaInfExtensionModule extends
SimpleExtensionModule {
for (String extensionClass : extensionClasses) {
try {
extensionClass = extensionClass.trim();
- if (extensionClass.length() > 0) {
+ if (!extensionClass.isEmpty()) {
instanceClasses.add(loader.loadClass(extensionClass));
}
} catch (ClassNotFoundException | NoClassDefFoundError |
UnsupportedClassVersionError e) {
diff --git
a/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceText.java
b/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceText.java
index 04cd475a3b..96ebeb3631 100644
--- a/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceText.java
+++ b/src/main/java/org/codehaus/groovy/runtime/powerassert/SourceText.java
@@ -68,7 +68,7 @@ public class SourceText {
lineOffsets.add(countLeadingWhitespace(lineText));
lineText = lineText.trim();
- if (line != stat.getLastLineNumber() && lineText.length() > 0)
+ if (line != stat.getLastLineNumber() && !lineText.isEmpty())
lineText += ' ';
normalizedTextBuffer.append(lineText);
textOffsets.add(normalizedTextBuffer.length());
diff --git a/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
b/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
index 17a567a3f6..63ff6a56b6 100644
--- a/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
+++ b/src/main/java/org/codehaus/groovy/syntax/ASTHelper.java
@@ -67,7 +67,7 @@ public class ASTHelper {
public PackageNode setPackage(String packageName, List<AnnotationNode>
annotations) {
this.packageName = packageName;
- if (packageName != null && packageName.length() > 0) {
+ if (packageName != null && !packageName.isEmpty()) {
packageName += '.';
}
PackageNode packageNode = new PackageNode(packageName);
@@ -102,7 +102,7 @@ public class ASTHelper {
* @param name typically a simple unqualified class name
*/
public static String dot(String base, String name) {
- if (base != null && base.length() > 0) {
+ if (base != null && !base.isEmpty()) {
return base + "." + name;
}
return name;
diff --git a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
index 38b0762f10..2b8b1e119a 100644
--- a/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
+++ b/src/main/java/org/codehaus/groovy/syntax/CSTNode.java
@@ -406,7 +406,7 @@ public abstract class CSTNode {
}
}
- if (indent.length() > 0) {
+ if (!indent.isEmpty()) {
writer.println(")");
} else {
writer.print(")");
diff --git a/src/main/java/org/codehaus/groovy/tools/GrapeUtil.java
b/src/main/java/org/codehaus/groovy/tools/GrapeUtil.java
index e4483aeedc..c6e002ff88 100644
--- a/src/main/java/org/codehaus/groovy/tools/GrapeUtil.java
+++ b/src/main/java/org/codehaus/groovy/tools/GrapeUtil.java
@@ -37,7 +37,7 @@ public class GrapeUtil {
if (parts.length > 3) result.put("classifier", parts[3]);
if (parts.length > 2) result.put("version", parts[2]);
else result.put("version", "*");
- if (ext.length() > 0) result.put("ext", ext);
+ if (!ext.isEmpty()) result.put("ext", ext);
if (parts.length > 1) result.put("module", parts[1]);
if (parts.length > 0) result.put("group", parts[0]);
return result;
diff --git a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
index 4acf272ce8..e691243ce1 100644
--- a/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
+++ b/src/main/java/org/codehaus/groovy/tools/LoaderConfiguration.java
@@ -113,7 +113,7 @@ public class LoaderConfiguration {
line = line.trim();
lineNumber++;
- if (line.startsWith("#") || line.length() == 0) continue;
+ if (line.startsWith("#") || line.isEmpty()) continue;
if (line.startsWith(LOAD_PREFIX)) {
String loadPath =
line.substring(LOAD_PREFIX.length()).trim();
@@ -204,7 +204,7 @@ public class LoaderConfiguration {
int index = propertyIndexEnd + 1;
if (index < str.length() && str.charAt(index) == '/' &&
propertyValue.endsWith("/") &&
- propertyValue.length() > 0) {
+ !propertyValue.isEmpty()) {
propertyValue = propertyValue.substring(0, propertyValue.length()
- 1);
}
return propertyValue;
diff --git a/src/main/java/org/codehaus/groovy/tools/Utilities.java
b/src/main/java/org/codehaus/groovy/tools/Utilities.java
index 3715b14257..b749d2bccb 100644
--- a/src/main/java/org/codehaus/groovy/tools/Utilities.java
+++ b/src/main/java/org/codehaus/groovy/tools/Utilities.java
@@ -63,14 +63,14 @@ public abstract class Utilities
* Tells if the given string is a valid Java identifier.
*/
public static boolean isJavaIdentifier(String name) {
- if (name.length() == 0 || INVALID_JAVA_IDENTIFIERS.contains(name))
return false;
+ if (name.isEmpty() || INVALID_JAVA_IDENTIFIERS.contains(name)) return
false;
char[] chars = name.toCharArray();
if (!Character.isJavaIdentifierStart(chars[0])) return false;
for (int i = 1; i < chars.length; i++ ) {
if (!Character.isJavaIdentifierPart(chars[i])) return false;
}
return true;
- }
+ }
private static String eol = System.lineSeparator();
diff --git
a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
index 1735b51d4e..c18a410e9a 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
@@ -293,7 +293,7 @@ public final class ASTTransformationVisitor extends
ClassCodeVisitorSupport {
Set<String> disabledGlobalTransforms =
compilationUnit.getConfiguration().getDisabledGlobalASTTransformations();
if (disabledGlobalTransforms == null)
disabledGlobalTransforms = Collections.emptySet();
while (className != null) {
- if (!className.startsWith("#") && className.length() >
0) {
+ if (!className.startsWith("#") &&
!className.isEmpty()) {
if (!disabledGlobalTransforms.contains(className))
{
if (transformNames.containsKey(className)) {
try {
diff --git
a/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
index d367485017..a10ad45206 100644
--- a/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/BuilderASTTransformation.java
@@ -162,7 +162,7 @@ public class BuilderASTTransformation extends
AbstractASTTransformation implemen
}
}
if (memberValue != null) {
- String message = extraMessage.length() == 0 ? "" : " " +
extraMessage;
+ String message = extraMessage.isEmpty() ? "" : " " +
extraMessage;
transform.addError("Error during " + MY_TYPE_NAME + "
processing: Annotation attribute '" + memberName + "' not supported by " +
getClass().getName() + message, anno);
return true;
}
diff --git
a/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java
index 904b088d02..30fdfd8424 100644
---
a/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/ImmutableASTTransformation.java
@@ -168,7 +168,7 @@ public class ImmutableASTTransformation extends
AbstractASTTransformation implem
static boolean isSpecialNamedArgCase(final List<PropertyNode> list, final
boolean checkSize) {
if (checkSize && list.size() != 1) return false;
- if (list.size() == 0) return false;
+ if (list.isEmpty()) return false;
ClassNode firstParamType = list.get(0).getField().getType();
if (firstParamType.equals(ClassHelper.MAP_TYPE)) {
return true;
diff --git
a/src/main/java/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
index 5a7c049293..39c4b8806d 100644
---
a/src/main/java/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/ReadWriteLockASTTransformation.java
@@ -102,7 +102,7 @@ public class ReadWriteLockASTTransformation extends
AbstractASTTransformation {
}
private FieldNode determineLock(String value, ClassNode targetClass,
boolean isStatic, String myTypeName) {
- if (value != null && value.length() > 0 &&
!value.equalsIgnoreCase(DEFAULT_INSTANCE_LOCKNAME)) {
+ if (value != null && !value.isEmpty() &&
!value.equalsIgnoreCase(DEFAULT_INSTANCE_LOCKNAME)) {
FieldNode existingLockField = targetClass.getDeclaredField(value);
if (existingLockField == null) {
addError("Error during " + myTypeName + " processing: lock
field with name '" + value + "' not found in class " + targetClass.getName(),
targetClass);
diff --git
a/src/main/java/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
index fd280a2c7d..35e3450c4a 100644
---
a/src/main/java/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/SynchronizedASTTransformation.java
@@ -77,7 +77,7 @@ public class SynchronizedASTTransformation extends
AbstractASTTransformation {
private String determineLock(String value, ClassNode cNode, MethodNode
mNode) {
boolean isStatic = mNode.isStatic();
- if (value != null && value.length() > 0 &&
!"$lock".equalsIgnoreCase(value)) {
+ if (value != null && !value.isEmpty() &&
!"$lock".equalsIgnoreCase(value)) {
if (cNode.getDeclaredField(value) == null) {
addError("Error during " + MY_TYPE_NAME + " processing: lock
field with name '" + value + "' not found in class " + cNode.getName(), mNode);
return null;
diff --git
a/src/main/java/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.java
b/src/main/java/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.java
index 69a7c07e09..0118291c5a 100644
---
a/src/main/java/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.java
+++
b/src/main/java/org/codehaus/groovy/transform/tailrec/InWhileLoopWrapper.java
@@ -54,7 +54,7 @@ public class InWhileLoopWrapper {
WhileStatement whileLoop = new WhileStatement(boolX(constX(true)),
block(new VariableScope(method.getVariableScope()), tryCatchStatement));
List<Statement> whileLoopStatements = ((BlockStatement)
whileLoop.getLoopBlock()).getStatements();
- if (whileLoopStatements.size() > 0)
whileLoopStatements.get(0).setStatementLabel(LOOP_LABEL);
+ if (!whileLoopStatements.isEmpty())
whileLoopStatements.get(0).setStatementLabel(LOOP_LABEL);
BlockStatement newBody = block(new
VariableScope(method.getVariableScope()));
newBody.addStatement(whileLoop);
method.setCode(newBody);
diff --git
a/src/main/java/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.java
b/src/main/java/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.java
index 721f7b2597..18846ff7c5 100644
---
a/src/main/java/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.java
+++
b/src/main/java/org/codehaus/groovy/transform/tailrec/TailRecursiveASTTransformation.java
@@ -87,7 +87,7 @@ public class TailRecursiveASTTransformation extends
AbstractASTTransformation {
private boolean hasAnnotation(MethodNode methodNode, ClassNode annotation)
{
List annots = methodNode.getAnnotations(annotation);
- return annots != null && annots.size() > 0;
+ return annots != null && !annots.isEmpty();
}
private void transformToIteration(MethodNode method, SourceUnit source) {
diff --git
a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
index dfb6dbd565..ece38707f8 100644
--- a/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
+++ b/src/main/java/org/codehaus/groovy/transform/trait/TraitComposer.java
@@ -574,7 +574,7 @@ public abstract class TraitComposer {
if (!getter && params.length!=1) {
return false;
}
- if (propertyName.length()==0) {
+ if (propertyName.isEmpty()) {
return false;
}
propertyName = MetaClassHelper.convertPropertyName(propertyName);
