chore(deps): bump spring-boot.version from 3.5.6 to 4.0.2

README.md

@@ -18,6 +18,10 @@ testing, and more - enabling efficient test automation.
   beans from other Testify modules.
 * **testify-testcontainers** - Testcontainers support, including JUnit extensions for MsSqlServer.
 
+## Spring Boot suport
+
+The `0.11.x` releases support Spring Boot 3, while `0.12.x` and later support Spring Boot 4. 
+
 ## Examples
 
 ### [Snapshot tests](testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionTest.java)

pom.xml

@@ -35,7 +35,7 @@
         <!-- This revision id (version) is overridden on deploy, so this revision number is only applicable for local usage -->
         <revision>0.10.0</revision>
 
-        <spring-boot.version>3.5.6</spring-boot.version>
+        <spring-boot.version>4.0.2</spring-boot.version>
 
         <code-quality.feature.enabled>true</code-quality.feature.enabled>
         <code-quality.configuration.checkstyle.suppression-location>checkstyle/checkstyle-suppressions.xml

testify-core/src/test/resources/snapshot.properties

@@ -1,9 +1,9 @@
-serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer
-serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer
-comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator
-reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter
+serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer
+serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer
+serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer
+serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer
+comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator
+reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
 output-dir=src/test/java
 ci-env-var=

testify-snapshot/pom.xml

@@ -24,6 +24,7 @@
         <datafaker.version>2.4.3</datafaker.version>
         <java-snapshot-testing-junit5.version>4.0.8</java-snapshot-testing-junit5.version>
         <json-path.version>2.9.0</json-path.version>
+        <snapshot-testing.version>0.10.0</snapshot-testing.version>
     </properties>
 
     <dependencies>
@@ -55,14 +56,14 @@
             <artifactId>testify-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>io.github.origin-energy</groupId>
-            <artifactId>java-snapshot-testing-plugin-jackson</artifactId>
-            <version>${java-snapshot-testing-junit5.version}</version>
+            <groupId>io.github.finoid</groupId>
+            <artifactId>snapshot-testing-jackson2</artifactId>
+            <version>${snapshot-testing.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.github.origin-energy</groupId>
-            <artifactId>java-snapshot-testing-junit5</artifactId>
-            <version>${java-snapshot-testing-junit5.version}</version>
+            <groupId>io.github.finoid</groupId>
+            <artifactId>snapshot-testing-junit5</artifactId>
+            <version>${snapshot-testing.version}</version>
         </dependency>
         <dependency>
             <groupId>org.checkerframework</groupId>

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Base64SnapshotDsl.java

@@ -1,7 +1,7 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
-import au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer;
+import io.github.finoid.snapshots.Expect;
+import io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer;
 import io.github.finoid.testify.core.internal.Precondition;
 import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl;
 

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotDsl.java

@@ -1,6 +1,6 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
+import io.github.finoid.snapshots.Expect;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import io.github.finoid.testify.core.internal.Precondition;
 import io.github.finoid.testify.snapshot.SnapshotDsl.MaskingSnapshotDsl;

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/JsonSnapshotSerializer.java

@@ -1,10 +1,10 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Snapshot;
-import au.com.origin.snapshots.SnapshotSerializerContext;
-import au.com.origin.snapshots.exceptions.SnapshotExtensionException;
-import au.com.origin.snapshots.serializers.SerializerType;
-import au.com.origin.snapshots.serializers.SnapshotSerializer;
+import io.github.finoid.snapshots.Snapshot;
+import io.github.finoid.snapshots.SnapshotSerializerContext;
+import io.github.finoid.snapshots.exceptions.SnapshotExtensionException;
+import io.github.finoid.snapshots.serializers.SerializerType;
+import io.github.finoid.snapshots.serializers.SnapshotSerializer;
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.PrettyPrinter;

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/PlainSnapshotDsl.java

@@ -1,7 +1,7 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
-import au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer;
+import io.github.finoid.snapshots.Expect;
+import io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer;
 import io.github.finoid.testify.core.internal.Precondition;
 import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl;
 

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/Snapshotter.java

@@ -1,7 +1,7 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
-import au.com.origin.snapshots.junit5.SnapshotExtension;
+import io.github.finoid.snapshots.Expect;
+import io.github.finoid.snapshots.junit5.SnapshotExtension;
 import lombok.RequiredArgsConstructor;
 
 /**

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/SnapshotterExtension.java

@@ -1,10 +1,10 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
-import au.com.origin.snapshots.SnapshotVerifier;
-import au.com.origin.snapshots.config.PropertyResolvingSnapshotConfig;
-import au.com.origin.snapshots.exceptions.SnapshotMatchException;
-import au.com.origin.snapshots.utils.ReflectionUtils;
+import io.github.finoid.snapshots.Expect;
+import io.github.finoid.snapshots.SnapshotVerifier;
+import io.github.finoid.snapshots.config.PropertyResolvingSnapshotConfig;
+import io.github.finoid.snapshots.exceptions.SnapshotMatchException;
+import io.github.finoid.snapshots.utils.ReflectionUtils;
 import lombok.Value;
 import org.junit.jupiter.api.extension.AfterAllCallback;
 import org.junit.jupiter.api.extension.BeforeAllCallback;

testify-snapshot/src/main/java/io/github/finoid/testify/snapshot/XmlSnapshotDsl.java

@@ -1,6 +1,6 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
+import io.github.finoid.snapshots.Expect;
 import io.github.finoid.testify.core.internal.Precondition;
 import io.github.finoid.testify.snapshot.SnapshotDsl.ScenarioSnapshotDsl;
 

testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterExtensionUnitTest.java

@@ -1,7 +1,7 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.SnapshotVerifier;
-import au.com.origin.snapshots.exceptions.SnapshotMatchException;
+import io.github.finoid.snapshots.SnapshotVerifier;
+import io.github.finoid.snapshots.exceptions.SnapshotMatchException;
 import io.github.finoid.testify.core.type.UnitTest;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;

testify-snapshot/src/test/java/io/github/finoid/testify/snapshot/SnapshotterUnitTest.java

@@ -1,9 +1,9 @@
 package io.github.finoid.testify.snapshot;
 
-import au.com.origin.snapshots.Expect;
-import au.com.origin.snapshots.SnapshotVerifier;
-import au.com.origin.snapshots.config.PropertyResolvingSnapshotConfig;
-import au.com.origin.snapshots.exceptions.SnapshotMatchException;
+import io.github.finoid.snapshots.Expect;
+import io.github.finoid.snapshots.SnapshotVerifier;
+import io.github.finoid.snapshots.config.PropertyResolvingSnapshotConfig;
+import io.github.finoid.snapshots.exceptions.SnapshotMatchException;
 import io.github.finoid.testify.core.type.UnitTest;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;

testify-snapshot/src/test/resources/snapshot.properties

@@ -1,9 +1,9 @@
-serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer
-serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer
-comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator
-reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter
+serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer
+serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer
+serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer
+serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer
+comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator
+reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
 output-dir=src/test/java
 ci-env-var=

testify-spring/src/main/java/io/github/finoid/testify/spring/http/HttpAsserter.java

@@ -27,6 +27,7 @@
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 import org.springframework.validation.Validator;
+import org.springframework.web.servlet.HandlerExceptionResolver;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -154,11 +155,12 @@ public static class HttpAsserterDsl {
         private ObjectMapper objectMapper = new ObjectMapper();
         @Nullable
         private Object controller;
-        private List<Object> controllerAdvices = Collections.emptyList();
+        private Collection<Object> controllerAdvices = Collections.emptyList();
         private FormattingConversionService conversionService = new DefaultFormattingConversionService();
+        private Collection<HandlerExceptionResolver> handlerExceptionResolvers = Collections.emptyList();
         private Validator validator = new ValidatorFactoryBean();
-        private List<Object> additionalBeans = Collections.emptyList();
-        private List<HttpMessageConverter<?>> httpMessageConverters = Collections.emptyList();
+        private Collection<Object> additionalBeans = Collections.emptyList();
+        private Collection<HttpMessageConverter<?>> httpMessageConverters = Collections.emptyList();
 
         private HttpAsserterDsl() {
         }
@@ -205,6 +207,18 @@ public HttpAsserterDsl conversionService(final FormattingConversionService conve
             return this;
         }
 
+        public HttpAsserterDsl handlerExceptionResolvers(final Collection<HandlerExceptionResolver> handlerExceptionResolvers) {
+            this.handlerExceptionResolvers = handlerExceptionResolvers;
+
+            return this;
+        }
+
+        public HttpAsserterDsl handlerExceptionResolvers(final HandlerExceptionResolver... handlerExceptionResolvers) {
+            this.handlerExceptionResolvers = List.of(handlerExceptionResolvers);
+
+            return this;
+        }
+
         public HttpAsserterDsl validator(final Validator validator) {
             this.validator = Precondition.nonNull(validator, "Validator must not be null");
 
@@ -229,10 +243,11 @@ public HttpAsserterDsl httpMessageConverters(final Collection<HttpMessageConvert
         public HttpAsserter toHttpAsserter() {
             final MockMvcBuilder builder = (controller != null ? new MockMvcBuilder(controller) : new MockMvcBuilder())
                 .setMessageConverters(httpMessageConverters.toArray(HttpMessageConverter[]::new))
+                .setHandlerExceptionResolvers(handlerExceptionResolvers.toArray(HandlerExceptionResolver[]::new))
                 .setControllerAdvice(controllerAdvices.toArray(Object[]::new))
                 .setConversionService(conversionService)
                 .setValidator(validator)
-                .setAdditionalBeans(additionalBeans);
+                .setAdditionalBeans(List.copyOf(additionalBeans));
 
             return new HttpAsserter(builder.build(), objectMapper);
         }

testify-spring/src/test/resources/snapshot.properties

@@ -1,9 +1,9 @@
-serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer
-serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer
-comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator
-reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter
+serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer
+serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer
+serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer
+serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer
+comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator
+reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
 output-dir=src/test/java
 ci-env-var=

testify-testcontainers/src/test/resources/snapshot.properties

@@ -1,9 +1,9 @@
-serializer=au.com.origin.snapshots.serializers.v1.ToStringSnapshotSerializer
-serializer.base64=au.com.origin.snapshots.serializers.v1.Base64SnapshotSerializer
-serializer.json=au.com.origin.snapshots.jackson.serializers.v1.JacksonSnapshotSerializer
-serializer.orderedJson=au.com.origin.snapshots.jackson.serializers.v1.DeterministicJacksonSnapshotSerializer
-comparator=au.com.origin.snapshots.comparators.v1.PlainTextEqualsComparator
-reporters=au.com.origin.snapshots.reporters.v1.PlainTextSnapshotReporter
+serializer=io.github.finoid.snapshots.serializers.v1.ToStringSnapshotSerializer
+serializer.base64=io.github.finoid.snapshots.serializers.v1.Base64SnapshotSerializer
+serializer.json=io.github.finoid.snapshots.jackson2.serializers.v1.JacksonSnapshotSerializer
+serializer.orderedJson=io.github.finoid.snapshots.jackson2.serializers.v1.DeterministicJacksonSnapshotSerializer
+comparator=io.github.finoid.snapshots.comparators.v1.PlainTextEqualsComparator
+reporters=io.github.finoid.snapshots.reporters.v1.PlainTextSnapshotReporter
 snapshot-dir=__snapshots__
 output-dir=src/test/java
 ci-env-var=