diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java index 89d0c929..cf2c81a3 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOController.java @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.executors.Transformer; import org.alfresco.transformer.probes.ProbeTestTransform; import org.slf4j.Logger; @@ -41,13 +41,12 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.config.CoreVersionDecorator.setOrClearCoreVersion; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_DEFAULT; import static org.alfresco.transformer.util.RequestParamMap.CONFIG_VERSION; import static org.alfresco.transformer.util.RequestParamMap.SOURCE_ENCODING; -import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import static org.springframework.http.HttpStatus.OK; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java index 7f01dc9c..23fd8b85 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/main/java/org/alfresco/transformer/AIOCustomConfig.java @@ -26,7 +26,7 @@ */ package org.alfresco.transformer; -import org.alfresco.transform.client.registry.TransformServiceRegistry; +import org.alfresco.transform.registry.TransformServiceRegistry; import org.alfresco.transformer.executors.ImageMagickCommandExecutor; import org.alfresco.transformer.executors.LibreOfficeJavaExecutor; import org.alfresco.transformer.executors.PdfRendererCommandExecutor; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java index 1dc97d3b..f4dd759a 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOControllerTest.java @@ -29,7 +29,7 @@ package org.alfresco.transformer; import java.io.IOException; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.client.model.config.TransformConfig; +import org.alfresco.transform.config.TransformConfig; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -37,8 +37,8 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.context.annotation.Import; import org.springframework.http.ResponseEntity; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_LATEST; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_DEFAULT; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_LATEST; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOQueueTransformServiceIT.java b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOQueueTransformServiceIT.java index 59e630c1..a9c6ea6c 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOQueueTransformServiceIT.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio-boot/src/test/java/org/alfresco/transformer/AIOQueueTransformServiceIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java index 0dadfee5..a19fcb7a 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/main/java/org/alfresco/transformer/AIOTransformRegistry.java @@ -27,14 +27,13 @@ package org.alfresco.transformer; import com.fasterxml.jackson.databind.ObjectMapper; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.registry.AbstractTransformRegistry; -import org.alfresco.transform.client.registry.CombinedTransformConfig; -import org.alfresco.transform.client.registry.TransformCache; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.alfresco.transform.registry.CombinedTransformConfig; +import org.alfresco.transform.registry.TransformCache; import org.alfresco.transformer.executors.Transformer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Value; import java.io.IOException; import java.io.InputStream; @@ -44,7 +43,7 @@ import java.util.HashMap; import java.util.Map; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; +import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; /** * AIOTransformRegistry manages all of the sub transformers registered to it and provides aggregated TransformConfig. @@ -91,7 +90,7 @@ public class AIOTransformRegistry extends AbstractTransformRegistry combinedTransformConfig.addTransformConfig(transformConfig, location, transformerId, this); // Map all of the transforms defined in the config to this Transformer implementation - for (org.alfresco.transform.client.model.config.Transformer transformerConfig : transformConfig.getTransformers()) + for (org.alfresco.transform.config.Transformer transformerConfig : transformConfig.getTransformers()) { String transformerName = transformerConfig.getTransformerName(); // A later tEngine 'might' override one that has already been defined. That is fine. diff --git a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/AIOTransformRegistryTest.java b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/AIOTransformRegistryTest.java index 22ce7f59..f70e1e92 100644 --- a/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/AIOTransformRegistryTest.java +++ b/alfresco-transform-core-aio/alfresco-transform-core-aio/src/test/java/org/alfresco/transformer/AIOTransformRegistryTest.java @@ -27,7 +27,7 @@ package org.alfresco.transformer; import com.fasterxml.jackson.databind.ObjectMapper; -import org.alfresco.transform.client.model.config.TransformConfig; +import org.alfresco.transform.config.TransformConfig; import org.alfresco.transformer.executors.TikaJavaExecutor; import org.alfresco.transformer.executors.Transformer; import org.alfresco.transformer.transformers.SelectingTransformer; @@ -51,9 +51,7 @@ import java.util.stream.Collectors; import java.util.stream.Stream; import static org.alfresco.transformer.util.RequestParamMap.PAGE_LIMIT; -import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; public class AIOTransformRegistryTest diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java index 12d10691..f1be9481 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickControllerTest.java @@ -26,8 +26,7 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; -import static org.alfresco.transformer.util.MimetypeMap.PREFIX_IMAGE; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -92,6 +91,8 @@ public class ImageMagickControllerTest extends AbstractTransformerControllerTest { private static final String ENGINE_CONFIG_NAME = "imagemagick_engine_config.json"; + private String PREFIX_IMAGE = "image/"; + @Mock protected ExecutionResult mockExecutionResult; diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java index 0b0b5398..d415bbce 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickQueueTransformServiceIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; import java.util.UUID; diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java index 2845f263..b85e2ea0 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick-boot/src/test/java/org/alfresco/transformer/ImageMagickTransformationIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -32,39 +32,39 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; import static org.alfresco.transformer.EngineClient.sendTRequest; import static org.alfresco.transformer.TestFileInfo.testFile; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_APPLICATION_EPS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_BMP; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_CGM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_GIF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_IEF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_JP2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PBM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PGM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PNG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PNM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PPJ; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PPM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PSD; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_3FR; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_ARW; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_CR2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_DNG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_K25; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_MRW; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_NEF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_ORF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_PEF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_R3D; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_RAF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_RW2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_RWL; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_X3F; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_TIFF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_XBM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_XPM; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_XWD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_APPLICATION_EPS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_BMP; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_CGM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_GIF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_IEF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JP2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PBM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PGM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PPJ; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PPM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PSD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_3FR; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_ARW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_CR2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_DNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_K25; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_MRW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_NEF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_ORF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_PEF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_R3D; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_RAF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_RW2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_RWL; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_X3F; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_TIFF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_XBM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_XPM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_XWD; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickOptionsBuilder.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickOptionsBuilder.java index 3c7515af..5486071f 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickOptionsBuilder.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/ImageMagickOptionsBuilder.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -27,7 +27,7 @@ package org.alfresco.transformer; import com.google.common.collect.ImmutableList; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import java.util.List; import java.util.StringJoiner; diff --git a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java index 9287ea40..641b50d8 100644 --- a/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java +++ b/alfresco-transform-imagemagick/alfresco-transform-imagemagick/src/main/java/org/alfresco/transformer/executors/ImageMagickCommandExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,7 +26,7 @@ */ package org.alfresco.transformer.executors; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.ImageMagickOptionsBuilder; import java.io.File; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java index 298f335a..bd63ede7 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeControllerTest.java @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.alfresco.transformer.util.RequestParamMap.SOURCE_MIMETYPE; import static org.alfresco.transformer.util.RequestParamMap.TARGET_EXTENSION; import static org.alfresco.transformer.util.RequestParamMap.TARGET_MIMETYPE; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java index 990fcd48..e73acd9a 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeQueueTransformServiceIT.java @@ -26,7 +26,7 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; import java.util.UUID; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java index 7dd05877..21c62d9b 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice-boot/src/test/java/org/alfresco/transformer/LibreOfficeTransformationIT.java @@ -31,37 +31,37 @@ import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; import static org.alfresco.transformer.EngineClient.sendTRequest; import static org.alfresco.transformer.TestFileInfo.testFile; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_EXCEL; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_HTML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_SVG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_GRAPHICS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_PRESENTATION; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_SPREADSHEET; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_TEXT; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PDF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PPT; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_RTF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_CSV; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TSV; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VISIO; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VISIO_2013; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORD; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORDPERFECT; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OUTLOOK_MSG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_DITA; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_SXI; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_SXC; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STW; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STI; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_STC; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_SVG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_GRAPHICS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_RTF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_CSV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TSV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VISIO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VISIO_2013; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORDPERFECT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OUTLOOK_MSG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_DITA; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_SXI; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_SXC; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_STW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_STI; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_STC; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; diff --git a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java index 1f96fdcc..783db94e 100644 --- a/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java +++ b/alfresco-transform-libreoffice/alfresco-transform-libreoffice/src/main/java/org/alfresco/transformer/executors/LibreOfficeJavaExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -28,7 +28,7 @@ package org.alfresco.transformer.executors; import com.fasterxml.jackson.databind.ObjectMapper; import com.sun.star.task.ErrorCodeIOException; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.apache.commons.lang3.StringUtils; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java index 3a466d42..1f63447d 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/main/java/org/alfresco/transformer/MiscController.java @@ -36,8 +36,8 @@ import java.io.File; import java.util.HashMap; import java.util.Map; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import static org.alfresco.transformer.util.RequestParamMap.SOURCE_ENCODING; import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER; diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java index e4dec7e0..f78a8c52 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscControllerTest.java @@ -27,15 +27,15 @@ package org.alfresco.transformer; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IWORK_KEYNOTE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IWORK_NUMBERS; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_RFC822; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_KEYNOTE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_NUMBERS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_RFC822; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscMetadataExtractsIT.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscMetadataExtractsIT.java index cfb8775e..4b91d312 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscMetadataExtractsIT.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscMetadataExtractsIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,9 +26,9 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_RFC822; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_XHTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_RFC822; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XHTML; import static org.alfresco.transformer.TestFileInfo.testFile; import java.util.stream.Stream; diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java index 6e4479a6..e2801aa1 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscQueueTransformServiceIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; diff --git a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java index a0ebf206..93f05c63 100644 --- a/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java +++ b/alfresco-transform-misc/alfresco-transform-misc-boot/src/test/java/org/alfresco/transformer/MiscTransformsIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -29,31 +29,31 @@ package org.alfresco.transformer; import static java.text.MessageFormat.format; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_DITA; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_EXCEL; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_GIF; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_PNG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_TIFF; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IWORK_KEYNOTE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IWORK_NUMBERS; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IWORK_PAGES; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_JAVASCRIPT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OUTLOOK_MSG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PPT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_RFC822; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_CSS; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_CSV; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_JAVASCRIPT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_MEDIAWIKI; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_WORD; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_XML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_DITA; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_GIF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_TIFF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_KEYNOTE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_NUMBERS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_PAGES; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_JAVASCRIPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OUTLOOK_MSG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_RFC822; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_CSS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_CSV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_JAVASCRIPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_MEDIAWIKI; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; import static org.alfresco.transformer.EngineClient.sendTRequest; import static org.alfresco.transformer.TestFileInfo.testFile; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java index a9db9ac1..bcace46e 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/AppleIWorksContentTransformer.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -41,7 +41,7 @@ import java.nio.file.StandardCopyOption; import java.util.List; import java.util.Map; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; /** * Converts Apple iWorks files to JPEGs for thumbnailing and previewing. diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java index e538de97..ed4c642f 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/EMLTransformer.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -48,9 +48,9 @@ import java.io.Writer; import java.util.Map; import java.util.Properties; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_HTML; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_MULTIPART_ALTERNATIVE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_MULTIPART_ALTERNATIVE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; /** * Uses javax.mail.MimeMessage to generate plain text versions of RFC822 email diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java index eb84e5f8..857ea39f 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/HtmlParserContentTransformer.java @@ -42,7 +42,7 @@ import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.util.Map; -import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING; +import static org.alfresco.transform.common.RequestParamMap.SOURCE_ENCODING; /** * Content transformer which wraps the HTML Parser library for diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java index 0a1760a6..3364b631 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/StringExtractingContentTransformer.java @@ -42,8 +42,8 @@ import java.nio.charset.Charset; import java.nio.charset.IllegalCharsetNameException; import java.util.Map; -import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING; -import static org.alfresco.transform.client.util.RequestParamMap.TARGET_ENCODING; +import static org.alfresco.transform.common.RequestParamMap.SOURCE_ENCODING; +import static org.alfresco.transform.common.RequestParamMap.TARGET_ENCODING; /** * Converts any textual format to plain text. diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java index 253d1c88..4be864d6 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/main/java/org/alfresco/transformer/transformers/TextToPdfContentTransformer.java @@ -50,7 +50,7 @@ import java.nio.charset.Charset; import java.util.HashMap; import java.util.Map; -import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING; +import static org.alfresco.transform.common.RequestParamMap.SOURCE_ENCODING; /** *

diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java index 775a4408..3e663972 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/HtmlParserContentTransformerTest.java @@ -35,7 +35,7 @@ import java.nio.file.Files; import java.util.HashMap; import java.util.Map; -import static org.alfresco.transform.client.util.RequestParamMap.SOURCE_ENCODING; +import static org.alfresco.transform.common.RequestParamMap.SOURCE_ENCODING; import static org.junit.jupiter.api.Assertions.assertEquals; public class HtmlParserContentTransformerTest diff --git a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java index 5fa08d79..e80f5569 100644 --- a/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java +++ b/alfresco-transform-misc/alfresco-transform-misc/src/test/java/org/alfresco/transformer/transformers/TextToPdfContentTransformerTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -263,7 +263,7 @@ public class TextToPdfContentTransformerTest l = is.read(bytes); off = 0; // When we read the first block, change the offset if we don't want the BOM and also work out - // if the byte endian need to be switch. The source bytes allways start with a standard BOM. + // if the byte endian need to be switch. The source bytes always start with a standard BOM. if (firstRead) { firstRead = false; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java index eb9b0b79..558616c8 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java @@ -21,7 +21,7 @@ */ package org.alfresco.transform.client.model; -import org.alfresco.transform.router.TransformStack; +import org.alfresco.transform.messages.TransformStack; import java.io.Serializable; import java.util.ArrayList; @@ -34,6 +34,8 @@ import java.util.Map; * @author Denis Ungureanu * created on 10/01/2019 */ +// 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. public class InternalContext implements Serializable { private MultiStep multiStep; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/Mimetype.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/Mimetype.java deleted file mode 100644 index ce38c380..00000000 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/Mimetype.java +++ /dev/null @@ -1,364 +0,0 @@ -/* - * #%L - * Alfresco Transform Model - * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * . - * #L% - */ -package org.alfresco.transform.client.model; - -import static java.util.Arrays.stream; -import static java.util.Collections.unmodifiableSet; -import static java.util.stream.Collectors.toSet; - -import java.lang.reflect.Field; -import java.lang.reflect.Modifier; -import java.util.Objects; -import java.util.Set; - -/** - * Mimetype - *

- * The same mimetypes defined in org.alfresco.repo.content.MimetypeMap - */ -public class Mimetype -{ - //region Prefixes - public static final String PREFIX_APPLICATION = "application/"; - - public static final String PREFIX_AUDIO = "audio/"; - - public static final String PREFIX_IMAGE = "image/"; - - public static final String PREFIX_MESSAGE = "message/"; - - public static final String PREFIX_MODEL = "model/"; - - public static final String PREFIX_MULTIPART = "multipart/"; - - public static final String PREFIX_TEXT = "text/"; - - public static final String PREFIX_VIDEO = "video/"; - - public static final String EXTENSION_BINARY = "bin"; - - public static final String MACOS_RESOURCE_FORK_FILE_NAME_PREFIX = "._"; - //endregion - - //region Misc - public static final String MIMETYPE_MULTIPART_ALTERNATIVE = "multipart/alternative"; - - public static final String MIMETYPE_TEXT_PLAIN = "text/plain"; - - public static final String MIMETYPE_TEXT_MEDIAWIKI = "text/mediawiki"; - - public static final String MIMETYPE_TEXT_CSS = "text/css"; - - public static final String MIMETYPE_TEXT_CSV = "text/csv"; - - public static final String MIMETYPE_TEXT_JAVASCRIPT = "text/javascript"; - - public static final String MIMETYPE_XML = "text/xml"; - - public static final String MIMETYPE_HTML = "text/html"; - - public static final String MIMETYPE_XHTML = "application/xhtml+xml"; - - public static final String MIMETYPE_PDF = "application/pdf"; - - public static final String MIMETYPE_JSON = "application/json"; - - public static final String MIMETYPE_WORD = "application/msword"; - - public static final String MIMETYPE_EXCEL = "application/vnd.ms-excel"; - - public static final String MIMETYPE_BINARY = "application/octet-stream"; - - public static final String MIMETYPE_PPT = "application/vnd.ms-powerpoint"; - - public static final String MIMETYPE_APP_DWG = "application/dwg"; - - public static final String MIMETYPE_IMG_DWG = "image/vnd.dwg"; - - public static final String MIMETYPE_VIDEO_AVI = "video/x-msvideo"; - - public static final String MIMETYPE_VIDEO_QUICKTIME = "video/quicktime"; - - public static final String MIMETYPE_VIDEO_WMV = "video/x-ms-wmv"; - - public static final String MIMETYPE_VIDEO_3GP = "video/3gpp"; - - public static final String MIMETYPE_VIDEO_3GP2 = "video/3gpp2"; - - public static final String MIMETYPE_DITA = "application/dita+xml"; - //endregion - - //region Flash - public static final String MIMETYPE_FLASH = "application/x-shockwave-flash"; - - public static final String MIMETYPE_VIDEO_FLV = "video/x-flv"; - - public static final String MIMETYPE_APPLICATION_FLA = "application/x-fla"; - - public static final String MIMETYPE_VIDEO_MPG = "video/mpeg"; - - public static final String MIMETYPE_VIDEO_MP4 = "video/mp4"; - - public static final String MIMETYPE_IMAGE_GIF = "image/gif"; - - public static final String MIMETYPE_IMAGE_JPEG = "image/jpeg"; - - public static final String MIMETYPE_IMAGE_RGB = "image/x-rgb"; - - public static final String MIMETYPE_IMAGE_SVG = "image/svg+xml"; - - public static final String MIMETYPE_IMAGE_PNG = "image/png"; - - public static final String MIMETYPE_IMAGE_TIFF = "image/tiff"; - - public static final String MIMETYPE_IMAGE_RAW_DNG = "image/x-raw-adobe"; - - public static final String MIMETYPE_IMAGE_RAW_3FR = "image/x-raw-hasselblad"; - - public static final String MIMETYPE_IMAGE_RAW_RAF = "image/x-raw-fuji"; - - public static final String MIMETYPE_IMAGE_RAW_CR2 = "image/x-raw-canon"; - - public static final String MIMETYPE_IMAGE_RAW_K25 = "image/x-raw-kodak"; - - public static final String MIMETYPE_IMAGE_RAW_MRW = "image/x-raw-minolta"; - - public static final String MIMETYPE_IMAGE_RAW_NEF = "image/x-raw-nikon"; - - public static final String MIMETYPE_IMAGE_RAW_ORF = "image/x-raw-olympus"; - - public static final String MIMETYPE_IMAGE_RAW_PEF = "image/x-raw-pentax"; - - public static final String MIMETYPE_IMAGE_RAW_ARW = "image/x-raw-sony"; - - public static final String MIMETYPE_IMAGE_RAW_X3F = "image/x-raw-sigma"; - - public static final String MIMETYPE_IMAGE_RAW_RW2 = "image/x-raw-panasonic"; - - public static final String MIMETYPE_IMAGE_RAW_RWL = "image/x-raw-leica"; - - public static final String MIMETYPE_IMAGE_RAW_R3D = "image/x-raw-red"; - - public static final String MIMETYPE_IMAGE_DWT = "image/x-dwt"; - - public static final String MIMETYPE_APPLICATION_EPS = "application/eps"; - - public static final String MIMETYPE_APPLICATION_PS = "application/postscript"; - - public static final String MIMETYPE_JAVASCRIPT = "application/x-javascript"; - - public static final String MIMETYPE_ZIP = "application/zip"; - - public static final String MIMETYPE_OPENSEARCH_DESCRIPTION = "application/opensearchdescription+xml"; - - public static final String MIMETYPE_ATOM = "application/atom+xml"; - - public static final String MIMETYPE_RSS = "application/rss+xml"; - - public static final String MIMETYPE_RFC822 = "message/rfc822"; - - public static final String MIMETYPE_OUTLOOK_MSG = "application/vnd.ms-outlook"; - - public static final String MIMETYPE_VISIO = "application/vnd.visio"; - - public static final String MIMETYPE_VISIO_2013 = "application/vnd.visio2013"; - //endregion - - //region Adobe - public static final String MIMETYPE_APPLICATION_ILLUSTRATOR = "application/illustrator"; - - public static final String MIMETYPE_APPLICATION_PHOTOSHOP = "image/vnd.adobe.photoshop"; - //endregion - - //region Encrypted office document - public static final String MIMETYPE_ENCRYPTED_OFFICE = "application/x-tika-ooxml-protected"; - //endregion - - //region Open Document - public static final String MIMETYPE_OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text"; - - public static final String MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE = "application/vnd.oasis.opendocument.text-template"; - - public static final String MIMETYPE_OPENDOCUMENT_GRAPHICS = "application/vnd.oasis.opendocument.graphics"; - - public static final String MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE = "application/vnd.oasis.opendocument.graphics-template"; - - public static final String MIMETYPE_OPENDOCUMENT_PRESENTATION = "application/vnd.oasis.opendocument.presentation"; - - public static final String MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE = "application/vnd.oasis.opendocument.presentation-template"; - - public static final String MIMETYPE_OPENDOCUMENT_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet"; - - public static final String MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE = "application/vnd.oasis.opendocument.spreadsheet-template"; - - public static final String MIMETYPE_OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart"; - - public static final String MIMETYPE_OPENDOCUMENT_CHART_TEMPLATE = "applicationvnd.oasis.opendocument.chart-template"; - - public static final String MIMETYPE_OPENDOCUMENT_IMAGE = "application/vnd.oasis.opendocument.image"; - - public static final String MIMETYPE_OPENDOCUMENT_IMAGE_TEMPLATE = "applicationvnd.oasis.opendocument.image-template"; - - public static final String MIMETYPE_OPENDOCUMENT_FORMULA = "application/vnd.oasis.opendocument.formula"; - - public static final String MIMETYPE_OPENDOCUMENT_FORMULA_TEMPLATE = "applicationvnd.oasis.opendocument.formula-template"; - - public static final String MIMETYPE_OPENDOCUMENT_TEXT_MASTER = "application/vnd.oasis.opendocument.text-master"; - - public static final String MIMETYPE_OPENDOCUMENT_TEXT_WEB = "application/vnd.oasis.opendocument.text-web"; - - public static final String MIMETYPE_OPENDOCUMENT_DATABASE = "application/vnd.oasis.opendocument.database"; - //endregion - - //region Open Office - public static final String MIMETYPE_OPENOFFICE1_WRITER = "application/vnd.sun.xml.writer"; - - public static final String MIMETYPE_OPENOFFICE1_CALC = "application/vnd.sun.xml.calc"; - - public static final String MIMETYPE_OPENOFFICE1_DRAW = "application/vnd.sun.xml.draw"; - - public static final String MIMETYPE_OPENOFFICE1_IMPRESS = "application/vnd.sun.xml.impress"; - //endregion - - //region Open XML - public static final String MIMETYPE_OPENXML_WORDPROCESSING = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; - public static final String MIMETYPE_OPENXML_WORDPROCESSING_MACRO = "application/vnd.ms-word.document.macroenabled.12"; - public static final String MIMETYPE_OPENXML_WORD_TEMPLATE = "application/vnd.openxmlformats-officedocument.wordprocessingml.template"; - public static final String MIMETYPE_OPENXML_WORD_TEMPLATE_MACRO = "application/vnd.ms-word.template.macroenabled.12"; - public static final String MIMETYPE_OPENXML_SPREADSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; - public static final String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE = "application/vnd.openxmlformats-officedocument.spreadsheetml.template"; - public static final String MIMETYPE_OPENXML_SPREADSHEET_MACRO = "application/vnd.ms-excel.sheet.macroenabled.12"; - public static final String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO = "application/vnd.ms-excel.template.macroenabled.12"; - public static final String MIMETYPE_OPENXML_SPREADSHEET_ADDIN_MACRO = "application/vnd.ms-excel.addin.macroenabled.12"; - public static final String MIMETYPE_OPENXML_SPREADSHEET_BINARY_MACRO = "application/vnd.ms-excel.sheet.binary.macroenabled.12"; - public static final String MIMETYPE_OPENXML_PRESENTATION = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; - public static final String MIMETYPE_OPENXML_PRESENTATION_MACRO = "application/vnd.ms-powerpoint.presentation.macroenabled.12"; - public static final String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW = "application/vnd.openxmlformats-officedocument.presentationml.slideshow"; - public static final String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO = "application/vnd.ms-powerpoint.slideshow.macroenabled.12"; - public static final String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE = "application/vnd.openxmlformats-officedocument.presentationml.template"; - public static final String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE_MACRO = "application/vnd.ms-powerpoint.template.macroenabled.12"; - public static final String MIMETYPE_OPENXML_PRESENTATION_ADDIN = "application/vnd.ms-powerpoint.addin.macroenabled.12"; - public static final String MIMETYPE_OPENXML_PRESENTATION_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.slide"; - public static final String MIMETYPE_OPENXML_PRESENTATION_SLIDE_MACRO = "application/vnd.ms-powerpoint.slide.macroenabled.12"; - //endregion - - //region Star Office - public static final String MIMETYPE_STAROFFICE5_DRAW = "application/vnd.stardivision.draw"; - - public static final String MIMETYPE_STAROFFICE5_CALC = "application/vnd.stardivision.calc"; - - public static final String MIMETYPE_STAROFFICE5_IMPRESS = "application/vnd.stardivision.impress"; - - public static final String MIMETYPE_STAROFFICE5_IMPRESS_PACKED = "application/vnd.stardivision.impress-packed"; - - public static final String MIMETYPE_STAROFFICE5_CHART = "application/vnd.stardivision.chart"; - - public static final String MIMETYPE_STAROFFICE5_WRITER = "application/vnd.stardivision.writer"; - - public static final String MIMETYPE_STAROFFICE5_WRITER_GLOBAL = "application/vnd.stardivision.writer-global"; - - public static final String MIMETYPE_STAROFFICE5_MATH = "application/vnd.stardivision.math"; - //endregion - - //region Apple iWorks - public static final String MIMETYPE_IWORK_KEYNOTE = "application/vnd.apple.keynote"; - - public static final String MIMETYPE_IWORK_NUMBERS = "application/vnd.apple.numbers"; - - public static final String MIMETYPE_IWORK_PAGES = "application/vnd.apple.pages"; - //endregion - - //region MACOS - public static final String MIMETYPE_APPLEFILE = "application/applefile"; - //endregion - - //region WordPerfect - public static final String MIMETYPE_WORDPERFECT = "application/wordperfect"; - //endregion - - //region Audio - public static final String MIMETYPE_MP3 = "audio/mpeg"; - - public static final String MIMETYPE_AUDIO_MP4 = "audio/mp4"; - - public static final String MIMETYPE_VORBIS = "audio/vorbis"; - - public static final String MIMETYPE_FLAC = "audio/x-flac"; - //endregion - - //region Alfresco - public static final String MIMETYPE_ACP = "application/acp"; - - //region other - public static final String MIMETYPE_PBM = "image/x-portable-bitmap"; - - public static final String MIMETYPE_PNM = "image/x-portable-anymap"; - - public static final String MIMETYPE_XBM = "image/x-xbitmap"; - - public static final String MIMETYPE_XPM = "image/x-xpixmap"; - - public static final String MIMETYPE_Z = "application/x-compress"; - - public static final String MIMETYPE_PPM = "image/x-portable-pixmap"; - - public static final String MIMETYPE_TAR = "application/x-tar"; - - public static final String MIMETYPE_OGG = "application/ogg"; - //endregion - - private static final Set ALL_MIMETYPES; - - static - { - ALL_MIMETYPES = unmodifiableSet(stream(Mimetype.class.getDeclaredFields()) - .filter(f -> Modifier.isPublic(f.getModifiers())) - .filter(f -> Modifier.isStatic(f.getModifiers())) - .filter(f -> Modifier.isFinal(f.getModifiers())) - .filter(f -> f.getType().isAssignableFrom(String.class)) - .filter(f -> f.getName().startsWith("MIMETYPE_")) - .peek(f -> f.setAccessible(true)) - .map(Mimetype::getFieldValue) - .filter(Objects::nonNull) - .collect(toSet())); - } - - private static String getFieldValue(final Field f) - { - try - { - return (String) f.get(null); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - } - - public static Set matchMimetypes(final String regex) - { - return unmodifiableSet(ALL_MIMETYPES - .stream() - .filter(t -> t.matches(regex)) - .collect(toSet())); - } -} diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java index 028ab7fa..a10556c7 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -31,6 +31,8 @@ import java.util.List; * @author Lucian Tuca * created on 19/12/2018 */ +// 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. public class MultiStep implements Serializable { private String initialRequestId; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java index b877fe94..511d04d3 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -24,6 +24,8 @@ package org.alfresco.transform.client.model; import java.io.Serializable; import java.util.Objects; +// 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. public class TransformReply implements Serializable { private String requestId; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java index 90784b4b..ebb5df46 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -26,6 +26,8 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; +// 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. public class TransformRequest implements Serializable { private String requestId; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/ExtensionService.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java similarity index 61% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/router/ExtensionService.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java index 04e90ebe..23d03d06 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/ExtensionService.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java @@ -19,47 +19,47 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.common; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_DITA; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_EXCEL; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_SVG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_GRAPHICS; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENOFFICE1_CALC; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENOFFICE1_IMPRESS; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENOFFICE1_WRITER; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_ADDIN; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDE_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_PRESENTATION_TEMPLATE_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_BINARY_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORD_TEMPLATE; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORD_TEMPLATE_MACRO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OUTLOOK_MSG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PPT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_VISIO; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_VISIO_2013; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_WORD; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_WORDPERFECT; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.router.TransformerDebug.MIMETYPE_METADATA_EMBED; -import static org.alfresco.transform.router.TransformerDebug.MIMETYPE_METADATA_EXTRACT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_DITA; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_SVG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_GRAPHICS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENOFFICE1_CALC; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENOFFICE1_IMPRESS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENOFFICE1_WRITER; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_ADDIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_SLIDE_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION_TEMPLATE_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_BINARY_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORD_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORD_TEMPLATE_MACRO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OUTLOOK_MSG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VISIO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VISIO_2013; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORDPERFECT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.TransformerDebug.MIMETYPE_METADATA_EMBED; +import static org.alfresco.transform.common.TransformerDebug.MIMETYPE_METADATA_EXTRACT; import java.util.Map; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java similarity index 88% rename from alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java index b897e960..9a1d3707 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/MimetypeMap.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java @@ -1,190 +1,192 @@ /* * #%L - * Alfresco Transform Core + * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% - * This file is part of the Alfresco software. - * - - * If the software was purchased under a paid Alfresco license, the terms of - * the paid license agreement will prevail. Otherwise, the software is - * provided under the following open source license terms: - * - - * Alfresco is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - - * Alfresco is distributed in the hope that it will be useful, + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - - * You should have received a copy of the GNU Lesser General Public License - * along with Alfresco. If not, see . + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * . * #L% */ -package org.alfresco.transformer.util; +package org.alfresco.transform.common; + +import static java.util.Arrays.stream; +import static java.util.Collections.unmodifiableSet; +import static java.util.stream.Collectors.toSet; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.Objects; +import java.util.Set; /** - * Partially duplicated from *alfresco-data-model*. + * Mimetype + *

+ * Values from in Alfresco repo org.alfresco.repo.content.MimetypeMap */ -public interface MimetypeMap +public interface Mimetype { - String MIMETYPE_METADATA_EXTRACT = "alfresco-metadata-extract"; - String MIMETYPE_METADATA_EMBED = "alfresco-metadata-embed"; - - String PREFIX_APPLICATION = "application/"; - String PREFIX_AUDIO = "audio/"; - String PREFIX_IMAGE = "image/"; - String PREFIX_MESSAGE = "message/"; - String PREFIX_MODEL = "model/"; - String PREFIX_MULTIPART = "multipart/"; - String PREFIX_TEXT = "text/"; - String PREFIX_VIDEO = "video/"; - String EXTENSION_BINARY = "bin"; - String MACOS_RESOURCE_FORK_FILE_NAME_PREFIX = "._"; - String MIMETYPE_MULTIPART_ALTERNATIVE = "multipart/alternative"; - String MIMETYPE_TEXT_PLAIN = "text/plain"; - String MIMETYPE_TEXT_MEDIAWIKI = "text/mediawiki"; - String MIMETYPE_TEXT_CSS = "text/css"; - String MIMETYPE_TEXT_CSV = "text/csv"; - String MIMETYPE_TEXT_JAVASCRIPT = "text/javascript"; - String MIMETYPE_XML = "text/xml"; - String MIMETYPE_HTML = "text/html"; - String MIMETYPE_XHTML = "application/xhtml+xml"; - String MIMETYPE_PDF = "application/pdf"; - String MIMETYPE_JSON = "application/json"; - String MIMETYPE_WORD = "application/msword"; - String MIMETYPE_EXCEL = "application/vnd.ms-excel"; - String MIMETYPE_BINARY = "application/octet-stream"; - String MIMETYPE_PPT = "application/vnd.ms-powerpoint"; - String MIMETYPE_RTF = "application/rtf"; - String MIMETYPE_TSV = "text/tab-separated-values"; - String MIMETYPE_APP_DWG = "application/dwg"; - String MIMETYPE_IMG_DWG = "image/vnd.dwg"; - String MIMETYPE_VIDEO_AVI = "video/x-msvideo"; - String MIMETYPE_VIDEO_QUICKTIME = "video/quicktime"; - String MIMETYPE_VIDEO_WMV = "video/x-ms-wmv"; - String MIMETYPE_VIDEO_3GP = "video/3gpp"; - String MIMETYPE_VIDEO_3GP2 = "video/3gpp2"; - String MIMETYPE_DITA = "application/dita+xml"; - String MIMETYPE_FLASH = "application/x-shockwave-flash"; - String MIMETYPE_VIDEO_FLV = "video/x-flv"; + String MIMETYPE_ACP = "application/acp"; + String MIMETYPE_APPLEFILE = "application/applefile"; + String MIMETYPE_APPLICATION_EPS = "application/eps"; String MIMETYPE_APPLICATION_FLA = "application/x-fla"; - String MIMETYPE_VIDEO_MPG = "video/mpeg"; - String MIMETYPE_VIDEO_MP4 = "video/mp4"; + String MIMETYPE_APPLICATION_ILLUSTRATOR = "application/illustrator"; + String MIMETYPE_APPLICATION_PHOTOSHOP = "image/vnd.adobe.photoshop"; + String MIMETYPE_APPLICATION_PS = "application/postscript"; + String MIMETYPE_APP_DWG = "application/dwg"; + String MIMETYPE_ATOM = "application/atom+xml"; + String MIMETYPE_AUDIO_MP4 = "audio/mp4"; + String MIMETYPE_BINARY = "application/octet-stream"; + String MIMETYPE_DITA = "application/dita+xml"; + String MIMETYPE_ENCRYPTED_OFFICE = "application/x-tika-ooxml-protected"; + String MIMETYPE_EXCEL = "application/vnd.ms-excel"; + String MIMETYPE_FLAC = "audio/x-flac"; + String MIMETYPE_FLASH = "application/x-shockwave-flash"; + String MIMETYPE_HTML = "text/html"; String MIMETYPE_IMAGE_BMP = "image/bmp"; String MIMETYPE_IMAGE_CGM = "image/cgm"; + String MIMETYPE_IMAGE_DWT = "image/x-dwt"; String MIMETYPE_IMAGE_GIF = "image/gif"; String MIMETYPE_IMAGE_IEF = "image/ief"; - String MIMETYPE_IMAGE_JPEG = "image/jpeg"; String MIMETYPE_IMAGE_JP2 = "image/jp2"; - String MIMETYPE_IMAGE_RGB = "image/x-rgb"; - String MIMETYPE_IMAGE_SVG = "image/svg+xml"; + String MIMETYPE_IMAGE_JPEG = "image/jpeg"; String MIMETYPE_IMAGE_PBM = "image/x-portable-bitmap"; String MIMETYPE_IMAGE_PGM = "image/x-portable-graymap"; - String MIMETYPE_IMAGE_PNM = "image/x-portable-anymap"; String MIMETYPE_IMAGE_PNG = "image/png"; - String MIMETYPE_IMAGE_PPM = "image/x-portable-pixmap"; + String MIMETYPE_IMAGE_PNM = "image/x-portable-anymap"; String MIMETYPE_IMAGE_PPJ = "image/vnd.adobe.premiere"; + String MIMETYPE_IMAGE_PPM = "image/x-portable-pixmap"; String MIMETYPE_IMAGE_PSD = "image/vnd.adobe.photoshop"; String MIMETYPE_IMAGE_RAS = "image/x-cmu-raster"; - String MIMETYPE_IMAGE_TIFF = "image/tiff"; - String MIMETYPE_IMAGE_RAW_DNG = "image/x-raw-adobe"; String MIMETYPE_IMAGE_RAW_3FR = "image/x-raw-hasselblad"; - String MIMETYPE_IMAGE_RAW_RAF = "image/x-raw-fuji"; + String MIMETYPE_IMAGE_RAW_ARW = "image/x-raw-sony"; String MIMETYPE_IMAGE_RAW_CR2 = "image/x-raw-canon"; + String MIMETYPE_IMAGE_RAW_DNG = "image/x-raw-adobe"; String MIMETYPE_IMAGE_RAW_K25 = "image/x-raw-kodak"; String MIMETYPE_IMAGE_RAW_MRW = "image/x-raw-minolta"; String MIMETYPE_IMAGE_RAW_NEF = "image/x-raw-nikon"; String MIMETYPE_IMAGE_RAW_ORF = "image/x-raw-olympus"; String MIMETYPE_IMAGE_RAW_PEF = "image/x-raw-pentax"; - String MIMETYPE_IMAGE_RAW_ARW = "image/x-raw-sony"; - String MIMETYPE_IMAGE_RAW_X3F = "image/x-raw-sigma"; + String MIMETYPE_IMAGE_RAW_R3D = "image/x-raw-red"; + String MIMETYPE_IMAGE_RAW_RAF = "image/x-raw-fuji"; String MIMETYPE_IMAGE_RAW_RW2 = "image/x-raw-panasonic"; String MIMETYPE_IMAGE_RAW_RWL = "image/x-raw-leica"; - String MIMETYPE_IMAGE_RAW_R3D = "image/x-raw-red"; - String MIMETYPE_IMAGE_DWT = "image/x-dwt"; + String MIMETYPE_IMAGE_RAW_X3F = "image/x-raw-sigma"; + String MIMETYPE_IMAGE_RGB = "image/x-rgb"; + String MIMETYPE_IMAGE_SVG = "image/svg+xml"; + String MIMETYPE_IMAGE_TIFF = "image/tiff"; String MIMETYPE_IMAGE_XBM = "image/x-xbitmap"; String MIMETYPE_IMAGE_XPM = "image/x-xpixmap"; String MIMETYPE_IMAGE_XWD = "image/x-xwindowdump"; - String MIMETYPE_APPLICATION_EPS = "application/eps"; - String MIMETYPE_APPLICATION_PS = "application/postscript"; + String MIMETYPE_IMG_DWG = "image/vnd.dwg"; + String MIMETYPE_IWORK_KEYNOTE = "application/vnd.apple.keynote"; + String MIMETYPE_IWORK_NUMBERS = "application/vnd.apple.numbers"; + String MIMETYPE_IWORK_PAGES = "application/vnd.apple.pages"; String MIMETYPE_JAVASCRIPT = "application/x-javascript"; - String MIMETYPE_ZIP = "application/zip"; - String MIMETYPE_OPENSEARCH_DESCRIPTION = "application/opensearchdescription+xml"; - String MIMETYPE_ATOM = "application/atom+xml"; - String MIMETYPE_RSS = "application/rss+xml"; - String MIMETYPE_RFC822 = "message/rfc822"; - String MIMETYPE_OUTLOOK_MSG = "application/vnd.ms-outlook"; - String MIMETYPE_VISIO = "application/vnd.visio"; - String MIMETYPE_VISIO_2013 = "application/vnd.visio2013"; - String MIMETYPE_APPLICATION_ILLUSTRATOR = "application/illustrator"; - String MIMETYPE_APPLICATION_PHOTOSHOP = "image/vnd.adobe.photoshop"; - String MIMETYPE_ENCRYPTED_OFFICE = "application/x-tika-ooxml-protected"; - String MIMETYPE_OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text"; - String MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE = "application/vnd.oasis.opendocument.text-template"; + String MIMETYPE_JSON = "application/json"; + String MIMETYPE_METADATA_EMBED = "alfresco-metadata-embed"; + String MIMETYPE_METADATA_EXTRACT = "alfresco-metadata-extract"; + String MIMETYPE_MP3 = "audio/mpeg"; + String MIMETYPE_MULTIPART_ALTERNATIVE = "multipart/alternative"; + String MIMETYPE_OGG = "application/ogg"; + String MIMETYPE_OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart"; + String MIMETYPE_OPENDOCUMENT_CHART_TEMPLATE = "applicationvnd.oasis.opendocument.chart-template"; + String MIMETYPE_OPENDOCUMENT_DATABASE = "application/vnd.oasis.opendocument.database"; + String MIMETYPE_OPENDOCUMENT_FORMULA = "application/vnd.oasis.opendocument.formula"; + String MIMETYPE_OPENDOCUMENT_FORMULA_TEMPLATE = "applicationvnd.oasis.opendocument.formula-template"; String MIMETYPE_OPENDOCUMENT_GRAPHICS = "application/vnd.oasis.opendocument.graphics"; String MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE = "application/vnd.oasis.opendocument.graphics-template"; + String MIMETYPE_OPENDOCUMENT_IMAGE = "application/vnd.oasis.opendocument.image"; + String MIMETYPE_OPENDOCUMENT_IMAGE_TEMPLATE = "applicationvnd.oasis.opendocument.image-template"; String MIMETYPE_OPENDOCUMENT_PRESENTATION = "application/vnd.oasis.opendocument.presentation"; String MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE = "application/vnd.oasis.opendocument.presentation-template"; String MIMETYPE_OPENDOCUMENT_SPREADSHEET = "application/vnd.oasis.opendocument.spreadsheet"; String MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE = "application/vnd.oasis.opendocument.spreadsheet-template"; - String MIMETYPE_OPENDOCUMENT_CHART = "application/vnd.oasis.opendocument.chart"; - String MIMETYPE_OPENDOCUMENT_CHART_TEMPLATE = "applicationvnd.oasis.opendocument.chart-template"; - String MIMETYPE_OPENDOCUMENT_IMAGE = "application/vnd.oasis.opendocument.image"; - String MIMETYPE_OPENDOCUMENT_IMAGE_TEMPLATE = "applicationvnd.oasis.opendocument.image-template"; - String MIMETYPE_OPENDOCUMENT_FORMULA = "application/vnd.oasis.opendocument.formula"; - String MIMETYPE_OPENDOCUMENT_FORMULA_TEMPLATE = "applicationvnd.oasis.opendocument.formula-template"; + String MIMETYPE_OPENDOCUMENT_TEXT = "application/vnd.oasis.opendocument.text"; String MIMETYPE_OPENDOCUMENT_TEXT_MASTER = "application/vnd.oasis.opendocument.text-master"; + String MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE = "application/vnd.oasis.opendocument.text-template"; String MIMETYPE_OPENDOCUMENT_TEXT_WEB = "application/vnd.oasis.opendocument.text-web"; - String MIMETYPE_OPENDOCUMENT_DATABASE = "application/vnd.oasis.opendocument.database"; - String MIMETYPE_OPENOFFICE1_WRITER = "application/vnd.sun.xml.writer"; String MIMETYPE_OPENOFFICE1_CALC = "application/vnd.sun.xml.calc"; String MIMETYPE_OPENOFFICE1_DRAW = "application/vnd.sun.xml.draw"; String MIMETYPE_OPENOFFICE1_IMPRESS = "application/vnd.sun.xml.impress"; + String MIMETYPE_OPENOFFICE1_WRITER = "application/vnd.sun.xml.writer"; + String MIMETYPE_OPENSEARCH_DESCRIPTION = "application/opensearchdescription+xml"; + String MIMETYPE_OPENXML_PRESENTATION = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; + String MIMETYPE_OPENXML_PRESENTATION_ADDIN = "application/vnd.ms-powerpoint.addin.macroenabled.12"; + String MIMETYPE_OPENXML_PRESENTATION_MACRO = "application/vnd.ms-powerpoint.presentation.macroenabled.12"; + String MIMETYPE_OPENXML_PRESENTATION_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.slide"; + String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW = "application/vnd.openxmlformats-officedocument.presentationml.slideshow"; + String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO = "application/vnd.ms-powerpoint.slideshow.macroenabled.12"; + String MIMETYPE_OPENXML_PRESENTATION_SLIDE_MACRO = "application/vnd.ms-powerpoint.slide.macroenabled.12"; + String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE = "application/vnd.openxmlformats-officedocument.presentationml.template"; + String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE_MACRO = "application/vnd.ms-powerpoint.template.macroenabled.12"; + String MIMETYPE_OPENXML_SPREADSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + String MIMETYPE_OPENXML_SPREADSHEET_ADDIN_MACRO = "application/vnd.ms-excel.addin.macroenabled.12"; + String MIMETYPE_OPENXML_SPREADSHEET_BINARY_MACRO = "application/vnd.ms-excel.sheet.binary.macroenabled.12"; + String MIMETYPE_OPENXML_SPREADSHEET_MACRO = "application/vnd.ms-excel.sheet.macroenabled.12"; + String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE = "application/vnd.openxmlformats-officedocument.spreadsheetml.template"; + String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO = "application/vnd.ms-excel.template.macroenabled.12"; String MIMETYPE_OPENXML_WORDPROCESSING = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; String MIMETYPE_OPENXML_WORDPROCESSING_MACRO = "application/vnd.ms-word.document.macroenabled.12"; String MIMETYPE_OPENXML_WORD_TEMPLATE = "application/vnd.openxmlformats-officedocument.wordprocessingml.template"; String MIMETYPE_OPENXML_WORD_TEMPLATE_MACRO = "application/vnd.ms-word.template.macroenabled.12"; - String MIMETYPE_OPENXML_SPREADSHEET = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; - String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE = "application/vnd.openxmlformats-officedocument.spreadsheetml.template"; - String MIMETYPE_OPENXML_SPREADSHEET_MACRO = "application/vnd.ms-excel.sheet.macroenabled.12"; - String MIMETYPE_OPENXML_SPREADSHEET_TEMPLATE_MACRO = "application/vnd.ms-excel.template.macroenabled.12"; - String MIMETYPE_OPENXML_SPREADSHEET_ADDIN_MACRO = "application/vnd.ms-excel.addin.macroenabled.12"; - String MIMETYPE_OPENXML_SPREADSHEET_BINARY_MACRO = "application/vnd.ms-excel.sheet.binary.macroenabled.12"; - String MIMETYPE_OPENXML_PRESENTATION = "application/vnd.openxmlformats-officedocument.presentationml.presentation"; - String MIMETYPE_OPENXML_PRESENTATION_MACRO = "application/vnd.ms-powerpoint.presentation.macroenabled.12"; - String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW = "application/vnd.openxmlformats-officedocument.presentationml.slideshow"; - String MIMETYPE_OPENXML_PRESENTATION_SLIDESHOW_MACRO = "application/vnd.ms-powerpoint.slideshow.macroenabled.12"; - String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE = "application/vnd.openxmlformats-officedocument.presentationml.template"; - String MIMETYPE_OPENXML_PRESENTATION_TEMPLATE_MACRO = "application/vnd.ms-powerpoint.template.macroenabled.12"; - String MIMETYPE_OPENXML_PRESENTATION_ADDIN = "application/vnd.ms-powerpoint.addin.macroenabled.12"; - String MIMETYPE_OPENXML_PRESENTATION_SLIDE = "application/vnd.openxmlformats-officedocument.presentationml.slide"; - String MIMETYPE_OPENXML_PRESENTATION_SLIDE_MACRO = "application/vnd.ms-powerpoint.slide.macroenabled.12"; - String MIMETYPE_STAROFFICE5_DRAW = "application/vnd.stardivision.draw"; + String MIMETYPE_OUTLOOK_MSG = "application/vnd.ms-outlook"; + String MIMETYPE_PBM = "image/x-portable-bitmap"; + String MIMETYPE_PDF = "application/pdf"; + String MIMETYPE_PNM = "image/x-portable-anymap"; + String MIMETYPE_PPM = "image/x-portable-pixmap"; + String MIMETYPE_PPT = "application/vnd.ms-powerpoint"; + String MIMETYPE_RFC822 = "message/rfc822"; + String MIMETYPE_RSS = "application/rss+xml"; + String MIMETYPE_RTF = "application/rtf"; String MIMETYPE_STAROFFICE5_CALC = "application/vnd.stardivision.calc"; + String MIMETYPE_STAROFFICE5_CHART = "application/vnd.stardivision.chart"; + String MIMETYPE_STAROFFICE5_DRAW = "application/vnd.stardivision.draw"; String MIMETYPE_STAROFFICE5_IMPRESS = "application/vnd.stardivision.impress"; String MIMETYPE_STAROFFICE5_IMPRESS_PACKED = "application/vnd.stardivision.impress-packed"; - String MIMETYPE_STAROFFICE5_CHART = "application/vnd.stardivision.chart"; + String MIMETYPE_STAROFFICE5_MATH = "application/vnd.stardivision.math"; String MIMETYPE_STAROFFICE5_WRITER = "application/vnd.stardivision.writer"; String MIMETYPE_STAROFFICE5_WRITER_GLOBAL = "application/vnd.stardivision.writer-global"; - String MIMETYPE_STAROFFICE5_MATH = "application/vnd.stardivision.math"; - String MIMETYPE_IWORK_KEYNOTE = "application/vnd.apple.keynote"; - String MIMETYPE_IWORK_NUMBERS = "application/vnd.apple.numbers"; - String MIMETYPE_IWORK_PAGES = "application/vnd.apple.pages"; - String MIMETYPE_APPLEFILE = "application/applefile"; - String MIMETYPE_WORDPERFECT = "application/wordperfect"; - String MIMETYPE_MP3 = "audio/mpeg"; - String MIMETYPE_AUDIO_MP4 = "audio/mp4"; - String MIMETYPE_VORBIS = "audio/vorbis"; - String MIMETYPE_FLAC = "audio/x-flac"; - String MIMETYPE_ACP = "application/acp"; String MIMETYPE_STC = "application/vnd.sun.xml.calc.template"; String MIMETYPE_STI = "application/vnd.sun.xml.impress.template"; String MIMETYPE_STW = "application/vnd.sun.xml.writer.template"; String MIMETYPE_SXC = "application/vnd.sun.xml.calc"; String MIMETYPE_SXI = "application/vnd.sun.xml.impress"; - + String MIMETYPE_TAR = "application/x-tar"; + String MIMETYPE_TEXT_CSS = "text/css"; + String MIMETYPE_TEXT_CSV = "text/csv"; + String MIMETYPE_TEXT_JAVASCRIPT = "text/javascript"; + String MIMETYPE_TEXT_MEDIAWIKI = "text/mediawiki"; + String MIMETYPE_TEXT_PLAIN = "text/plain"; + String MIMETYPE_TSV = "text/tab-separated-values"; + String MIMETYPE_VIDEO_3GP = "video/3gpp"; + String MIMETYPE_VIDEO_3GP2 = "video/3gpp2"; + String MIMETYPE_VIDEO_AVI = "video/x-msvideo"; + String MIMETYPE_VIDEO_FLV = "video/x-flv"; + String MIMETYPE_VIDEO_MP4 = "video/mp4"; + String MIMETYPE_VIDEO_MPG = "video/mpeg"; + String MIMETYPE_VIDEO_QUICKTIME = "video/quicktime"; + String MIMETYPE_VIDEO_WMV = "video/x-ms-wmv"; + String MIMETYPE_VISIO = "application/vnd.visio"; + String MIMETYPE_VISIO_2013 = "application/vnd.visio2013"; + String MIMETYPE_VORBIS = "audio/vorbis"; + String MIMETYPE_WORD = "application/msword"; + String MIMETYPE_WORDPERFECT = "application/wordperfect"; + String MIMETYPE_XBM = "image/x-xbitmap"; + String MIMETYPE_XHTML = "application/xhtml+xml"; + String MIMETYPE_XML = "text/xml"; + String MIMETYPE_XPM = "image/x-xpixmap"; + String MIMETYPE_Z = "application/x-compress"; + String MIMETYPE_ZIP = "application/zip"; } diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/RepositoryClientData.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java similarity index 97% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/router/RepositoryClientData.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java index 4f4606ea..befe9dee 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/RepositoryClientData.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.common; import java.util.StringJoiner; import java.util.stream.Stream; @@ -28,7 +28,7 @@ import java.util.stream.Stream; * The client data supplied and echoed back to content repository (the client). May be modified to include * TransformerDebug. */ -class RepositoryClientData +public class RepositoryClientData { private static final String CLIENT_DATA_SEPARATOR = "\u23D0"; public static final String DEBUG_SEPARATOR = "\u23D1"; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/util/RequestParamMap.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java similarity index 94% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/util/RequestParamMap.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java index 3bd59f4a..8a309454 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/util/RequestParamMap.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java @@ -19,9 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.util; +package org.alfresco.transform.common; -import org.alfresco.transform.client.model.config.CoreVersionDecorator; +import org.alfresco.transform.config.CoreVersionDecorator; /** * Request parameters and transform options used in the core transformers. diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/exceptions/TransformException.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java similarity index 92% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/exceptions/TransformException.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java index dad82c2f..3372e8a4 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/exceptions/TransformException.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2018 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.exceptions; +package org.alfresco.transform.common; public class TransformException extends RuntimeException { diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformerDebug.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java similarity index 99% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformerDebug.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java index 202ac56b..324b4b31 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformerDebug.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java @@ -19,11 +19,12 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.common; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; +import org.alfresco.transform.messages.TransformStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AbstractTransformOption.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java similarity index 94% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AbstractTransformOption.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java index d1357815..de0b4851 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AbstractTransformOption.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AddSupported.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java similarity index 93% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AddSupported.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java index c51405cd..58fd267d 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AddSupported.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; /** * Holds information to add new {@link SupportedSourceAndTarget} objects to an existing {@link Transformer}.


diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreFunction.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java similarity index 91% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreFunction.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java index 51f89b47..400f2375 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreFunction.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java @@ -19,12 +19,12 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import org.apache.maven.artifact.versioning.ComparableVersion; -import static org.alfresco.transform.client.model.config.CoreFunction.Constants.NO_UPPER_VERSION; -import static org.alfresco.transform.client.model.config.CoreFunction.Constants.NO_VERSION; +import static org.alfresco.transform.config.CoreFunction.Constants.NO_UPPER_VERSION; +import static org.alfresco.transform.config.CoreFunction.Constants.NO_VERSION; /** * Provides a mapping between a transform {@code coreVersion} and functionality (such as the use of Direct Access URLs) diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreVersionDecorator.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java similarity index 96% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreVersionDecorator.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java index 10d1649b..7140deec 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreVersionDecorator.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import org.apache.maven.artifact.versioning.ComparableVersion; @@ -32,9 +32,9 @@ import java.util.function.Function; import java.util.stream.Collectors; import static java.util.function.Predicate.not; -import static org.alfresco.transform.client.model.config.CoreFunction.Constants.NO_VERSION; -import static org.alfresco.transform.client.model.config.CoreFunction.newComparableVersion; -import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.config.CoreFunction.Constants.NO_VERSION; +import static org.alfresco.transform.config.CoreFunction.newComparableVersion; +import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; /** *

Class sets or clears the {@code coreVersion} property of {@link Transformer}s in a {@link TransformConfig}

diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/OverrideSupported.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java similarity index 93% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/OverrideSupported.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java index 6a482152..80d02f28 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/OverrideSupported.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; /** * Holds information to overriding existing {@link SupportedSourceAndTarget} objects with new {@code priority} and diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/RemoveSupported.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java similarity index 93% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/RemoveSupported.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java index 29912859..1c0ce805 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/RemoveSupported.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; /** * Holds information about existing {@link SupportedSourceAndTarget} objects that should be removed.


diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedDefaults.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedDefaults.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java index 3a7b6542..07c3b20c 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedDefaults.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; import java.util.StringJoiner; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedSourceAndTarget.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java similarity index 96% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedSourceAndTarget.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java index 4a36d67b..01bcbc27 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedSourceAndTarget.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; import java.util.StringJoiner; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformConfig.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformConfig.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java index 3b4b70a1..9b9b275f 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformConfig.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOption.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java similarity index 92% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOption.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java index e457f93f..61597b76 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOption.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionGroup.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java similarity index 95% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionGroup.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java index c3b31439..54225ff8 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionGroup.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.HashSet; import java.util.Objects; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionValue.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java similarity index 94% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionValue.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java index 2e4841dd..823ae095 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionValue.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformStep.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java similarity index 95% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformStep.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java index 49eb5839..a91526b6 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformStep.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Transformer.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Transformer.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java index b363034e..6ec32bcd 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Transformer.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java @@ -19,9 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; -import org.alfresco.transform.client.registry.TransformServiceRegistry; +import org.alfresco.transform.registry.TransformServiceRegistry; import java.util.ArrayList; import java.util.HashSet; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerAndTypes.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java similarity index 95% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerAndTypes.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java index a065113d..978f4cfe 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerAndTypes.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; import java.util.StringJoiner; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerTypesSizeAndPriority.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java similarity index 96% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerTypesSizeAndPriority.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java index 5bcdcca2..808c8f74 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerTypesSizeAndPriority.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; import java.util.StringJoiner; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Types.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java similarity index 96% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Types.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java index 06174258..fbbcbde2 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Types.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import java.util.Objects; import java.util.StringJoiner; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequestValidator.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java similarity index 97% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequestValidator.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java index fe9b3a13..f0bbf048 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequestValidator.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java @@ -19,8 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.model; +package org.alfresco.transform.messages; +import org.alfresco.transform.client.model.TransformRequest; import org.springframework.validation.Errors; import org.springframework.validation.Validator; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformStack.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformStack.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java index ba9f3672..f5eb8f43 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformStack.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java @@ -19,10 +19,12 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.messages; import org.alfresco.transform.client.model.InternalContext; +import org.alfresco.transform.client.model.MultiStep; import org.alfresco.transform.client.model.TransformReply; +import org.alfresco.transform.common.TransformerDebug; import org.apache.commons.lang3.StringUtils; import java.util.ArrayList; @@ -34,7 +36,7 @@ import java.util.StringJoiner; /** * Represents the current state of a top level transform request in terms of its current nested call stack, which is * the current transform step being performed and what other transform steps are still to be executed in the current - * level. This information is encoded in the {@link org.alfresco.transform.client.model.MultiStep} structure of the + * level. This information is encoded in the {@link MultiStep} structure of the * internal context passed between T-Router and T-Engines. Ideally we would have changed the structure, * but for backward compatibility we are using the existing structure, which allows T-Engines that were developed * previously to be used unchanged.


@@ -69,7 +71,7 @@ public class TransformStack public static final String PIPELINE_FLAG = "P"; public static final String FAILOVER_FLAG = "F"; - static final String SEPARATOR = "\u23D0"; + public static final String SEPARATOR = "\u23D0"; private static final String SEPARATOR_REGEX = "\u23D0"; static final int OPTIONS_LEVEL = 0; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/AbstractTransformRegistry.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java similarity index 93% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/AbstractTransformRegistry.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java index d4c26d94..a43e8431 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/AbstractTransformRegistry.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java @@ -19,18 +19,18 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import static org.alfresco.transform.client.registry.TransformRegistryHelper.retrieveTransformListBySize; -import static org.alfresco.transform.client.registry.TransformRegistryHelper.lookupTransformOptions; +import static org.alfresco.transform.registry.TransformRegistryHelper.retrieveTransformListBySize; +import static org.alfresco.transform.registry.TransformRegistryHelper.lookupTransformOptions; import java.util.List; import java.util.Map; import java.util.Set; -import org.alfresco.transform.client.model.config.CoreFunction; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.Transformer; +import org.alfresco.transform.config.CoreFunction; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.Transformer; /** * Used to work out if a transformation is supported. Sub classes should implement {@link #getData()} to return an diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/CombinedTransformConfig.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java similarity index 97% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/CombinedTransformConfig.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java index 522a4d23..f11421de 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/CombinedTransformConfig.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java @@ -19,19 +19,19 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.client.model.config.AddSupported; -import org.alfresco.transform.client.model.config.SupportedDefaults; -import org.alfresco.transform.client.model.config.OverrideSupported; -import org.alfresco.transform.client.model.config.RemoveSupported; -import org.alfresco.transform.client.model.config.SupportedSourceAndTarget; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.TransformStep; -import org.alfresco.transform.client.model.config.Transformer; -import org.alfresco.transform.client.model.config.TransformerAndTypes; -import org.alfresco.transform.client.model.config.Types; +import org.alfresco.transform.config.AddSupported; +import org.alfresco.transform.config.SupportedDefaults; +import org.alfresco.transform.config.OverrideSupported; +import org.alfresco.transform.config.RemoveSupported; +import org.alfresco.transform.config.SupportedSourceAndTarget; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.TransformStep; +import org.alfresco.transform.config.Transformer; +import org.alfresco.transform.config.TransformerAndTypes; +import org.alfresco.transform.config.Types; import java.util.ArrayList; import java.util.HashMap; @@ -43,7 +43,7 @@ import java.util.StringJoiner; import java.util.stream.Collectors; import static java.util.stream.Collectors.toSet; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnMultiStepTransformers; +import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnMultiStepTransformers; /** * This class combines one or more T-Engine config and local files and registers them as if they were all in one file. diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Defaults.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java similarity index 97% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Defaults.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java index 48d38f99..4802bf79 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Defaults.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java @@ -19,9 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.client.model.config.SupportedDefaults; +import org.alfresco.transform.config.SupportedDefaults; import java.util.HashMap; import java.util.Map; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Origin.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java similarity index 95% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Origin.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java index d6cd769b..0e35c36b 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Origin.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import java.util.Collection; import java.util.HashSet; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/SupportedTransform.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java similarity index 91% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/SupportedTransform.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java index d2680b8c..9cae1f75 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/SupportedTransform.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,13 +19,13 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import java.util.Objects; import java.util.Set; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.TransformOptionGroup; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.TransformOptionGroup; public class SupportedTransform { diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformCache.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformCache.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java index bd3a9fff..55da8aa0 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformCache.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import static java.util.Collections.emptyMap; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformRegistryHelper.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java similarity index 97% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformRegistryHelper.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java index 7253f7ce..98ebe47e 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformRegistryHelper.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import static java.util.Collections.emptyList; import static java.util.Collections.emptyMap; @@ -35,10 +35,10 @@ import java.util.Map; import java.util.Set; import java.util.function.Consumer; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.TransformOptionGroup; -import org.alfresco.transform.client.model.config.TransformOptionValue; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.TransformOptionGroup; +import org.alfresco.transform.config.TransformOptionValue; +import org.alfresco.transform.common.TransformException; class TransformRegistryHelper { diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistry.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java similarity index 98% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistry.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java index 30f5a7d6..9232b157 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistry.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java @@ -19,9 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.client.model.config.CoreFunction; +import org.alfresco.transform.config.CoreFunction; import java.util.Map; diff --git a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformerAndSourceType.java b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java similarity index 92% rename from alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformerAndSourceType.java rename to alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java index 9d03f863..3c520075 100644 --- a/alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformerAndSourceType.java +++ b/alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,9 +19,9 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.client.model.config.OverrideSupported; +import org.alfresco.transform.config.OverrideSupported; import java.util.Objects; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformerDebugTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java similarity index 93% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformerDebugTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java index 0c0116e4..46a58c9f 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformerDebugTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.common; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -30,14 +30,15 @@ import com.google.common.collect.ImmutableMap; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; +import org.alfresco.transform.messages.TransformStack; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.slf4j.LoggerFactory; -import java.util.Map; import java.util.StringJoiner; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; import static org.junit.jupiter.api.Assertions.*; /** @@ -123,7 +124,7 @@ class TransformerDebugTest { twoStepTransform(false, false, Level.DEBUG); - assertEquals("" + + Assertions.assertEquals("" + "1 txt pdf 1.2 KB wrapper\n" + "1.1 txt doc transformer1\n" + "1.2 doc pdf transformer2\n" + @@ -140,7 +141,7 @@ class TransformerDebugTest // With trace there are "Finished" lines for nested transforms, like a T-Engine's debug but still without // the size and rendition name - assertEquals("" + + Assertions.assertEquals("" + "1 txt pdf 1.2 KB wrapper\n" + "1.1 txt doc transformer1\n" + "1.1 Finished in -- ms\n" + @@ -159,7 +160,7 @@ class TransformerDebugTest // Note the first and last lines would only ever be logged on the router, but the expected data includes // the extra "Finished" lines, sizes and renditions (if set in client data). - assertEquals("" + + Assertions.assertEquals("" + "1 txt pdf 1.2 KB wrapper\n" + "1.1 txt doc 1.2 KB transformer1\n" + "1.1 Finished in -- ms\n" + @@ -176,7 +177,7 @@ class TransformerDebugTest { twoStepTransform(false, true, Level.DEBUG); - assertEquals("" + + Assertions.assertEquals("" + "1 txt pdf 1.2 KB wrapper\n" + "1.1 txt doc transformer1\n" + "1.2 doc pdf transformer2\n" + @@ -198,7 +199,7 @@ class TransformerDebugTest transformerDebug.logFailure(reply); - assertEquals(" T-Request was null - a major error", getTransformerDebugOutput()); + Assertions.assertEquals(" T-Request was null - a major error", getTransformerDebugOutput()); } @Test diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreFunctionTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java similarity index 97% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreFunctionTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java index bcac6e7d..df95d3cc 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreFunctionTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import org.junit.jupiter.api.Test; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreVersionDecoratorTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java similarity index 93% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreVersionDecoratorTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java index 2794a3b7..5155b7ad 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreVersionDecoratorTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.model.config; +package org.alfresco.transform.config; import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Test; @@ -30,12 +30,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.CONFIG_VERSION_INCLUDES_CORE_VERSION; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnMultiStepTransformers; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT; -import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_DEFAULT; +import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.config.CoreVersionDecorator.CONFIG_VERSION_INCLUDES_CORE_VERSION; +import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnMultiStepTransformers; +import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; +import static org.alfresco.transform.config.CoreVersionDecorator.setOrClearCoreVersion; import static org.junit.jupiter.api.Assertions.*; class CoreVersionDecoratorTest diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/TransformRequestValidatorTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java similarity index 96% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/TransformRequestValidatorTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java index ca90822b..501d8c84 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/TransformRequestValidatorTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java @@ -19,16 +19,17 @@ * . * #L% */ -package org.alfresco.transform.client.model; +package org.alfresco.transform.messages; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_PNG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.UUID; +import org.alfresco.transform.client.model.TransformRequest; import org.junit.Test; import org.springframework.validation.DirectFieldBindingResult; import org.springframework.validation.Errors; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformStackTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java similarity index 96% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformStackTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java index 0e4e5677..7f8c9151 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformStackTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java @@ -19,12 +19,14 @@ * . * #L% */ -package org.alfresco.transform.router; +package org.alfresco.transform.messages; import com.google.common.collect.ImmutableMap; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.MultiStep; import org.alfresco.transform.client.model.TransformReply; +import org.alfresco.transform.common.TransformerDebug; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mock; @@ -36,15 +38,13 @@ import java.util.Arrays; import java.util.Map; import java.util.UUID; -import static org.alfresco.transform.router.TransformStack.OPTIONS_LEVEL; -import static org.alfresco.transform.router.TransformStack.SEPARATOR; -import static org.alfresco.transform.router.TransformStack.TOP_STACK_LEVEL; -import static org.alfresco.transform.router.TransformStack.getInitialSourceReference; +import static org.alfresco.transform.messages.TransformStack.OPTIONS_LEVEL; +import static org.alfresco.transform.messages.TransformStack.SEPARATOR; +import static org.alfresco.transform.messages.TransformStack.TOP_STACK_LEVEL; +import static org.alfresco.transform.messages.TransformStack.getInitialSourceReference; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; import static org.mockito.Mockito.doReturn; class TransformStackTest @@ -225,7 +225,7 @@ class TransformStackTest removedLevels++; TransformStack.removeTransformLevel(internalContext); } - assertEquals(2, removedLevels); + Assertions.assertEquals(2, removedLevels); assertTrue(TransformStack.isLastStepInTransformLevel(internalContext)); TransformStack.removeFailedStep(reply, transformerDebug); // Should remove the rest as failure was last step in failover assertTrue(TransformStack.isFinished(internalContext)); @@ -413,10 +413,10 @@ class TransformStackTest } if (transformStepCount >= 25) { - fail("Appear to be in an infinite loop"); + Assertions.fail("Appear to be in an infinite loop"); } } while (!TransformStack.isFinished(internalContext)); - assertEquals(7, transformStepCount); + Assertions.assertEquals(7, transformStepCount); } @Test @@ -461,7 +461,7 @@ class TransformStackTest { System.out.println("TransformOptions value: " + value); internalContext.getMultiStep().getTransformsToBeDone().set(OPTIONS_LEVEL, value); - assertNull(TransformStack.checkStructure(internalContext, "T-Reply")); + Assertions.assertNull(TransformStack.checkStructure(internalContext, "T-Reply")); // call the getter just in case we have missed something TransformStack.getInitialTransformRequestOptions(internalContext); } @@ -496,7 +496,7 @@ class TransformStackTest { System.out.println("TransformLevel value: " + value); internalContext.getMultiStep().getTransformsToBeDone().set(TOP_STACK_LEVEL, value); - assertNull(TransformStack.checkStructure(internalContext, "T-Reply")); + Assertions.assertNull(TransformStack.checkStructure(internalContext, "T-Reply")); // call a getter just in case we have missed something TransformStack.currentStep(internalContext); }; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/CombinedTransformConfigTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java similarity index 99% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/CombinedTransformConfigTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java index 818a0e50..bfef160e 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/CombinedTransformConfigTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java @@ -19,15 +19,15 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.alfresco.transform.client.model.config.SupportedSourceAndTarget; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.model.config.TransformStep; -import org.alfresco.transform.client.model.config.Transformer; +import org.alfresco.transform.config.SupportedSourceAndTarget; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.config.TransformStep; +import org.alfresco.transform.config.Transformer; import org.junit.Test; import java.util.List; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/OverrideTransformConfigTests.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java similarity index 97% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/OverrideTransformConfigTests.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java index 91216546..351b48cf 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/OverrideTransformConfigTests.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,17 +19,17 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import org.alfresco.transform.client.model.config.AddSupported; -import org.alfresco.transform.client.model.config.SupportedDefaults; -import org.alfresco.transform.client.model.config.OverrideSupported; -import org.alfresco.transform.client.model.config.RemoveSupported; -import org.alfresco.transform.client.model.config.SupportedSourceAndTarget; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.model.config.Transformer; +import org.alfresco.transform.config.AddSupported; +import org.alfresco.transform.config.SupportedDefaults; +import org.alfresco.transform.config.OverrideSupported; +import org.alfresco.transform.config.RemoveSupported; +import org.alfresco.transform.config.SupportedSourceAndTarget; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.config.Transformer; import org.junit.Test; import java.util.HashSet; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TestTransformRegistry.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java similarity index 91% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TestTransformRegistry.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java index ecc0f675..a1048e85 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TestTransformRegistry.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,10 +19,10 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.Transformer; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.Transformer; import java.util.ArrayList; import java.util.HashMap; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryHelperTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java similarity index 97% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryHelperTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java index 6249760f..505b5d1e 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryHelperTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java @@ -24,16 +24,16 @@ * along with Alfresco. If not, see . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.junit.Test; import java.util.List; import static java.util.Arrays.asList; import static java.util.Collections.emptySet; -import static org.alfresco.transform.client.registry.TransformRegistryHelper.retrieveTransformListBySize; +import static org.alfresco.transform.registry.TransformRegistryHelper.retrieveTransformListBySize; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryTest.java b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java similarity index 97% rename from alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryTest.java rename to alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java index 7a7e3984..aef1bb2f 100644 --- a/alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryTest.java +++ b/alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Model * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -19,7 +19,7 @@ * . * #L% */ -package org.alfresco.transform.client.registry; +package org.alfresco.transform.registry; import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; @@ -28,8 +28,8 @@ import static java.util.Collections.singletonList; import static java.util.Collections.singletonMap; import static java.util.function.Function.identity; import static java.util.stream.Collectors.toMap; -import static org.alfresco.transform.client.registry.TransformRegistryHelper.addToPossibleTransformOptions; -import static org.alfresco.transform.client.registry.TransformRegistryHelper.optionsMatch; +import static org.alfresco.transform.registry.TransformRegistryHelper.addToPossibleTransformOptions; +import static org.alfresco.transform.registry.TransformRegistryHelper.optionsMatch; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -42,12 +42,12 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.alfresco.transform.client.model.config.SupportedSourceAndTarget; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.TransformOptionGroup; -import org.alfresco.transform.client.model.config.TransformOptionValue; -import org.alfresco.transform.client.model.config.Transformer; +import org.alfresco.transform.config.SupportedSourceAndTarget; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.TransformOptionGroup; +import org.alfresco.transform.config.TransformOptionValue; +import org.alfresco.transform.config.Transformer; import org.junit.Before; import org.junit.Test; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java index 22a38754..cdea0f40 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererControllerTest.java @@ -26,7 +26,7 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java index 15b93a2e..0e3ea58c 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer-boot/src/test/java/org/alfresco/transformer/AlfrescoPdfRendererQueueTransformServiceIT.java @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; import java.util.UUID; diff --git a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java index c191c4a3..7c234742 100644 --- a/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java +++ b/alfresco-transform-pdf-renderer/alfresco-transform-pdf-renderer/src/main/java/org/alfresco/transformer/executors/PdfRendererCommandExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,7 +26,7 @@ */ package org.alfresco.transformer.executors; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.PdfRendererOptionsBuilder; import java.io.File; diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java index 253a8251..4b76caa8 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/main/java/org/alfresco/transformer/TikaController.java @@ -38,8 +38,8 @@ import java.util.HashMap; import java.util.Map; import static org.alfresco.transformer.executors.Tika.PDF_BOX; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PDF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; /** * Controller for the Docker based Tika transformers. diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java index 5ee48b2f..81a02c7c 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaControllerTest.java @@ -27,7 +27,7 @@ package org.alfresco.transformer; import static java.nio.file.Files.readAllBytes; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.alfresco.transformer.executors.Tika.ARCHIVE; import static org.alfresco.transformer.executors.Tika.CSV; import static org.alfresco.transformer.executors.Tika.DOC; @@ -48,19 +48,19 @@ import static org.alfresco.transformer.executors.Tika.XHTML; import static org.alfresco.transformer.executors.Tika.XML; import static org.alfresco.transformer.executors.Tika.XSLX; import static org.alfresco.transformer.executors.Tika.ZIP; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_HTML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_METADATA_EMBED; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OUTLOOK_MSG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PDF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_CSV; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORD; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XHTML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_ZIP; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_METADATA_EMBED; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OUTLOOK_MSG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_CSV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XHTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_ZIP; import static org.alfresco.transformer.util.RequestParamMap.INCLUDE_CONTENTS; import static org.alfresco.transformer.util.RequestParamMap.NOT_EXTRACT_BOOKMARKS_TEXT; import static org.junit.jupiter.api.Assertions.assertArrayEquals; diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java index bcd376d7..dc7e116f 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaMetadataExtractsIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,51 +26,51 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_APP_DWG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OUTLOOK_MSG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_APP_DWG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OUTLOOK_MSG; import static org.alfresco.transformer.TestFileInfo.testFile; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_AUDIO_MP4; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_EXCEL; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_BMP; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_GIF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PNG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_TIFF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IWORK_KEYNOTE; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IWORK_NUMBERS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IWORK_PAGES; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_MP3; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_FORMULA; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_GRAPHICS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_PRESENTATION; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_SPREADSHEET; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_TEXT; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENOFFICE1_WRITER; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_PRESENTATION; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_SPREADSHEET; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PDF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_PPT; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VIDEO_3GP; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VIDEO_3GP2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VIDEO_FLV; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VIDEO_MP4; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VIDEO_QUICKTIME; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VISIO; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_VORBIS; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_WORD; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_ZIP; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_RAF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_ARW; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_CR2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_RW2; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_RAW_NEF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_AUDIO_MP4; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_EXCEL; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_BMP; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_GIF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_TIFF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_KEYNOTE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_NUMBERS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IWORK_PAGES; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_MP3; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_FORMULA; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_GRAPHICS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_GRAPHICS_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_PRESENTATION_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_SPREADSHEET_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENDOCUMENT_TEXT_TEMPLATE; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENOFFICE1_WRITER; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_PRESENTATION; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_SPREADSHEET; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_PPT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VIDEO_3GP; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VIDEO_3GP2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VIDEO_FLV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VIDEO_MP4; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VIDEO_QUICKTIME; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VISIO; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_VORBIS; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_WORD; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_ZIP; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_RAF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_ARW; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_CR2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_RW2; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_RAW_NEF; import java.util.stream.Stream; diff --git a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java index 13c5dcbf..95909519 100644 --- a/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java +++ b/alfresco-transform-tika/alfresco-transform-tika-boot/src/test/java/org/alfresco/transformer/TikaQueueTransformServiceIT.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCESSING; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java index f6289d50..b1205f63 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/executors/Tika.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -65,14 +65,14 @@ import java.net.URL; import java.util.List; import java.util.regex.Pattern; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_HTML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_PNG; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_IMAGE_TIFF; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_CSV; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XHTML; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_XML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_HTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_TIFF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_CSV; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XHTML; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_XML; /** * Stripped down command line Tika transformers. Not actually run as a separate process, but the code fits the patten diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAutoMetadataExtractor.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAutoMetadataExtractor.java index 4eb63727..0f6a6dd7 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAutoMetadataExtractor.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/metadataExtractors/TikaAutoMetadataExtractor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2020 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -26,7 +26,7 @@ */ package org.alfresco.transformer.metadataExtractors; -import org.alfresco.transformer.util.MimetypeMap; +import org.alfresco.transform.common.Mimetype; import org.apache.tika.config.TikaConfig; import org.apache.tika.metadata.Metadata; import org.apache.tika.metadata.TIFF; @@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory; import java.io.Serializable; import java.util.Map; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; import static org.alfresco.transformer.executors.Tika.readTikaConfig; /** @@ -100,7 +101,7 @@ public class TikaAutoMetadataExtractor extends AbstractTikaMetadataExtractor protected Map extractSpecific(Metadata metadata, Map properties, Map headers) { - if (MimetypeMap.MIMETYPE_IMAGE_JPEG.equals(metadata.get(Metadata.CONTENT_TYPE))) + if (MIMETYPE_IMAGE_JPEG.equals(metadata.get(Metadata.CONTENT_TYPE))) { //check if the image has exif information if (metadata.get(EXIF_IMAGE_WIDTH_TAG) != null diff --git a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java index 9e15731e..d10230a3 100644 --- a/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java +++ b/alfresco-transform-tika/alfresco-transform-tika/src/main/java/org/alfresco/transformer/tika/parsers/ExifToolParser.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -27,8 +27,8 @@ package org.alfresco.transformer.tika.parsers; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_JPEG; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_IMAGE_TIFF; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_JPEG; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_TIFF; import java.io.BufferedReader; import java.io.File; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java b/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java new file mode 100644 index 00000000..1a47cff7 --- /dev/null +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transform/CustomTransformer.java @@ -0,0 +1,38 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform; + +import java.io.InputStream; +import java.io.OutputStream; +import java.util.Map; + +public interface CustomTransformer +{ + void transform(String transformerName, String sourceMimetype, String targetMimetype, + Map transformOptions, + InputStream inputStream, OutputStream outputStream) throws Exception; +} diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java b/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java new file mode 100644 index 00000000..1802714c --- /dev/null +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transform/TransformEngine.java @@ -0,0 +1,58 @@ +/* + * #%L + * Alfresco Transform Core + * %% + * Copyright (C) 2005 - 2022 Alfresco Software Limited + * %% + * This file is part of the Alfresco software. + * - + * If the software was purchased under a paid Alfresco license, the terms of + * the paid license agreement will prevail. Otherwise, the software is + * provided under the following open source license terms: + * - + * Alfresco is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * - + * Alfresco is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * - + * You should have received a copy of the GNU Lesser General Public License + * along with Alfresco. If not, see . + * #L% + */ +package org.alfresco.transform; + +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transformer.probes.ProbeTestTransform; + +import java.util.Set; + +/** + * The interface to the custom transform code applied on top of a base t-engine. + */ +public interface TransformEngine +{ + /** + * @return the name of the t-engine. The t-router reads config from t-engines in name order. + */ + String getTransformEngineName(); + + /** + * @return a definition of what the t-engine supports. Normally read from a json Resource on the classpath. + */ + TransformConfig getTransformConfig(); + + /** + * @return actual transform codes. + */ + Set getTransformers(); + + /** + * @return a ProbeTestTransform (will do a quick transform) for k8 liveness and readiness probes. + */ + ProbeTestTransform getLivenessAndReadinessProbeTestTransform(); +} diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java index 042201d0..c984202c 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/AbstractTransformerController.java @@ -26,14 +26,14 @@ */ package org.alfresco.transformer; +import org.alfresco.transform.common.TransformerDebug; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.client.model.TransformRequestValidator; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.registry.TransformServiceRegistry; -import org.alfresco.transform.exceptions.TransformException; -import org.alfresco.transform.router.TransformerDebug; +import org.alfresco.transform.messages.TransformRequestValidator; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.registry.TransformServiceRegistry; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.model.FileRefResponse; @@ -67,12 +67,12 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import static java.util.stream.Collectors.joining; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setOrClearCoreVersion; -import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION; -import static org.alfresco.transform.client.util.RequestParamMap.CONFIG_VERSION_DEFAULT; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG; +import static org.alfresco.transform.config.CoreVersionDecorator.setOrClearCoreVersion; +import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION; +import static org.alfresco.transform.common.RequestParamMap.CONFIG_VERSION_DEFAULT; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG; import static org.alfresco.transformer.fs.FileManager.TempFileProvider.createTempFile; import static org.alfresco.transformer.fs.FileManager.buildFile; import static org.alfresco.transformer.fs.FileManager.createAttachment; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java index cb1d6fa4..cc6b410d 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java @@ -37,7 +37,7 @@ import javax.jms.Message; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.messaging.TransformMessageConverter; import org.alfresco.transformer.messaging.TransformReplySender; import org.slf4j.Logger; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java index 858d262b..e45b31d9 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformController.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -39,7 +39,7 @@ import javax.servlet.http.HttpServletResponse; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.alfresco.transformer.probes.ProbeTestTransform; import org.slf4j.Logger; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java index f2289c37..a520c926 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/TransformRegistryImpl.java @@ -2,7 +2,7 @@ * #%L * Alfresco Repository * %% - * Copyright (C) 2005 - 2021 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * If the software was purchased under a paid Alfresco license, the terms of @@ -26,7 +26,7 @@ package org.alfresco.transformer; import static java.nio.charset.StandardCharsets.UTF_8; -import static org.alfresco.transform.client.model.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; +import static org.alfresco.transform.config.CoreVersionDecorator.setCoreVersionOnSingleStepTransformers; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.IOException; @@ -35,11 +35,11 @@ import java.io.Reader; import javax.annotation.PostConstruct; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.registry.AbstractTransformRegistry; -import org.alfresco.transform.client.registry.CombinedTransformConfig; -import org.alfresco.transform.client.registry.TransformCache; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.registry.AbstractTransformRegistry; +import org.alfresco.transform.registry.CombinedTransformConfig; +import org.alfresco.transform.registry.TransformCache; +import org.alfresco.transform.common.TransformException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java index 025f9bd3..71a6e1d6 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/clients/AlfrescoSharedFileStoreClient.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -31,7 +31,7 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; import java.io.File; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.model.FileRefResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java index 0efd8d23..d65c6a57 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/config/WebApplicationConfig.java @@ -26,9 +26,9 @@ */ package org.alfresco.transformer.config; -import org.alfresco.transform.client.model.TransformRequestValidator; -import org.alfresco.transform.client.registry.TransformServiceRegistry; -import org.alfresco.transform.router.TransformerDebug; +import org.alfresco.transform.messages.TransformRequestValidator; +import org.alfresco.transform.registry.TransformServiceRegistry; +import org.alfresco.transform.common.TransformerDebug; import org.alfresco.transformer.TransformInterceptor; import org.alfresco.transformer.TransformRegistryImpl; import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient; @@ -38,7 +38,7 @@ import org.springframework.web.client.RestTemplate; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; @Configuration public class WebApplicationConfig implements WebMvcConfigurer diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java index c881082a..5abc142a 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/AbstractCommandExecutor.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -33,7 +33,7 @@ import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; import java.io.File; import java.util.Map; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; /** * diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java index ecd52dc9..27ad1af8 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/executors/Transformer.java @@ -27,13 +27,13 @@ package org.alfresco.transformer.executors; * #L% */ -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import java.io.File; import java.util.Map; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_METADATA_EMBED; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_METADATA_EXTRACT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_METADATA_EMBED; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_METADATA_EXTRACT; import static org.alfresco.transformer.util.RequestParamMap.TRANSFORM_NAME_PARAMETER; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java index 746897b1..fbf78180 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/fs/FileManager.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -42,7 +42,7 @@ import java.util.Arrays; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.logging.LogEntry; import org.springframework.core.io.Resource; import org.springframework.core.io.UrlResource; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java index 181d67d4..88fa920a 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/MessagingConfig.java @@ -29,7 +29,7 @@ package org.alfresco.transformer.messaging; import javax.jms.ConnectionFactory; import javax.jms.Queue; -import org.alfresco.transform.client.model.TransformRequestValidator; +import org.alfresco.transform.messages.TransformRequestValidator; import org.apache.activemq.command.ActiveMQQueue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java index b6bfd431..60869bf1 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/probes/ProbeTestTransform.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -44,7 +44,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.servlet.http.HttpServletRequest; -import org.alfresco.transform.exceptions.TransformException; +import org.alfresco.transform.common.TransformException; import org.alfresco.transformer.AbstractTransformerController; import org.alfresco.transformer.logging.LogEntry; import org.slf4j.Logger; @@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory; *

K8s probes: A readiness probe indicates if the pod should accept request. It does not indicate that a pod is * ready after startup. The liveness probe indicates when to kill the pod. Both probes are called throughout the * lifetime of the pod and a liveness probes can take place before a readiness probe. The k8s - * initialDelaySeconds field is not fully honoured as it multiplied by a random number, so is + * initialDelaySeconds field is not fully honoured as it is multiplied by a random number, so is * actually a maximum initial delay in seconds, but could be 0.

* *

Live and readiness probes might do test transforms. The first 6 requests result in a transformation diff --git a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java index 7ffa3e4a..19428792 100644 --- a/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java +++ b/alfresco-transformer-base/src/main/java/org/alfresco/transformer/util/RequestParamMap.java @@ -30,7 +30,7 @@ package org.alfresco.transformer.util; * Extends the list of transform options with historic request parameters or 'extra' parameters used in testing * or communication in the all-in-one transformer. */ -public interface RequestParamMap extends org.alfresco.transform.client.util.RequestParamMap +public interface RequestParamMap extends org.alfresco.transform.common.RequestParamMap { // This property can be sent by acs repository's legacy transformers to force a transform, // instead of letting this T-Engine determine it based on the request parameters. diff --git a/alfresco-transformer-base/src/main/resources/application.yaml b/alfresco-transformer-base/src/main/resources/application.yaml index 7fa17b39..f2dec7db 100644 --- a/alfresco-transformer-base/src/main/resources/application.yaml +++ b/alfresco-transformer-base/src/main/resources/application.yaml @@ -31,7 +31,7 @@ logging: org.alfresco.transformer.ImageMagickController: debug org.alfresco.transformer.TikaController: debug org.alfresco.transformer.MiscellaneousTransformersController: debug - org.alfresco.transform.router.TransformerDebug: debug + org.alfresco.transform.common.TransformerDebug: debug fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file} diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java index 6dd6c245..846918f5 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractHttpRequestTest.java @@ -26,8 +26,8 @@ */ package org.alfresco.transformer; -import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.springframework.http.HttpMethod.POST; import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java index 97addbaa..86aa17b3 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractMetadataExtractsIT.java @@ -28,7 +28,7 @@ package org.alfresco.transformer; import static java.text.MessageFormat.format; import static org.alfresco.transformer.EngineClient.sendTRequest; -import static org.alfresco.transformer.util.MimetypeMap.MIMETYPE_METADATA_EXTRACT; +import static org.alfresco.transform.common.Mimetype.MIMETYPE_METADATA_EXTRACT; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index 9bb6fbe0..575934d1 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -27,11 +27,10 @@ package org.alfresco.transformer; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; -import static org.alfresco.transform.client.model.Mimetype.MIMETYPE_TEXT_PLAIN; -import static org.alfresco.transform.client.util.RequestParamMap.DIRECT_ACCESS_URL; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG; +import static org.alfresco.transform.common.RequestParamMap.DIRECT_ACCESS_URL; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG_LATEST; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM_CONFIG; import static org.hamcrest.Matchers.containsString; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -65,14 +64,14 @@ import java.util.UUID; import org.alfresco.transform.client.model.InternalContext; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.client.model.config.SupportedSourceAndTarget; -import org.alfresco.transform.client.model.config.TransformConfig; -import org.alfresco.transform.client.model.config.TransformOption; -import org.alfresco.transform.client.model.config.TransformOptionGroup; -import org.alfresco.transform.client.model.config.TransformOptionValue; -import org.alfresco.transform.client.model.config.Transformer; -import org.alfresco.transform.client.registry.TransformServiceRegistry; -import org.alfresco.transform.router.TransformStack; +import org.alfresco.transform.config.SupportedSourceAndTarget; +import org.alfresco.transform.config.TransformConfig; +import org.alfresco.transform.config.TransformOption; +import org.alfresco.transform.config.TransformOptionGroup; +import org.alfresco.transform.config.TransformOptionValue; +import org.alfresco.transform.config.Transformer; +import org.alfresco.transform.registry.TransformServiceRegistry; +import org.alfresco.transform.messages.TransformStack; import org.alfresco.transformer.clients.AlfrescoSharedFileStoreClient; import org.alfresco.transformer.model.FileRefEntity; import org.alfresco.transformer.model.FileRefResponse; diff --git a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java index 78a2c7cc..a1c3864f 100644 --- a/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java +++ b/alfresco-transformer-base/src/test/java/org/alfresco/transformer/EngineClient.java @@ -8,7 +8,7 @@ package org.alfresco.transformer; import static java.util.Collections.emptyMap; -import static org.alfresco.transform.client.util.RequestParamMap.ENDPOINT_TRANSFORM; +import static org.alfresco.transform.common.RequestParamMap.ENDPOINT_TRANSFORM; import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; import java.util.Map;