From c9db978d73c06f272dae1b2609286e67e27e30c5 Mon Sep 17 00:00:00 2001 From: Alex Mukha Date: Tue, 24 Mar 2026 10:32:24 +0000 Subject: [PATCH] Revert "AAE-41879 Migrate jackson 2 -> 3" This reverts commit 61c808befb514df41ddc82bfd04e74812c3cc403. --- .../transform/client/model/InternalContext.java | 13 ------------- .../transform/client/model/MultiStep.java | 9 --------- .../client/model/TransformRequest.java | 17 ----------------- 3 files changed, 39 deletions(-) diff --git a/model/src/main/java/org/alfresco/transform/client/model/InternalContext.java b/model/src/main/java/org/alfresco/transform/client/model/InternalContext.java index 799f8dea..84786a3d 100644 --- a/model/src/main/java/org/alfresco/transform/client/model/InternalContext.java +++ b/model/src/main/java/org/alfresco/transform/client/model/InternalContext.java @@ -26,10 +26,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - import org.alfresco.transform.messages.TransformStack; /** @@ -39,23 +35,14 @@ import org.alfresco.transform.messages.TransformStack; */ // This class is in the package org.alfresco.transform.messages in HxP because that is more readable, but in // org.alfresco.transform.client.model in Alfresco for backward compatibility. -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class InternalContext implements Serializable { - @JsonProperty("multiStep") private MultiStep multiStep; - @JsonProperty("attemptedRetries") private int attemptedRetries; - @JsonProperty("currentSourceMediaType") private String currentSourceMediaType; - @JsonProperty("currentTargetMediaType") private String currentTargetMediaType; - @JsonProperty("replyToDestination") private String replyToDestination; - @JsonProperty("currentSourceSize") private Long currentSourceSize; - @JsonProperty("transformRequestOptions") private Map transformRequestOptions = new HashMap<>(); public MultiStep getMultiStep() diff --git a/model/src/main/java/org/alfresco/transform/client/model/MultiStep.java b/model/src/main/java/org/alfresco/transform/client/model/MultiStep.java index e14d6068..af2a6ed8 100644 --- a/model/src/main/java/org/alfresco/transform/client/model/MultiStep.java +++ b/model/src/main/java/org/alfresco/transform/client/model/MultiStep.java @@ -25,10 +25,6 @@ import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - /** * Holds required contextual information for a multi-step transform. * @@ -36,15 +32,10 @@ import com.fasterxml.jackson.annotation.JsonProperty; */ // This class is in the package org.alfresco.transform.messages in HxP because that is more readable, but in // org.alfresco.transform.client.model in Alfresco for backward compatibility. -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class MultiStep implements Serializable { - @JsonProperty("initialRequestId") private String initialRequestId; - @JsonProperty("initialSourceMediaType") private String initialSourceMediaType; - @JsonProperty("transformsToBeDone") private List transformsToBeDone = new ArrayList<>(); // regions [Accessors] diff --git a/model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java b/model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java index ab7d1b0e..02ab1073 100644 --- a/model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java +++ b/model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java @@ -30,40 +30,23 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonProperty; - import org.alfresco.transform.common.ExtensionService; import org.alfresco.transform.messages.TransformStack; // This class is in the package org.alfresco.transform.messages in HxP because that is more readable, but in // org.alfresco.transform.client.model in Alfresco for backward compatibility. -@JsonIgnoreProperties(ignoreUnknown = true) -@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class TransformRequest implements Serializable { - @JsonProperty("requestId") private String requestId; - @JsonProperty("sourceReference") private String sourceReference; - @JsonProperty("sourceMediaType") private String sourceMediaType; - @JsonProperty("sourceSize") private Long sourceSize; - @JsonProperty("sourceExtension") private String sourceExtension; - @JsonProperty("targetMediaType") private String targetMediaType; - @JsonProperty("targetExtension") private String targetExtension; - @JsonProperty("clientData") private String clientData; - @JsonProperty("schema") private int schema; - @JsonProperty("transformRequestOptions") private Map transformRequestOptions = new HashMap<>(); - @JsonProperty("internalContext") private InternalContext internalContext; // regions [Accessors]