From 550bec5a0c20a8a7d3a8b37b8dfdcf6ea14d8566 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/convert/DefaultDataAccessStrategyUnitTests.java | 2 -- .../jdbc/core/mapping/PersistentPropertyPathTestUtils.java | 2 -- .../config/EnableJdbcAuditingHsqlIntegrationTests.java | 3 +-- .../data/jdbc/repository/query/JdbcQueryMethodUnitTests.java | 2 -- .../jdbc/repository/query/StringBasedJdbcQueryUnitTests.java | 2 -- 7 files changed, 1 insertion(+), 16 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 f06153f3f..7990b5077 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.jupiter.api.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 83a674836..e91fa3086 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.jupiter.api.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/convert/DefaultDataAccessStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java index fb5284f43..58bf103f6 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/convert/DefaultDataAccessStrategyUnitTests.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; @@ -192,7 +191,6 @@ public class DefaultDataAccessStrategyUnitTests { assertThat(paramSourceCaptor.getValue().getValue("DUMMYENTITYROOT")).isEqualTo(rawId); } - @NotNull private DefaultDataAccessStrategy createAccessStrategyWithConverter(List converters) { DelegatingDataAccessStrategy relationResolver = new DelegatingDataAccessStrategy(); 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 b20383242..95bbdaee4 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 4183523af..871f18916 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.jupiter.api.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 54defd3b6..c207f797b 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.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -101,7 +100,6 @@ public class JdbcQueryMethodUnitTests { } - @NotNull private JdbcQueryMethod createJdbcQueryMethod(String methodName) throws NoSuchMethodException { Method method = JdbcQueryMethodUnitTests.class.getDeclaredMethod(methodName); diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java index eb7a7b2f1..fd2a7be32 100644 --- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java +++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java @@ -21,7 +21,6 @@ import static org.mockito.Mockito.*; import java.sql.ResultSet; import org.assertj.core.api.Assertions; -import org.jetbrains.annotations.NotNull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -80,7 +79,6 @@ public class StringBasedJdbcQueryUnitTests { .execute(new Object[] {})); } - @NotNull private StringBasedJdbcQuery createQuery() { StringBasedJdbcQuery query = new StringBasedJdbcQuery(queryMethod, operations, defaultRowMapper, converter);