This is an automated email from the ASF dual-hosted git repository. paulk pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/groovy.git
commit dd12c648204e42467afda44591323e69f1de1d19 Author: Paul King <[email protected]> AuthorDate: Mon Nov 4 16:57:34 2024 +1000 minor refactor: remove checkstyle warnings --- src/main/java/groovy/lang/Closure.java | 2 +- src/main/java/groovy/lang/ExpandoMetaClass.java | 4 ++-- src/main/java/groovy/lang/GroovyShell.java | 2 +- src/main/java/groovy/lang/MetaClassImpl.java | 6 +++--- src/main/java/groovy/transform/stc/POJO.java | 2 +- src/main/java/groovy/ui/GroovyMain.java | 4 ++-- src/main/java/groovy/util/FactoryBuilderSupport.java | 2 +- .../groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java | 6 +++--- .../classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/main/java/groovy/lang/Closure.java b/src/main/java/groovy/lang/Closure.java index 6f4ca744e5..2bfe4cbe63 100644 --- a/src/main/java/groovy/lang/Closure.java +++ b/src/main/java/groovy/lang/Closure.java @@ -933,7 +933,7 @@ public abstract class Closure<V> extends GroovyObjectSupport implements Cloneabl private class WritableClosure extends Closure implements Writable { private static final long serialVersionUID = -5749205698681690370L; - public WritableClosure() { + private WritableClosure() { super(Closure.this); } diff --git a/src/main/java/groovy/lang/ExpandoMetaClass.java b/src/main/java/groovy/lang/ExpandoMetaClass.java index c6905bbff3..ac2347f690 100644 --- a/src/main/java/groovy/lang/ExpandoMetaClass.java +++ b/src/main/java/groovy/lang/ExpandoMetaClass.java @@ -1371,7 +1371,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject { private class SubClassDefiningClosure extends GroovyObjectSupport { private final Class klazz; - public SubClassDefiningClosure(Class klazz) { + private SubClassDefiningClosure(Class klazz) { this.klazz = klazz; } @@ -1481,7 +1481,7 @@ public class ExpandoMetaClass extends MetaClassImpl implements GroovyObject { private final Object object; private final Set<MixinInMetaClass> mixinClasses; - public MixedInAccessor(Object object, Set<MixinInMetaClass> mixinClasses) { + private MixedInAccessor(Object object, Set<MixinInMetaClass> mixinClasses) { this.object = object; this.mixinClasses = mixinClasses; } diff --git a/src/main/java/groovy/lang/GroovyShell.java b/src/main/java/groovy/lang/GroovyShell.java index 97922fb828..59484a8152 100644 --- a/src/main/java/groovy/lang/GroovyShell.java +++ b/src/main/java/groovy/lang/GroovyShell.java @@ -223,7 +223,7 @@ public class GroovyShell extends GroovyObjectSupport { class DoSetContext implements PrivilegedAction { final ClassLoader classLoader; - public DoSetContext(ClassLoader loader) { + DoSetContext(ClassLoader loader) { classLoader = loader; } diff --git a/src/main/java/groovy/lang/MetaClassImpl.java b/src/main/java/groovy/lang/MetaClassImpl.java index 427d4b4e60..a7669ab88c 100644 --- a/src/main/java/groovy/lang/MetaClassImpl.java +++ b/src/main/java/groovy/lang/MetaClassImpl.java @@ -3912,15 +3912,15 @@ public class MetaClassImpl implements MetaClass, MutableMetaClass { */ @Deprecated static class MethodIndex extends Index { - public MethodIndex(boolean b) { + MethodIndex(boolean b) { super(false); } - public MethodIndex(int size) { + MethodIndex(int size) { super(size); } - public MethodIndex() { + MethodIndex() { super(); } diff --git a/src/main/java/groovy/transform/stc/POJO.java b/src/main/java/groovy/transform/stc/POJO.java index 7a8a638789..34c82b77ad 100644 --- a/src/main/java/groovy/transform/stc/POJO.java +++ b/src/main/java/groovy/transform/stc/POJO.java @@ -1,6 +1,6 @@ /* * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file * to you under the Apache License, Version 2.0 (the diff --git a/src/main/java/groovy/ui/GroovyMain.java b/src/main/java/groovy/ui/GroovyMain.java index 4dfa13a075..0697345d66 100644 --- a/src/main/java/groovy/ui/GroovyMain.java +++ b/src/main/java/groovy/ui/GroovyMain.java @@ -166,7 +166,7 @@ public class GroovyMain { description = "The Groovy command line processor.", sortOptions = false, versionProvider = VersionProvider.class) - private static class GroovyCommand { + private static final class GroovyCommand { // IMPLEMENTATION NOTE: // classpath must be the first argument, so that the `startGroovy(.bat)` script @@ -515,7 +515,7 @@ public class GroovyMain { class DoSetContext implements PrivilegedAction<Object> { ClassLoader classLoader; - public DoSetContext(ClassLoader loader) { + DoSetContext(ClassLoader loader) { classLoader = loader; } diff --git a/src/main/java/groovy/util/FactoryBuilderSupport.java b/src/main/java/groovy/util/FactoryBuilderSupport.java index 6891392c07..0012211318 100644 --- a/src/main/java/groovy/util/FactoryBuilderSupport.java +++ b/src/main/java/groovy/util/FactoryBuilderSupport.java @@ -1304,7 +1304,7 @@ class FactoryInterceptorMetaClass extends DelegatingMetaClass { FactoryBuilderSupport builder; - public FactoryInterceptorMetaClass(MetaClass delegate, FactoryBuilderSupport builder) { + FactoryInterceptorMetaClass(MetaClass delegate, FactoryBuilderSupport builder) { super(delegate); this.builder = builder; } diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java index 38c5d6f916..e57392abe5 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/BinaryExpressionMultiTypeDispatcher.java @@ -60,7 +60,7 @@ import static org.codehaus.groovy.syntax.Types.RIGHT_SHIFT_UNSIGNED; public class BinaryExpressionMultiTypeDispatcher extends BinaryExpressionHelper { private static class BinaryCharExpressionHelper extends BinaryIntExpressionHelper { - public BinaryCharExpressionHelper(final WriterController wc) { + private BinaryCharExpressionHelper(final WriterController wc) { super(wc, charArraySet, charArrayGet); } private static final MethodCaller @@ -70,7 +70,7 @@ public class BinaryExpressionMultiTypeDispatcher extends BinaryExpressionHelper } private static class BinaryByteExpressionHelper extends BinaryIntExpressionHelper { - public BinaryByteExpressionHelper(final WriterController wc) { + private BinaryByteExpressionHelper(final WriterController wc) { super(wc, byteArraySet, byteArrayGet); } private static final MethodCaller @@ -80,7 +80,7 @@ public class BinaryExpressionMultiTypeDispatcher extends BinaryExpressionHelper } private static class BinaryShortExpressionHelper extends BinaryIntExpressionHelper { - public BinaryShortExpressionHelper(final WriterController wc) { + private BinaryShortExpressionHelper(final WriterController wc) { super(wc, shortArraySet, shortArrayGet); } private static final MethodCaller diff --git a/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java b/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java index 8d47c552de..efd39f4dfe 100644 --- a/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java +++ b/src/main/java/org/codehaus/groovy/classgen/asm/indy/sc/IndyStaticTypesMultiTypeDispatcher.java @@ -57,7 +57,7 @@ public class IndyStaticTypesMultiTypeDispatcher extends StaticTypesBinaryExpress false); private static class GenericArrayAccess extends MethodCaller { private final String name, signature; - public GenericArrayAccess(String name, String signature) { + private GenericArrayAccess(String name, String signature) { this.name = name; this.signature = signature; }
