From 9c9d06b2ae80479359dbbe0087b73edd8999aa0f Mon Sep 17 00:00:00 2001 From: Andreas Hufler Date: Thu, 26 Sep 2024 15:12:42 +0200 Subject: [PATCH 1/2] add some nonNull annotations --- .../testdata/base/ModifyableTestDataCreator.java | 11 ++++++----- .../testing/testdata/base/TestDataCreator.java | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifyableTestDataCreator.java b/src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifyableTestDataCreator.java index bd12e1c..4d28cd1 100644 --- a/src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifyableTestDataCreator.java +++ b/src/main/java/it/aboutbits/springboot/testing/testdata/base/ModifyableTestDataCreator.java @@ -2,6 +2,7 @@ import it.aboutbits.springboot.testing.spring.BeanAccessor; import jakarta.persistence.EntityManager; +import lombok.NonNull; import lombok.extern.slf4j.Slf4j; import org.springframework.transaction.support.TransactionTemplate; @@ -29,7 +30,7 @@ protected ModifyableTestDataCreator(int count) { super(count); } - public CREATOR modifyParameter(BiFunction parameterMutator) { + public CREATOR modifyParameter(@NonNull BiFunction parameterMutator) { this.parameterMutator = (parameter, index) -> { mutatorCalled = true; return parameterMutator.apply(parameter, index); @@ -38,7 +39,7 @@ public CREATOR modifyParameter(BiFunction paramet return (CREATOR) this; } - public CREATOR modifyParameter(UnaryOperator parameterMutator) { + public CREATOR modifyParameter(@NonNull UnaryOperator parameterMutator) { this.parameterMutator = (parameter, index) -> { mutatorCalled = true; return parameterMutator.apply(parameter); @@ -47,12 +48,12 @@ public CREATOR modifyParameter(UnaryOperator parameterMutator) { return (CREATOR) this; } - public CREATOR modifyResult(ObjIntConsumer resultMutator) { + public CREATOR modifyResult(@NonNull ObjIntConsumer resultMutator) { this.resultMutator = resultMutator; return (CREATOR) this; } - public CREATOR modifyResult(Consumer resultMutator) { + public CREATOR modifyResult(@NonNull Consumer resultMutator) { this.resultMutator = (item, index) -> resultMutator.accept(item); return (CREATOR) this; } @@ -79,7 +80,7 @@ protected List create() { return result; } - protected ITEM saveMutation(ITEM item) { + protected ITEM saveMutation(@NonNull ITEM item) { var entityManager = BeanAccessor.getBean(EntityManager.class); var transactionTemplate = BeanAccessor.getBean(TransactionTemplate.class); diff --git a/src/main/java/it/aboutbits/springboot/testing/testdata/base/TestDataCreator.java b/src/main/java/it/aboutbits/springboot/testing/testdata/base/TestDataCreator.java index 3a23885..25f2fb6 100644 --- a/src/main/java/it/aboutbits/springboot/testing/testdata/base/TestDataCreator.java +++ b/src/main/java/it/aboutbits/springboot/testing/testdata/base/TestDataCreator.java @@ -1,5 +1,7 @@ package it.aboutbits.springboot.testing.testdata.base; +import lombok.NonNull; + import java.util.ArrayList; import java.util.Comparator; import java.util.HashSet; @@ -26,11 +28,11 @@ public List returnAll() { return create(); } - public List returnSorted(Comparator comparator) { + public List returnSorted(@NonNull Comparator comparator) { return returnAll().stream().sorted(comparator).toList(); } - public > List returnSorted(Function comparator) { + public > List returnSorted(@NonNull Function comparator) { return returnAll().stream() .sorted(Comparator.comparing(comparator)) .toList(); From 36dea5f81d50f08fbb0a758b3463e1a12d9a68d5 Mon Sep 17 00:00:00 2001 From: Andreas Hufler Date: Thu, 26 Sep 2024 15:15:12 +0200 Subject: [PATCH 2/2] bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f6b039f..5f6877d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.2 + 3.3.4