From cca9cd8abcb0602b16b64368715351650497e542 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Sat, 19 Nov 2016 12:46:49 +0100 Subject: [PATCH] DATACMNS-937 - Polishing. Removed Spring 4.2 guard from QueryExecutionConverter and its unit tests. --- .../data/repository/util/QueryExecutionConverters.java | 8 ++------ .../util/QueryExecutionConvertersUnitTests.java | 9 --------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java index 9acc89cfe..82ccd20cf 100644 --- a/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java +++ b/src/main/java/org/springframework/data/repository/util/QueryExecutionConverters.java @@ -59,10 +59,6 @@ import com.google.common.base.Optional; */ public abstract class QueryExecutionConverters { - private static final boolean SPRING_4_2_PRESENT = ClassUtils.isPresent( - "org.springframework.core.annotation.AnnotationConfigurationException", - QueryExecutionConverters.class.getClassLoader()); - private static final boolean GUAVA_PRESENT = ClassUtils.isPresent("com.google.common.base.Optional", QueryExecutionConverters.class.getClassLoader()); private static final boolean JDK_8_PRESENT = ClassUtils.isPresent("java.util.Optional", @@ -90,7 +86,7 @@ public abstract class QueryExecutionConverters { UNWRAPPERS.add(Jdk8OptionalUnwrapper.INSTANCE); } - if (JDK_8_PRESENT && SPRING_4_2_PRESENT) { + if (JDK_8_PRESENT) { WRAPPER_TYPES.add(NullableWrapperToCompletableFutureConverter.getWrapperType()); } @@ -480,7 +476,7 @@ public abstract class QueryExecutionConverters { * * @author Oliver Gierke * @author Mark Paluch - * @author 1.13 + * @since 1.12 */ private static enum ScalOptionUnwrapper implements Converter { diff --git a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java index 9eadf6925..6034dd842 100644 --- a/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java +++ b/src/test/java/org/springframework/data/repository/util/QueryExecutionConvertersUnitTests.java @@ -17,7 +17,6 @@ package org.springframework.data.repository.util; import static org.hamcrest.CoreMatchers.*; import static org.junit.Assert.*; -import static org.junit.Assume.*; import scala.Option; @@ -27,9 +26,7 @@ import java.util.concurrent.Future; import org.junit.Before; import org.junit.Test; -import org.springframework.core.SpringVersion; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.data.util.Version; import org.springframework.util.ReflectionUtils; import org.springframework.util.concurrent.ListenableFuture; @@ -43,9 +40,6 @@ import com.google.common.base.Optional; */ public class QueryExecutionConvertersUnitTests { - private static final Version SPRING_VERSION = Version.parse(SpringVersion.getVersion()); - private static final Version FOUR_DOT_TWO = new Version(4, 2); - DefaultConversionService conversionService; @Before @@ -74,9 +68,6 @@ public class QueryExecutionConvertersUnitTests { */ @Test public void registersCompletableFutureAsWrapperTypeOnSpring42OrBetter() { - - assumeThat(SPRING_VERSION.isGreaterThanOrEqualTo(FOUR_DOT_TWO), is(true)); - assertThat(QueryExecutionConverters.supports(CompletableFuture.class), is(true)); }