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 2018/04/04 00:20:32 UTC
[3/6] groovy git commit: Avoid call to 'toArray()' with pre-sized
array argument
Avoid call to 'toArray()' with pre-sized array argument
(cherry picked from commit fe4224a)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/9a0552e0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/9a0552e0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/9a0552e0
Branch: refs/heads/GROOVY_2_5_X
Commit: 9a0552e05c1d3d541d0f82243d99424324641332
Parents: d73bd4f
Author: sunlan <su...@apache.org>
Authored: Wed Apr 4 07:59:07 2018 +0800
Committer: sunlan <su...@apache.org>
Committed: Wed Apr 4 08:20:25 2018 +0800
----------------------------------------------------------------------
.../codehaus/groovy/ant/FileSystemCompilerFacade.java | 2 +-
.../main/java/org/codehaus/groovy/ant/Groovyc.java | 2 +-
.../tools/groovydoc/ExternalGroovyClassDoc.java | 2 +-
.../groovy/tools/groovydoc/SimpleGroovyClassDoc.java | 14 +++++++-------
.../groovy/tools/groovydoc/SimpleGroovyDoc.java | 2 +-
.../groovydoc/SimpleGroovyExecutableMemberDoc.java | 2 +-
.../tools/groovydoc/SimpleGroovyPackageDoc.java | 14 +++++++-------
.../groovy/tools/groovydoc/SimpleGroovyParameter.java | 2 +-
.../groovydoc/SimpleGroovyProgramElementDoc.java | 2 +-
.../groovy/tools/groovydoc/SimpleGroovyRootDoc.java | 4 ++--
.../groovy-sql/src/main/java/groovy/sql/Sql.java | 2 +-
.../groovy/binding/ClosureTriggerBinding.java | 4 ++--
12 files changed, 26 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
index e9b3327..3235c23 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/FileSystemCompilerFacade.java
@@ -37,7 +37,7 @@ public class FileSystemCompilerFacade {
if (forceLookupUnnamedFiles) {
argList.remove("--forceLookupUnnamedFiles");
}
- String[] newArgs = forceLookupUnnamedFiles ? argList.toArray(new String[argList.size()]) : args;
+ String[] newArgs = forceLookupUnnamedFiles ? argList.toArray(new String[0]) : args;
FileSystemCompiler.commandLineCompileWithErrorHandling(newArgs, forceLookupUnnamedFiles);
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
index 8af272b..5543a32 100644
--- a/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
+++ b/subprojects/groovy-ant/src/main/java/org/codehaus/groovy/ant/Groovyc.java
@@ -1154,7 +1154,7 @@ public class Groovyc extends MatchingTask {
private String[] makeCommandLine(List<String> commandLineList) {
log.verbose("Compilation arguments:\n" + DefaultGroovyMethods.join((Iterable)commandLineList, "\n"));
- return commandLineList.toArray(new String[commandLineList.size()]);
+ return commandLineList.toArray(new String[0]);
}
private void runForked(String[] commandLine) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
index d4611f7..c9fecb7 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/ExternalGroovyClassDoc.java
@@ -46,7 +46,7 @@ public class ExternalGroovyClassDoc implements GroovyClassDoc {
}
public GroovyAnnotationRef[] annotations() {
- return annotationRefs.toArray(new GroovyAnnotationRef[annotationRefs.size()]);
+ return annotationRefs.toArray(new GroovyAnnotationRef[0]);
}
public String qualifiedTypeName() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
index e3d4637..ace2b45 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyClassDoc.java
@@ -116,7 +116,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyConstructorDoc[] constructors() {
Collections.sort(constructors);
- return constructors.toArray(new GroovyConstructorDoc[constructors.size()]);
+ return constructors.toArray(new GroovyConstructorDoc[0]);
}
public boolean add(GroovyConstructorDoc constructor) {
@@ -145,7 +145,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyClassDoc[] innerClasses() {
Collections.sort(nested);
- return nested.toArray(new GroovyClassDoc[nested.size()]);
+ return nested.toArray(new GroovyClassDoc[0]);
}
public boolean addNested(GroovyClassDoc nestedClass) {
@@ -157,7 +157,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyFieldDoc[] fields() {
Collections.sort(fields);
- return fields.toArray(new GroovyFieldDoc[fields.size()]);
+ return fields.toArray(new GroovyFieldDoc[0]);
}
public boolean add(GroovyFieldDoc field) {
@@ -169,7 +169,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyFieldDoc[] properties() {
Collections.sort(properties);
- return properties.toArray(new GroovyFieldDoc[properties.size()]);
+ return properties.toArray(new GroovyFieldDoc[0]);
}
public boolean addProperty(GroovyFieldDoc property) {
@@ -181,7 +181,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyFieldDoc[] enumConstants() {
Collections.sort(enumConstants);
- return enumConstants.toArray(new GroovyFieldDoc[enumConstants.size()]);
+ return enumConstants.toArray(new GroovyFieldDoc[0]);
}
public boolean addEnumConstant(GroovyFieldDoc field) {
@@ -193,7 +193,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
*/
public GroovyMethodDoc[] methods() {
Collections.sort(methods);
- return methods.toArray(new GroovyMethodDoc[methods.size()]);
+ return methods.toArray(new GroovyMethodDoc[0]);
}
public boolean add(GroovyMethodDoc method) {
@@ -732,7 +732,7 @@ public class SimpleGroovyClassDoc extends SimpleGroovyAbstractableElementDoc imp
public GroovyClassDoc[] interfaces() {
Collections.sort(interfaceClasses);
- return interfaceClasses.toArray(new GroovyClassDoc[interfaceClasses.size()]);
+ return interfaceClasses.toArray(new GroovyClassDoc[0]);
}
public GroovyType[] interfaceTypes() {/*todo*/
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
index f87c7cd..8dd1d9c 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyDoc.java
@@ -108,7 +108,7 @@ public class SimpleGroovyDoc implements GroovyDoc, GroovyTokenTypes {
setDeprecated(true);
}
}
- tags = result.toArray(new GroovyTag[result.size()]);
+ tags = result.toArray(new GroovyTag[0]);
}
public static String calculateFirstSentence(String raw) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
index 53219c1..5316ce4 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyExecutableMemberDoc.java
@@ -35,7 +35,7 @@ public class SimpleGroovyExecutableMemberDoc extends SimpleGroovyMemberDoc imple
}
public GroovyParameter[] parameters() {
- return (GroovyParameter[]) parameters.toArray(new GroovyParameter[parameters.size()]);
+ return (GroovyParameter[]) parameters.toArray(new GroovyParameter[0]);
}
public void add(GroovyParameter parameter) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
index b703554..36090fb 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyPackageDoc.java
@@ -39,7 +39,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
}
public GroovyClassDoc[] allClasses() {
- return classDocs.values().toArray(new GroovyClassDoc[classDocs.values().size()]);
+ return classDocs.values().toArray(new GroovyClassDoc[0]);
}
public void setDescription(String description) {
@@ -68,7 +68,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
public GroovyClassDoc[] allClasses(boolean arg0) {
List<GroovyClassDoc> classDocValues = new ArrayList<GroovyClassDoc>(classDocs.values());
- return classDocValues.toArray(new GroovyClassDoc[classDocValues.size()]);
+ return classDocValues.toArray(new GroovyClassDoc[0]);
}
public GroovyClassDoc[] enums() {
@@ -78,7 +78,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
result.add(doc);
}
}
- return result.toArray(new GroovyClassDoc[result.size()]);
+ return result.toArray(new GroovyClassDoc[0]);
}
public GroovyClassDoc[] errors() {
@@ -88,7 +88,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
result.add(doc);
}
}
- return result.toArray(new GroovyClassDoc[result.size()]);
+ return result.toArray(new GroovyClassDoc[0]);
}
public GroovyClassDoc[] exceptions() {
@@ -98,7 +98,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
result.add(doc);
}
}
- return result.toArray(new GroovyClassDoc[result.size()]);
+ return result.toArray(new GroovyClassDoc[0]);
}
public GroovyClassDoc findClass(String arg0) {/*todo*/
@@ -112,7 +112,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
result.add(doc);
}
}
- return result.toArray(new GroovyClassDoc[result.size()]);
+ return result.toArray(new GroovyClassDoc[0]);
}
public GroovyClassDoc[] ordinaryClasses() {
@@ -122,7 +122,7 @@ public class SimpleGroovyPackageDoc extends SimpleGroovyDoc implements GroovyPac
result.add(doc);
}
}
- return result.toArray(new GroovyClassDoc[result.size()]);
+ return result.toArray(new GroovyClassDoc[0]);
}
public String description() {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
index 947d48c..27cf037 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyParameter.java
@@ -62,7 +62,7 @@ public class SimpleGroovyParameter implements GroovyParameter {
}
public GroovyAnnotationRef[] annotations() {
- return annotationRefs.toArray(new GroovyAnnotationRef[annotationRefs.size()]);
+ return annotationRefs.toArray(new GroovyAnnotationRef[0]);
}
public void addAnnotationRef(GroovyAnnotationRef ref) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
index 7b86ea0..8a2339d 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyProgramElementDoc.java
@@ -98,7 +98,7 @@ public class SimpleGroovyProgramElementDoc extends SimpleGroovyDoc implements Gr
}
public GroovyAnnotationRef[] annotations() {
- return annotationRefs.toArray(new GroovyAnnotationRef[annotationRefs.size()]);
+ return annotationRefs.toArray(new GroovyAnnotationRef[0]);
}
public void addAnnotationRef(GroovyAnnotationRef ref) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
index cc0dd1b..eeffd16 100644
--- a/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
+++ b/subprojects/groovy-groovydoc/src/main/java/org/codehaus/groovy/tools/groovydoc/SimpleGroovyRootDoc.java
@@ -87,7 +87,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc implements GroovyRootDo
classDocValues = new ArrayList<GroovyClassDoc>(classDocs.values());
Collections.sort(classDocValues);
}
- return classDocValues.toArray(new GroovyClassDoc[classDocValues.size()]);
+ return classDocValues.toArray(new GroovyClassDoc[0]);
}
public String[][] options() {/*todo*/
@@ -117,7 +117,7 @@ public class SimpleGroovyRootDoc extends SimpleGroovyDoc implements GroovyRootDo
packageDocValues = new ArrayList<GroovyPackageDoc>(packageDocs.values());
Collections.sort(packageDocValues);
}
- return packageDocValues.toArray(new GroovyPackageDoc[packageDocValues.size()]);
+ return packageDocValues.toArray(new GroovyPackageDoc[0]);
}
public Map<String, GroovyClassDoc> getVisibleClasses(List importedClassesAndPackages) {
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
index a554644..da61e9f 100644
--- a/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
+++ b/subprojects/groovy-sql/src/main/java/groovy/sql/Sql.java
@@ -4589,7 +4589,7 @@ public class Sql {
@Override
protected PreparedStatement execute(Connection connection, String sql) throws SQLException {
if (returnGeneratedKeys == USE_COLUMN_NAMES && keyColumnNames != null) {
- return connection.prepareStatement(sql, keyColumnNames.toArray(new String[keyColumnNames.size()]));
+ return connection.prepareStatement(sql, keyColumnNames.toArray(new String[0]));
}
if (returnGeneratedKeys != 0) {
return connection.prepareStatement(sql, returnGeneratedKeys);
http://git-wip-us.apache.org/repos/asf/groovy/blob/9a0552e0/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
----------------------------------------------------------------------
diff --git a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
index 8a0fecb..6c41a9e 100644
--- a/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
+++ b/subprojects/groovy-swing/src/main/java/org/codehaus/groovy/binding/ClosureTriggerBinding.java
@@ -55,7 +55,7 @@ public class ClosureTriggerBinding implements TriggerBinding, SourceBinding {
for (Map.Entry<String, BindPathSnooper> entry : snooper.fields.entrySet()) {
childPaths.add(createBindPath(entry.getKey(), entry.getValue()));
}
- bp.children = childPaths.toArray(new BindPath[childPaths.size()]);
+ bp.children = childPaths.toArray(new BindPath[0]);
return bp;
}
@@ -123,7 +123,7 @@ public class ClosureTriggerBinding implements TriggerBinding, SourceBinding {
PropertyPathFullBinding fb = new PropertyPathFullBinding();
fb.setSourceBinding(new ClosureSourceBinding(closure));
fb.setTargetBinding(target);
- fb.bindPaths = rootPaths.toArray(new BindPath[rootPaths.size()]);
+ fb.bindPaths = rootPaths.toArray(new BindPath[0]);
return fb;
}