diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorBeanRegistrationAotProcessor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorBeanRegistrationAotProcessor.java index 5a384e85515d..8e8058ea0ad3 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorBeanRegistrationAotProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJAdvisorBeanRegistrationAotProcessor.java @@ -33,12 +33,13 @@ */ class AspectJAdvisorBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor { - private static final boolean aspectJPresent = ClassUtils.isPresent("org.aspectj.lang.annotation.Pointcut", + private static final boolean aspectjPresent = ClassUtils.isPresent("org.aspectj.lang.annotation.Pointcut", AspectJAdvisorBeanRegistrationAotProcessor.class.getClassLoader()); + @Override public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) { - if (aspectJPresent) { + if (aspectjPresent) { Class beanClass = registeredBean.getBeanClass(); if (AbstractAspectJAdvisorFactory.compiledByAjc(beanClass)) { return new AspectJAdvisorContribution(beanClass); @@ -47,6 +48,7 @@ public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registe return null; } + private static class AspectJAdvisorContribution implements BeanRegistrationAotContribution { private final Class beanClass; diff --git a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java index a851fb27b64a..71e7bea2b4ac 100644 --- a/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java +++ b/spring-aop/src/main/java/org/springframework/aop/aspectj/annotation/AspectJBeanFactoryInitializationAotProcessor.java @@ -40,11 +40,12 @@ */ class AspectJBeanFactoryInitializationAotProcessor implements BeanFactoryInitializationAotProcessor { - private static final boolean aspectJPresent = ClassUtils.isPresent( - "org.aspectj.lang.annotation.Pointcut", AspectJBeanFactoryInitializationAotProcessor.class.getClassLoader()); + private static final boolean aspectJPresent = ClassUtils.isPresent("org.aspectj.lang.annotation.Pointcut", + AspectJBeanFactoryInitializationAotProcessor.class.getClassLoader()); + - @Nullable @Override + @Nullable public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableListableBeanFactory beanFactory) { if (aspectJPresent) { return AspectDelegate.processAheadOfTime(beanFactory); @@ -52,6 +53,7 @@ public BeanFactoryInitializationAotContribution processAheadOfTime(ConfigurableL return null; } + /** * Inner class to avoid a hard dependency on AspectJ at runtime. */ @@ -63,7 +65,6 @@ private static AspectContribution processAheadOfTime(ConfigurableListableBeanFac List advisors = builder.buildAspectJAdvisors(); return (advisors.isEmpty() ? null : new AspectContribution(advisors)); } - } @@ -84,7 +85,6 @@ public void applyTo(GenerationContext generationContext, BeanFactoryInitializati } } } - } } diff --git a/spring-core/src/main/java/org/springframework/core/codec/CharBufferDecoder.java b/spring-core/src/main/java/org/springframework/core/codec/CharBufferDecoder.java index 7c87b5039dca..6745a2e00c61 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/CharBufferDecoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/CharBufferDecoder.java @@ -42,14 +42,14 @@ */ public final class CharBufferDecoder extends AbstractCharSequenceDecoder { - public CharBufferDecoder(List delimiters, boolean stripDelimiter, MimeType... mimeTypes) { super(delimiters, stripDelimiter, mimeTypes); } + @Override public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) { - return elementType.resolve() == CharBuffer.class && super.canDecode(elementType, mimeType); + return (elementType.resolve() == CharBuffer.class) && super.canDecode(elementType, mimeType); } @Override @@ -69,9 +69,8 @@ public static CharBufferDecoder textPlainOnly() { /** * Create a {@code CharBufferDecoder} for {@code "text/plain"}. - * @param delimiters delimiter strings to use to split the input stream - * @param stripDelimiter whether to remove delimiters from the resulting - * input strings + * @param delimiters delimiter strings to use to split the input stream + * @param stripDelimiter whether to remove delimiters from the resulting input strings */ public static CharBufferDecoder textPlainOnly(List delimiters, boolean stripDelimiter) { var textPlain = new MimeType("text", "plain", DEFAULT_CHARSET); @@ -87,9 +86,8 @@ public static CharBufferDecoder allMimeTypes() { /** * Create a {@code CharBufferDecoder} that supports all MIME types. - * @param delimiters delimiter strings to use to split the input stream - * @param stripDelimiter whether to remove delimiters from the resulting - * input strings + * @param delimiters delimiter strings to use to split the input stream + * @param stripDelimiter whether to remove delimiters from the resulting input strings */ public static CharBufferDecoder allMimeTypes(List delimiters, boolean stripDelimiter) { var textPlain = new MimeType("text", "plain", DEFAULT_CHARSET); diff --git a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java index 267a68421f5d..4103a1cec2c3 100644 --- a/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java +++ b/spring-core/src/main/java/org/springframework/core/codec/CharSequenceEncoder.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2019 the original author or authors. + * Copyright 2002-2023 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -51,8 +51,7 @@ public final class CharSequenceEncoder extends AbstractEncoder { */ public static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8; - private final ConcurrentMap charsetToMaxBytesPerChar = - new ConcurrentHashMap<>(3); + private final ConcurrentMap charsetToMaxBytesPerChar = new ConcurrentHashMap<>(3); private CharSequenceEncoder(MimeType... mimeTypes) { @@ -105,8 +104,8 @@ public DataBuffer encodeValue(CharSequence charSequence, DataBufferFactory buffe } int calculateCapacity(CharSequence sequence, Charset charset) { - float maxBytesPerChar = this.charsetToMaxBytesPerChar - .computeIfAbsent(charset, cs -> cs.newEncoder().maxBytesPerChar()); + float maxBytesPerChar = this.charsetToMaxBytesPerChar.computeIfAbsent(charset, + cs -> cs.newEncoder().maxBytesPerChar()); float maxBytesForSequence = sequence.length() * maxBytesPerChar; return (int) Math.ceil(maxBytesForSequence); } diff --git a/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java index 52daecb88e97..17e5d2cc293d 100644 --- a/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java +++ b/spring-core/src/main/java/org/springframework/core/io/buffer/OutputStreamPublisher.java @@ -68,8 +68,8 @@ final class OutputStreamPublisher implements Publisher { public void subscribe(Subscriber subscriber) { Objects.requireNonNull(subscriber, "Subscriber must not be null"); - OutputStreamSubscription subscription = new OutputStreamSubscription(subscriber, this.outputStreamConsumer, - this.bufferFactory, this.chunkSize); + OutputStreamSubscription subscription = new OutputStreamSubscription( + subscriber, this.outputStreamConsumer, this.bufferFactory, this.chunkSize); subscriber.onSubscribe(subscription); this.executor.execute(subscription::invokeHandler); @@ -80,7 +80,6 @@ private static final class OutputStreamSubscription extends OutputStream impleme private static final Object READY = new Object(); - private final Subscriber actual; private final Consumer outputStreamHandler; @@ -98,7 +97,6 @@ private static final class OutputStreamSubscription extends OutputStream impleme private long produced; - OutputStreamSubscription(Subscriber actual, Consumer outputStreamConsumer, DataBufferFactory bufferFactory, int chunkSize) { @@ -351,4 +349,5 @@ private static long addCap(long a, long b) { return res; } } + } diff --git a/spring-core/src/main/java/org/springframework/core/task/support/ContextPropagatingTaskDecorator.java b/spring-core/src/main/java/org/springframework/core/task/support/ContextPropagatingTaskDecorator.java index 4e2d337ee37d..67a5799ab877 100644 --- a/spring-core/src/main/java/org/springframework/core/task/support/ContextPropagatingTaskDecorator.java +++ b/spring-core/src/main/java/org/springframework/core/task/support/ContextPropagatingTaskDecorator.java @@ -22,8 +22,9 @@ import org.springframework.core.task.TaskDecorator; /** - * {@link TaskDecorator} that {@link ContextSnapshot#wrap(Runnable) wraps the execution} of - * tasks, assisting with context propagation. + * {@link TaskDecorator} that {@link ContextSnapshot#wrap(Runnable) wraps the execution} + * of tasks, assisting with context propagation. + * *

This operation is only useful when the task execution is scheduled on a different * thread than the original call stack; this depends on the choice of * {@link org.springframework.core.task.TaskExecutor}. This is particularly useful for @@ -39,6 +40,7 @@ public class ContextPropagatingTaskDecorator implements TaskDecorator { private final ContextSnapshotFactory factory; + /** * Create a new decorator that uses a default instance of the {@link ContextSnapshotFactory}. */ @@ -54,6 +56,7 @@ public ContextPropagatingTaskDecorator(ContextSnapshotFactory factory) { this.factory = factory; } + @Override public Runnable decorate(Runnable runnable) { return this.factory.captureAll().wrap(runnable); diff --git a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java index b56856020f05..b31c9d4a8825 100644 --- a/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java +++ b/spring-web/src/main/java/org/springframework/http/StreamingHttpOutputMessage.java @@ -54,7 +54,7 @@ interface Body { /** * Indicates whether this body is capable of * {@linkplain #writeTo(OutputStream) writing its data} more than - * once. Default implementation returns {@code false}. + * once. The default implementation returns {@code false}. * @return {@code true} if this body can be written repeatedly, * {@code false} otherwise * @since 6.1