From b5475a9c9eb9eeadf1eb85c3b2b4c80a7f0d61bf Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Fri, 20 Mar 2026 20:22:24 +0000 Subject: [PATCH] AAE-41879 Migrate jackson 2 -> 3 --- .../org/alfresco/transformer/TransformRegistryImpl.java | 2 +- .../transformer/messaging/TransformMessageConverter.java | 6 +++--- .../metadataExtractors/AbstractMetadataExtractor.java | 2 +- .../alfresco/transformer/AbstractMetadataExtractsIT.java | 4 ++-- .../transformer/AbstractTransformerControllerTest.java | 2 +- .../transform/base/messaging/TransformMessageConverter.java | 6 +++--- .../base/metadata/AbstractMetadataExtractorEmbedder.java | 2 +- .../java/org/alfresco/transform/base/AbstractBaseTest.java | 2 +- .../transform/base/TransformControllerAllInOneTest.java | 2 +- .../alfresco/transform/base/TransformControllerTest.java | 2 +- .../transform/base/metadata/AbstractMetadataExtractsIT.java | 4 ++-- .../libreoffice/transformers/LibreOfficeTransformer.java | 4 ++-- .../transform/config/reader/TransformConfigReaderJson.java | 2 +- .../transform/config/reader/TransformConfigReaderYaml.java | 2 +- .../transform/registry/CombinedTransformConfigTest.java | 2 +- 15 files changed, 22 insertions(+), 22 deletions(-) diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java index 576ba94b..10adc5c0 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java @@ -36,13 +36,13 @@ import java.io.InputStreamReader; import java.io.Reader; import jakarta.annotation.PostConstruct; -import tools.jackson.databind.ObjectMapper; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.config.TransformConfig; import org.alfresco.transform.exceptions.TransformException; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java index dbcceb34..ff1cd61f 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java @@ -27,19 +27,19 @@ package org.alfresco.transformer.messaging; -import tools.jackson.databind.JavaType; -import tools.jackson.databind.type.TypeFactory; -import com.google.common.collect.ImmutableMap; import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.Session; +import com.google.common.collect.ImmutableMap; import org.springframework.jms.support.converter.JacksonJsonMessageConverter; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.jms.support.converter.MessageType; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.type.TypeFactory; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java index c720148f..a8682534 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/metadataExtractors/AbstractMetadataExtractor.java @@ -43,10 +43,10 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeMap; +import org.slf4j.Logger; import tools.jackson.core.JacksonException; import tools.jackson.core.type.TypeReference; import tools.jackson.databind.ObjectMapper; -import org.slf4j.Logger; /** * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine. diff --git a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java index 1a5d83f0..27b4db87 100644 --- a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java +++ b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java @@ -42,10 +42,10 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import tools.jackson.core.type.TypeReference; -import tools.jackson.databind.ObjectMapper; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; /** * @deprecated will be removed in a future release. Replaced by alfresco-base-t-engine. diff --git a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index 00839437..321ae1b4 100644 --- a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -59,7 +59,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import tools.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -75,6 +74,7 @@ import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java index d43f7345..9e556ccf 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java @@ -27,19 +27,19 @@ package org.alfresco.transform.base.messaging; -import tools.jackson.databind.JavaType; -import tools.jackson.databind.type.TypeFactory; -import com.google.common.collect.ImmutableMap; import jakarta.jms.JMSException; import jakarta.jms.Message; import jakarta.jms.Session; +import com.google.common.collect.ImmutableMap; import org.springframework.jms.support.converter.JacksonJsonMessageConverter; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.jms.support.converter.MessageType; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; +import tools.jackson.databind.JavaType; +import tools.jackson.databind.type.TypeFactory; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; diff --git a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java index e412e8e5..76b0a1d0 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java @@ -45,10 +45,10 @@ import java.util.Set; import java.util.StringTokenizer; import java.util.TreeMap; +import org.slf4j.Logger; import tools.jackson.core.JacksonException; import tools.jackson.core.type.TypeReference; import tools.jackson.databind.ObjectMapper; -import org.slf4j.Logger; import org.alfresco.transform.base.CustomTransformer; import org.alfresco.transform.base.TransformManager; diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java index c6f3836e..d1326dbf 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/AbstractBaseTest.java @@ -56,7 +56,6 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.io.TempDir; @@ -70,6 +69,7 @@ import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.base.executors.CommandExecutor; import org.alfresco.transform.base.executors.RuntimeExec; diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java index b779f069..48f1623b 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerAllInOneTest.java @@ -56,7 +56,6 @@ import java.nio.charset.StandardCharsets; import java.util.StringJoiner; import java.util.concurrent.TimeUnit; -import tools.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -65,6 +64,7 @@ import org.springframework.mock.web.MockMultipartFile; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.base.fakes.FakeTransformEngineWithAllInOne; import org.alfresco.transform.base.fakes.FakeTransformEngineWithOneCustomTransformer; diff --git a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java index 972603bf..02e44516 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/TransformControllerTest.java @@ -76,7 +76,6 @@ import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.AppenderBase; -import tools.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import org.codehaus.plexus.util.FileUtils; import org.junit.jupiter.api.BeforeEach; @@ -96,6 +95,7 @@ import org.springframework.test.context.bean.override.mockito.MockitoBean; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.base.fakes.FakeTransformEngineWithTwoCustomTransformers; import org.alfresco.transform.base.fakes.FakeTransformerPdf2Png; diff --git a/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java index 94e4bd73..91f0cd64 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractsIT.java @@ -42,10 +42,10 @@ import java.io.Serializable; import java.util.HashMap; import java.util.Map; -import tools.jackson.core.type.TypeReference; -import tools.jackson.databind.ObjectMapper; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; +import tools.jackson.core.type.TypeReference; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.base.clients.FileInfo; diff --git a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java index c412c3e6..20ab5b90 100644 --- a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java +++ b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/transformers/LibreOfficeTransformer.java @@ -35,8 +35,6 @@ import java.io.Serializable; import java.util.Map; import jakarta.annotation.PostConstruct; -import tools.jackson.core.JacksonException; -import tools.jackson.databind.ObjectMapper; import com.sun.star.task.ErrorCodeIOException; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; @@ -49,6 +47,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import tools.jackson.core.JacksonException; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.base.TransformManager; import org.alfresco.transform.base.executors.JavaExecutor; diff --git a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderJson.java b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderJson.java index 98017b7f..693643c4 100644 --- a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderJson.java +++ b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderJson.java @@ -23,8 +23,8 @@ package org.alfresco.transform.config.reader; import java.io.IOException; -import tools.jackson.databind.ObjectMapper; import org.springframework.core.io.Resource; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.config.TransformConfig; diff --git a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderYaml.java b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderYaml.java index f3901446..0dfae53c 100644 --- a/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderYaml.java +++ b/model/src/main/java/org/alfresco/transform/config/reader/TransformConfigReaderYaml.java @@ -23,9 +23,9 @@ package org.alfresco.transform.config.reader; import java.io.IOException; +import org.springframework.core.io.Resource; import tools.jackson.databind.ObjectMapper; import tools.jackson.dataformat.yaml.YAMLMapper; -import org.springframework.core.io.Resource; import org.alfresco.transform.config.TransformConfig; diff --git a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java index a7e82a19..02264629 100644 --- a/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java +++ b/model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java @@ -33,11 +33,11 @@ import java.io.IOException; import java.util.List; import java.util.Set; -import tools.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import org.junit.jupiter.api.Test; +import tools.jackson.databind.ObjectMapper; import org.alfresco.transform.config.OverrideSupported; import org.alfresco.transform.config.SupportedSourceAndTarget;