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/04/11 15:33:11 UTC
[groovy] branch GROOVY_3_0_X updated (1f612e1 -> e4ffcf6)
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a change to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git.
from 1f612e1 Trivial refactoring: Iteration can be replaced with bulk 'Collection.addAll' call
new ccfdc8a Trivial refactoring: Simplify the code
new 55184df Trivial refactoring: Standard Charset object can be used
new 36894d0 Trivial refactoring: Remove redundant condition(`byte >= -128` is always true)
new 9c6e8be Trivial refactoring: Replaced with Java-Style code
new 8a296fa Trivial refactoring: Remove redundant interface modifiers
new 0ce7ed2 Trivial refactoring: Simplify type argument
new ce1cb85 Add `@Override` to method declaration
new 468c21e Trivial refactoring: simplify the condition
new 5623246 Trivial refactoring: Replace with Java-Style code
new e59e140 Trivial refactoring: Standard Charset object can be used
new 4b394d2 Trivial refactoring: Replace with enhanced 'for' loop
new 4c1f66f Trivial refactoring: Replace AIC with lambda and method reference
new d34937f Unqualified call to 'yield' method might not be supported in future releases of Java
new 3fd91d1 Trivial refactoring: extract common code
new b5107ec Trivial refactoring: extract common code further
new 73ce595 Trivial refactoring: extract common variable
new d62dd43 Trivial refactoring: Rename the extracted variable to align with other variable name rule
new 864a4a2 Trivial refactoring: Replace with 'Math.max' call
new 65d4b15 Trivial refactoring: Replace with Java-Style code
new e4ffcf6 Trivial refactoring: Standard Charset object can be used
The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/main/java/groovy/io/PlatformLineWriter.java | 2 +-
src/main/java/groovy/lang/DelegatesTo.java | 2 +-
src/main/java/groovy/lang/ExpandoMetaClass.java | 4 ++--
src/main/java/groovy/lang/MetaClassImpl.java | 10 ++++-----
src/main/java/groovy/util/CharsetToolkit.java | 13 ++++++------
src/main/java/groovy/util/logging/Commons.java | 2 +-
src/main/java/groovy/util/logging/Log.java | 2 +-
src/main/java/groovy/util/logging/Log4j.java | 2 +-
src/main/java/groovy/util/logging/Log4j2.java | 2 +-
src/main/java/groovy/util/logging/Slf4j.java | 2 +-
.../groovy/ast/MixinASTTransformation.java | 2 +-
.../codehaus/groovy/ast/tools/GeneralUtils.java | 2 +-
.../control/customizers/SecureASTCustomizer.java | 2 +-
.../groovy/control/io/FileReaderSource.java | 3 ++-
.../codehaus/groovy/reflection/CachedClass.java | 2 ++
.../codehaus/groovy/reflection/ParameterTypes.java | 4 ++--
.../reflection/stdclasses/CachedClosureClass.java | 2 +-
.../groovy/runtime/EncodingGroovyMethods.java | 7 +------
.../codehaus/groovy/runtime/MethodRankHelper.java | 4 ++--
.../groovy/runtime/StringBufferWriter.java | 2 +-
.../groovy/runtime/callsite/ConstructorSite.java | 6 +++---
.../runtime/callsite/StaticMetaMethodSite.java | 6 +++---
.../runtime/metaclass/ConcurrentReaderHashMap.java | 4 ++--
.../groovy/runtime/metaclass/MetaMethodIndex.java | 14 ++++++-------
.../org/codehaus/groovy/tools/GroovyStarter.java | 4 ++--
.../groovy/transform/ASTTransformation.java | 2 +-
.../groovy/transform/ASTTransformationVisitor.java | 3 ++-
.../groovy/util/AbstractConcurrentMap.java | 12 +++++------
.../groovy/util/AbstractConcurrentMapBase.java | 24 +++++++++++-----------
.../codehaus/groovy/util/ComplexKeyHashMap.java | 2 +-
.../java/org/codehaus/groovy/util/FastArray.java | 2 +-
.../vmplugin/v8/PluginDefaultGroovyMethods.java | 6 +++---
.../groovy/json/internal/BaseJsonParser.java | 3 ++-
.../org/apache/groovy/json/internal/CharBuf.java | 12 ++++-------
.../apache/groovy/json/internal/CharScanner.java | 6 +++---
.../json/internal/ReaderCharacterSource.java | 2 +-
.../groovy/groovy/xml/StreamingDOMBuilder.groovy | 10 +--------
.../groovy/xml/StreamingMarkupBuilder.groovy | 9 +++-----
.../groovy/groovy/xml/StreamingSAXBuilder.groovy | 9 +-------
.../AbstractStreamingBuilder.groovy | 14 ++++++++++++-
.../src/main/java/groovy/xml/DOMBuilder.java | 5 ++---
.../src/main/java/groovy/xml/FactorySupport.java | 12 ++---------
.../src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../main/java/groovy/xml/MarkupBuilderHelper.java | 2 +-
.../src/main/java/groovy/xml/XmlParser.java | 4 ++--
.../src/main/java/groovy/xml/XmlSlurper.java | 8 ++------
.../src/main/java/groovy/xml/XmlUtil.java | 9 ++------
.../src/main/java/groovy/xml/dom/DOMCategory.java | 2 +-
.../java/groovy/xml/slurpersupport/Attributes.java | 5 ++---
.../groovy/xml/slurpersupport/GPathResult.java | 10 ++++-----
.../groovy/xml/slurpersupport/NodeChildren.java | 19 +++++++----------
51 files changed, 132 insertions(+), 167 deletions(-)
[groovy] 05/20: Trivial refactoring: Remove redundant interface
modifiers
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 8a296fafc842f32356612a87c565b7f35c71c34c
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:39:05 2020 +0800
Trivial refactoring: Remove redundant interface modifiers
(cherry picked from commit 39912a673f4edbf9d2f1292b29e58eba7f9f776b)
---
src/main/java/groovy/lang/DelegatesTo.java | 2 +-
src/main/java/groovy/util/logging/Commons.java | 2 +-
src/main/java/groovy/util/logging/Log.java | 2 +-
src/main/java/groovy/util/logging/Log4j.java | 2 +-
src/main/java/groovy/util/logging/Log4j2.java | 2 +-
src/main/java/groovy/util/logging/Slf4j.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/groovy/lang/DelegatesTo.java b/src/main/java/groovy/lang/DelegatesTo.java
index c4fd50c..6a7d0e4 100644
--- a/src/main/java/groovy/lang/DelegatesTo.java
+++ b/src/main/java/groovy/lang/DelegatesTo.java
@@ -83,7 +83,7 @@ public @interface DelegatesTo {
*/
@Retention(RetentionPolicy.RUNTIME)
@java.lang.annotation.Target({ElementType.PARAMETER})
- public static @interface Target {
+ @interface Target {
/**
* An identifier that should be used to disambiguate targets when there are
diff --git a/src/main/java/groovy/util/logging/Commons.java b/src/main/java/groovy/util/logging/Commons.java
index 6146309..a9662e7 100644
--- a/src/main/java/groovy/util/logging/Commons.java
+++ b/src/main/java/groovy/util/logging/Commons.java
@@ -74,7 +74,7 @@ public @interface Commons {
Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default CommonsLoggingStrategy.class;
- public static class CommonsLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
+ class CommonsLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
private static final String LOGGER_NAME = "org.apache.commons.logging.Log";
private static final String LOGGERFACTORY_NAME = "org.apache.commons.logging.LogFactory";
diff --git a/src/main/java/groovy/util/logging/Log.java b/src/main/java/groovy/util/logging/Log.java
index c431bc7..317939a 100644
--- a/src/main/java/groovy/util/logging/Log.java
+++ b/src/main/java/groovy/util/logging/Log.java
@@ -83,7 +83,7 @@ public @interface Log {
/**
* This class contains the logic of how to weave a Java Util Logging logger into the host class.
*/
- public static class JavaUtilLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
+ class JavaUtilLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
private static final ClassNode LOGGER_CLASSNODE = ClassHelper.make(java.util.logging.Logger.class);
private static final ClassNode LEVEL_CLASSNODE = ClassHelper.make(java.util.logging.Level.class);
diff --git a/src/main/java/groovy/util/logging/Log4j.java b/src/main/java/groovy/util/logging/Log4j.java
index ccccad5..ad8084f 100644
--- a/src/main/java/groovy/util/logging/Log4j.java
+++ b/src/main/java/groovy/util/logging/Log4j.java
@@ -76,7 +76,7 @@ public @interface Log4j {
Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Log4jLoggingStrategy.class;
- public static class Log4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
+ class Log4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
private static final String LOGGER_NAME = "org.apache.log4j.Logger";
private static final String PRIORITY_NAME = "org.apache.log4j.Priority";
diff --git a/src/main/java/groovy/util/logging/Log4j2.java b/src/main/java/groovy/util/logging/Log4j2.java
index 08f57fc..03c504e 100644
--- a/src/main/java/groovy/util/logging/Log4j2.java
+++ b/src/main/java/groovy/util/logging/Log4j2.java
@@ -75,7 +75,7 @@ public @interface Log4j2 {
Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Log4j2LoggingStrategy.class;
- public static class Log4j2LoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
+ class Log4j2LoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
private static final String LOGGER_NAME = "org.apache.logging.log4j.core.Logger";
private static final String LOG_MANAGER_NAME = "org.apache.logging.log4j.LogManager";
diff --git a/src/main/java/groovy/util/logging/Slf4j.java b/src/main/java/groovy/util/logging/Slf4j.java
index 5ee7218..40fe2ca 100644
--- a/src/main/java/groovy/util/logging/Slf4j.java
+++ b/src/main/java/groovy/util/logging/Slf4j.java
@@ -75,7 +75,7 @@ public @interface Slf4j {
Class<? extends LogASTTransformation.LoggingStrategy> loggingStrategy() default Slf4jLoggingStrategy.class;
- public static class Slf4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
+ class Slf4jLoggingStrategy extends LogASTTransformation.AbstractLoggingStrategyV2 {
private static final String LOGGER_NAME = "org.slf4j.Logger";
private static final String FACTORY_NAME = "org.slf4j.LoggerFactory";
[groovy] 20/20: Trivial refactoring: Standard Charset object can be
used
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e4ffcf687753e1793f13ea581bfeceaf0f2fa829
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 23:03:37 2020 +0800
Trivial refactoring: Standard Charset object can be used
(cherry picked from commit 1d6fe880bbadda5e541ec1a312df4f656a3e4063)
---
.../java/org/apache/groovy/json/internal/BaseJsonParser.java | 3 ++-
.../src/main/java/org/apache/groovy/json/internal/CharBuf.java | 10 +++-------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
index eab7894..5bc4d62 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/BaseJsonParser.java
@@ -30,6 +30,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.concurrent.ConcurrentHashMap;
/**
@@ -70,7 +71,7 @@ public abstract class BaseJsonParser implements JsonParser {
protected static final boolean internKeys = Boolean.parseBoolean(System.getProperty("groovy.json.internKeys", "false"));
protected static final ConcurrentHashMap<String, String> internedKeysCache;
- private static final Charset UTF_8 = Charset.forName("UTF-8");
+ private static final Charset UTF_8 = StandardCharsets.UTF_8;
protected String charset = UTF_8.name();
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
index 57f3583..8c0c09c 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
@@ -21,10 +21,10 @@ package org.apache.groovy.json.internal;
import groovy.json.JsonException;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
public class CharBuf extends Writer implements CharSequence {
@@ -44,12 +44,8 @@ public class CharBuf extends Writer implements CharSequence {
public CharBuf(byte[] bytes) {
this.buffer = null;
- try {
- String str = new String(bytes, "UTF-8");
- __init__(FastStringUtils.toCharArray(str));
- } catch (UnsupportedEncodingException e) {
- Exceptions.handle(e);
- }
+ String str = new String(bytes, StandardCharsets.UTF_8);
+ __init__(FastStringUtils.toCharArray(str));
}
public static CharBuf createExact(final int capacity) {
[groovy] 14/20: Trivial refactoring: extract common code
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 3fd91d1da1def10a6442c203fe058845be68c39b
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 22:03:27 2020 +0800
Trivial refactoring: extract common code
(cherry picked from commit f885f10441a6fe666e03caeca5feb2d9a1eda4a6)
---
.../src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy | 10 +---------
.../src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy | 9 +--------
.../streamingmarkupsupport/AbstractStreamingBuilder.groovy | 11 +++++++++++
3 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
index 8f61ec2..8441f7a 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
@@ -37,15 +37,7 @@ class StreamingDOMBuilder extends AbstractStreamingBuilder {
attrs.each {target, instruction ->
def pi = null
if (instruction instanceof Map) {
- def buf = new StringBuffer()
- instruction.each { name, value ->
- if (value.toString().contains('"')) {
- buf.append(" $name='$value'")
- } else {
- buf.append(" $name=\"$value\"" )
- }
- }
- pi = dom.document.createProcessingInstruction(target, buf.toString())
+ pi = dom.document.createProcessingInstruction(target, toMapString(instruction))
} else {
pi = dom.document.createProcessingInstruction(target, instruction)
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
index 05faf23..917d1ba 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
@@ -35,14 +35,7 @@ class StreamingSAXBuilder extends AbstractStreamingBuilder {
def piClosure = {doc, pendingNamespaces, namespaces, namespaceSpecificTags, prefix, attrs, body, contentHandler ->
attrs.each {target, instruction ->
if (instruction instanceof Map) {
- def buf = new StringBuffer()
- instruction.each {name, value ->
- if (value.toString().contains('"'))
- buf.append(" $name='$value'")
- else
- buf.append(" $name=\"$value\"")
- }
- contentHandler.processingInstruction(target, buf.toString())
+ contentHandler.processingInstruction(target, toMapString(instruction))
} else {
contentHandler.processingInstruction(target, instruction)
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
index a49d4fe..91a3057 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
@@ -62,6 +62,17 @@ class AbstractStreamingBuilder {
}
def getNamespaceClosure = {doc, pendingNamespaces, namespaces, Object[] rest -> [namespaces, pendingNamespaces]}
+ def toMapString = { Map instruction ->
+ def buf = new StringBuilder()
+ instruction.each { name, value ->
+ if (value.toString().contains('"'))
+ buf.append(" $name='$value'")
+ else
+ buf.append(" $name=\"$value\"")
+ }
+ return buf.toString()
+ }
+
def specialTags = ['declareNamespace':namespaceSetupClosure,
'declareAlias':aliasSetupClosure,
'getNamespaces':getNamespaceClosure]
[groovy] 19/20: Trivial refactoring: Replace with Java-Style code
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 65d4b1554b7bd3525b7494d7ef73b9fd2b06717d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 23:02:26 2020 +0800
Trivial refactoring: Replace with Java-Style code
(cherry picked from commit 82b6f1047cb7608f0beface235825ff6cf501bf4)
---
.../src/main/java/org/apache/groovy/json/internal/CharScanner.java | 4 ++--
.../java/org/apache/groovy/json/internal/ReaderCharacterSource.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
index aa6ba10..a4d8567 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
@@ -41,7 +41,7 @@ public class CharScanner {
static final String MIN_INT_STR_NO_SIGN = String.valueOf(Integer.MIN_VALUE);
static final String MAX_INT_STR = String.valueOf(Integer.MAX_VALUE);
- private static double powersOf10[] = {
+ private static double[] powersOf10 = {
1.0,
10.0,
100.0,
@@ -285,7 +285,7 @@ public class CharScanner {
return c == COMMA || c == CLOSED_CURLY || c == CLOSED_BRACKET;
}
- public static Number parseJsonNumber(char[] buffer, int from, int max, int size[]) {
+ public static Number parseJsonNumber(char[] buffer, int from, int max, int[] size) {
Number value = null;
boolean simple = true;
int digitsPastPoint = 0;
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
index 117d7bc..1c7fe71 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/ReaderCharacterSource.java
@@ -241,7 +241,7 @@ public class ReaderCharacterSource implements CharacterSource {
if (index >= length && more) {
ensureBuffer();
if (length != 0) {
- char results2[] = readNumber();
+ char[] results2 = readNumber();
return Chr.add(results, results2);
} else {
return results;
[groovy] 18/20: Trivial refactoring: Replace with 'Math.max' call
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 864a4a2f9efaf77109cbbe293f575499ab9d5de5
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 22:56:11 2020 +0800
Trivial refactoring: Replace with 'Math.max' call
(cherry picked from commit d7852d61df49dad01dc678ba2e1f6b9a154335bf)
---
.../src/main/java/org/apache/groovy/json/internal/CharBuf.java | 2 +-
.../src/main/java/org/apache/groovy/json/internal/CharScanner.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
index 62fd285..57f3583 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java
@@ -401,7 +401,7 @@ public class CharBuf extends Writer implements CharSequence {
int sizeNeeded = (ensureThisMuch) + _location;
if (sizeNeeded > capacity) {
- int growBy = (_buffer.length * 2) < sizeNeeded ? sizeNeeded : (_buffer.length * 2);
+ int growBy = Math.max((_buffer.length * 2), sizeNeeded);
_buffer = Chr.grow(buffer, growBy);
capacity = _buffer.length;
}
diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
index ffd7a57..aa6ba10 100644
--- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
+++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java
@@ -476,7 +476,7 @@ public class CharScanner {
buf.addLine(new String(array, lastLineIndex, count));
} catch (Exception ex) {
try {
- int start = index = (index - 10 < 0) ? 0 : index - 10;
+ int start = index = Math.max(index - 10, 0);
buf.addLine(new String(array, start, index));
} catch (Exception ex2) {
[groovy] 12/20: Trivial refactoring: Replace AIC with lambda and
method reference
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4c1f66f822c8e3639e083f468f4709425a2023fa
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:31:22 2020 +0800
Trivial refactoring: Replace AIC with lambda and method reference
(cherry picked from commit 36abf696dce783190cfd39f417dad24971f6fc53)
---
.../groovy-xml/src/main/java/groovy/xml/FactorySupport.java | 12 ++----------
.../groovy-xml/src/main/java/groovy/xml/XmlSlurper.java | 6 +-----
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java b/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
index c2385c5..a6d57c7 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/FactorySupport.java
@@ -45,18 +45,10 @@ public class FactorySupport {
}
public static DocumentBuilderFactory createDocumentBuilderFactory() throws ParserConfigurationException {
- return (DocumentBuilderFactory) createFactory(new PrivilegedExceptionAction() {
- public Object run() throws ParserConfigurationException {
- return DocumentBuilderFactory.newInstance();
- }
- });
+ return (DocumentBuilderFactory) createFactory(DocumentBuilderFactory::newInstance);
}
public static SAXParserFactory createSaxParserFactory() throws ParserConfigurationException {
- return (SAXParserFactory) createFactory(new PrivilegedExceptionAction() {
- public Object run() throws ParserConfigurationException {
- return SAXParserFactory.newInstance();
- }
- });
+ return (SAXParserFactory) createFactory(SAXParserFactory::newInstance);
}
}
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
index 6463a95..5c3354a 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
@@ -339,11 +339,7 @@ public class XmlSlurper extends DefaultHandler {
* @param base The URL used to resolve relative URLs
*/
public void setEntityBaseUrl(final URL base) {
- reader.setEntityResolver(new EntityResolver() {
- public InputSource resolveEntity(final String publicId, final String systemId) throws IOException {
- return new InputSource(new URL(base, systemId).openStream());
- }
- });
+ reader.setEntityResolver((publicId, systemId) -> new InputSource(new URL(base, systemId).openStream()));
}
/* (non-Javadoc)
[groovy] 08/20: Trivial refactoring: simplify the condition
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 468c21eaf3e47a495464aa9ef8aaed9c52ef5364
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:15:12 2020 +0800
Trivial refactoring: simplify the condition
(cherry picked from commit d1b9ccff5ae9f077e57ec8d1572370746558a427)
---
subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
index 88798ed..37c129b 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/dom/DOMCategory.java
@@ -351,7 +351,7 @@ public class DOMCategory {
}
public static Node replaceNode(NodesHolder self, Closure c) {
- if (self.getLength() <= 0 || self.getLength() > 1) {
+ if (self.getLength() != 1) {
throw new GroovyRuntimeException(
"replaceNode() can only be used to replace a single element, " +
"but was applied to " + self.getLength() + " elements."
[groovy] 01/20: Trivial refactoring: Simplify the code
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ccfdc8a364f855b473997ff6c893b049a215a6bb
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:08:31 2020 +0800
Trivial refactoring: Simplify the code
(cherry picked from commit 85dcdf21a8c7522c3296c3c928e16b207b609161)
---
.../codehaus/groovy/control/customizers/SecureASTCustomizer.java | 2 +-
.../org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java b/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
index ce899de..37ffb70 100644
--- a/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
+++ b/src/main/java/org/codehaus/groovy/control/customizers/SecureASTCustomizer.java
@@ -700,7 +700,7 @@ public class SecureASTCustomizer extends CompilationCustomizer {
// we should now check if the import is in the star imports
String packageName = getWildCardImport(className);
if (!staticStarImportsWhitelist.contains(className + ".*")
- && !staticStarImportsWhitelist.stream().filter(it -> it.endsWith(".")).anyMatch(packageName::startsWith)) {
+ && staticStarImportsWhitelist.stream().filter(it -> it.endsWith(".")).noneMatch(packageName::startsWith)) {
throw new SecurityException("Importing [" + fqn + "] is not allowed");
}
} else {
diff --git a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
index 7ac2176..76a7d7c 100644
--- a/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/vmplugin/v8/PluginDefaultGroovyMethods.java
@@ -601,7 +601,7 @@ public class PluginDefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 2.5.0
*/
public static Stream<Integer> stream(final int[] self) {
- return Arrays.stream(self).mapToObj(Integer::valueOf);
+ return Arrays.stream(self).boxed();
}
/**
@@ -614,7 +614,7 @@ public class PluginDefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 2.5.0
*/
public static Stream<Long> stream(final long[] self) {
- return Arrays.stream(self).mapToObj(Long::valueOf);
+ return Arrays.stream(self).boxed();
}
/**
@@ -627,7 +627,7 @@ public class PluginDefaultGroovyMethods extends DefaultGroovyMethodsSupport {
* @since 2.5.0
*/
public static Stream<Double> stream(final double[] self) {
- return Arrays.stream(self).mapToObj(Double::valueOf);
+ return Arrays.stream(self).boxed();
}
/**
[groovy] 15/20: Trivial refactoring: extract common code further
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit b5107ecc4e90f03150b296312368f8f8a3b2c2b0
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 22:25:51 2020 +0800
Trivial refactoring: extract common code further
(cherry picked from commit 7b6c81bd551db8f766bed9181d281945a4686926)
---
.../src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy | 8 +-------
.../xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy | 9 +++++----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
index b5e0a2e..ee0f124 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
@@ -75,13 +75,7 @@ class StreamingMarkupBuilder extends AbstractStreamingBuilder {
out.unescaped() << "<?"
if (instruction instanceof Map) {
out.unescaped() << target
- instruction.each {name, value ->
- if (value.toString().contains('\'') || (useDoubleQuotes && !value.toString().contains('"'))) {
- out.unescaped() << " $name=\"$value\""
- } else {
- out.unescaped() << " $name='$value'"
- }
- }
+ out.unescaped() << toMapString(instruction, {value -> value.toString().contains('\'') || (useDoubleQuotes && !value.toString().contains('"'))})
} else {
out.unescaped() << "$target $instruction"
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
index 91a3057..a109e4a 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
@@ -62,13 +62,14 @@ class AbstractStreamingBuilder {
}
def getNamespaceClosure = {doc, pendingNamespaces, namespaces, Object[] rest -> [namespaces, pendingNamespaces]}
- def toMapString = { Map instruction ->
+ def toMapString = { Map instruction, checkDoubleQutationMarks={value -> !value.toString().contains('"')} ->
def buf = new StringBuilder()
instruction.each { name, value ->
- if (value.toString().contains('"'))
- buf.append(" $name='$value'")
- else
+ if (checkDoubleQutationMarks(value)) {
buf.append(" $name=\"$value\"")
+ } else {
+ buf.append(" $name='$value'")
+ }
}
return buf.toString()
}
[groovy] 10/20: Trivial refactoring: Standard Charset object can be
used
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit e59e140e8b8ca51792fcbd1fc273817ccd125fe1
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:20:42 2020 +0800
Trivial refactoring: Standard Charset object can be used
(cherry picked from commit 8eac2c8e8517e2f84e066d86476f6f772637b8fa)
---
subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
index 7880cbd..db8d8bb 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlUtil.java
@@ -48,9 +48,9 @@ import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
/**
* Used for pretty printing XML content and other XML related utilities.
@@ -437,12 +437,7 @@ public class XmlUtil {
}
private static void serialize(Source source, OutputStream os) {
- try {
- serialize(source, new StreamResult(new OutputStreamWriter(os, "UTF-8")));
- }
- catch (UnsupportedEncodingException e) {
- // ignore
- }
+ serialize(source, new StreamResult(new OutputStreamWriter(os, StandardCharsets.UTF_8)));
}
private static void serialize(Source source, Writer w) {
[groovy] 03/20: Trivial refactoring: Remove redundant
condition(`byte >= -128` is always true)
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 36894d0bb530e2f121a31268419cfd256b51237f
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:29:33 2020 +0800
Trivial refactoring: Remove redundant condition(`byte >= -128` is always true)
(cherry picked from commit e33db248e1b9a059b2fa1e85a25bedf332dbec6f)
---
src/main/java/groovy/util/CharsetToolkit.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/groovy/util/CharsetToolkit.java b/src/main/java/groovy/util/CharsetToolkit.java
index 89d977e..6e2d135 100644
--- a/src/main/java/groovy/util/CharsetToolkit.java
+++ b/src/main/java/groovy/util/CharsetToolkit.java
@@ -277,7 +277,7 @@ public class CharsetToolkit {
* @return true if it's a continuation char.
*/
private static boolean isContinuationChar(byte b) {
- return -128 <= b && b <= -65;
+ return b <= -65;
}
/**
[groovy] 02/20: Trivial refactoring: Standard Charset object can be
used
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 55184df987d6b2dfd2cb7a65b8fd89597e79cb69
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:24:51 2020 +0800
Trivial refactoring: Standard Charset object can be used
(cherry picked from commit ab91f6bb795a251f053a01b80703032e504dbb82)
---
src/main/java/groovy/util/CharsetToolkit.java | 11 ++++++-----
.../java/org/codehaus/groovy/control/io/FileReaderSource.java | 3 ++-
.../org/codehaus/groovy/runtime/EncodingGroovyMethods.java | 7 +------
.../codehaus/groovy/transform/ASTTransformationVisitor.java | 3 ++-
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/main/java/groovy/util/CharsetToolkit.java b/src/main/java/groovy/util/CharsetToolkit.java
index 7b2d0d8..89d977e 100644
--- a/src/main/java/groovy/util/CharsetToolkit.java
+++ b/src/main/java/groovy/util/CharsetToolkit.java
@@ -27,6 +27,7 @@ import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Collection;
/**
@@ -164,11 +165,11 @@ public class CharsetToolkit {
// if the file has a Byte Order Marker, we can assume the file is in UTF-xx
// otherwise, the file would not be human readable
if (hasUTF8Bom())
- return Charset.forName("UTF-8");
+ return StandardCharsets.UTF_8;
if (hasUTF16LEBom())
- return Charset.forName("UTF-16LE");
+ return StandardCharsets.UTF_16LE;
if (hasUTF16BEBom())
- return Charset.forName("UTF-16BE");
+ return StandardCharsets.UTF_16BE;
// if a byte has its most significant bit set, the file is in UTF-8 or in the default encoding
// otherwise, the file is in US-ASCII
@@ -259,12 +260,12 @@ public class CharsetToolkit {
if (this.enforce8Bit)
return this.defaultCharset;
else
- return Charset.forName("US-ASCII");
+ return StandardCharsets.US_ASCII;
}
// if no invalid UTF-8 were encountered, we can assume the encoding is UTF-8,
// otherwise the file would not be human readable
if (validU8Char)
- return Charset.forName("UTF-8");
+ return StandardCharsets.UTF_8;
// finally, if it's not UTF-8 nor US-ASCII, let's assume the encoding is the default encoding
return this.defaultCharset;
}
diff --git a/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java b/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
index 07700d3..8e117d9 100644
--- a/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
+++ b/src/main/java/org/codehaus/groovy/control/io/FileReaderSource.java
@@ -29,13 +29,14 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URI;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
/**
* A ReaderSource for source files.
*/
public class FileReaderSource extends AbstractReaderSource {
private final File file; // The File from which we produce Readers.
- private final Charset UTF8 = Charset.forName("UTF-8");
+ private final Charset UTF8 = StandardCharsets.UTF_8;
/**
* Creates the ReaderSource from a File descriptor.
diff --git a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
index 2d4ba4f..ee8abcd 100644
--- a/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
+++ b/src/main/java/org/codehaus/groovy/runtime/EncodingGroovyMethods.java
@@ -24,7 +24,6 @@ import org.apache.groovy.io.StringBuilderWriter;
import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
@@ -285,11 +284,7 @@ public class EncodingGroovyMethods {
if (byteShift == 0) byteShift = 4;
}
- try {
- return buffer.toString().getBytes("ISO-8859-1");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Base 64 decode produced byte values > 255"); // TODO: change this exception type
- }
+ return buffer.toString().getBytes(StandardCharsets.ISO_8859_1);
}
/**
diff --git a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
index ee9bebc..48249d3 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformationVisitor.java
@@ -45,6 +45,7 @@ import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.net.URISyntaxException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
@@ -241,7 +242,7 @@ public final class ASTTransformationVisitor extends ClassCodeVisitorSupport {
while (globalServices.hasMoreElements()) {
URL service = globalServices.nextElement();
String className;
- try (BufferedReader svcIn = new BufferedReader(new InputStreamReader(URLStreams.openUncachedStream(service), "UTF-8"))) {
+ try (BufferedReader svcIn = new BufferedReader(new InputStreamReader(URLStreams.openUncachedStream(service), StandardCharsets.UTF_8))) {
try {
className = svcIn.readLine();
} catch (IOException ioe) {
[groovy] 07/20: Add `@Override` to method declaration
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit ce1cb85eeb9beea9e928d0812299aeef531e238d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:08:19 2020 +0800
Add `@Override` to method declaration
(cherry picked from commit 7aa419fae34850cf75218b49a4ba7716debd1ae4)
---
src/main/java/org/codehaus/groovy/reflection/CachedClass.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
index c4740d8..3fe83c7 100644
--- a/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/CachedClass.java
@@ -292,6 +292,7 @@ public class CachedClass {
return distance;
}
+ @Override
public int hashCode() {
if (hashCode == 0) {
hashCode = super.hashCode();
@@ -486,6 +487,7 @@ public class CachedClass {
public static class CachedMethodComparatorWithString implements Comparator {
public static final Comparator INSTANCE = new CachedMethodComparatorWithString();
+ @Override
public int compare(Object o1, Object o2) {
if (o1 instanceof CachedMethod)
return ((CachedMethod) o1).getName().compareTo((String) o2);
[groovy] 11/20: Trivial refactoring: Replace with enhanced 'for'
loop
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 4b394d260cf9e003277d16e4ab0288bf80ab6f3d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:24:19 2020 +0800
Trivial refactoring: Replace with enhanced 'for' loop
(cherry picked from commit af164227c8f7f006445beb049c3d314179318601)
---
.../src/main/java/groovy/xml/DOMBuilder.java | 5 ++---
.../java/groovy/xml/slurpersupport/Attributes.java | 5 ++---
.../java/groovy/xml/slurpersupport/GPathResult.java | 10 ++++------
.../java/groovy/xml/slurpersupport/NodeChildren.java | 19 +++++++------------
4 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
index 2823cb5..05626b6 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/DOMBuilder.java
@@ -33,7 +33,6 @@ import javax.xml.parsers.ParserConfigurationException;
import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
-import java.util.Iterator;
import java.util.Map;
/**
@@ -190,8 +189,8 @@ public class DOMBuilder extends BuilderSupport {
protected Object createNode(Object name, Map attributes) {
Element element = (Element) createNode(name);
- for (Iterator iter = attributes.entrySet().iterator(); iter.hasNext();) {
- Map.Entry entry = (Map.Entry) iter.next();
+ for (Object o : attributes.entrySet()) {
+ Map.Entry entry = (Map.Entry) o;
String attrName = entry.getKey().toString();
Object value = entry.getValue();
if ("xmlns".equals(attrName)) {
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java
index 182e2ce..e21550d 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/Attributes.java
@@ -107,9 +107,8 @@ public class Attributes extends NodeChildren {
public String text() {
final StringBuilder sb = new StringBuilder();
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- sb.append(iter.next());
+ for (Object o : this) {
+ sb.append(o);
}
return sb.toString();
}
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java
index d733797..da1b3d6 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/GPathResult.java
@@ -147,10 +147,9 @@ public abstract class GPathResult extends GroovyObjectSupport implements Writabl
public void setProperty(final String property, final Object newValue) {
if (property.startsWith("@")) {
if (newValue instanceof String || newValue instanceof GString) {
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- final NodeChild child = (NodeChild) iter.next();
+ for (Object o : this) {
+ final NodeChild child = (NodeChild) o;
child.attributes().put(property.substring(1), newValue);
}
@@ -572,9 +571,8 @@ public abstract class GPathResult extends GroovyObjectSupport implements Writabl
List nextLevel = new ArrayList();
for (Object child : children) {
GPathResult next = (GPathResult) child;
- Iterator iterator = next.iterator();
- while (iterator.hasNext()) {
- nextLevel.add(iterator.next());
+ for (Object o : next) {
+ nextLevel.add(o);
}
}
this.iter = nextLevel.iterator();
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NodeChildren.java b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NodeChildren.java
index ba760dc..ce22c18 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NodeChildren.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/slurpersupport/NodeChildren.java
@@ -171,9 +171,7 @@ public class NodeChildren extends GPathResult {
}
public GPathResult find(final Closure closure) {
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- final Object node = iter.next();
+ for (Object node : this) {
if (DefaultTypeTransformation.castToBoolean(closure.call(new Object[]{node}))) {
return (GPathResult) node;
}
@@ -209,25 +207,22 @@ public class NodeChildren extends GPathResult {
}
protected void replaceNode(final Closure newValue) {
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- final NodeChild result = (NodeChild) iter.next();
+ for (Object o : this) {
+ final NodeChild result = (NodeChild) o;
result.replaceNode(newValue);
}
}
protected void replaceBody(final Object newValue) {
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- final NodeChild result = (NodeChild) iter.next();
+ for (Object o : this) {
+ final NodeChild result = (NodeChild) o;
result.replaceBody(newValue);
}
}
protected void appendNode(final Object newValue) {
- final Iterator iter = iterator();
- while (iter.hasNext()) {
- final NodeChild result = (NodeChild) iter.next();
+ for (Object o : this) {
+ final NodeChild result = (NodeChild) o;
result.appendNode(newValue);
}
}
[groovy] 17/20: Trivial refactoring: Rename the extracted variable
to align with other variable name rule
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit d62dd43b982a5fd8b050c9a81e659e8b8925e8cc
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 22:46:59 2020 +0800
Trivial refactoring: Rename the extracted variable to align with other variable name rule
(cherry picked from commit 86d5e802d74c3d8260f556908e3a2457c8ccaff7)
---
.../groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy | 2 +-
.../src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy | 2 +-
.../groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy | 2 +-
.../groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
index 8441f7a..d625d13 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingDOMBuilder.groovy
@@ -37,7 +37,7 @@ class StreamingDOMBuilder extends AbstractStreamingBuilder {
attrs.each {target, instruction ->
def pi = null
if (instruction instanceof Map) {
- pi = dom.document.createProcessingInstruction(target, toMapString(instruction))
+ pi = dom.document.createProcessingInstruction(target, toMapStringClosure(instruction))
} else {
pi = dom.document.createProcessingInstruction(target, instruction)
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
index ce1c35b..1d50b08 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
@@ -75,7 +75,7 @@ class StreamingMarkupBuilder extends AbstractStreamingBuilder {
out.unescaped() << "<?"
if (instruction instanceof Map) {
out.unescaped() << target
- out.unescaped() << toMapString(instruction) { value ->
+ out.unescaped() << toMapStringClosure(instruction) { value ->
def valueStr = value.toString()
valueStr.contains('\'') || (useDoubleQuotes && !valueStr.contains('"'))
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
index 917d1ba..7b03ed4 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingSAXBuilder.groovy
@@ -35,7 +35,7 @@ class StreamingSAXBuilder extends AbstractStreamingBuilder {
def piClosure = {doc, pendingNamespaces, namespaces, namespaceSpecificTags, prefix, attrs, body, contentHandler ->
attrs.each {target, instruction ->
if (instruction instanceof Map) {
- contentHandler.processingInstruction(target, toMapString(instruction))
+ contentHandler.processingInstruction(target, toMapStringClosure(instruction))
} else {
contentHandler.processingInstruction(target, instruction)
}
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
index a109e4a..f2a7b16 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/streamingmarkupsupport/AbstractStreamingBuilder.groovy
@@ -60,9 +60,9 @@ class AbstractStreamingBuilder {
}
}
}
- def getNamespaceClosure = {doc, pendingNamespaces, namespaces, Object[] rest -> [namespaces, pendingNamespaces]}
+ def getNamespaceClosure = { doc, pendingNamespaces, namespaces, Object[] rest -> [namespaces, pendingNamespaces] }
- def toMapString = { Map instruction, checkDoubleQutationMarks={value -> !value.toString().contains('"')} ->
+ def toMapStringClosure = { Map instruction, checkDoubleQutationMarks={ value -> !value.toString().contains('"') } ->
def buf = new StringBuilder()
instruction.each { name, value ->
if (checkDoubleQutationMarks(value)) {
[groovy] 09/20: Trivial refactoring: Replace with Java-Style code
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 5623246df7bb1925ec9324292ca119a70619c56d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:18:54 2020 +0800
Trivial refactoring: Replace with Java-Style code
(cherry picked from commit de4033915ddf018deddfa4357e9328e1cafbaaf6)
---
subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java | 4 ++--
subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
index 3f72bbb..fe9ee3b 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlParser.java
@@ -408,7 +408,7 @@ public class XmlParser implements ContentHandler {
}
}
- public void characters(char buffer[], int start, int length) throws SAXException {
+ public void characters(char[] buffer, int start, int length) throws SAXException {
bodyText.append(buffer, start, length);
}
@@ -418,7 +418,7 @@ public class XmlParser implements ContentHandler {
public void endPrefixMapping(String prefix) throws SAXException {
}
- public void ignorableWhitespace(char buffer[], int start, int len) throws SAXException {
+ public void ignorableWhitespace(char[] buffer, int start, int len) throws SAXException {
if (keepIgnorableWhitespace) characters(buffer, start, len);
}
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
index a12c074..6463a95 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/XmlSlurper.java
@@ -420,7 +420,7 @@ public class XmlSlurper extends DefaultHandler {
currentNode = newElement;
}
- public void ignorableWhitespace(char buffer[], int start, int len) throws SAXException {
+ public void ignorableWhitespace(char[] buffer, int start, int len) throws SAXException {
if (keepIgnorableWhitespace) characters(buffer, start, len);
}
[groovy] 13/20: Unqualified call to 'yield' method might not be
supported in future releases of Java
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit d34937fcdfe69e352043346cbeddebc0fd8baab9
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 21:36:40 2020 +0800
Unqualified call to 'yield' method might not be supported in future releases of Java
(cherry picked from commit ac0d7c183c15b700a94bf42ac9081473b2c60c6f)
---
subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java | 2 +-
.../groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
index cc219f8..b1138e0 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilder.java
@@ -316,7 +316,7 @@ public class MarkupBuilder extends BuilderSupport {
}
}
if (value != null) {
- yield(value.toString(), true);
+ this.yield(value.toString(), true);
} else {
nodeIsEmpty = true;
}
diff --git a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
index bed8872..89c5abe 100644
--- a/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
+++ b/subprojects/groovy-xml/src/main/java/groovy/xml/MarkupBuilderHelper.java
@@ -41,7 +41,7 @@ public class MarkupBuilderHelper {
* @param value an Object whose toString() representation is to be printed
*/
public void yield(Object value) {
- yield(value.toString());
+ this.yield(value.toString());
}
/**
[groovy] 06/20: Trivial refactoring: Simplify type argument
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 0ce7ed206a0277a73638ea459e0243243f7d591d
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:40:55 2020 +0800
Trivial refactoring: Simplify type argument
(cherry picked from commit 33720755464a83b2e124984b44897a649c31342a)
---
src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
index 384703c..12e6653 100644
--- a/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
+++ b/src/main/java/org/codehaus/groovy/ast/tools/GeneralUtils.java
@@ -610,7 +610,7 @@ public class GeneralUtils {
return new ListExpression(args);
}
- public static ListExpression list2args(final List<? extends Object> args) {
+ public static ListExpression list2args(final List<?> args) {
ListExpression result = new ListExpression();
for (Object o : args) {
result.addExpression(constX(o));
[groovy] 04/20: Trivial refactoring: Replaced with Java-Style code
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 9c6e8be7301ff435f8c4c53c0dbca0129d62cb91
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 20:35:24 2020 +0800
Trivial refactoring: Replaced with Java-Style code
(cherry picked from commit f389be25b554d2f372a60c0712e9a923d8629401)
---
src/main/java/groovy/io/PlatformLineWriter.java | 2 +-
src/main/java/groovy/lang/ExpandoMetaClass.java | 4 ++--
src/main/java/groovy/lang/MetaClassImpl.java | 10 ++++-----
.../groovy/ast/MixinASTTransformation.java | 2 +-
.../codehaus/groovy/reflection/ParameterTypes.java | 4 ++--
.../reflection/stdclasses/CachedClosureClass.java | 2 +-
.../codehaus/groovy/runtime/MethodRankHelper.java | 4 ++--
.../groovy/runtime/StringBufferWriter.java | 2 +-
.../groovy/runtime/callsite/ConstructorSite.java | 6 +++---
.../runtime/callsite/StaticMetaMethodSite.java | 6 +++---
.../runtime/metaclass/ConcurrentReaderHashMap.java | 4 ++--
.../groovy/runtime/metaclass/MetaMethodIndex.java | 14 ++++++-------
.../org/codehaus/groovy/tools/GroovyStarter.java | 4 ++--
.../groovy/transform/ASTTransformation.java | 2 +-
.../groovy/util/AbstractConcurrentMap.java | 12 +++++------
.../groovy/util/AbstractConcurrentMapBase.java | 24 +++++++++++-----------
.../codehaus/groovy/util/ComplexKeyHashMap.java | 2 +-
.../java/org/codehaus/groovy/util/FastArray.java | 2 +-
18 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/src/main/java/groovy/io/PlatformLineWriter.java b/src/main/java/groovy/io/PlatformLineWriter.java
index 7fb5289..f4e5cfe 100644
--- a/src/main/java/groovy/io/PlatformLineWriter.java
+++ b/src/main/java/groovy/io/PlatformLineWriter.java
@@ -41,7 +41,7 @@ public class PlatformLineWriter extends Writer {
writer = new BufferedWriter(out, sz);
}
- public void write(char cbuf[], int off, int len) throws IOException {
+ public void write(char[] cbuf, int off, int len) throws IOException {
for (; len > 0; len--) {
char c = cbuf[off++];
if (c == '\n') {
diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java
index 73a2ad4..558531e 100644
--- a/src/main/java/groovy/lang/ExpandoMetaClass.java
+++ b/src/main/java/groovy/lang/ExpandoMetaClass.java
@@ -1348,7 +1348,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject {
public Object invokeMethod(String name, Object obj) {
if (obj instanceof Object[]) {
- Object args[] = (Object[]) obj;
+ Object[] args = (Object[]) obj;
if (args.length == 1 && args[0] instanceof Closure) {
registerSubclassInstanceMethod(name, klazz, (Closure) args[0]);
return null;
@@ -1395,7 +1395,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject {
c.call((Object)null);
return null;
}
- Object args[] = (Object[]) obj;
+ Object[] args = (Object[]) obj;
if (args.length == 1 && args[0] instanceof Closure) {
registerInstanceMethod(name, (Closure) args[0]);
} else if (args.length == 2 && args[0] instanceof Class && args[1] instanceof Closure)
diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java
index 27b19bf..9e8ab86 100644
--- a/src/main/java/groovy/lang/MetaClassImpl.java
+++ b/src/main/java/groovy/lang/MetaClassImpl.java
@@ -212,7 +212,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
* @param theClass The class
* @param add The methods
*/
- public MetaClassImpl(MetaClassRegistry registry, final Class theClass, MetaMethod add[]) {
+ public MetaClassImpl(MetaClassRegistry registry, final Class theClass, MetaMethod[] add) {
this(theClass, add);
this.registry = registry;
this.constructors = new FastArray(theCachedClass.getConstructors());
@@ -620,7 +620,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
private void inheritInterfaceNewMetaMethods(Set<CachedClass> interfaces) {
// add methods declared by DGM for interfaces
for (CachedClass cls : interfaces) {
- MetaMethod methods[] = getNewMetaMethods(cls);
+ MetaMethod[] methods = getNewMetaMethods(cls);
for (MetaMethod method : methods) {
boolean skip = false;
// skip DGM methods on an interface if the class already has the method
@@ -3169,7 +3169,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
return;
}
- Object data[] = list.getArray();
+ Object[] data = list.getArray();
for (int j = 0; j != len; ++j) {
MetaMethod aMethod = (MetaMethod) data[j];
Boolean match = getMatchKindForCategory(aMethod, method);
@@ -3217,7 +3217,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
if (methods instanceof FastArray) {
FastArray m = (FastArray) methods;
final int len = m.size;
- final Object data[] = m.getArray();
+ final Object[] data = m.getArray();
for (int i = 0; i != len; ++i) {
MetaMethod method = (MetaMethod) data[i];
if (method.isMethod(aMethod)) {
@@ -3278,7 +3278,7 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass {
Object matchingMethods = null;
final int len = methods.size;
- Object data[] = methods.getArray();
+ Object[] data = methods.getArray();
for (int i = 0; i != len; ++i) {
Object method = data[i];
diff --git a/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java b/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java
index 21bccce..5bbe7b0 100644
--- a/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/ast/MixinASTTransformation.java
@@ -42,7 +42,7 @@ import static org.codehaus.groovy.ast.tools.GeneralUtils.stmt;
public class MixinASTTransformation extends AbstractASTTransformation {
private static final ClassNode MY_TYPE = make(Mixin.class);
- public void visit(ASTNode nodes[], SourceUnit source) {
+ public void visit(ASTNode[] nodes, SourceUnit source) {
init(nodes, source);
AnnotationNode node = (AnnotationNode) nodes[0];
AnnotatedNode parent = (AnnotatedNode) nodes[1];
diff --git a/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java b/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java
index 6069036..4b7cc45 100644
--- a/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java
+++ b/src/main/java/org/codehaus/groovy/reflection/ParameterTypes.java
@@ -36,11 +36,11 @@ public class ParameterTypes {
public ParameterTypes() {
}
- public ParameterTypes(Class pt[]) {
+ public ParameterTypes(Class[] pt) {
nativeParamTypes = pt;
}
- public ParameterTypes(String pt[]) {
+ public ParameterTypes(String[] pt) {
nativeParamTypes = new Class[pt.length];
for (int i = 0; i != pt.length; ++i) {
try {
diff --git a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
index 7dcaed0..5ade872 100644
--- a/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
+++ b/src/main/java/org/codehaus/groovy/reflection/stdclasses/CachedClosureClass.java
@@ -29,7 +29,7 @@ public class CachedClosureClass extends CachedClass {
public CachedClosureClass(Class klazz, ClassInfo classInfo) {
super(klazz, classInfo);
- CachedMethod methods [] = getMethods();
+ CachedMethod[] methods = getMethods();
// set it to -1 for starters so parameterTypes will always get a type
int maximumNumberOfParameters = -1;
diff --git a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
index 83723df..74a4a5a 100644
--- a/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
+++ b/src/main/java/org/codehaus/groovy/runtime/MethodRankHelper.java
@@ -428,7 +428,7 @@ public class MethodRankHelper{
int[][] vals = new int[3][n + 1];
- int _d[]; //placeholder to assist in rotating vals
+ int[] _d; //placeholder to assist in rotating vals
// indexes into strings s and t
int i; // iterates through s
@@ -519,7 +519,7 @@ public class MethodRankHelper{
int[][] vals = new int[3][n + 1];
- int _d[]; //placeholder to assist in rotating vals
+ int[] _d; //placeholder to assist in rotating vals
// indexes into arrays s and t
int i; // iterates through s
diff --git a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
index d25398e..09ce506 100644
--- a/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
+++ b/src/main/java/org/codehaus/groovy/runtime/StringBufferWriter.java
@@ -51,7 +51,7 @@ public class StringBufferWriter extends Writer {
* @param offset Offset from which to start writing characters
* @param length Number of characters to write
*/
- public void write(char text[], int offset, int length) {
+ public void write(char[] text, int offset, int length) {
if ((offset < 0) || (offset > text.length) || (length < 0) || ((offset + length) > text.length) || ((offset + length) < 0)) {
throw new IndexOutOfBoundsException();
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
index 1724ac0..9f50abe 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/ConstructorSite.java
@@ -31,7 +31,7 @@ public class ConstructorSite extends MetaClassSite {
final Class[] params;
private final int version;
- public ConstructorSite(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) {
+ public ConstructorSite(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) {
super(site, metaClass);
this.constructor = constructor;
this.params = params;
@@ -74,7 +74,7 @@ public class ConstructorSite extends MetaClassSite {
*/
public static class ConstructorSiteNoUnwrap extends ConstructorSite {
- public ConstructorSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) {
+ public ConstructorSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) {
super(site, metaClass, constructor, params);
}
@@ -95,7 +95,7 @@ public class ConstructorSite extends MetaClassSite {
*/
public static class ConstructorSiteNoUnwrapNoCoerce extends ConstructorSite {
- public ConstructorSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class params[]) {
+ public ConstructorSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, CachedConstructor constructor, Class[] params) {
super(site, metaClass, constructor, params);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
index 2758478..399594f 100644
--- a/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
+++ b/src/main/java/org/codehaus/groovy/runtime/callsite/StaticMetaMethodSite.java
@@ -33,7 +33,7 @@ import org.codehaus.groovy.runtime.ScriptBytecodeAdapter;
public class StaticMetaMethodSite extends MetaMethodSite {
private final int version;
- public StaticMetaMethodSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) {
+ public StaticMetaMethodSite(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) {
super(site, metaClass, metaMethod, params);
version = metaClass.getVersion ();
}
@@ -122,7 +122,7 @@ public class StaticMetaMethodSite extends MetaMethodSite {
*/
public static class StaticMetaMethodSiteNoUnwrap extends StaticMetaMethodSite {
- public StaticMetaMethodSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) {
+ public StaticMetaMethodSiteNoUnwrap(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) {
super(site, metaClass, metaMethod, params);
}
@@ -140,7 +140,7 @@ public class StaticMetaMethodSite extends MetaMethodSite {
*/
public static class StaticMetaMethodSiteNoUnwrapNoCoerce extends StaticMetaMethodSite {
- public StaticMetaMethodSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class params[]) {
+ public StaticMetaMethodSiteNoUnwrapNoCoerce(CallSite site, MetaClassImpl metaClass, MetaMethod metaMethod, Class[] params) {
super(site, metaClass, metaMethod, params);
}
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
index a99f714..71d29af 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/ConcurrentReaderHashMap.java
@@ -713,7 +713,7 @@ public class ConcurrentReaderHashMap
public boolean containsValue(Object value) {
if (value == null) throw new NullPointerException();
- Entry tab[] = getTableForReading();
+ Entry[] tab = getTableForReading();
for (Entry entry : tab) {
for (Entry e = entry; e != null; e = e.next)
@@ -780,7 +780,7 @@ public class ConcurrentReaderHashMap
* Removes all mappings from this map.
*/
public synchronized void clear() {
- Entry tab[] = table;
+ Entry[] tab = table;
for (int i = 0; i < tab.length ; ++i) {
// must invalidate all to force concurrent get's to wait and then retry
diff --git a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
index e1ca0f8..fbdaadc 100644
--- a/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
+++ b/src/main/java/org/codehaus/groovy/runtime/metaclass/MetaMethodIndex.java
@@ -92,7 +92,7 @@ public class MetaMethodIndex {
}
}
- protected Entry table[];
+ protected Entry[] table;
protected static final int DEFAULT_CAPACITY = 32;
protected static final int MINIMUM_CAPACITY = 4;
@@ -275,7 +275,7 @@ public class MetaMethodIndex {
FastArray oldList = (FastArray) oldListOrMethod;
Entry e = null;
int len1 = oldList.size();
- Object list[] = oldList.getArray();
+ Object[] list = oldList.getArray();
for (int j = 0; j != len1; ++j) {
MetaMethod method = (MetaMethod) list[j];
if (method.isPrivate()) continue;
@@ -298,7 +298,7 @@ public class MetaMethodIndex {
FastArray oldList = (FastArray) oldListOrMethod;
Entry e = null;
int len1 = oldList.size();
- Object list[] = oldList.getArray();
+ Object[] list = oldList.getArray();
for (int j = 0; j != len1; ++j) {
MetaMethod method = (MetaMethod) list[j];
if (e == null)
@@ -320,7 +320,7 @@ public class MetaMethodIndex {
if (oldListOrMethod instanceof FastArray) {
FastArray oldList = (FastArray) oldListOrMethod;
int len1 = oldList.size();
- Object list[] = oldList.getArray();
+ Object[] list = oldList.getArray();
for (int j = 0; j != len1; ++j) {
MetaMethod method = (MetaMethod) list[j];
if (method.isPrivate()) continue;
@@ -352,7 +352,7 @@ public class MetaMethodIndex {
FastArray oldList = (FastArray) oldListOrMethod;
Entry e = null;
int len1 = oldList.size();
- Object list[] = oldList.getArray();
+ Object[] list = oldList.getArray();
for (int j = 0; j != len1; ++j) {
MetaMethod method = (MetaMethod) list[j];
if (method instanceof NewMetaMethod || method.isPrivate()) continue;
@@ -474,7 +474,7 @@ public class MetaMethodIndex {
private static int findMatchingMethod(FastArray list, MetaMethod method) {
int len = list.size();
- Object data[] = list.getArray();
+ Object[] data = list.getArray();
for (int j = 0; j != len; ++j) {
MetaMethod aMethod = (MetaMethod) data[j];
if (isMatchingMethod(aMethod, method))
@@ -513,7 +513,7 @@ public class MetaMethodIndex {
FastArray oldList = (FastArray) oldListOrMethod;
Entry e = null;
int len1 = oldList.size();
- Object list[] = oldList.getArray();
+ Object[] list = oldList.getArray();
for (int j = 0; j != len1; ++j) {
MetaMethod method = (MetaMethod) list[j];
if (e == null)
diff --git a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
index 2f3a78d..5ad37bf 100644
--- a/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
+++ b/src/main/java/org/codehaus/groovy/tools/GroovyStarter.java
@@ -35,7 +35,7 @@ public class GroovyStarter {
}
- public static void rootLoader(String args[]) {
+ public static void rootLoader(String[] args) {
String conf = System.getProperty("groovy.starter.conf",null);
final LoaderConfiguration lc = new LoaderConfiguration();
@@ -124,7 +124,7 @@ public class GroovyStarter {
System.exit(1);
}
- public static void main(String args[]) {
+ public static void main(String[] args) {
try {
rootLoader(args);
} catch (Throwable t) {
diff --git a/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java b/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java
index 47354c1..ba59ce7 100644
--- a/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java
+++ b/src/main/java/org/codehaus/groovy/transform/ASTTransformation.java
@@ -45,5 +45,5 @@ public interface ASTTransformation {
* @param source The source unit being compiled. The source unit may contain several classes. For global transformations,
* information about the AST can be retrieved from this object.
*/
- void visit(ASTNode nodes[], SourceUnit source);
+ void visit(ASTNode[] nodes, SourceUnit source);
}
diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java
index 3fbf8e0..6168877 100644
--- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java
+++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMap.java
@@ -67,7 +67,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object value : arr) {
Entry<K, V> e = (Entry<K, V>) value;
if (e != null && e.isEqual(key, hash)) {
@@ -90,7 +90,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object item : arr) {
Entry<K, V> e = (Entry<K, V>) item;
if (e != null && e.isEqual(key, hash)) {
@@ -118,7 +118,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
return e;
}
else {
- Object arr [] = new Object [2];
+ Object[] arr = new Object [2];
final Entry ee = createEntry(key, hash, value);
arr [0] = ee;
arr [1] = e;
@@ -128,7 +128,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object item : arr) {
Entry e = (Entry) item;
if (e != null && e.isEqual(key, hash)) {
@@ -147,7 +147,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
}
}
- Object newArr [] = new Object[arr.length+1];
+ Object[] newArr = new Object[arr.length+1];
newArr [0] = ee;
System.arraycopy(arr, 0, newArr, 1, arr.length);
tab [index] = newArr;
@@ -181,7 +181,7 @@ public abstract class AbstractConcurrentMap<K, V> extends AbstractConcurrentMapB
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (int i = 0; i < arr.length; i++) {
Entry<K,V> e = (Entry<K,V>) arr[i];
if (e != null && e.isEqual(key, hash)) {
diff --git a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
index d592b9b..01f84af 100644
--- a/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
+++ b/src/main/java/org/codehaus/groovy/util/AbstractConcurrentMapBase.java
@@ -77,7 +77,7 @@ public abstract class AbstractConcurrentMapBase {
if (o instanceof Entry) {
count++;
} else {
- Object arr[] = (Object[]) o;
+ Object[] arr = (Object[]) o;
count += arr.length;
}
}
@@ -102,7 +102,7 @@ public abstract class AbstractConcurrentMapBase {
if (e.isValid())
count++;
} else {
- Object arr[] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object value : arr) {
Entry info = (Entry) value;
if (info != null && info.isValid())
@@ -131,7 +131,7 @@ public abstract class AbstractConcurrentMapBase {
if (e.isValid())
result.add(e);
} else {
- Object arr[] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object value : arr) {
Entry info = (Entry) value;
if (info != null && info.isValid())
@@ -179,7 +179,7 @@ public abstract class AbstractConcurrentMapBase {
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
Object res = null;
for (Object value : arr) {
Entry info = (Entry) value;
@@ -231,7 +231,7 @@ public abstract class AbstractConcurrentMapBase {
}
}
else {
- Object arr [] = (Object[]) o;
+ Object[] arr = (Object[]) o;
int localCount = 0;
for (int index = 0; index < arr.length; index++) {
Entry e = (Entry) arr[index];
@@ -263,7 +263,7 @@ public abstract class AbstractConcurrentMapBase {
newCount++;
}
} else {
- Object arr[] = (Object[]) o;
+ Object[] arr = (Object[]) o;
for (Object value : arr) {
Entry e = (Entry) value;
if (e != null && e.isValid()) {
@@ -286,15 +286,15 @@ public abstract class AbstractConcurrentMapBase {
Object o = tab[index];
if (o != null) {
if (o instanceof Entry) {
- Object arr [] = new Object [2];
+ Object[] arr = new Object [2];
arr [0] = ee;
arr [1] = o;
tab[index] = arr;
return;
}
else {
- Object arr [] = (Object[]) o;
- Object newArr [] = new Object[arr.length+1];
+ Object[] arr = (Object[]) o;
+ Object[] newArr = new Object[arr.length+1];
newArr [0] = ee;
System.arraycopy(arr, 0, newArr, 1, arr.length);
tab [index] = newArr;
@@ -307,14 +307,14 @@ public abstract class AbstractConcurrentMapBase {
private static Object put(Entry ee, Object o) {
if (o != null) {
if (o instanceof Entry) {
- Object arr [] = new Object [2];
+ Object[] arr = new Object [2];
arr [0] = ee;
arr [1] = o;
return arr;
}
else {
- Object arr [] = (Object[]) o;
- Object newArr [] = new Object[arr.length+1];
+ Object[] arr = (Object[]) o;
+ Object[] newArr = new Object[arr.length+1];
newArr [0] = ee;
System.arraycopy(arr, 0, newArr, 1, arr.length);
return newArr;
diff --git a/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java b/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java
index 91fc7f9..c74f0bb 100644
--- a/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java
+++ b/src/main/java/org/codehaus/groovy/util/ComplexKeyHashMap.java
@@ -37,7 +37,7 @@ public class ComplexKeyHashMap
}
}
- protected Entry table [];
+ protected Entry[] table;
protected static final int DEFAULT_CAPACITY = 32;
protected static final int MINIMUM_CAPACITY = 4;
diff --git a/src/main/java/org/codehaus/groovy/util/FastArray.java b/src/main/java/org/codehaus/groovy/util/FastArray.java
index 17e6f6d..183878b 100644
--- a/src/main/java/org/codehaus/groovy/util/FastArray.java
+++ b/src/main/java/org/codehaus/groovy/util/FastArray.java
@@ -82,7 +82,7 @@ public class FastArray implements Cloneable, Serializable {
return;
final int newSize = this.size + size;
if (newSize > data.length) {
- Object nd [] = new Object [newSize];
+ Object[] nd = new Object [newSize];
System.arraycopy(data, 0, nd, 0, this.size);
data = nd;
}
[groovy] 16/20: Trivial refactoring: extract common variable
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sunlan pushed a commit to branch GROOVY_3_0_X
in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 73ce5954a4ecd7ac0f32492b930326d6604d09dd
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Apr 11 22:41:21 2020 +0800
Trivial refactoring: extract common variable
(cherry picked from commit 558d49f91bc46c4fb9b741a90734ee3b32eb7429)
---
.../src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
index ee0f124..ce1c35b 100644
--- a/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
+++ b/subprojects/groovy-xml/src/main/groovy/groovy/xml/StreamingMarkupBuilder.groovy
@@ -75,7 +75,10 @@ class StreamingMarkupBuilder extends AbstractStreamingBuilder {
out.unescaped() << "<?"
if (instruction instanceof Map) {
out.unescaped() << target
- out.unescaped() << toMapString(instruction, {value -> value.toString().contains('\'') || (useDoubleQuotes && !value.toString().contains('"'))})
+ out.unescaped() << toMapString(instruction) { value ->
+ def valueStr = value.toString()
+ valueStr.contains('\'') || (useDoubleQuotes && !valueStr.contains('"'))
+ }
} else {
out.unescaped() << "$target $instruction"
}