Polishing

Author: jhoeller

spring-core/src/main/java/org/springframework/aot/generate/GeneratedFiles.java

@@ -181,6 +181,7 @@ default void addFile(Kind kind, String path, InputStreamSource content) {
 	 */
 	void handleFile(Kind kind, String path, ThrowingConsumer<FileHandler> handler);
 
+
 	private static String getClassNamePath(String className) {
 		Assert.hasLength(className, "'className' must not be empty");
 		validatePackage(ClassUtils.getPackageName(className), className);
@@ -232,13 +233,12 @@ enum Kind {
 		 * generated using CGLIB.
 		 */
 		CLASS
-
 	}
 
+
 	/**
 	 * Provide access to a particular file and offer convenient methods to retrieve,
 	 * save, or override its content.
-	 *
 	 * @since 6.2
 	 */
 	abstract class FileHandler {
@@ -292,7 +292,6 @@ public void override(InputStreamSource content) {
 		}
 
 		protected abstract void copy(InputStreamSource content, boolean override);
-
 	}
 
 }

spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflection.java

@@ -48,15 +48,17 @@
  * packages can use this annotation as well.
  *
  * <p>To register reflection hints for the type itself, only member categories
- * should be specified:<pre><code class="java">
+ * should be specified:
+ * <pre><code class="java">
  * &#064;Component
  * &#064;RegisterReflection(memberCategories = INVOKE_PUBLIC_METHODS)
  * class MyComponent {
  *     // ...
  * }</code></pre>
  *
  * <p>Reflection hints can be registered from a method. In this case, at least
- * one target class should be specified:<pre><code class="java">
+ * one target class should be specified:
+ * <pre><code class="java">
  * class MyProcessor {
  *
  *     &#064;RegisterReflection(classes = CustomerEntry.class, memberCategories = PUBLIC_FIELDS)
@@ -81,11 +83,10 @@
 
 	/**
 	 * Classes for which reflection hints should be registered. Consider using
-	 * {@link #classNames()} for classes that are not public in the current
-	 * scope. If both {@code classes} and {@code classNames} are specified, they
-	 * are merged in a single set.
-	 * <p>
-	 * By default, the annotated type is the target of the registration. When
+	 * {@link #classNames()} for classes that are not public in the current scope.
+	 * If both {@code classes} and {@code classNames} are specified, they are
+	 * merged into a single set.
+	 * <p>By default, the annotated type is the target of the registration. When
 	 * placed on a method, at least one class must be specified.
 	 * @see #classNames()
 	 */

spring-core/src/main/java/org/springframework/aot/hint/annotation/RegisterReflectionReflectiveProcessor.java

@@ -45,12 +45,11 @@ public class RegisterReflectionReflectiveProcessor implements ReflectiveProcesso
 
 	private static final Log logger = LogFactory.getLog(RegisterReflectionReflectiveProcessor.class);
 
+
 	@Override
 	public final void registerReflectionHints(ReflectionHints hints, AnnotatedElement element) {
-		RegisterReflection annotation = AnnotatedElementUtils.getMergedAnnotation(
-				element, RegisterReflection.class);
-		Assert.notNull(annotation, "Element must be annotated with @" + RegisterReflection.class.getSimpleName()
-				+ ": " + element);
+		RegisterReflection annotation = AnnotatedElementUtils.getMergedAnnotation(element, RegisterReflection.class);
+		Assert.notNull(annotation, () -> "Element must be annotated with @RegisterReflection: " + element);
 		ReflectionRegistration registration = parse(element, annotation);
 		registerReflectionHints(hints, registration);
 	}
@@ -65,12 +64,10 @@ protected ReflectionRegistration parse(AnnotatedElement element, RegisterReflect
 				allClassNames.add(clazz);
 			}
 			else {
-				throw new IllegalStateException("At least one class must be specified, "
-						+ "could not detect target from '" + element + "'");
+				throw new IllegalStateException("At least one class must be specified: " + element);
 			}
 		}
-		return new ReflectionRegistration(allClassNames.toArray(new Class<?>[0]),
-				annotation.memberCategories());
+		return new ReflectionRegistration(allClassNames.toArray(new Class<?>[0]), annotation.memberCategories());
 	}
 
 	protected void registerReflectionHints(ReflectionHints hints, ReflectionRegistration registration) {
@@ -89,11 +86,15 @@ private Class<?> loadClass(String className) {
 			return ClassUtils.forName(className, getClass().getClassLoader());
 		}
 		catch (Exception ex) {
-			logger.warn("Ignoring '" + className + "': " + ex.getMessage());
+			if (logger.isWarnEnabled()) {
+				logger.warn("Ignoring '" + className + "': " + ex);
+			}
 			return null;
 		}
 	}
 
-	protected record ReflectionRegistration(Class<?>[] classes, MemberCategory[] memberCategories) {}
+
+	protected record ReflectionRegistration(Class<?>[] classes, MemberCategory[] memberCategories) {
+	}
 
 }

spring-core/src/main/java/org/springframework/core/env/ConfigurablePropertyResolver.java

@@ -26,6 +26,7 @@
  * used when converting property values from one type to another.
  *
  * @author Chris Beams
+ * @author Stephane Nicoll
  * @since 3.1
  */
 public interface ConfigurablePropertyResolver extends PropertyResolver {
@@ -75,9 +76,8 @@ public interface ConfigurablePropertyResolver extends PropertyResolver {
 	void setValueSeparator(@Nullable String valueSeparator);
 
 	/**
-	 * Specify the escape character to use to ignore placeholder prefix
-	 * or value separator, or {@code null} if no escaping should take
-	 * place.
+	 * Specify the escape character to use to ignore placeholder prefix or
+	 * value separator, or {@code null} if no escaping should take place.
 	 * @since 6.2
 	 */
 	void setEscapeCharacter(@Nullable Character escapeCharacter);

spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBuffer.java

@@ -67,21 +67,15 @@ public final class JettyDataBuffer implements PooledDataBuffer {
 		this.chunk = null;
 	}
 
+
 	@Override
 	public boolean isAllocated() {
 		return this.refCount.get() > 0;
 	}
 
 	@Override
 	public PooledDataBuffer retain() {
-		int result = this.refCount.updateAndGet(c -> {
-			if (c != 0) {
-				return c + 1;
-			}
-			else {
-				return 0;
-			}
-		});
+		int result = this.refCount.updateAndGet(c -> (c != 0 ? c + 1 : 0));
 		if (result != 0 && this.chunk != null) {
 			this.chunk.retain();
 		}
@@ -107,7 +101,7 @@ public boolean release() {
 			return this.chunk.release();
 		}
 		else {
-			return result == 0;
+			return (result == 0);
 		}
 	}
 
@@ -116,6 +110,7 @@ public DataBufferFactory factory() {
 		return this.bufferFactory;
 	}
 
+
 	// delegation
 
 	@Override
@@ -305,15 +300,16 @@ public String toString(int index, int length, Charset charset) {
 		return this.delegate.toString(index, length, charset);
 	}
 
+
 	@Override
-	public int hashCode() {
-		return this.delegate.hashCode();
+	public boolean equals(Object other) {
+		return (this == other || (other instanceof JettyDataBuffer otherBuffer &&
+				this.delegate.equals(otherBuffer.delegate)));
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		return this == o || (o instanceof JettyDataBuffer other &&
-				this.delegate.equals(other.delegate));
+	public int hashCode() {
+		return this.delegate.hashCode();
 	}
 
 	@Override
@@ -322,13 +318,13 @@ public String toString() {
 				readPosition(), writePosition(), capacity());
 	}
 
+
 	private static final class JettyByteBufferIterator implements ByteBufferIterator {
 
 		private final ByteBufferIterator delegate;
 
 		private final Content.Chunk chunk;
 
-
 		public JettyByteBufferIterator(ByteBufferIterator delegate, Content.Chunk chunk) {
 			Assert.notNull(delegate, "Delegate must not be null");
 			Assert.notNull(chunk, "Chunk must not be null");
@@ -338,7 +334,6 @@ public JettyByteBufferIterator(ByteBufferIterator delegate, Content.Chunk chunk)
 			this.chunk.retain();
 		}
 
-
 		@Override
 		public void close() {
 			this.delegate.close();

spring-core/src/main/java/org/springframework/core/io/buffer/JettyDataBufferFactory.java

@@ -105,4 +105,5 @@ public JettyDataBuffer join(List<? extends DataBuffer> dataBuffers) {
 	public boolean isDirect() {
 		return this.delegate.isDirect();
 	}
+
 }

spring-core/src/main/java/org/springframework/lang/CheckReturnValue.java

@@ -23,8 +23,8 @@
 /**
  * Specifies that the method return value must be used.
  *
- * <p>Inspired from {@code org.jetbrains.annotations.CheckReturnValue}, this variant
- * has been introduce in the {@code org.springframework.lang} package to avoid
+ * <p>Inspired by {@code org.jetbrains.annotations.CheckReturnValue}, this variant
+ * has been introduced in the {@code org.springframework.lang} package to avoid
  * requiring an extra dependency, while still following similar semantics.
  *
  * <p>This annotation should not be used if the return value of the method

spring-core/src/main/java/org/springframework/lang/Contract.java

@@ -28,9 +28,9 @@
  * just describes how the code works and doesn't add any functionality by means of
  * code generation.
  *
- * <p>Inspired from {@code org.jetbrains.annotations.Contract}, this variant has
- * been introduce in the {@code org.springframework.lang} package to avoid requiring
- * an extra dependency, while still following the same semantics.
+ * <p>Inspired by {@code org.jetbrains.annotations.Contract}, this variant has
+ * been introduced in the {@code org.springframework.lang} package to avoid
+ * requiring an extra dependency, while still following the same semantics.
  *
  * <p>Method contract has the following syntax:
  * <pre>{@code
@@ -85,4 +85,5 @@
 	 * Contains the contract clauses describing causal relations between call arguments and the returned value.
 	 */
 	String value() default "";
+
 }

spring-core/src/main/java/org/springframework/util/ClassUtils.java

@@ -1502,8 +1502,7 @@ private static Method findInterfaceMethodIfPossible(String methodName, Class<?>[
 	 * (if there is one). For {@code toString()}, it may traverse as far as {@link Object}.
 	 * @param method the method to be invoked, potentially from an implementation class
 	 * @param targetClass the target class to invoke the method on, or {@code null} if unknown
-	 * @return the corresponding publicly accessible method, or the original method if none
-	 * found
+	 * @return the corresponding publicly accessible method, or the original method if none found
 	 * @since 6.2
 	 * @see #getInterfaceMethodIfPossible(Method, Class)
 	 * @see #getMostSpecificMethod(Method, Class)

spring-core/src/main/java/org/springframework/util/CollectionUtils.java

@@ -515,7 +515,6 @@ public static <K, V> MultiValueMap<K, V> unmodifiableMultiValueMap(
 	 * Return a (partially unmodifiable) map that combines the provided two
 	 * maps. Invoking {@link Map#put(Object, Object)} or {@link Map#putAll(Map)}
 	 * on the returned map results in an {@link UnsupportedOperationException}.
-	 *
 	 * <p>In the case of a key collision, {@code first} takes precedence over
 	 * {@code second}. In other words, entries in {@code second} with a key
 	 * that is also mapped by {@code first} are effectively ignored.
@@ -535,7 +534,6 @@ public static <K, V> Map<K, V> compositeMap(Map<K,V> first, Map<K,V> second) {
 	 * {@link UnsupportedOperationException} {@code putFunction} is
 	 * {@code null}. The same applies to {@link Map#putAll(Map)} and
 	 * {@code putAllFunction}.
-	 *
 	 * <p>In the case of a key collision, {@code first} takes precedence over
 	 * {@code second}. In other words, entries in {@code second} with a key
 	 * that is also mapped by {@code first} are effectively ignored.

spring-core/src/main/java/org/springframework/util/CompositeCollection.java

@@ -43,6 +43,7 @@ class CompositeCollection<E> implements Collection<E> {
 		this.second = second;
 	}
 
+
 	@Override
 	public int size() {
 		return this.first.size() + this.second.size();
@@ -160,4 +161,5 @@ public void clear() {
 		this.first.clear();
 		this.second.clear();
 	}
+
 }

spring-core/src/main/java/org/springframework/util/CompositeMap.java

@@ -186,4 +186,5 @@ public String toString() {
 			sb.append(',').append(' ');
 		}
 	}
+
 }

spring-core/src/main/java/org/springframework/util/CompositeSet.java

@@ -18,6 +18,8 @@
 
 import java.util.Set;
 
+import org.springframework.lang.Nullable;
+
 /**
  * Composite set that combines two other sets. This type is only exposed through
  * {@link CompositeMap#keySet()} and {@link CompositeMap#entrySet()}.
@@ -34,24 +36,19 @@ final class CompositeSet<E> extends CompositeCollection<E> implements Set<E> {
 
 
 	@Override
-	public boolean equals(Object obj) {
-		if (obj == this) {
+	public boolean equals(@Nullable Object other) {
+		if (this == other) {
 			return true;
 		}
-		else if (obj instanceof Set<?> set) {
-			if (set.size() != size()) {
-				return false;
-			}
+		if (other instanceof Set<?> otherSet && size() == otherSet.size()) {
 			try {
-				return containsAll(set);
+				return containsAll(otherSet);
 			}
 			catch (ClassCastException | NullPointerException ignored) {
-				return false;
+				// fall through
 			}
 		}
-		else {
-			return false;
-		}
+		return false;
 	}
 
 	@Override
@@ -64,4 +61,5 @@ public int hashCode() {
 		}
 		return hashCode;
 	}
+
 }

spring-core/src/main/java/org/springframework/util/FilteredCollection.java

@@ -24,6 +24,7 @@
 /**
  * Collection that filters out values that do not match a predicate.
  * This type is used by {@link CompositeMap}.
+ *
  * @author Arjen Poutsma
  * @since 6.2
  * @param <E> the type of elements maintained by this collection
@@ -38,11 +39,11 @@ class FilteredCollection<E> extends AbstractCollection<E> {
 	public FilteredCollection(Collection<E> delegate, Predicate<E> filter) {
 		Assert.notNull(delegate, "Delegate must not be null");
 		Assert.notNull(filter, "Filter must not be null");
-
 		this.delegate = delegate;
 		this.filter = filter;
 	}
 
+
 	@Override
 	public int size() {
 		int size = 0;
@@ -87,4 +88,5 @@ public boolean contains(Object o) {
 	public void clear() {
 		this.delegate.clear();
 	}
+
 }

spring-core/src/main/java/org/springframework/util/FilteredIterator.java

@@ -25,6 +25,7 @@
 /**
  * Iterator that filters out values that do not match a predicate.
  * This type is used by {@link CompositeMap}.
+ *
  * @author Arjen Poutsma
  * @since 6.2
  * @param <E> the type of elements returned by this iterator
@@ -44,7 +45,6 @@ final class FilteredIterator<E> implements Iterator<E> {
 	public FilteredIterator(Iterator<E> delegate, Predicate<E> filter) {
 		Assert.notNull(delegate, "Delegate must not be null");
 		Assert.notNull(filter, "Filter must not be null");
-
 		this.delegate = delegate;
 		this.filter = filter;
 	}
@@ -83,4 +83,5 @@ private boolean setNext() {
 		}
 		return false;
 	}
+
 }