Skip to content

Commit 73e169c

Browse files
committed
Fixes the build.
Use JUnit 4 instead of 5 for 1.1.x Remove jetbrains @NotNull annotation. Closes #921
1 parent c412fe1 commit 73e169c

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/PersistentPropertyPathExtensionUnitTests.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import java.util.List;
1919

20-
import org.jetbrains.annotations.NotNull;
2120
import org.junit.Test;
2221
import org.springframework.data.annotation.Id;
2322
import org.springframework.data.jdbc.core.mapping.JdbcMappingContext;
@@ -200,12 +199,10 @@ public void extendBy() {
200199
});
201200
}
202201

203-
@NotNull
204202
private PersistentPropertyPathExtension extPath(RelationalPersistentEntity<?> entity) {
205203
return new PersistentPropertyPathExtension(context, entity);
206204
}
207205

208-
@NotNull
209206
private PersistentPropertyPathExtension extPath(String path) {
210207
return new PersistentPropertyPathExtension(context, createSimplePath(path));
211208
}

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/core/mapping/PersistentPropertyPathTestUtils.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import lombok.experimental.UtilityClass;
1919

20-
import org.jetbrains.annotations.NotNull;
2120
import org.springframework.data.mapping.PersistentPropertyPath;
2221
import org.springframework.data.relational.core.mapping.RelationalMappingContext;
2322
import org.springframework.data.relational.core.mapping.RelationalPersistentProperty;
@@ -28,7 +27,6 @@
2827
@UtilityClass
2928
public class PersistentPropertyPathTestUtils {
3029

31-
@NotNull
3230
public static PersistentPropertyPath<RelationalPersistentProperty> getPath(RelationalMappingContext context,
3331
String path, Class<?> baseType) {
3432

spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/config/EnableJdbcAuditingHsqlIntegrationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import java.util.function.Consumer;
2727

2828
import org.assertj.core.api.SoftAssertions;
29-
import org.jetbrains.annotations.NotNull;
3029
import org.junit.Test;
3130
import org.springframework.context.ApplicationListener;
3231
import org.springframework.context.ConfigurableApplicationContext;
@@ -271,7 +270,7 @@ NamingStrategy namingStrategy() {
271270

272271
return new NamingStrategy() {
273272

274-
public String getTableName(@NotNull Class<?> type) {
273+
public String getTableName(Class<?> type) {
275274
return "DummyEntity";
276275
}
277276
};

spring-data-relational/src/test/java/org/springframework/data/relational/core/sql/ConditionsUnitTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.util.ArrayList;
66
import java.util.List;
77

8-
import org.junit.jupiter.api.Test;
8+
import org.junit.Test;
99

1010
/*
1111
* Copyright 2021 the original author or authors.
@@ -22,10 +22,10 @@
2222
* See the License for the specific language governing permissions and
2323
* limitations under the License.
2424
*/
25-
class ConditionsUnitTests {
25+
public class ConditionsUnitTests {
2626

2727
@Test // gh-916
28-
void notInOfColumnAndExpression() {
28+
public void notInOfColumnAndExpression() {
2929

3030
Table table = Table.create("t");
3131
Column column = Column.create("col", table);

0 commit comments

Comments
 (0)