From 73a44d12bc03165bc39581e120a2ad957caecba3 Mon Sep 17 00:00:00 2001 From: Jens Schauder Date: Mon, 7 Dec 2020 15:38:19 +0100 Subject: [PATCH] DATAJDBC-641 - Removes references of org.jetbrains.annotations.NotNull. Those annotations cause build failures once the providing jar wasn't available anymore since kotlin removed that dependency. Those annotations were present in the code by accident anyway since Spring has and uses its own set of annotations. --- .../JdbcAggregateChangeExecutorContextImmutableUnitTests.java | 3 --- .../jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java | 3 --- .../jdbc/core/mapping/PersistentPropertyPathTestUtils.java | 2 -- .../config/EnableJdbcAuditingHsqlIntegrationTests.java | 3 +-- .../data/jdbc/repository/query/JdbcQueryMethodUnitTests.java | 2 -- 5 files changed, 1 insertion(+), 12 deletions(-) diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java index 4a8dfed5..96209b4e 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextImmutableUnitTests.java @@ -25,7 +25,6 @@ import lombok.With; import java.util.List; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; @@ -134,12 +133,10 @@ public class JdbcAggregateChangeExecutorContextImmutableUnitTests { return new PersistentPropertyPathExtension(context, getPersistentPropertyPath(path)); } - @NotNull PersistentPropertyPath getPersistentPropertyPath(String propertyName) { return context.getPersistentPropertyPath(propertyName, DummyEntity.class); } - @NotNull Identifier createBackRef() { return JdbcIdentifierBuilder.forBackReferences(converter, toPathExt("content"), 23L).build(); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java index bf57dc47..283544e4 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/JdbcAggregateChangeExecutorContextUnitTests.java @@ -22,7 +22,6 @@ import static org.mockito.Mockito.*; import java.util.ArrayList; import java.util.List; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.springframework.data.annotation.Id; import org.springframework.data.annotation.Version; @@ -148,12 +147,10 @@ public class JdbcAggregateChangeExecutorContextUnitTests { return new PersistentPropertyPathExtension(context, getPersistentPropertyPath(path)); } - @NotNull PersistentPropertyPath getPersistentPropertyPath(String propertyName) { return context.getPersistentPropertyPath(propertyName, DummyEntity.class); } - @NotNull Identifier createBackRef() { return JdbcIdentifierBuilder.forBackReferences(converter, toPathExt("content"), 23L).build(); } diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/PersistentPropertyPathTestUtils.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/PersistentPropertyPathTestUtils.java index b2038324..95bbdaee 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/PersistentPropertyPathTestUtils.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/PersistentPropertyPathTestUtils.java @@ -17,7 +17,6 @@ package org.springframework.data.jdbc.core.mapping; import lombok.experimental.UtilityClass; -import org.jetbrains.annotations.NotNull; import org.springframework.data.mapping.PersistentPropertyPath; import org.springframework.data.relational.core.mapping.RelationalMappingContext; import org.springframework.data.relational.core.mapping.RelationalPersistentProperty; @@ -28,7 +27,6 @@ import org.springframework.data.relational.core.mapping.RelationalPersistentProp @UtilityClass public class PersistentPropertyPathTestUtils { - @NotNull public static PersistentPropertyPath getPath(RelationalMappingContext context, String path, Class baseType) { diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java index 35283996..a06f4679 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import java.util.function.Consumer; import org.assertj.core.api.SoftAssertions; -import org.jetbrains.annotations.NotNull; import org.junit.Test; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; @@ -271,7 +270,7 @@ public class EnableJdbcAuditingHsqlIntegrationTests { return new NamingStrategy() { - public String getTableName(@NotNull Class type) { + public String getTableName(Class type) { return "DummyEntity"; } }; diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java index 26792735..971816a8 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/JdbcQueryMethodUnitTests.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.sql.ResultSet; import java.util.Properties; -import org.jetbrains.annotations.NotNull; import org.junit.Before; import org.junit.Test; @@ -98,7 +97,6 @@ public class JdbcQueryMethodUnitTests { } - @NotNull private JdbcQueryMethod createJdbcQueryMethod(String methodName) throws NoSuchMethodException { Method method = JdbcQueryMethodUnitTests.class.getDeclaredMethod(methodName);