diff --git a/Spring Data Commons.sonargraph b/Spring Data Commons.sonargraph
index 53dd51c93..f15e968ea 100644
--- a/Spring Data Commons.sonargraph
+++ b/Spring Data Commons.sonargraph
@@ -57,6 +57,7 @@
+
@@ -84,6 +85,7 @@
+
@@ -142,80 +144,92 @@
+
-
+
-
+
-
+
-
-
+
-
+
-
+
+
+
-
+
-
+
-
+
-
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
-
+
-
+
-
+
-
+
+
-
-
-
-
-
+
-
+
-
+
-
+
-
-
-
-
+
-
+
+
+
+
+
+
+
@@ -348,6 +362,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/org/springframework/data/domain/DomainEvents.java b/src/main/java/org/springframework/data/domain/DomainEvents.java
index a184d9cf7..053917fef 100644
--- a/src/main/java/org/springframework/data/domain/DomainEvents.java
+++ b/src/main/java/org/springframework/data/domain/DomainEvents.java
@@ -20,14 +20,12 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import org.springframework.context.ApplicationEventPublisher;
-
/**
* {@link DomainEvents} can be used on methods of aggregate roots managed by Spring Data repositories to publish the
* events returned by that method as Spring application events.
*
* @author Oliver Gierke
- * @see ApplicationEventPublisher
+ * @see org.springframework.context.ApplicationEventPublisher
* @see AfterDomainEventPublication
* @since 1.13
* @soundtrack Benny Greb - Soulfood (Moving Parts Live)
diff --git a/src/main/java/org/springframework/data/domain/Page.java b/src/main/java/org/springframework/data/domain/Page.java
index 9e5b9aabf..589a0ca15 100644
--- a/src/main/java/org/springframework/data/domain/Page.java
+++ b/src/main/java/org/springframework/data/domain/Page.java
@@ -17,8 +17,6 @@ package org.springframework.data.domain;
import java.util.function.Function;
-import org.springframework.core.convert.converter.Converter;
-
/**
* A page is a sublist of a list of objects. It allows gain information about the position of it in the containing
* entire list.
@@ -43,10 +41,10 @@ public interface Page extends Slice {
long getTotalElements();
/**
- * Returns a new {@link Page} with the content of the current one mapped by the given {@link Converter}.
+ * Returns a new {@link Page} with the content of the current one mapped by the given {@link Function}.
*
* @param converter must not be {@literal null}.
- * @return a new {@link Page} with the content of the current one mapped by the given {@link Converter}.
+ * @return a new {@link Page} with the content of the current one mapped by the given {@link Function}.
* @since 1.10
*/
Page map(Function converter);
diff --git a/src/main/java/org/springframework/data/support/ExampleMatcherAccessor.java b/src/main/java/org/springframework/data/support/ExampleMatcherAccessor.java
index 80f699082..369dccb2d 100644
--- a/src/main/java/org/springframework/data/support/ExampleMatcherAccessor.java
+++ b/src/main/java/org/springframework/data/support/ExampleMatcherAccessor.java
@@ -15,12 +15,13 @@
*/
package org.springframework.data.support;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
import java.util.Collection;
import org.springframework.data.domain.ExampleMatcher;
import org.springframework.data.domain.ExampleMatcher.PropertySpecifier;
-import org.springframework.data.util.StringMatcher;
-import org.springframework.util.Assert;
/**
* Accessor for the {@link ExampleMatcher} to use in modules that support query by example (QBE) querying.
@@ -31,21 +32,10 @@ import org.springframework.util.Assert;
* @author Jens Schauder
* @since 1.12
*/
+@RequiredArgsConstructor
public class ExampleMatcherAccessor {
- private final ExampleMatcher matcher;
-
- /**
- * Creates a new {@link ExampleMatcherAccessor} for the given {@link ExampleMatcher}.
- *
- * @param matcher must not be {@literal null}.
- */
- public ExampleMatcherAccessor(ExampleMatcher matcher) {
-
- Assert.notNull(matcher, "ExampleMatcher must not be null!");
-
- this.matcher = matcher;
- }
+ private final @NonNull ExampleMatcher matcher;
/**
* Returns the {@link PropertySpecifier}s of the underlying {@link ExampleMatcher}.
diff --git a/src/main/java/org/springframework/data/util/ClassTypeInformation.java b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
index c26b07d6b..6924f55cf 100644
--- a/src/main/java/org/springframework/data/util/ClassTypeInformation.java
+++ b/src/main/java/org/springframework/data/util/ClassTypeInformation.java
@@ -117,7 +117,6 @@ public class ClassTypeInformation extends TypeDiscoverer {
return getTypeVariableMap(type, new HashSet<>());
}
- @SuppressWarnings("deprecation")
private static Map, Type> getTypeVariableMap(Class type, Collection visited) {
if (visited.contains(type)) {
diff --git a/src/main/java/org/springframework/data/util/ReflectionUtils.java b/src/main/java/org/springframework/data/util/ReflectionUtils.java
index 639d6f2ed..b3e0ad1d2 100644
--- a/src/main/java/org/springframework/data/util/ReflectionUtils.java
+++ b/src/main/java/org/springframework/data/util/ReflectionUtils.java
@@ -60,7 +60,7 @@ public class ReflectionUtils {
public static T createInstanceIfPresent(String classname, T defaultInstance) {
try {
- Class type = ClassUtils.getDefaultClassLoader().loadClass(classname);
+ Class type = ClassUtils.forName(classname, ClassUtils.getDefaultClassLoader());
return (T) BeanUtils.instantiateClass(type);
} catch (Exception e) {
return defaultInstance;
diff --git a/src/main/java/org/springframework/data/util/TypeDiscoverer.java b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
index d936ade19..7423f3fae 100644
--- a/src/main/java/org/springframework/data/util/TypeDiscoverer.java
+++ b/src/main/java/org/springframework/data/util/TypeDiscoverer.java
@@ -115,7 +115,7 @@ class TypeDiscoverer implements TypeInformation {
* @param fieldType must not be {@literal null}.
* @return
*/
- @SuppressWarnings({ "rawtypes", "unchecked", "deprecation" })
+ @SuppressWarnings({ "rawtypes", "unchecked" })
protected TypeInformation createInfo(Type fieldType) {
Assert.notNull(fieldType, "Field type must not be null!");
@@ -180,7 +180,7 @@ class TypeDiscoverer implements TypeInformation {
* @param type
* @return
*/
- @SuppressWarnings({ "unchecked", "rawtypes", "deprecation" })
+ @SuppressWarnings({ "unchecked", "rawtypes" })
protected Class resolveType(Type type) {
Map map = new HashMap<>();