Polishing.

Add missing Override annotations. Use instanceof pattern variables, use diamond operator where possible.

Closes #3162

Author: ngocnhan-tran1996

src/main/java/org/springframework/data/aot/DefaultAotContext.java

@@ -39,7 +39,7 @@ class DefaultAotContext implements AotContext {
 	private final ConfigurableListableBeanFactory factory;
 
 	public DefaultAotContext(BeanFactory beanFactory) {
-		factory = beanFactory instanceof ConfigurableListableBeanFactory ? (ConfigurableListableBeanFactory) beanFactory
+		factory = beanFactory instanceof ConfigurableListableBeanFactory cbf ? cbf
 				: new DefaultListableBeanFactory(beanFactory);
 	}
 

src/main/java/org/springframework/data/convert/ConfigurableTypeInformationMapper.java

@@ -66,6 +66,7 @@ public ConfigurableTypeInformationMapper(Map<? extends Class<?>, String> sourceT
 		}
 	}
 
+	@Override
 	public Alias createAliasFor(TypeInformation<?> type) {
 		return typeToAlias.getOrDefault(type, Alias.NONE);
 	}

src/main/java/org/springframework/data/convert/MappingContextTypeInformationMapper.java

@@ -58,6 +58,7 @@ public MappingContextTypeInformationMapper(MappingContext<? extends PersistentEn
 		}
 	}
 
+	@Override
 	public Alias createAliasFor(TypeInformation<?> type) {
 
 		return typeMap.computeIfAbsent(type.getRawTypeInformation(), key -> {

src/main/java/org/springframework/data/convert/SimplePropertyValueConverterRegistry.java

@@ -79,6 +79,7 @@ public int size() {
 		return converterRegistrationMap.size();
 	}
 
+	@Override
 	public boolean isEmpty() {
 		return converterRegistrationMap.isEmpty();
 	}

src/main/java/org/springframework/data/crossstore/HashMapChangeSet.java

@@ -41,6 +41,7 @@ public HashMapChangeSet() {
 		this(new HashMap<>());
 	}
 
+	@Override
 	public void set(String key, Object o) {
 		values.put(key, o);
 	}
@@ -49,15 +50,18 @@ public String toString() {
 		return "HashMapChangeSet: values=[" + values + "]";
 	}
 
+	@Override
 	public Map<String, Object> getValues() {
 		return Collections.unmodifiableMap(values);
 	}
 
+	@Override
 	@Nullable
 	public Object removeProperty(String k) {
 		return this.values.remove(k);
 	}
 
+	@Override
 	@Nullable
 	public <T> T get(String key, Class<T> requiredClass, ConversionService conversionService) {
 

src/main/java/org/springframework/data/domain/Chunk.java

@@ -54,42 +54,52 @@ public Chunk(List<T> content, Pageable pageable) {
 		this.pageable = pageable;
 	}
 
+	@Override
 	public int getNumber() {
 		return pageable.isPaged() ? pageable.getPageNumber() : 0;
 	}
 
+	@Override
 	public int getSize() {
 		return pageable.isPaged() ? pageable.getPageSize() : content.size();
 	}
 
+	@Override
 	public int getNumberOfElements() {
 		return content.size();
 	}
 
+	@Override
 	public boolean hasPrevious() {
 		return getNumber() > 0;
 	}
 
+	@Override
 	public boolean isFirst() {
 		return !hasPrevious();
 	}
 
+	@Override
 	public boolean isLast() {
 		return !hasNext();
 	}
 
+	@Override
 	public Pageable nextPageable() {
 		return hasNext() ? pageable.next() : Pageable.unpaged();
 	}
 
+	@Override
 	public Pageable previousPageable() {
 		return hasPrevious() ? pageable.previousOrFirst() : Pageable.unpaged();
 	}
 
+	@Override
 	public boolean hasContent() {
 		return !content.isEmpty();
 	}
 
+	@Override
 	public List<T> getContent() {
 		return Collections.unmodifiableList(content);
 	}

src/main/java/org/springframework/data/domain/Page.java

@@ -69,5 +69,6 @@ static <T> Page<T> empty(Pageable pageable) {
 	 * @return a new {@link Page} with the content of the current one mapped by the given {@link Function}.
 	 * @since 1.10
 	 */
+	@Override
 	<U> Page<U> map(Function<? super T, ? extends U> converter);
 }

src/main/java/org/springframework/data/domain/PageRequest.java

@@ -97,6 +97,7 @@ public static PageRequest ofSize(int pageSize) {
 		return PageRequest.of(0, pageSize);
 	}
 
+	@Override
 	public Sort getSort() {
 		return sort;
 	}

src/main/java/org/springframework/data/domain/Slice.java

@@ -136,6 +136,7 @@ default Pageable getPageable() {
 	 * @return a new {@link Slice} with the content of the current one mapped by the given {@link Converter}.
 	 * @since 1.10
 	 */
+	@Override
 	<U> Slice<U> map(Function<? super T, ? extends U> converter);
 
 	/**

src/main/java/org/springframework/data/domain/SliceImpl.java

@@ -15,6 +15,7 @@
  */
 package org.springframework.data.domain;
 
+import java.io.Serial;
 import java.util.List;
 import java.util.function.Function;
 
@@ -29,6 +30,7 @@
  */
 public class SliceImpl<T> extends Chunk<T> {
 
+	@Serial
 	private static final long serialVersionUID = 867755909294344406L;
 
 	private final boolean hasNext;
@@ -59,6 +61,7 @@ public SliceImpl(List<T> content) {
 		this(content, Pageable.unpaged(), false);
 	}
 
+	@Override
 	public boolean hasNext() {
 		return hasNext;
 	}
@@ -74,7 +77,7 @@ public String toString() {
 		String contentType = "UNKNOWN";
 		List<T> content = getContent();
 
-		if (content.size() > 0) {
+		if (!content.isEmpty()) {
 			contentType = content.get(0).getClass().getName();
 		}
 

src/main/java/org/springframework/data/domain/Sort.java

@@ -204,7 +204,7 @@ public Sort and(Sort sort) {
 
 		Assert.notNull(sort, "Sort must not be null");
 
-		List<Order> these = new ArrayList<Order>(this.toList());
+		List<Order> these = new ArrayList<>(this.toList());
 
 		for (Order order : sort) {
 			these.add(order);

src/main/java/org/springframework/data/domain/TypedExample.java

@@ -38,10 +38,12 @@ class TypedExample<T> implements Example<T> {
 		this.matcher = matcher;
 	}
 
+	@Override
 	public T getProbe() {
 		return this.probe;
 	}
 
+	@Override
 	public ExampleMatcher getMatcher() {
 		return this.matcher;
 	}

src/main/java/org/springframework/data/domain/Window.java

@@ -72,6 +72,7 @@ static <T> Window<T> from(List<T> items, IntFunction<? extends ScrollPosition> p
 	 *
 	 * @return {@code true} if this window contains no elements
 	 */
+	@Override
 	boolean isEmpty();
 
 	/**
@@ -149,6 +150,7 @@ default ScrollPosition positionAt(T object) {
 	 * @param converter must not be {@literal null}.
 	 * @return a new {@link Window} with the content of the current one mapped by the given {@code converter}.
 	 */
+	@Override
 	<U> Window<U> map(Function<? super T, ? extends U> converter);
 
 }

src/main/java/org/springframework/data/geo/CustomMetric.java

@@ -55,6 +55,7 @@ public CustomMetric(double multiplier, String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
 
+	@Override
 	public double getMultiplier() {
 		return multiplier;
 	}

src/main/java/org/springframework/data/geo/Metrics.java

@@ -41,6 +41,7 @@ private Metrics(double multiplier, String abbreviation) {
 		this.abbreviation = abbreviation;
 	}
 
+	@Override
 	public double getMultiplier() {
 		return multiplier;
 	}

src/main/java/org/springframework/data/history/AnnotationRevisionMetadata.java

@@ -84,18 +84,22 @@ public AnnotationRevisionMetadata(Object entity, Class<? extends Annotation> rev
 		this.revisionType = revisionType;
 	}
 
+	@Override
 	public Optional<N> getRevisionNumber() {
 		return revisionNumber.get();
 	}
 
+	@Override
 	public Optional<Instant> getRevisionInstant() {
 		return revisionDate.get().map(AnnotationRevisionMetadata::convertToInstant);
 	}
 
+	@Override
 	public RevisionType getRevisionType() {
 		return revisionType;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T getDelegate() {
 		return (T) entity;

src/main/java/org/springframework/data/mapping/AccessOptions.java

@@ -186,7 +186,7 @@ public <T> GetOptions registerHandler(PersistentProperty<?> property, Class<T> t
 			Assert.isTrue(type.isAssignableFrom(property.getType()), () -> String
 					.format("Cannot register a property handler for %s on a property of type %s", type, property.getType()));
 
-			Function<Object, T> caster = (Function<Object, T>) it -> type.cast(it);
+			Function<Object, T> caster = type::cast;
 
 			return registerHandler(property, caster.andThen(handler));
 		}

src/main/java/org/springframework/data/mapping/InstanceCreatorMetadataSupport.java

@@ -67,6 +67,7 @@ Executable getExecutable() {
 	 *
 	 * @return
 	 */
+	@Override
 	public List<Parameter<Object, P>> getParameters() {
 		return parameters;
 	}

src/main/java/org/springframework/data/mapping/PropertyPath.java

@@ -246,7 +246,7 @@ public PropertyPath nested(String path) {
 	@Override
 	public Iterator<PropertyPath> iterator() {
 
-		return new Iterator<PropertyPath>() {
+		return new Iterator<>() {
 
 			private @Nullable PropertyPath current = PropertyPath.this;
 
@@ -365,7 +365,7 @@ public static PropertyPath from(String source, TypeInformation<?> type) {
 			Iterator<String> parts = iteratorSource.iterator();
 
 			PropertyPath result = null;
-			Stack<PropertyPath> current = new Stack<PropertyPath>();
+			Stack<PropertyPath> current = new Stack<>();
 
 			while (parts.hasNext()) {
 				if (result == null) {

src/main/java/org/springframework/data/mapping/callback/EntityCallbackDiscoverer.java

@@ -311,7 +311,7 @@ void discoverEntityCallbacks(BeanFactory beanFactory) {
 
 			for (var beanName : bf.getBeanNamesForType(EntityCallback.class)) {
 
-				EntityCallback<?> bean = EntityCallback.class.cast(bf.getBean(beanName));
+				EntityCallback<?> bean = (EntityCallback) bf.getBean(beanName);
 
 				ResolvableType type = ResolvableType.forClass(EntityCallback.class, bean.getClass());
 				ResolvableType entityType = type.getGeneric(0);

src/main/java/org/springframework/data/mapping/context/DefaultPersistentPropertyPath.java

@@ -135,15 +135,15 @@ public String toPath(String delimiter, Converter<? super P, String> converter) {
 	@Override
 	public P getLeafProperty() {
 
-		Assert.state(properties.size() > 0, "Empty PersistentPropertyPath should not exist");
+		Assert.state(!properties.isEmpty(), "Empty PersistentPropertyPath should not exist");
 
 		return properties.get(properties.size() - 1);
 	}
 
 	@Override
 	public P getBaseProperty() {
 
-		Assert.state(properties.size() > 0, "Empty PersistentPropertyPath should not exist");
+		Assert.state(!properties.isEmpty(), "Empty PersistentPropertyPath should not exist");
 
 		return properties.get(0);
 	}
@@ -208,10 +208,17 @@ public Iterator<P> iterator() {
 	 */
 	public boolean containsPropertyOfType(@Nullable TypeInformation<?> type) {
 
-		return type == null //
-				? false //
-				: properties.stream() //
-						.anyMatch(property -> type.equals(property.getTypeInformation().getActualType()));
+		if (type == null) {
+			return false;
+		}
+
+		for (P property : properties) {
+			if (type.equals(property.getTypeInformation().getActualType())) {
+				return true;
+			}
+		}
+
+		return false;
 	}
 
 	@Override

src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java

@@ -406,7 +406,7 @@ public Iterator<P> iterator() {
 
 		Iterator<P> iterator = properties.iterator();
 
-		return new Iterator<P>() {
+		return new Iterator<>() {
 
 			@Override
 			public boolean hasNext() {

src/main/java/org/springframework/data/mapping/model/BeanWrapper.java

@@ -57,6 +57,7 @@ protected BeanWrapper(T bean) {
 		this.bean = bean;
 	}
 
+	@Override
 	@SuppressWarnings("unchecked")
 	public void setProperty(PersistentProperty<?> property, @Nullable Object value) {
 
@@ -104,6 +105,7 @@ public void setProperty(PersistentProperty<?> property, @Nullable Object value)
 		}
 	}
 
+	@Override
 	@Nullable
 	public Object getProperty(PersistentProperty<?> property) {
 		return getProperty(property, property.getType());
@@ -144,6 +146,7 @@ public <S> Object getProperty(PersistentProperty<?> property, Class<? extends S>
 		}
 	}
 
+	@Override
 	public T getBean() {
 		return bean;
 	}

src/main/java/org/springframework/data/mapping/model/DefaultSpELExpressionEvaluator.java

@@ -43,6 +43,7 @@ public DefaultSpELExpressionEvaluator(Object source, SpELContext factory) {
 		this.factory = factory;
 	}
 
+	@Override
 	@Nullable
 	@SuppressWarnings("unchecked")
 	public <T> T evaluate(String expression) {

src/main/java/org/springframework/data/mapping/model/IdPropertyIdentifierAccessor.java

@@ -54,6 +54,7 @@ public IdPropertyIdentifierAccessor(PersistentEntity<?, ?> entity, Object target
 		this.accessor = entity.getPropertyAccessor(target);
 	}
 
+	@Override
 	@Nullable
 	public Object getIdentifier() {
 		return accessor.getProperty(idProperty);

src/main/java/org/springframework/data/mapping/model/KotlinValueUtils.java

@@ -435,7 +435,7 @@ public String toString() {
 			ValueBoxing hierarchy = this;
 			while (hierarchy != null) {
 
-				if (sb.length() != 0) {
+				if (!sb.isEmpty()) {
 					sb.append(" -> ");
 				}
 

src/main/java/org/springframework/data/mapping/model/PersistentEntityIsNewStrategy.java

@@ -100,8 +100,8 @@ public boolean isNew(Object entity) {
 			return false;
 		}
 
-		if (value instanceof Number) {
-			return ((Number) value).longValue() == 0;
+		if (value instanceof Number n) {
+			return n.longValue() == 0;
 		}
 
 		throw new IllegalArgumentException(