From 7b5421d4ccbfcc75009aa88bc170787497c0eb45 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 18 May 2024 11:06:30 -0700 Subject: [PATCH] Remove redundant modifiers (#548) --- .../java/org/kohsuke/stapler/ClassDescriptor.java | 2 +- .../main/java/org/kohsuke/stapler/Function.java | 6 +++--- .../java/org/kohsuke/stapler/KlassDescriptor.java | 2 +- .../main/java/org/kohsuke/stapler/MetaClass.java | 2 +- .../org/kohsuke/stapler/TruncatedInputStream.java | 2 +- .../org/kohsuke/stapler/bind/BoundObjectTable.java | 2 +- .../org/kohsuke/stapler/export/FieldProperty.java | 2 +- .../kohsuke/stapler/export/PythonDataWriter.java | 2 +- .../org/kohsuke/stapler/export/RubyDataWriter.java | 2 +- .../java/org/kohsuke/stapler/export/TypeUtil.java | 4 ++-- .../kohsuke/stapler/framework/io/LargeText.java | 14 +++++++------- .../stapler/interceptor/JsonOutputFilter.java | 4 ++-- .../stapler/jsr269/AbstractProcessorImpl.java | 2 +- .../stapler/jelly/groovy/GroovierJellyScript.java | 2 +- .../jelly/AttributeNameRewritingTagScript.java | 2 +- .../kohsuke/stapler/jelly/CustomJellyContext.java | 2 +- .../stapler/jsp/RequestDispatcherWrapper.java | 2 +- .../java/org/kohsuke/stapler/tags/Include.java | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java index 747acbc67e..25aa52333e 100644 --- a/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/ClassDescriptor.java @@ -327,7 +327,7 @@ static final class MethodMirror { final Signature sig; final Method method; - public MethodMirror(Signature sig, Method method) { + MethodMirror(Signature sig, Method method) { this.sig = sig; this.method = method; } diff --git a/core/src/main/java/org/kohsuke/stapler/Function.java b/core/src/main/java/org/kohsuke/stapler/Function.java index d254a919b0..266c14ab02 100644 --- a/core/src/main/java/org/kohsuke/stapler/Function.java +++ b/core/src/main/java/org/kohsuke/stapler/Function.java @@ -323,7 +323,7 @@ private abstract static class MethodFunction extends Function { private volatile String[] names; - public MethodFunction(Method m) { + MethodFunction(Method m) { this.m = m; // defer the resolution of MethodHandle so that a Function can be built to represent a non-public method } @@ -452,7 +452,7 @@ static final class OverridingInstanceFunction extends InstanceFunction { // the last one takes precedence private final List methods; - public OverridingInstanceFunction(List m) { + OverridingInstanceFunction(List m) { super(m.get(0)); methods = m; } @@ -498,7 +498,7 @@ public Annotation[][] getParameterAnnotations() { * Static methods on the wrapper type. */ static final class StaticFunction extends MethodFunction { - public StaticFunction(Method m) { + StaticFunction(Method m) { super(m); } diff --git a/core/src/main/java/org/kohsuke/stapler/KlassDescriptor.java b/core/src/main/java/org/kohsuke/stapler/KlassDescriptor.java index 0dccb9c5b0..717bcbb56a 100644 --- a/core/src/main/java/org/kohsuke/stapler/KlassDescriptor.java +++ b/core/src/main/java/org/kohsuke/stapler/KlassDescriptor.java @@ -20,7 +20,7 @@ class KlassDescriptor { * @param klazz * The class to build a descriptor around. */ - public KlassDescriptor(Klass klazz) { + KlassDescriptor(Klass klazz) { this.clazz = klazz; this.fields = klazz.getFields(); this.methods = new FunctionList(klazz.getFunctions()); diff --git a/core/src/main/java/org/kohsuke/stapler/MetaClass.java b/core/src/main/java/org/kohsuke/stapler/MetaClass.java index 2efa9f664f..94c01d4ab8 100644 --- a/core/src/main/java/org/kohsuke/stapler/MetaClass.java +++ b/core/src/main/java/org/kohsuke/stapler/MetaClass.java @@ -720,7 +720,7 @@ private static String camelize(String name) { private static class JavaScriptProxyMethodDispatcher extends NameBasedDispatcher { private final Function f; - public JavaScriptProxyMethodDispatcher(String name, Function f) { + JavaScriptProxyMethodDispatcher(String name, Function f) { super(name, 0); this.f = f; } diff --git a/core/src/main/java/org/kohsuke/stapler/TruncatedInputStream.java b/core/src/main/java/org/kohsuke/stapler/TruncatedInputStream.java index 53ce7d0cf7..820453c217 100644 --- a/core/src/main/java/org/kohsuke/stapler/TruncatedInputStream.java +++ b/core/src/main/java/org/kohsuke/stapler/TruncatedInputStream.java @@ -35,7 +35,7 @@ final class TruncatedInputStream extends FilterInputStream { private long len; - public TruncatedInputStream(InputStream in, long len) { + TruncatedInputStream(InputStream in, long len) { super(in); this.len = len; } diff --git a/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java b/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java index 48bf1ca6cc..a05a04c028 100644 --- a/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java +++ b/core/src/main/java/org/kohsuke/stapler/bind/BoundObjectTable.java @@ -300,7 +300,7 @@ private static final class WellKnownObjectHandle extends Bound { private final String url; private final Object target; - public WellKnownObjectHandle(String url, Object target) { + WellKnownObjectHandle(String url, Object target) { this.url = url; this.target = target; } diff --git a/core/src/main/java/org/kohsuke/stapler/export/FieldProperty.java b/core/src/main/java/org/kohsuke/stapler/export/FieldProperty.java index 932f98bcd7..5e0cd09eb1 100644 --- a/core/src/main/java/org/kohsuke/stapler/export/FieldProperty.java +++ b/core/src/main/java/org/kohsuke/stapler/export/FieldProperty.java @@ -33,7 +33,7 @@ class FieldProperty extends Property { private final Field field; - public FieldProperty(Model owner, Field field, Exported exported) { + FieldProperty(Model owner, Field field, Exported exported) { super(owner, field.getName(), field.getGenericType(), exported); this.field = field; } diff --git a/core/src/main/java/org/kohsuke/stapler/export/PythonDataWriter.java b/core/src/main/java/org/kohsuke/stapler/export/PythonDataWriter.java index 5f326293fc..7c6b36d63b 100644 --- a/core/src/main/java/org/kohsuke/stapler/export/PythonDataWriter.java +++ b/core/src/main/java/org/kohsuke/stapler/export/PythonDataWriter.java @@ -36,7 +36,7 @@ * @author Kohsuke Kawaguchi */ final class PythonDataWriter extends JSONDataWriter { - public PythonDataWriter(Writer out, ExportConfig config) throws IOException { + PythonDataWriter(Writer out, ExportConfig config) throws IOException { super(out, config); } diff --git a/core/src/main/java/org/kohsuke/stapler/export/RubyDataWriter.java b/core/src/main/java/org/kohsuke/stapler/export/RubyDataWriter.java index 03b365b34f..05c740d2a2 100644 --- a/core/src/main/java/org/kohsuke/stapler/export/RubyDataWriter.java +++ b/core/src/main/java/org/kohsuke/stapler/export/RubyDataWriter.java @@ -37,7 +37,7 @@ * @author Kohsuke Kawaguchi, Jim Meyer */ final class RubyDataWriter extends JSONDataWriter { - public RubyDataWriter(Writer out, ExportConfig config) throws IOException { + RubyDataWriter(Writer out, ExportConfig config) throws IOException { super(out, config); } diff --git a/core/src/main/java/org/kohsuke/stapler/export/TypeUtil.java b/core/src/main/java/org/kohsuke/stapler/export/TypeUtil.java index 4202ea41c8..0fcdd19013 100644 --- a/core/src/main/java/org/kohsuke/stapler/export/TypeUtil.java +++ b/core/src/main/java/org/kohsuke/stapler/export/TypeUtil.java @@ -297,7 +297,7 @@ private static class BinderArg { assert params.length == args.length; } - public BinderArg(GenericDeclaration decl, Type[] args) { + BinderArg(GenericDeclaration decl, Type[] args) { this(decl.getTypeParameters(), args); } @@ -538,7 +538,7 @@ static final class WildcardTypeImpl implements WildcardType { private final Type[] ub; private final Type[] lb; - public WildcardTypeImpl(Type[] ub, Type[] lb) { + WildcardTypeImpl(Type[] ub, Type[] lb) { this.ub = ub; this.lb = lb; } diff --git a/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java b/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java index 9b74d17bb8..952085bce7 100644 --- a/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java +++ b/core/src/main/java/org/kohsuke/stapler/framework/io/LargeText.java @@ -317,7 +317,7 @@ private static class Mark { protected ByteBuf buf; protected int pos; - public Mark(ByteBuf buf) { + Mark(ByteBuf buf) { this.buf = buf; } } @@ -327,7 +327,7 @@ public Mark(ByteBuf buf) { * to the output yet. */ private static final class HeadMark extends Mark { - public HeadMark(ByteBuf buf) { + HeadMark(ByteBuf buf) { super(buf); } @@ -354,7 +354,7 @@ void finish(OutputStream os) throws IOException { * Points to the end of the region. */ private static final class TailMark extends Mark { - public TailMark(ByteBuf buf) { + TailMark(ByteBuf buf) { super(buf); } @@ -386,7 +386,7 @@ private static final class ByteBuf { private int size = 0; private ByteBuf next; - public ByteBuf(ByteBuf previous, Session f) throws IOException { + ByteBuf(ByteBuf previous, Session f) throws IOException { if (previous != null) { assert previous.next == null; previous.next = this; @@ -424,7 +424,7 @@ private interface Session extends Closeable { private static final class FileSession implements Session { private final RandomAccessFile file; - public FileSession(File file) throws IOException { + FileSession(File file) throws IOException { this.file = new RandomAccessFile(file, "r"); } @@ -459,7 +459,7 @@ public int read(byte[] buf, int offset, int length) throws IOException { private static final class GzipAwareSession implements Session { private final GZIPInputStream gz; - public GzipAwareSession(File file) throws IOException { + GzipAwareSession(File file) throws IOException { this.gz = new GZIPInputStream(Files.newInputStream(file.toPath(), StandardOpenOption.READ)); } @@ -553,7 +553,7 @@ public static long getGzipStreamSize(File file) { private static final class BufferSession implements Session { private final InputStream in; - public BufferSession(ByteBuffer buf) { + BufferSession(ByteBuffer buf) { this.in = buf.newInputStream(); } diff --git a/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java b/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java index 1ca922927a..c588a8cac3 100644 --- a/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java +++ b/core/src/main/java/org/kohsuke/stapler/interceptor/JsonOutputFilter.java @@ -97,11 +97,11 @@ class FilterPropertyFilter implements PropertyFilter { private Set includes; private Set excludes; - public FilterPropertyFilter(String[] includes, String[] excludes) { + FilterPropertyFilter(String[] includes, String[] excludes) { this(new HashSet<>(Arrays.asList(includes)), new HashSet<>(Arrays.asList(excludes))); } - public FilterPropertyFilter(Set includes, Set excludes) { + FilterPropertyFilter(Set includes, Set excludes) { this.includes = includes; this.excludes = excludes; } diff --git a/core/src/main/java/org/kohsuke/stapler/jsr269/AbstractProcessorImpl.java b/core/src/main/java/org/kohsuke/stapler/jsr269/AbstractProcessorImpl.java index 88ad5b05dd..d4466a4812 100644 --- a/core/src/main/java/org/kohsuke/stapler/jsr269/AbstractProcessorImpl.java +++ b/core/src/main/java/org/kohsuke/stapler/jsr269/AbstractProcessorImpl.java @@ -92,7 +92,7 @@ protected FileObject createResource(String name) throws IOException { private static class CommentStrippingBufferedWriter extends BufferedWriter { private final AtomicInteger count = new AtomicInteger(0); - public CommentStrippingBufferedWriter(Writer out) { + CommentStrippingBufferedWriter(Writer out) { super(out); } diff --git a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovierJellyScript.java b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovierJellyScript.java index 093751a6ef..96b2989a09 100644 --- a/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovierJellyScript.java +++ b/groovy/src/main/java/org/kohsuke/stapler/jelly/groovy/GroovierJellyScript.java @@ -96,7 +96,7 @@ public void run(JellyBuilder builder) { private static final class AliasMetaMethod extends CachedMethod { private final String alias; - public AliasMetaMethod(CachedClass clazz, Method method, String alias) { + AliasMetaMethod(CachedClass clazz, Method method, String alias) { super(clazz, method); this.alias = Objects.requireNonNull(alias); } diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/AttributeNameRewritingTagScript.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/AttributeNameRewritingTagScript.java index a73f5a88d1..3b8cdfd780 100644 --- a/jelly/src/main/java/org/kohsuke/stapler/jelly/AttributeNameRewritingTagScript.java +++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/AttributeNameRewritingTagScript.java @@ -34,7 +34,7 @@ private final String original; private final String replacement; - public AttributeNameRewritingTagScript(String original, String replacement) { + AttributeNameRewritingTagScript(String original, String replacement) { this.original = original; this.replacement = replacement; } diff --git a/jelly/src/main/java/org/kohsuke/stapler/jelly/CustomJellyContext.java b/jelly/src/main/java/org/kohsuke/stapler/jelly/CustomJellyContext.java index b6360960ff..2baf6c1493 100644 --- a/jelly/src/main/java/org/kohsuke/stapler/jelly/CustomJellyContext.java +++ b/jelly/src/main/java/org/kohsuke/stapler/jelly/CustomJellyContext.java @@ -201,7 +201,7 @@ private static class I18nExpWithArgsExpression extends ExpressionSupport { private final String text; private final Map resourceLiterals; - public I18nExpWithArgsExpression( + I18nExpWithArgsExpression( String text, Map resourceLiterals, String exp) throws JellyException { this.text = text; diff --git a/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java b/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java index e192287829..17dd4c1195 100644 --- a/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java +++ b/jsp/src/main/java/org/kohsuke/stapler/jsp/RequestDispatcherWrapper.java @@ -39,7 +39,7 @@ final class RequestDispatcherWrapper implements RequestDispatcher { private final RequestDispatcher core; private final Object it; - public RequestDispatcherWrapper(RequestDispatcher core, Object it) { + RequestDispatcherWrapper(RequestDispatcher core, Object it) { this.core = core; this.it = it; } diff --git a/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java b/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java index b1733db823..5dc5f36e60 100644 --- a/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java +++ b/jsp/src/main/java/org/kohsuke/stapler/tags/Include.java @@ -139,7 +139,7 @@ public void doTag() throws JspException, IOException { class Wrapper extends HttpServletResponseWrapper { private final PrintWriter pw; - public Wrapper(HttpServletResponse httpServletResponse, PrintWriter w) { + Wrapper(HttpServletResponse httpServletResponse, PrintWriter w) { super(httpServletResponse); this.pw = w; }