Remove Jakarta annotation support.

Author: mp911de

pom.xml

@@ -35,7 +35,6 @@
 		<scala>2.11.7</scala>
 		<xmlbeam>1.4.24</xmlbeam>
 		<java-module-name>spring.data.commons</java-module-name>
-		<jakarta-annotation-api>2.1.1</jakarta-annotation-api>
 		<kotlin.api.target>1.8</kotlin.api.target>
 	</properties>
 

src/main/java/org/springframework/data/util/Nullability.java

@@ -72,9 +72,6 @@
  * <ul>
  * <li>Spring's {@link NonNullApi}, {@link Nullable}, and {@link org.springframework.lang.NonNull}.</li>
  * <li>JSR-305 {@code javax.annotation.Nonnull} and meta-annotations.</li>
- * <li><a href="https://projects.eclipse.org/projects/ee4j.ca">Jakarta Annotations API</a> via
- * {@code jakarta.annotation.Nonnull} which is a simplified variant of JSR-305 {@code javax.annotation.Nonnull} without
- * {@code when} and {@code @TypeQualifierDefault}.</li>
  * <li><a href="https://https://jspecify.dev/">JSpecify</a>, a newly designed specification to opt-in for non-null by
  * default through {@code org.jspecify.annotations.NullMarked} and {@code org.jspecify.annotations.Nullable}.</li>
  * </ul>

src/main/java/org/springframework/data/util/NullabilityIntrospector.java

@@ -53,18 +53,14 @@ class NullabilityIntrospector implements Nullability.Introspector {
 	private static final List<NullabilityProvider> providers;
 
 	static {
-		providers = new ArrayList<>(5);
+		providers = new ArrayList<>(4);
 
 		providers.add(new PrimitiveProvider());
 
 		if (Jsr305Provider.isAvailable()) {
 			providers.add(new Jsr305Provider());
 		}
 
-		if (JakartaAnnotationProvider.isAvailable()) {
-			providers.add(new JakartaAnnotationProvider());
-		}
-
 		if (JSpecifyAnnotationProvider.isAvailable()) {
 			providers.add(new JSpecifyAnnotationProvider());
 		}
@@ -369,24 +365,6 @@ static boolean isNullable(Annotation annotation) {
 		}
 	}
 
-	/**
-	 * Simplified variant of {@link Jsr305Provider} without {@code when} and {@code @TypeQualifierDefault} support.
-	 */
-	@SuppressWarnings("DataFlowIssue")
-	static class JakartaAnnotationProvider extends SimpleAnnotationNullabilityProvider {
-
-		private static final Class<Annotation> NON_NULL = findClass("jakarta.annotation.Nonnull");
-		private static final Class<Annotation> NULLABLE = findClass("jakarta.annotation.Nullable");
-
-		JakartaAnnotationProvider() {
-			super(NON_NULL, NULLABLE);
-		}
-
-		public static boolean isAvailable() {
-			return NON_NULL != null && NULLABLE != null;
-		}
-	}
-
 	/**
 	 * Provider for JSpecify annotations.
 	 */
@@ -431,49 +409,15 @@ Spec evaluate(AnnotatedElement element, ElementType elementType) {
 		private static Spec evaluate(Annotation[] annotations) {
 			for (Annotation annotation : annotations) {
 
-				if (SimpleAnnotationNullabilityProvider.test(NULL_UNMARKED, annotation)) {
+				if (test(NULL_UNMARKED, annotation)) {
 					return Spec.UNSPECIFIED;
 				}
 
-				if (SimpleAnnotationNullabilityProvider.test(NULL_MARKED, annotation)
-						|| SimpleAnnotationNullabilityProvider.test(NON_NULL, annotation)) {
+				if (test(NULL_MARKED, annotation) || test(NON_NULL, annotation)) {
 					return Spec.NON_NULL;
 				}
 
-				if (SimpleAnnotationNullabilityProvider.test(NULLABLE, annotation)) {
-					return Spec.NULLABLE;
-				}
-			}
-
-			return Spec.UNSPECIFIED;
-		}
-	}
-
-	/**
-	 * Annotation-based {@link NullabilityProvider} leveraging simple or meta-annotations.
-	 */
-	static class SimpleAnnotationNullabilityProvider extends NullabilityProvider {
-
-		private final Class<Annotation> nonNull;
-		private final Class<Annotation> nullable;
-
-		SimpleAnnotationNullabilityProvider(Class<Annotation> nonNull, Class<Annotation> nullable) {
-			this.nonNull = nonNull;
-			this.nullable = nullable;
-		}
-
-		@Override
-		Spec evaluate(AnnotatedElement element, ElementType elementType) {
-
-			Annotation[] annotations = element.getAnnotations();
-
-			for (Annotation annotation : annotations) {
-
-				if (test(nonNull, annotation)) {
-					return Spec.NON_NULL;
-				}
-
-				if (test(nullable, annotation)) {
+				if (test(NULLABLE, annotation)) {
 					return Spec.NULLABLE;
 				}
 			}
@@ -490,7 +434,6 @@ static boolean test(Class<Annotation> annotationClass, Annotation annotation) {
 			MergedAnnotations annotations = MergedAnnotations.from(annotation.annotationType());
 			return annotations.isPresent(annotationClass);
 		}
-
 	}
 
 	@Nullable

src/test/java/org/springframework/data/util/NullableUtilsUnitTests.java

@@ -70,29 +70,7 @@ void packageAnnotatedShouldConsiderNonNullAnnotationForMethod() {
 		assertThat(NullableUtils.isNonNull(NonNullOnPackage.class, ElementType.PACKAGE)).isFalse();
 	}
 
-	@Test //
-	void shouldConsiderJakartaNonNullParameters() {
-
-		var method = ReflectionUtils.findMethod(org.springframework.data.util.nonnull.jakarta.NonNullOnPackage.class, "someMethod", String.class, String.class);
-		Nullability.Introspector introspector = Nullability.introspect(method.getDeclaringClass());
-		Nullability mrt = introspector.forReturnType(method);
-
-		assertThat(mrt.isDeclared()).isTrue();
-		assertThat(mrt.isNonNull()).isTrue();
-		assertThat(mrt.isNullable()).isFalse();
-
-		Nullability pn0 = introspector.forParameter(MethodParameter.forExecutable(method, 0));
-		assertThat(pn0.isDeclared()).isTrue();
-		assertThat(pn0.isNullable()).isFalse();
-		assertThat(pn0.isNonNull()).isTrue();
-
-		Nullability pn1 = introspector.forParameter(MethodParameter.forExecutable(method, 1));
-		assertThat(pn1.isDeclared()).isTrue();
-		assertThat(pn1.isNullable()).isTrue();
-		assertThat(pn1.isNonNull()).isFalse();
-	}
-
-	@Test //
+	@Test // GH-3100
 	void shouldConsiderJSpecifyNonNullParameters() {
 
 		var method = ReflectionUtils.findMethod(org.springframework.data.util.nonnull.jspecify.NonNullOnPackage.class,
@@ -229,27 +207,4 @@ void shouldConsiderMethodReturnJsr305NonnullAnnotation() {
 		assertThat(mrt.isNonNull()).isFalse();
 	}
 
-	@Test //
-	void shouldConsiderMethodReturnJakartaNonnullAnnotation() {
-
-		var method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "jakartaNonnullReturnWhen");
-
-		Nullability mrt = Nullability.forMethodReturnType(method);
-
-		assertThat(mrt.isDeclared()).isTrue();
-		assertThat(mrt.isNullable()).isFalse();
-		assertThat(mrt.isNonNull()).isTrue();
-	}
-
-	@Test //
-	void shouldConsiderMethodReturnJakartaNullableAnnotation() {
-
-		var method = ReflectionUtils.findMethod(NullableAnnotatedType.class, "jakartaNullableReturnWhen");
-
-		Nullability mrt = Nullability.forMethodReturnType(method);
-
-		assertThat(mrt.isDeclared()).isTrue();
-		assertThat(mrt.isNullable()).isTrue();
-		assertThat(mrt.isNonNull()).isFalse();
-	}
 }

src/test/java/org/springframework/data/util/nonnull/NullableAnnotatedType.java

@@ -35,9 +35,4 @@ public interface NullableAnnotatedType {
 	@javax.annotation.Nonnull(when = When.MAYBE)
 	String jsr305NullableReturnWhen();
 
-	@jakarta.annotation.Nonnull
-	String jakartaNonnullReturnWhen();
-
-	@jakarta.annotation.Nullable
-	String jakartaNullableReturnWhen();
 }