cleanup implementation

Author: SirCotare

.gitignore

@@ -46,4 +46,3 @@ build/
 
 ### Local Development ###
 application-local.yml
-/src/main/java/it/aboutbits/springboot/testing/demo_project/

src/main/java/it/aboutbits/springboot/testing/validation/core/BaseRuleBuilder.java

@@ -9,11 +9,11 @@
 import it.aboutbits.springboot.testing.validation.rule.NotBlankRule;
 import it.aboutbits.springboot.testing.validation.rule.NotEmptyRule;
 import it.aboutbits.springboot.testing.validation.rule.NotNullRule;
+import it.aboutbits.springboot.testing.validation.rule.NotValidatedRule;
 import it.aboutbits.springboot.testing.validation.rule.NullableRule;
 import it.aboutbits.springboot.testing.validation.rule.PastRule;
 import it.aboutbits.springboot.testing.validation.rule.PositiveOrZeroRule;
 import it.aboutbits.springboot.testing.validation.rule.PositiveRule;
-import it.aboutbits.springboot.testing.validation.rule.UncheckedRule;
 import it.aboutbits.springboot.testing.validation.rule.ValidBeanRule;
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -40,7 +40,7 @@ public abstract class BaseRuleBuilder<R extends BaseRuleBuilder<?>> implements
         PastRule<R>,
         PositiveOrZeroRule<R>,
         PositiveRule<R>,
-        UncheckedRule<R>,
+        NotValidatedRule<R>,
         ValidBeanRule<R> {
     @Getter(AccessLevel.PACKAGE)
     private final List<Rule> rules = new ArrayList<>();

src/main/java/it/aboutbits/springboot/testing/validation/core/BaseValidationAssert.java

@@ -11,10 +11,8 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-@RequiredArgsConstructor
-public abstract class BaseValidationAssert<R extends BaseRuleBuilder<?>> implements AutoCloseable {
+@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
+public abstract class BaseValidationAssert<R extends BaseRuleBuilder<?>> {
     @Getter(AccessLevel.PROTECTED)
     private final R ruleBuilder;
 
@@ -23,41 +21,32 @@ public abstract class BaseValidationAssert<R extends BaseRuleBuilder<?>> impleme
     private Object parameterUnderTest;
 
     @Setter(AccessLevel.PRIVATE)
-    private Consumer<Object> functionToCallWithParameter = null;
-
-    protected boolean hasBeenCalled = false;
+    private Consumer<?> functionToCallWithParameter = null;
 
     public static void registerNonBeanType(Class<?> type) {
         NON_BEAN_TYPES.add(type);
     }
 
-    public <P> CallBuilder<R, P> that(@NonNull P parameterUnderTest) {
+    public <P> CallBuilder<R, P> of(@NonNull P parameterUnderTest) {
         this.parameterUnderTest = parameterUnderTest;
         ruleBuilder.setTriggerValidation(this::assertValidation);
-        return new CallBuilder<>(this, parameterUnderTest);
-    }
-
-    @Override
-    public void close() throws RuntimeException {
-        assertThat(hasBeenCalled)
-                .withFailMessage("Validation was never invoked by calling 'isCompliant()'.")
-                .isTrue();
+        return new CallBuilder<>(this);
     }
 
     @RequiredArgsConstructor(access = AccessLevel.PRIVATE)
     public static final class CallBuilder<R extends BaseRuleBuilder<?>, P> {
         private final BaseValidationAssert<R> parent;
-        private final P parameterUnderTest;
 
         public R calling(@NonNull Consumer<P> functionToCallWithParameter) {
-            parent.setFunctionToCallWithParameter((Consumer<Object>) functionToCallWithParameter);
+            parent.setFunctionToCallWithParameter(functionToCallWithParameter);
             return parent.ruleBuilder;
         }
 
         public R usingBeanValidation() {
             return parent.ruleBuilder;
         }
 
+        @SuppressWarnings("unchecked")
         public <ID> R calling(
                 @NonNull BiConsumer<ID, P> functionToCallWithParameter,
                 @NonNull ID id
@@ -70,7 +59,6 @@ public <ID> R calling(
     }
 
     private void assertValidation() {
-        hasBeenCalled = true;
         new RuleValidator<>().assertValidation(
                 new RuleValidator.AssertionParameter<>(
                         parameterUnderTest,

src/main/java/it/aboutbits/springboot/testing/validation/core/RuleValidator.java

@@ -28,7 +28,7 @@ record AssertionParameter<P>(
             @NonNull
             P parameterUnderTest,
             @Nullable
-            Consumer<P> functionToCallWithParameter,
+            Consumer<?> functionToCallWithParameter,
             @NonNull
             List<Rule> rules,
             @NonNull
@@ -38,7 +38,8 @@ record AssertionParameter<P>(
 
     void assertValidation(AssertionParameter<P> assertionParameter) {
         var parameterUnderTest = assertionParameter.parameterUnderTest();
-        var functionToCallWithParameter = assertionParameter.functionToCallWithParameter();
+        @SuppressWarnings("unchecked")
+        var functionToCallWithParameter = (Consumer<P>) assertionParameter.functionToCallWithParameter();
         var rules = assertionParameter.rules();
         var nonBeanTypes = assertionParameter.nonBeanTypes();
 

src/main/java/it/aboutbits/springboot/testing/validation/core/ValueSource.java

@@ -3,5 +3,5 @@
 import java.util.stream.Stream;
 
 public interface ValueSource {
-    Stream<?> values(Class<?> propertyClass, Object... args);
+    <T> Stream<T> values(Class<T> propertyClass, Object... args);
 }

src/main/java/it/aboutbits/springboot/testing/validation/rule/BetweenRule.java

@@ -7,6 +7,7 @@
 import it.aboutbits.springboot.testing.validation.source.LessThanValueSource;
 import lombok.NonNull;
 
+@SuppressWarnings("unchecked")
 public interface BetweenRule<V extends BaseRuleBuilder<?>> extends ValidationRulesData {
     default V between(@NonNull String property, long min, long max) {
         addRule(

src/main/java/it/aboutbits/springboot/testing/validation/rule/FutureRule.java

@@ -6,6 +6,7 @@
 import it.aboutbits.springboot.testing.validation.source.PastValueSource;
 import lombok.NonNull;
 
+@SuppressWarnings("unchecked")
 public interface FutureRule<V extends BaseRuleBuilder<?>> extends ValidationRulesData {
     default V future(@NonNull String property) {
         addRule(

src/main/java/it/aboutbits/springboot/testing/validation/rule/MaxRule.java

@@ -6,6 +6,7 @@
 import it.aboutbits.springboot.testing.validation.source.BiggerThanValueSource;
 import lombok.NonNull;
 
+@SuppressWarnings("unchecked")
 public interface MaxRule<V extends BaseRuleBuilder<?>> extends ValidationRulesData {
     default V max(@NonNull String property, long max) {
         addRule(

src/main/java/it/aboutbits/springboot/testing/validation/rule/MinRule.java

@@ -6,6 +6,7 @@
 import it.aboutbits.springboot.testing.validation.source.LessThanValueSource;
 import lombok.NonNull;
 
+@SuppressWarnings("unchecked")
 public interface MinRule<V extends BaseRuleBuilder<?>> extends ValidationRulesData {
     default V min(@NonNull String property, long min) {
         addRule(

src/main/java/it/aboutbits/springboot/testing/validation/rule/NegativeOrZeroRule.java

@@ -6,6 +6,7 @@
 import it.aboutbits.springboot.testing.validation.source.BiggerThanValueSource;
 import lombok.NonNull;
 
+@SuppressWarnings("unchecked")
 public interface NegativeOrZeroRule<V extends BaseRuleBuilder<?>> extends ValidationRulesData {
     default V negativeOrZero(@NonNull String property) {
         addRule(