From 52a5e317a76cd03378b6b433163662495f59fdc2 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Wed, 4 Jun 2025 14:43:54 +0200 Subject: [PATCH] Polishing. Move warning suppression to the class-level. See #3901 --- .../threeten/Jsr310JpaConvertersUnitTests.java | 5 ++--- .../jpa/domain/DeleteSpecificationUnitTests.java | 4 +--- .../domain/PredicateSpecificationUnitTests.java | 4 +--- .../data/jpa/domain/SpecificationUnitTests.java | 14 +------------- .../jpa/domain/UpdateSpecificationUnitTests.java | 4 +--- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java index 41d24a1ed..691d1a83d 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/convert/threeten/Jsr310JpaConvertersUnitTests.java @@ -17,10 +17,10 @@ package org.springframework.data.jpa.convert.threeten; import static org.assertj.core.api.Assertions.*; -import java.util.Arrays; - import jakarta.persistence.AttributeConverter; +import java.util.Arrays; + import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -40,7 +40,6 @@ class Jsr310JpaConvertersUnitTests { new Jsr310JpaConverters.ZoneIdConverter()); } - @ParameterizedTest @MethodSource("data") void convertersHandleNullValuesCorrectly(AttributeConverter converter) { diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/DeleteSpecificationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/DeleteSpecificationUnitTests.java index ea41f7301..99e6bb80a 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/DeleteSpecificationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/DeleteSpecificationUnitTests.java @@ -39,7 +39,7 @@ import org.mockito.quality.Strictness; * * @author Mark Paluch */ -@SuppressWarnings("serial") +@SuppressWarnings({ "unchecked", "deprecation" }) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class DeleteSpecificationUnitTests implements Serializable { @@ -109,7 +109,6 @@ class DeleteSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) DeleteSpecification transferredSpecification = (DeleteSpecification) deserialize( serialize(specification)); @@ -125,7 +124,6 @@ class DeleteSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) DeleteSpecification transferredSpecification = (DeleteSpecification) deserialize( serialize(specification)); diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/PredicateSpecificationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/PredicateSpecificationUnitTests.java index d588fe212..0bcefc79a 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/PredicateSpecificationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/PredicateSpecificationUnitTests.java @@ -38,7 +38,7 @@ import org.mockito.quality.Strictness; * * @author Mark Paluch */ -@SuppressWarnings("serial") +@SuppressWarnings({ "unchecked", "deprecation" }) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class PredicateSpecificationUnitTests implements Serializable { @@ -107,7 +107,6 @@ class PredicateSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) PredicateSpecification transferredSpecification = (PredicateSpecification) deserialize( serialize(specification)); @@ -123,7 +122,6 @@ class PredicateSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) PredicateSpecification transferredSpecification = (PredicateSpecification) deserialize( serialize(specification)); diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java index 8380816d5..f819ed9a5 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/SpecificationUnitTests.java @@ -26,7 +26,6 @@ import jakarta.persistence.criteria.Root; import java.io.Serializable; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mock; @@ -44,24 +43,16 @@ import org.mockito.quality.Strictness; * @author Mark Paluch * @author Daniel Shuy */ -@SuppressWarnings("removal") +@SuppressWarnings({ "unchecked", "deprecation" }) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class SpecificationUnitTests { - private Specification spec; @Mock(serializable = true) Root root; @Mock(serializable = true) CriteriaQuery query; @Mock(serializable = true) CriteriaBuilder builder; - @Mock(serializable = true) Predicate predicate; - @BeforeEach - void setUp() { - - spec = (root, query, cb) -> predicate; - } - @Test // GH-1943 void emptyAllOfReturnsEmptySpecification() { @@ -88,7 +79,6 @@ class SpecificationUnitTests { assertThat(specification).isNotNull(); - @SuppressWarnings({ "unchecked", "deprecation"}) Specification transferredSpecification = (Specification) deserialize(serialize(specification)); assertThat(transferredSpecification).isNotNull(); @@ -103,7 +93,6 @@ class SpecificationUnitTests { assertThat(specification).isNotNull(); - @SuppressWarnings({ "unchecked", "deprecation"}) Specification transferredSpecification = (Specification) deserialize(serialize(specification)); assertThat(transferredSpecification).isNotNull(); @@ -116,7 +105,6 @@ class SpecificationUnitTests { Predicate secondPredicate = mock(Predicate.class); Specification first = ((root1, query1, criteriaBuilder) -> firstPredicate); - Specification second = ((root1, query1, criteriaBuilder) -> secondPredicate); first.and(second).toPredicate(root, query, builder); diff --git a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/UpdateSpecificationUnitTests.java b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/UpdateSpecificationUnitTests.java index 907e30258..f65ab6eca 100644 --- a/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/UpdateSpecificationUnitTests.java +++ b/spring-data-jpa/src/test/java/org/springframework/data/jpa/domain/UpdateSpecificationUnitTests.java @@ -39,7 +39,7 @@ import org.mockito.quality.Strictness; * * @author Mark Paluch */ -@SuppressWarnings("serial") +@SuppressWarnings({ "unchecked", "deprecation" }) @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) class UpdateSpecificationUnitTests implements Serializable { @@ -109,7 +109,6 @@ class UpdateSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) UpdateSpecification transferredSpecification = (UpdateSpecification) deserialize( serialize(specification)); @@ -125,7 +124,6 @@ class UpdateSpecificationUnitTests implements Serializable { assertThat(specification).isNotNull(); - @SuppressWarnings({"unchecked", "deprecation"}) UpdateSpecification transferredSpecification = (UpdateSpecification) deserialize( serialize(specification));