From 26579e141d938c9edd513d71bbf9b28bbf502df9 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 10 Oct 2025 09:24:37 +0200 Subject: [PATCH] Remove accidental `org.jetbrains:annotations` usage. See spring-projects/spring-data-build#2670 --- .../java/org/springframework/data/util/ReflectionUtils.java | 4 +--- .../data/expression/ValueEvaluationUnitTests.java | 4 ++-- .../core/support/RepositoryMethodInvokerUnitTests.java | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/data/util/ReflectionUtils.java b/src/main/java/org/springframework/data/util/ReflectionUtils.java index c0c2f908d..01bdb01d5 100644 --- a/src/main/java/org/springframework/data/util/ReflectionUtils.java +++ b/src/main/java/org/springframework/data/util/ReflectionUtils.java @@ -27,7 +27,6 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.jetbrains.annotations.NotNull; import org.jspecify.annotations.Nullable; import org.springframework.core.KotlinDetector; @@ -287,8 +286,7 @@ public final class ReflectionUtils { Assert.notNull(type, "Target type must not be null"); Assert.notNull(constructorArguments, "Constructor arguments must not be null"); - for (@NotNull - Constructor declaredConstructor : type.getDeclaredConstructors()) { + for (Constructor declaredConstructor : type.getDeclaredConstructors()) { if (argumentsMatch(declaredConstructor.getParameterTypes(), constructorArguments)) { return (Constructor) declaredConstructor; } diff --git a/src/test/java/org/springframework/data/expression/ValueEvaluationUnitTests.java b/src/test/java/org/springframework/data/expression/ValueEvaluationUnitTests.java index db3891822..096a388e8 100644 --- a/src/test/java/org/springframework/data/expression/ValueEvaluationUnitTests.java +++ b/src/test/java/org/springframework/data/expression/ValueEvaluationUnitTests.java @@ -19,7 +19,7 @@ import static org.assertj.core.api.Assertions.*; import java.util.Map; -import org.jetbrains.annotations.Nullable; +import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -49,7 +49,7 @@ public class ValueEvaluationUnitTests { StandardEnvironment environment = new StandardEnvironment(); environment.getPropertySources().addFirst(propertySource); - record MyRecord(String foo, @org.jspecify.annotations.Nullable String bar) { + record MyRecord(String foo, @Nullable String bar) { } diff --git a/src/test/java/org/springframework/data/repository/core/support/RepositoryMethodInvokerUnitTests.java b/src/test/java/org/springframework/data/repository/core/support/RepositoryMethodInvokerUnitTests.java index 265d50ffa..18d98f17a 100644 --- a/src/test/java/org/springframework/data/repository/core/support/RepositoryMethodInvokerUnitTests.java +++ b/src/test/java/org/springframework/data/repository/core/support/RepositoryMethodInvokerUnitTests.java @@ -37,7 +37,6 @@ import java.util.stream.Stream; import org.assertj.core.api.Assertions; import org.assertj.core.data.Percentage; -import org.jetbrains.annotations.NotNull; import org.jspecify.annotations.Nullable; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -356,7 +355,6 @@ class RepositoryMethodInvokerUnitTests { return CollectionUtils.lastElement(invocations); } - @NotNull @Override public Iterator iterator() { return invocations.iterator();