From 7883422253831d97bb8c36e219fb27ec23c0fae2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:08:05 +0000 Subject: [PATCH 1/6] Initial plan From fd893af592504bfd04c9cc56ffdea22c0d67b6ab Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:31:57 +0000 Subject: [PATCH 2/6] Fix Spring Boot 4.0 autoconfiguration compatibility - Update JacksonAutoConfiguration package from org.springframework.boot.autoconfigure.jackson to org.springframework.boot.jackson.autoconfigure - Replace WebClientAutoConfiguration with WebClientTestConfiguration that provides WebClient.Builder bean - Add ReactorAutoConfiguration and CodecsAutoConfiguration to test configurations - WebClient.Builder is no longer auto-configured in Spring Boot 4.0, so we provide it manually for tests Note: 9 test failures remain related to JSON serialization differences: - Map key serialization for Locale (und vs empty string) - Property ordering differences (mbox vs name) These appear to be Jackson 2.20.1 behavior changes that need further investigation. Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .../WebClientTestConfiguration.java | 24 +++++++++++++++++++ ...entAutoConfigurationAuthorizationTest.java | 10 +++++--- ...apiClientAutoConfigurationBaseUrlTest.java | 9 ++++--- ...AutoConfigurationUsernamePasswordTest.java | 9 ++++--- .../xapi/jackson/LocaleSerializer.java | 2 ++ 5 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 xapi-client/src/test/java/dev/learning/xapi/client/configuration/WebClientTestConfiguration.java diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/WebClientTestConfiguration.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/WebClientTestConfiguration.java new file mode 100644 index 00000000..1bdf5cda --- /dev/null +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/WebClientTestConfiguration.java @@ -0,0 +1,24 @@ +/* + * Copyright 2016-2025 Berry Cloud Ltd. All rights reserved. + */ + +package dev.learning.xapi.client.configuration; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.reactive.function.client.WebClient; + +/** + * Test configuration to provide WebClient.Builder bean for tests. + * + *

In Spring Boot 4.0, WebClient.Builder autoconfiguration was moved/removed. This configuration + * provides the bean for testing purposes. + */ +@Configuration +public class WebClientTestConfiguration { + + @Bean + public WebClient.Builder webClientBuilder() { + return WebClient.builder(); + } +} diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java index 4ddb5a38..98e20c71 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java @@ -16,8 +16,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration; +import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; +import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient.Builder; @@ -31,7 +33,9 @@ @SpringBootTest( classes = { XapiClientAutoConfiguration.class, - WebClientAutoConfiguration.class, + WebClientTestConfiguration.class, + CodecsAutoConfiguration.class, + ReactorAutoConfiguration.class, XapiTestClientConfiguration2.class, JacksonAutoConfiguration.class }, diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java index f82fd327..52881d13 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java @@ -15,8 +15,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration; +import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; /** @@ -28,7 +29,9 @@ @SpringBootTest( classes = { XapiClientAutoConfiguration.class, - WebClientAutoConfiguration.class, + WebClientTestConfiguration.class, + CodecsAutoConfiguration.class, + ReactorAutoConfiguration.class, JacksonAutoConfiguration.class }, properties = {"xapi.client.baseUrl = http://127.0.0.1:55123/"}) diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java index 10b1d5a7..e7607af8 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java @@ -16,8 +16,9 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; -import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration; +import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; +import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient.Builder; @@ -31,7 +32,9 @@ @SpringBootTest( classes = { XapiClientAutoConfiguration.class, - WebClientAutoConfiguration.class, + WebClientTestConfiguration.class, + CodecsAutoConfiguration.class, + ReactorAutoConfiguration.class, XapiTestClientConfiguration.class, JacksonAutoConfiguration.class }, diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java index aad7558e..3266bede 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java @@ -47,6 +47,8 @@ public LocaleKeySerializer() { @Override public void serialize(Locale value, JsonGenerator gen, SerializerProvider provider) throws IOException { + // For Map keys, Jackson calls this method but the JSON generator is in a state + // where we should write a string value that will be used as the field name gen.writeFieldName(value.toLanguageTag()); } } From 396728eb976e08eca445771f3e4ae1875b47dd97 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 15:36:40 +0000 Subject: [PATCH 3/6] Simplify WebClientTestConfiguration to avoid bean conflicts Remove ServerCodecConfigurer bean to avoid conflict with WebFluxAutoConfiguration. WebClient.Builder will use default codecs from Spring Boot autoconfiguration. Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .../main/java/dev/learning/xapi/jackson/LocaleSerializer.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java index 3266bede..aad7558e 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java @@ -47,8 +47,6 @@ public LocaleKeySerializer() { @Override public void serialize(Locale value, JsonGenerator gen, SerializerProvider provider) throws IOException { - // For Map keys, Jackson calls this method but the JSON generator is in a state - // where we should write a string value that will be used as the field name gen.writeFieldName(value.toLanguageTag()); } } From 15128cf1063a01a349c958533a396d8f4f76213b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 16:56:42 +0000 Subject: [PATCH 4/6] Changes before error encountered Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .../samples/xapiserver/StatementEntity.java | 2 +- .../samples/xapiserver/StatementService.java | 4 +-- .../xapi/client/AgentProfileRequest.java | 2 +- .../xapi/client/GetAgentProfilesRequest.java | 2 +- .../xapi/client/GetAgentsRequest.java | 2 +- .../xapi/client/GetStatementsRequest.java | 2 +- .../learning/xapi/client/StatesRequest.java | 2 +- .../model/XapiModelAutoConfiguration.java | 8 +++--- xapi-model/pom.xml | 6 +++-- .../xapi/jackson/LocaleSerializer.java | 6 ++--- .../NotNullDeserializationModifier.java | 18 ++++++------- .../jackson/StrictLocaleDeserializer.java | 14 +++++----- .../StrictObjectTypeResolverBuilder.java | 26 +++++++++---------- .../jackson/StrictTimestampDeserializer.java | 6 ++--- .../xapi/jackson/XapiStrictLocaleModule.java | 2 +- .../jackson/XapiStrictNullValuesModule.java | 2 +- .../jackson/XapiStrictObjectTypeModule.java | 2 +- .../jackson/XapiStrictTimestampModule.java | 2 +- .../model/strict/StrictObjectTypeMixIn.java | 2 +- .../java/dev/learning/xapi/model/About.java | 4 +-- .../java/dev/learning/xapi/model/Account.java | 4 +-- .../dev/learning/xapi/model/Activity.java | 4 +-- .../xapi/model/ActivityDefinition.java | 6 ++--- .../learning/xapi/model/ActivityState.java | 6 ++--- .../java/dev/learning/xapi/model/Actor.java | 12 ++++----- .../java/dev/learning/xapi/model/Agent.java | 4 +-- .../dev/learning/xapi/model/Attachment.java | 6 ++--- .../java/dev/learning/xapi/model/Context.java | 6 ++--- .../xapi/model/ContextActivities.java | 6 ++--- .../java/dev/learning/xapi/model/Group.java | 4 +-- .../xapi/model/InteractionComponent.java | 4 +-- .../learning/xapi/model/InteractionType.java | 2 +- .../dev/learning/xapi/model/LanguageMap.java | 2 +- .../java/dev/learning/xapi/model/Person.java | 8 +++--- .../java/dev/learning/xapi/model/Result.java | 4 +-- .../java/dev/learning/xapi/model/Score.java | 4 +-- .../dev/learning/xapi/model/Statement.java | 6 ++--- .../learning/xapi/model/StatementObject.java | 10 +++---- .../learning/xapi/model/StatementResult.java | 4 +-- .../xapi/model/SubStatementObject.java | 10 +++---- .../java/dev/learning/xapi/model/Verb.java | 6 ++--- .../dev/learning/xapi/model/AboutTests.java | 2 +- .../dev/learning/xapi/model/AccountTests.java | 2 +- .../xapi/model/ActivityDefinitionTests.java | 2 +- .../learning/xapi/model/ActivityTests.java | 4 +-- .../dev/learning/xapi/model/AgentTests.java | 2 +- .../learning/xapi/model/AttachmentTests.java | 2 +- .../xapi/model/ContextActivitiesTests.java | 2 +- .../dev/learning/xapi/model/ContextTests.java | 2 +- .../dev/learning/xapi/model/GroupTests.java | 2 +- .../xapi/model/InteractionComponentTests.java | 2 +- .../dev/learning/xapi/model/PersonTests.java | 2 +- .../dev/learning/xapi/model/ResultTests.java | 2 +- .../dev/learning/xapi/model/ScoreTests.java | 2 +- .../xapi/model/StatementReferenceTest.java | 2 +- .../xapi/model/StatementResultTest.java | 2 +- .../learning/xapi/model/StatementTests.java | 12 ++++----- .../xapi/model/SubStatementTests.java | 2 +- .../dev/learning/xapi/model/VerbTests.java | 2 +- 59 files changed, 141 insertions(+), 139 deletions(-) diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java index 05855660..6f61ca02 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java @@ -4,7 +4,7 @@ package dev.learning.xapi.samples.xapiserver; -import com.fasterxml.jackson.databind.JsonNode; +import tools.jackson.databind.JsonNode; import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java index a2036ae7..521cd3ad 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java @@ -4,8 +4,8 @@ package dev.learning.xapi.samples.xapiserver; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.core.JsonProcessingException; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Statement; import dev.learning.xapi.model.StatementResult; import java.net.URI; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java index a46ed1f2..b029c366 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.util.Map; import java.util.function.Consumer; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java index d8f3305d..3a6eca05 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.time.Instant; import java.util.Map; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java index dd2e28f8..1dba622e 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.util.Map; import java.util.function.Consumer; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java index 183ebc4e..f877e4cd 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import dev.learning.xapi.model.StatementFormat; import dev.learning.xapi.model.Verb; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java index 9b50841f..e041f08f 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.net.URI; import java.util.Map; diff --git a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java index 2973c77e..72a8083f 100644 --- a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java +++ b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java @@ -4,10 +4,10 @@ package dev.learning.xapi.autoconfigure.model; -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.cfg.CoercionAction; -import com.fasterxml.jackson.databind.cfg.CoercionInputShape; -import com.fasterxml.jackson.databind.type.LogicalType; +import tools.jackson.databind.DeserializationFeature; +import tools.jackson.databind.cfg.CoercionAction; +import tools.jackson.databind.cfg.CoercionInputShape; +import tools.jackson.databind.type.LogicalType; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.jackson.XapiStrictNullValuesModule; import dev.learning.xapi.jackson.XapiStrictObjectTypeModule; diff --git a/xapi-model/pom.xml b/xapi-model/pom.xml index c334d71f..15bf470d 100644 --- a/xapi-model/pom.xml +++ b/xapi-model/pom.xml @@ -34,8 +34,9 @@ - com.fasterxml.jackson.core + tools.jackson.core jackson-databind + 3.0.2 org.projectlombok @@ -43,8 +44,9 @@ provided - com.fasterxml.jackson.datatype + tools.jackson.datatype jackson-datatype-jsr310 + 3.0.2 jakarta.validation diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java index aad7558e..35981cc7 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java @@ -4,9 +4,9 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.databind.SerializerProvider; -import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import tools.jackson.core.JsonGenerator; +import tools.jackson.databind.SerializerProvider; +import tools.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.Locale; import java.util.Map; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java index 8eddea41..d50c439b 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java @@ -4,15 +4,15 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.BeanDescription; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; -import com.fasterxml.jackson.databind.deser.ResolvableDeserializer; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.BeanDescription; +import tools.jackson.databind.DeserializationConfig; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JsonDeserializer; +import tools.jackson.databind.JsonMappingException; +import tools.jackson.databind.deser.BeanDeserializerModifier; +import tools.jackson.databind.deser.ResolvableDeserializer; +import tools.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java index 0c4da593..419c4a71 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java @@ -4,13 +4,13 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.KeyDeserializer; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import tools.jackson.core.JsonParser; +import tools.jackson.core.JsonToken; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.JsonMappingException; +import tools.jackson.databind.KeyDeserializer; +import tools.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.util.Locale; import java.util.MissingResourceException; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java index cf3fcf23..eefdefac 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java @@ -4,19 +4,19 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.annotation.JsonTypeInfo.As; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.BeanProperty; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; -import com.fasterxml.jackson.databind.jsontype.NamedType; -import com.fasterxml.jackson.databind.jsontype.TypeDeserializer; -import com.fasterxml.jackson.databind.jsontype.TypeIdResolver; -import com.fasterxml.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer; -import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder; -import com.fasterxml.jackson.databind.util.TokenBuffer; +import tools.jackson.annotation.JsonTypeInfo.As; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.BeanProperty; +import tools.jackson.databind.DeserializationConfig; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.exc.InvalidTypeIdException; +import tools.jackson.databind.jsontype.NamedType; +import tools.jackson.databind.jsontype.TypeDeserializer; +import tools.jackson.databind.jsontype.TypeIdResolver; +import tools.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer; +import tools.jackson.databind.jsontype.impl.StdTypeResolverBuilder; +import tools.jackson.databind.util.TokenBuffer; import java.io.IOException; import java.util.Arrays; import java.util.Collection; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java index c533b865..df7f8445 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java @@ -4,9 +4,9 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.deser.std.StdDeserializer; +import tools.jackson.core.JsonParser; +import tools.jackson.databind.DeserializationContext; +import tools.jackson.databind.deser.std.StdDeserializer; import dev.learning.xapi.jackson.model.strict.XapiTimestamp; import dev.learning.xapi.jackson.model.strict.XapiTimestamp.XapiTimestampParseException; import java.io.IOException; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java index 86631173..439c2b68 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.databind.module.SimpleModule; +import tools.jackson.databind.module.SimpleModule; import dev.learning.xapi.jackson.StrictLocaleDeserializer.StrictLocaleKeyDeserializer; import java.util.Locale; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java index 83c19808..df4a0a72 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.databind.module.SimpleModule; +import tools.jackson.databind.module.SimpleModule; /** * xAPI JSON module for setting strict deserializer modifier. diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java index 436bd16d..aa7bbc16 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.databind.module.SimpleModule; +import tools.jackson.databind.module.SimpleModule; import dev.learning.xapi.jackson.model.strict.StrictObjectTypeMixIn; import dev.learning.xapi.model.Activity; import dev.learning.xapi.model.Actor; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java index 16b419d4..bf9c4435 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import com.fasterxml.jackson.databind.module.SimpleModule; +import tools.jackson.databind.module.SimpleModule; import java.time.Instant; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java index 72d78031..ca92ff20 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson.model.strict; -import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; +import tools.jackson.databind.annotation.JsonTypeResolver; import dev.learning.xapi.jackson.StrictObjectTypeResolverBuilder; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/About.java b/xapi-model/src/main/java/dev/learning/xapi/model/About.java index 4cff953d..153f99aa 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/About.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/About.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import java.net.URI; import java.util.LinkedHashMap; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java index aa1d4248..8b73e011 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java index e387a1e5..cfaf80eb 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonMerge; -import com.fasterxml.jackson.annotation.JsonProperty; +import tools.jackson.annotation.JsonMerge; +import tools.jackson.annotation.JsonProperty; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.ValidActivityDefinition; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java index bc5b5f09..9de8a1f6 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonMerge; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonMerge; import dev.learning.xapi.model.validation.constraints.HasScheme; import java.net.URI; import java.util.ArrayList; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java index 7220524a..6beb0296 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.node.ObjectNode; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.databind.node.ObjectNode; import dev.learning.xapi.model.validation.constraints.ValidActor; import dev.learning.xapi.model.validation.constraints.Variant; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java index 687df3c0..1653393e 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java @@ -4,12 +4,12 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeInfo.As; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonProperty; +import tools.jackson.annotation.JsonSubTypes; +import tools.jackson.annotation.JsonTypeInfo; +import tools.jackson.annotation.JsonTypeInfo.As; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.Mbox; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java index 3e22dd35..eb4998b6 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; +import tools.jackson.annotation.JsonIgnoreProperties; +import tools.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java index 3ccb705f..6cbccb2f 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonIgnore; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotNull; import jakarta.validation.valueextraction.Unwrapping; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java index 11147de4..11eb84ad 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.databind.annotation.JsonSerialize; import dev.learning.xapi.jackson.LocaleSerializer; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.NotUndetermined; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java index 33bcd55c..aec0526b 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonFormat; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import jakarta.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java index 367dfb4e..31770d12 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonIgnore; +import tools.jackson.annotation.JsonFormat; +import tools.jackson.annotation.JsonIgnore; import dev.learning.xapi.model.validation.constraints.ValidActor; import jakarta.validation.Valid; import java.util.ArrayList; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java index 0004b1d7..0b287a38 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import jakarta.validation.constraints.NotNull; import java.util.Locale; import lombok.Builder; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java index 85328cca..8d566a16 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java @@ -4,7 +4,7 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonProperty; +import tools.jackson.annotation.JsonProperty; /** * This enumeration class represents all valid xAPI interaction types. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java index 4f3705a3..8324cea6 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java @@ -4,7 +4,7 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import tools.jackson.databind.annotation.JsonSerialize; import dev.learning.xapi.jackson.LocaleSerializer; import java.util.LinkedHashMap; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java index 826c9d27..431785f2 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java @@ -4,10 +4,10 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonProperty; +import tools.jackson.annotation.JsonIgnoreProperties; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonProperty; import dev.learning.xapi.model.validation.constraints.Mbox; import jakarta.validation.Valid; import java.net.URI; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java index d6336624..1d743820 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.VaildScore; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java index f9f78039..030bfc72 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.ScaledScore; import lombok.Builder; import lombok.Value; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java index d07688c1..77e89c80 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonFormat; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.Agent.AgentObjectType; import dev.learning.xapi.model.validation.constraints.ValidActor; import dev.learning.xapi.model.validation.constraints.ValidAuthority; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java index 15b32c03..1e0dc437 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java @@ -4,11 +4,11 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeInfo.As; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonSubTypes; +import tools.jackson.annotation.JsonTypeInfo; +import tools.jackson.annotation.JsonTypeInfo.As; /** * This interface represents the xAPI statement object. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java index 3fa1d1ee..63f9a5d9 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import java.net.URI; import java.util.ArrayList; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java index 2f10bb84..c60e41ec 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java @@ -4,11 +4,11 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; -import com.fasterxml.jackson.annotation.JsonSubTypes; -import com.fasterxml.jackson.annotation.JsonTypeInfo; -import com.fasterxml.jackson.annotation.JsonTypeInfo.As; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonSubTypes; +import tools.jackson.annotation.JsonTypeInfo; +import tools.jackson.annotation.JsonTypeInfo.As; /** * This interface represents the xAPI SubStatement object. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java index 24429771..7f5dba5c 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonInclude.Include; +import tools.jackson.annotation.JsonIgnore; +import tools.jackson.annotation.JsonInclude; +import tools.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotNull; import java.net.URI; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java index 67eb2c64..db3082c8 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.Arrays; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java index 6df82540..ea04c5e0 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java index 8728cc8c..d890a382 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.springframework.integration.test.matcher.MapContentMatchers.hasAllEntries; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java index 250999e0..54d2defd 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java @@ -9,8 +9,8 @@ import static org.hamcrest.Matchers.is; import static org.springframework.integration.test.matcher.MapContentMatchers.hasAllEntries; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.InvalidFormatException; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.InvalidFormatException; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.ConstraintViolation; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java index 724037f8..b28f7b37 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.Validation; import jakarta.validation.Validator; import java.io.IOException; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java index 94293657..7f7af8e3 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNull; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java index 56e49619..346aa223 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import org.junit.jupiter.api.DisplayName; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java index e49246a3..a94301a7 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.LinkedHashMap; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java index f34c9fda..7e7ee99e 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.ArrayList; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java index 58127196..819d8de7 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java index 43a88cac..0894dd28 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.Collections; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java index e5f79c7c..70e35dd6 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java index 1c85cf92..6770db3c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java index 713d7828..dd661eba 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java index dc9f7aff..aa7ae30a 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.UUID; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java index ce5e2db4..2878c3ad 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java @@ -15,12 +15,12 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.exc.InvalidFormatException; -import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; -import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.fasterxml.jackson.databind.exc.ValueInstantiationException; +import tools.jackson.core.JsonProcessingException; +import tools.jackson.databind.ObjectMapper; +import tools.jackson.databind.exc.InvalidFormatException; +import tools.jackson.databind.exc.InvalidTypeIdException; +import tools.jackson.databind.exc.MismatchedInputException; +import tools.jackson.databind.exc.ValueInstantiationException; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.jackson.XapiStrictNullValuesModule; import dev.learning.xapi.jackson.XapiStrictObjectTypeModule; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java index caa82ef6..9c709902 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertThrows; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent.AgentObjectType; import java.io.IOException; import java.net.URI; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java index 49de95f4..f77d511c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import com.fasterxml.jackson.databind.ObjectMapper; +import tools.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; From 013030592297a56678bfdfbff83db6b0c897f890 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 22:28:04 +0000 Subject: [PATCH 5/6] Add spring-boot-jackson2 for Jackson 2 compatibility with Spring Boot 4.0 - Add spring-boot-jackson2 dependency to xapi-client and xapi-model-spring-boot-starter - Exclude spring-boot-starter-jackson (Jackson 3) from webflux starter - Update autoconfiguration imports to use Jackson2AutoConfiguration - Update hypersistence-utils to hibernate-70 for Hibernate 7 compatibility - Add spring-boot-webmvc-test for @WebMvcTest annotation Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- pom.xml | 5 ++++ samples/xapi-server/pom.xml | 9 +++++-- .../samples/xapiserver/StatementEntity.java | 2 +- .../samples/xapiserver/StatementService.java | 4 +-- .../xapiserver/StatementsControllerTest.java | 2 +- xapi-client/pom.xml | 10 +++++++ .../xapi/client/AgentProfileRequest.java | 2 +- .../xapi/client/GetAgentProfilesRequest.java | 2 +- .../xapi/client/GetAgentsRequest.java | 2 +- .../xapi/client/GetStatementsRequest.java | 2 +- .../learning/xapi/client/StatesRequest.java | 2 +- ...entAutoConfigurationAuthorizationTest.java | 5 ++-- ...apiClientAutoConfigurationBaseUrlTest.java | 4 +-- ...AutoConfigurationUsernamePasswordTest.java | 4 +-- xapi-model-spring-boot-starter/pom.xml | 10 +++++++ .../model/XapiModelAutoConfiguration.java | 14 +++++----- xapi-model/pom.xml | 6 ++--- .../xapi/jackson/LocaleSerializer.java | 6 ++--- .../NotNullDeserializationModifier.java | 18 ++++++------- .../jackson/StrictLocaleDeserializer.java | 14 +++++----- .../StrictObjectTypeResolverBuilder.java | 26 +++++++++---------- .../jackson/StrictTimestampDeserializer.java | 6 ++--- .../xapi/jackson/XapiStrictLocaleModule.java | 2 +- .../jackson/XapiStrictNullValuesModule.java | 2 +- .../jackson/XapiStrictObjectTypeModule.java | 2 +- .../jackson/XapiStrictTimestampModule.java | 2 +- .../model/strict/StrictObjectTypeMixIn.java | 2 +- .../java/dev/learning/xapi/model/About.java | 4 +-- .../java/dev/learning/xapi/model/Account.java | 4 +-- .../dev/learning/xapi/model/Activity.java | 4 +-- .../xapi/model/ActivityDefinition.java | 6 ++--- .../learning/xapi/model/ActivityState.java | 6 ++--- .../java/dev/learning/xapi/model/Actor.java | 12 ++++----- .../java/dev/learning/xapi/model/Agent.java | 4 +-- .../dev/learning/xapi/model/Attachment.java | 6 ++--- .../java/dev/learning/xapi/model/Context.java | 6 ++--- .../xapi/model/ContextActivities.java | 6 ++--- .../java/dev/learning/xapi/model/Group.java | 4 +-- .../xapi/model/InteractionComponent.java | 4 +-- .../learning/xapi/model/InteractionType.java | 2 +- .../dev/learning/xapi/model/LanguageMap.java | 2 +- .../java/dev/learning/xapi/model/Person.java | 8 +++--- .../java/dev/learning/xapi/model/Result.java | 4 +-- .../java/dev/learning/xapi/model/Score.java | 4 +-- .../dev/learning/xapi/model/Statement.java | 6 ++--- .../learning/xapi/model/StatementObject.java | 10 +++---- .../learning/xapi/model/StatementResult.java | 4 +-- .../xapi/model/SubStatementObject.java | 10 +++---- .../java/dev/learning/xapi/model/Verb.java | 6 ++--- .../dev/learning/xapi/model/AboutTests.java | 2 +- .../dev/learning/xapi/model/AccountTests.java | 2 +- .../xapi/model/ActivityDefinitionTests.java | 2 +- .../learning/xapi/model/ActivityTests.java | 4 +-- .../dev/learning/xapi/model/AgentTests.java | 2 +- .../learning/xapi/model/AttachmentTests.java | 2 +- .../xapi/model/ContextActivitiesTests.java | 2 +- .../dev/learning/xapi/model/ContextTests.java | 2 +- .../dev/learning/xapi/model/GroupTests.java | 2 +- .../xapi/model/InteractionComponentTests.java | 2 +- .../dev/learning/xapi/model/PersonTests.java | 2 +- .../dev/learning/xapi/model/ResultTests.java | 2 +- .../dev/learning/xapi/model/ScoreTests.java | 2 +- .../xapi/model/StatementReferenceTest.java | 2 +- .../xapi/model/StatementResultTest.java | 2 +- .../learning/xapi/model/StatementTests.java | 12 ++++----- .../xapi/model/SubStatementTests.java | 2 +- .../dev/learning/xapi/model/VerbTests.java | 2 +- 67 files changed, 181 insertions(+), 154 deletions(-) diff --git a/pom.xml b/pom.xml index f7eda3f1..d52d4e7b 100644 --- a/pom.xml +++ b/pom.xml @@ -272,6 +272,11 @@ pom import + + org.springframework.boot + spring-boot-jackson2 + 4.0.0 + dev.learning.xapi xapi-model diff --git a/samples/xapi-server/pom.xml b/samples/xapi-server/pom.xml index b3d481c5..234d542a 100644 --- a/samples/xapi-server/pom.xml +++ b/samples/xapi-server/pom.xml @@ -24,13 +24,18 @@ io.hypersistence - hypersistence-utils-hibernate-60 - 3.8.3 + hypersistence-utils-hibernate-70 + 3.12.0 org.springframework.boot spring-boot-devtools true + + org.springframework.boot + spring-boot-webmvc-test + test + diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java index 6f61ca02..05855660 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementEntity.java @@ -4,7 +4,7 @@ package dev.learning.xapi.samples.xapiserver; -import tools.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.JsonNode; import io.hypersistence.utils.hibernate.type.json.JsonType; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java index 521cd3ad..a2036ae7 100644 --- a/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java +++ b/samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StatementService.java @@ -4,8 +4,8 @@ package dev.learning.xapi.samples.xapiserver; -import tools.jackson.core.JsonProcessingException; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Statement; import dev.learning.xapi.model.StatementResult; import java.net.URI; diff --git a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java index ae42d851..4ad32d18 100644 --- a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java +++ b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java @@ -11,7 +11,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.webmvc.test.autoconfigure.WebMvcTest; import org.springframework.http.MediaType; import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.web.servlet.MockMvc; diff --git a/xapi-client/pom.xml b/xapi-client/pom.xml index 1acb0bfe..40b76560 100644 --- a/xapi-client/pom.xml +++ b/xapi-client/pom.xml @@ -16,6 +16,16 @@ org.springframework.boot spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-jackson + + + + + org.springframework.boot + spring-boot-jackson2 dev.learning.xapi diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java index b029c366..a46ed1f2 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/AgentProfileRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.util.Map; import java.util.function.Consumer; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java index 3a6eca05..d8f3305d 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentProfilesRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.time.Instant; import java.util.Map; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java index 1dba622e..dd2e28f8 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetAgentsRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.util.Map; import java.util.function.Consumer; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java index f877e4cd..183ebc4e 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/GetStatementsRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import dev.learning.xapi.model.StatementFormat; import dev.learning.xapi.model.Verb; diff --git a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java index e041f08f..9b50841f 100644 --- a/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java +++ b/xapi-client/src/main/java/dev/learning/xapi/client/StatesRequest.java @@ -4,7 +4,7 @@ package dev.learning.xapi.client; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent; import java.net.URI; import java.util.Map; diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java index 98e20c71..402cbe08 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationAuthorizationTest.java @@ -17,9 +17,8 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; -import org.springframework.boot.webflux.autoconfigure.WebFluxAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; import org.springframework.web.reactive.function.client.WebClient.Builder; @@ -37,7 +36,7 @@ CodecsAutoConfiguration.class, ReactorAutoConfiguration.class, XapiTestClientConfiguration2.class, - JacksonAutoConfiguration.class + Jackson2AutoConfiguration.class }, properties = "xapi.client.authorization = bearer 1234") class XapiClientAutoConfigurationAuthorizationTest { diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java index 52881d13..7e9a4eb7 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationBaseUrlTest.java @@ -16,7 +16,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; @@ -32,7 +32,7 @@ WebClientTestConfiguration.class, CodecsAutoConfiguration.class, ReactorAutoConfiguration.class, - JacksonAutoConfiguration.class + Jackson2AutoConfiguration.class }, properties = {"xapi.client.baseUrl = http://127.0.0.1:55123/"}) class XapiClientAutoConfigurationBaseUrlTest { diff --git a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java index e7607af8..be408062 100644 --- a/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java +++ b/xapi-client/src/test/java/dev/learning/xapi/client/configuration/XapiClientAutoConfigurationUsernamePasswordTest.java @@ -17,7 +17,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration; -import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration; +import org.springframework.boot.jackson2.autoconfigure.Jackson2AutoConfiguration; import org.springframework.boot.reactor.autoconfigure.ReactorAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.http.HttpHeaders; @@ -36,7 +36,7 @@ CodecsAutoConfiguration.class, ReactorAutoConfiguration.class, XapiTestClientConfiguration.class, - JacksonAutoConfiguration.class + Jackson2AutoConfiguration.class }, properties = {"xapi.client.username = username", "xapi.client.password = password"}) class XapiClientAutoConfigurationUsernamePasswordTest { diff --git a/xapi-model-spring-boot-starter/pom.xml b/xapi-model-spring-boot-starter/pom.xml index 51a8787a..fc162198 100644 --- a/xapi-model-spring-boot-starter/pom.xml +++ b/xapi-model-spring-boot-starter/pom.xml @@ -14,6 +14,16 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-jackson + + + + + org.springframework.boot + spring-boot-jackson2 org.springframework.boot diff --git a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java index 72a8083f..e56fe944 100644 --- a/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java +++ b/xapi-model-spring-boot-starter/src/main/java/dev/learning/xapi/autoconfigure/model/XapiModelAutoConfiguration.java @@ -4,10 +4,10 @@ package dev.learning.xapi.autoconfigure.model; -import tools.jackson.databind.DeserializationFeature; -import tools.jackson.databind.cfg.CoercionAction; -import tools.jackson.databind.cfg.CoercionInputShape; -import tools.jackson.databind.type.LogicalType; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.cfg.CoercionAction; +import com.fasterxml.jackson.databind.cfg.CoercionInputShape; +import com.fasterxml.jackson.databind.type.LogicalType; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.jackson.XapiStrictNullValuesModule; import dev.learning.xapi.jackson.XapiStrictObjectTypeModule; @@ -29,8 +29,8 @@ import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer; -import org.springframework.boot.autoconfigure.jackson.JacksonProperties; +import org.springframework.boot.jackson2.autoconfigure.Jackson2ObjectMapperBuilderCustomizer; +import org.springframework.boot.jackson2.autoconfigure.Jackson2Properties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -40,7 +40,7 @@ * @author István Rátkai (Selindek) */ @Configuration -@AutoConfigureBefore(JacksonProperties.class) +@AutoConfigureBefore(Jackson2Properties.class) public class XapiModelAutoConfiguration { /** diff --git a/xapi-model/pom.xml b/xapi-model/pom.xml index 15bf470d..c334d71f 100644 --- a/xapi-model/pom.xml +++ b/xapi-model/pom.xml @@ -34,9 +34,8 @@ - tools.jackson.core + com.fasterxml.jackson.core jackson-databind - 3.0.2 org.projectlombok @@ -44,9 +43,8 @@ provided - tools.jackson.datatype + com.fasterxml.jackson.datatype jackson-datatype-jsr310 - 3.0.2 jakarta.validation diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java index 35981cc7..aad7558e 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/LocaleSerializer.java @@ -4,9 +4,9 @@ package dev.learning.xapi.jackson; -import tools.jackson.core.JsonGenerator; -import tools.jackson.databind.SerializerProvider; -import tools.jackson.databind.ser.std.StdSerializer; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; import java.io.IOException; import java.util.Locale; import java.util.Map; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java index d50c439b..8eddea41 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/NotNullDeserializationModifier.java @@ -4,15 +4,15 @@ package dev.learning.xapi.jackson; -import tools.jackson.core.JsonParser; -import tools.jackson.databind.BeanDescription; -import tools.jackson.databind.DeserializationConfig; -import tools.jackson.databind.DeserializationContext; -import tools.jackson.databind.JsonDeserializer; -import tools.jackson.databind.JsonMappingException; -import tools.jackson.databind.deser.BeanDeserializerModifier; -import tools.jackson.databind.deser.ResolvableDeserializer; -import tools.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; +import com.fasterxml.jackson.databind.deser.ResolvableDeserializer; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java index 419c4a71..0c4da593 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictLocaleDeserializer.java @@ -4,13 +4,13 @@ package dev.learning.xapi.jackson; -import tools.jackson.core.JsonParser; -import tools.jackson.core.JsonToken; -import tools.jackson.databind.DeserializationContext; -import tools.jackson.databind.JavaType; -import tools.jackson.databind.JsonMappingException; -import tools.jackson.databind.KeyDeserializer; -import tools.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.KeyDeserializer; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import java.io.IOException; import java.util.Locale; import java.util.MissingResourceException; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java index eefdefac..cf3fcf23 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictObjectTypeResolverBuilder.java @@ -4,19 +4,19 @@ package dev.learning.xapi.jackson; -import tools.jackson.annotation.JsonTypeInfo.As; -import tools.jackson.core.JsonParser; -import tools.jackson.databind.BeanProperty; -import tools.jackson.databind.DeserializationConfig; -import tools.jackson.databind.DeserializationContext; -import tools.jackson.databind.JavaType; -import tools.jackson.databind.exc.InvalidTypeIdException; -import tools.jackson.databind.jsontype.NamedType; -import tools.jackson.databind.jsontype.TypeDeserializer; -import tools.jackson.databind.jsontype.TypeIdResolver; -import tools.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer; -import tools.jackson.databind.jsontype.impl.StdTypeResolverBuilder; -import tools.jackson.databind.util.TokenBuffer; +import com.fasterxml.jackson.annotation.JsonTypeInfo.As; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.BeanProperty; +import com.fasterxml.jackson.databind.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.jsontype.TypeDeserializer; +import com.fasterxml.jackson.databind.jsontype.TypeIdResolver; +import com.fasterxml.jackson.databind.jsontype.impl.AsPropertyTypeDeserializer; +import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder; +import com.fasterxml.jackson.databind.util.TokenBuffer; import java.io.IOException; import java.util.Arrays; import java.util.Collection; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java index df7f8445..c533b865 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/StrictTimestampDeserializer.java @@ -4,9 +4,9 @@ package dev.learning.xapi.jackson; -import tools.jackson.core.JsonParser; -import tools.jackson.databind.DeserializationContext; -import tools.jackson.databind.deser.std.StdDeserializer; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.deser.std.StdDeserializer; import dev.learning.xapi.jackson.model.strict.XapiTimestamp; import dev.learning.xapi.jackson.model.strict.XapiTimestamp.XapiTimestampParseException; import java.io.IOException; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java index 439c2b68..86631173 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictLocaleModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import tools.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.module.SimpleModule; import dev.learning.xapi.jackson.StrictLocaleDeserializer.StrictLocaleKeyDeserializer; import java.util.Locale; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java index df4a0a72..83c19808 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictNullValuesModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import tools.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.module.SimpleModule; /** * xAPI JSON module for setting strict deserializer modifier. diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java index aa7bbc16..436bd16d 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictObjectTypeModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import tools.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.module.SimpleModule; import dev.learning.xapi.jackson.model.strict.StrictObjectTypeMixIn; import dev.learning.xapi.model.Activity; import dev.learning.xapi.model.Actor; diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java index bf9c4435..16b419d4 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/XapiStrictTimestampModule.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson; -import tools.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.module.SimpleModule; import java.time.Instant; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java index ca92ff20..72d78031 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java +++ b/xapi-model/src/main/java/dev/learning/xapi/jackson/model/strict/StrictObjectTypeMixIn.java @@ -4,7 +4,7 @@ package dev.learning.xapi.jackson.model.strict; -import tools.jackson.databind.annotation.JsonTypeResolver; +import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; import dev.learning.xapi.jackson.StrictObjectTypeResolverBuilder; /** diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/About.java b/xapi-model/src/main/java/dev/learning/xapi/model/About.java index 153f99aa..4cff953d 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/About.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/About.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import java.net.URI; import java.util.LinkedHashMap; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java index 8b73e011..aa1d4248 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Account.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Account.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java index cfaf80eb..e387a1e5 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Activity.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonMerge; -import tools.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonMerge; +import com.fasterxml.jackson.annotation.JsonProperty; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.ValidActivityDefinition; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java index 9de8a1f6..bc5b5f09 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityDefinition.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.annotation.JsonMerge; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonMerge; import dev.learning.xapi.model.validation.constraints.HasScheme; import java.net.URI; import java.util.ArrayList; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java index 6beb0296..7220524a 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ActivityState.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.databind.node.ObjectNode; import dev.learning.xapi.model.validation.constraints.ValidActor; import dev.learning.xapi.model.validation.constraints.Variant; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java index 1653393e..687df3c0 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Actor.java @@ -4,12 +4,12 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.annotation.JsonProperty; -import tools.jackson.annotation.JsonSubTypes; -import tools.jackson.annotation.JsonTypeInfo; -import tools.jackson.annotation.JsonTypeInfo.As; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.Mbox; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java index eb4998b6..3e22dd35 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonIgnoreProperties; -import tools.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java index 6cbccb2f..3ccb705f 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Attachment.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonIgnore; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotNull; import jakarta.validation.valueextraction.Unwrapping; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java index 11eb84ad..11147de4 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Context.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Context.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import dev.learning.xapi.jackson.LocaleSerializer; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.NotUndetermined; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java index aec0526b..33bcd55c 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/ContextActivities.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonFormat; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import jakarta.validation.Valid; import java.util.ArrayList; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java index 31770d12..367dfb4e 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Group.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Group.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonFormat; -import tools.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonIgnore; import dev.learning.xapi.model.validation.constraints.ValidActor; import jakarta.validation.Valid; import java.util.ArrayList; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java index 0b287a38..0004b1d7 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionComponent.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import jakarta.validation.constraints.NotNull; import java.util.Locale; import lombok.Builder; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java index 8d566a16..85328cca 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/InteractionType.java @@ -4,7 +4,7 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonProperty; /** * This enumeration class represents all valid xAPI interaction types. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java index 8324cea6..4f3705a3 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/LanguageMap.java @@ -4,7 +4,7 @@ package dev.learning.xapi.model; -import tools.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import dev.learning.xapi.jackson.LocaleSerializer; import java.util.LinkedHashMap; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java index 431785f2..826c9d27 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Person.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Person.java @@ -4,10 +4,10 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonIgnoreProperties; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonProperty; import dev.learning.xapi.model.validation.constraints.Mbox; import jakarta.validation.Valid; import java.net.URI; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java index 1d743820..d6336624 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Result.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Result.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import dev.learning.xapi.model.validation.constraints.VaildScore; import jakarta.validation.Valid; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java index 030bfc72..f9f78039 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Score.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Score.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.ScaledScore; import lombok.Builder; import lombok.Value; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java index 77e89c80..d07688c1 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonFormat; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.Agent.AgentObjectType; import dev.learning.xapi.model.validation.constraints.ValidActor; import dev.learning.xapi.model.validation.constraints.ValidAuthority; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java index 1e0dc437..15b32c03 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementObject.java @@ -4,11 +4,11 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.annotation.JsonSubTypes; -import tools.jackson.annotation.JsonTypeInfo; -import tools.jackson.annotation.JsonTypeInfo.As; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo.As; /** * This interface represents the xAPI statement object. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java index 63f9a5d9..3fa1d1ee 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/StatementResult.java @@ -4,8 +4,8 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import java.net.URI; import java.util.ArrayList; import java.util.List; diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java index c60e41ec..2f10bb84 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/SubStatementObject.java @@ -4,11 +4,11 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; -import tools.jackson.annotation.JsonSubTypes; -import tools.jackson.annotation.JsonTypeInfo; -import tools.jackson.annotation.JsonTypeInfo.As; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo.As; /** * This interface represents the xAPI SubStatement object. diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java index 7f5dba5c..24429771 100644 --- a/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java +++ b/xapi-model/src/main/java/dev/learning/xapi/model/Verb.java @@ -4,9 +4,9 @@ package dev.learning.xapi.model; -import tools.jackson.annotation.JsonIgnore; -import tools.jackson.annotation.JsonInclude; -import tools.jackson.annotation.JsonInclude.Include; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.constraints.NotNull; import java.net.URI; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java index db3082c8..67eb2c64 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AboutTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.Arrays; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java index ea04c5e0..6df82540 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AccountTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java index d890a382..8728cc8c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityDefinitionTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.springframework.integration.test.matcher.MapContentMatchers.hasAllEntries; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java index 54d2defd..250999e0 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ActivityTests.java @@ -9,8 +9,8 @@ import static org.hamcrest.Matchers.is; import static org.springframework.integration.test.matcher.MapContentMatchers.hasAllEntries; -import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.exc.InvalidFormatException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.exc.InvalidFormatException; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.model.validation.constraints.HasScheme; import jakarta.validation.ConstraintViolation; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java index b28f7b37..724037f8 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AgentTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.Validation; import jakarta.validation.Validator; import java.io.IOException; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java index 7f7af8e3..94293657 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/AttachmentTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertNull; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java index 346aa223..56e49619 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextActivitiesTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import org.junit.jupiter.api.DisplayName; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java index a94301a7..e49246a3 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ContextTests.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.nullValue; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.LinkedHashMap; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java index 7e7ee99e..f34c9fda 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/GroupTests.java @@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.ArrayList; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java index 819d8de7..58127196 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/InteractionComponentTests.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java index 0894dd28..43a88cac 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/PersonTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.Collections; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java index 70e35dd6..e5f79c7c 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ResultTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java index 6770db3c..1c85cf92 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/ScoreTests.java @@ -8,7 +8,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java index dd661eba..713d7828 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementReferenceTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java index aa7ae30a..dc9f7aff 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementResultTest.java @@ -9,7 +9,7 @@ import static org.hamcrest.Matchers.instanceOf; import static org.hamcrest.Matchers.is; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import java.io.IOException; import java.net.URI; import java.util.UUID; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java index 2878c3ad..ce5e2db4 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java @@ -15,12 +15,12 @@ import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.startsWith; -import tools.jackson.core.JsonProcessingException; -import tools.jackson.databind.ObjectMapper; -import tools.jackson.databind.exc.InvalidFormatException; -import tools.jackson.databind.exc.InvalidTypeIdException; -import tools.jackson.databind.exc.MismatchedInputException; -import tools.jackson.databind.exc.ValueInstantiationException; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.exc.InvalidFormatException; +import com.fasterxml.jackson.databind.exc.InvalidTypeIdException; +import com.fasterxml.jackson.databind.exc.MismatchedInputException; +import com.fasterxml.jackson.databind.exc.ValueInstantiationException; import dev.learning.xapi.jackson.XapiStrictLocaleModule; import dev.learning.xapi.jackson.XapiStrictNullValuesModule; import dev.learning.xapi.jackson.XapiStrictObjectTypeModule; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java index 9c709902..caa82ef6 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/SubStatementTests.java @@ -10,7 +10,7 @@ import static org.hamcrest.Matchers.notNullValue; import static org.junit.jupiter.api.Assertions.assertThrows; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import dev.learning.xapi.model.Agent.AgentObjectType; import java.io.IOException; import java.net.URI; diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java index f77d511c..49de95f4 100644 --- a/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java +++ b/xapi-model/src/test/java/dev/learning/xapi/model/VerbTests.java @@ -11,7 +11,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; -import tools.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; import jakarta.validation.Validator; From def2178bfacd21dc3165c2a094c2e15e9e561496 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 24 Nov 2025 22:30:14 +0000 Subject: [PATCH 6/6] Fix Jackson 2 property prefix in xapi-server sample test Change spring.jackson.deserialization to spring.jackson2.deserialization for Spring Boot 4.0 Jackson 2 compatibility Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com> --- .../xapi/samples/xapiserver/StatementsControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java index 4ad32d18..b2470690 100644 --- a/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java +++ b/samples/xapi-server/src/test/java/dev/learning/xapi/samples/xapiserver/StatementsControllerTest.java @@ -25,7 +25,7 @@ */ @WebMvcTest( value = {StatementController.class}, - properties = "spring.jackson.deserialization.ACCEPT_SINGLE_VALUE_AS_ARRAY = true") + properties = "spring.jackson2.deserialization.ACCEPT_SINGLE_VALUE_AS_ARRAY = true") class StatementControllerTest { @Autowired private MockMvc mvc;