inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor packages in t-model to make them more readable

Browse Source
This commit is contained in:
alandavis
2022-06-17 10:16:04 +01:00
parent 69ec6cddc3
commit 78c82c9a01
105 changed files with 731 additions and 986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/InternalContext.java
View File

@@ -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;

364
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/Mimetype.java
View File

@@ -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
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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
* <p>
* 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<String> 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<String> matchMimetypes(final String regex)
{
return unmodifiableSet(ALL_MIMETYPES
.stream()
.filter(t -> t.matches(regex))
.collect(toSet()));
}
}

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/MultiStep.java
View File

@@ -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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformReply.java
View File

@@ -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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequest.java
View File

@@ -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;

80
alfresco-transform-model/src/main/java/org/alfresco/transform/router/ExtensionService.java → alfresco-transform-model/src/main/java/org/alfresco/transform/common/ExtensionService.java
View File

@@ -19,47 +19,47 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

192
alfresco-transform-model/src/main/java/org/alfresco/transform/common/Mimetype.java Normal file
View File

@@ -0,0 +1,192 @@
/*
* #%L
* Alfresco Transform Model
* %%
* 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
* 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
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
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;
/**
* Mimetype
* <p>
* Values from in Alfresco repo org.alfresco.repo.content.MimetypeMap
*/
public interface Mimetype
{
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_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_JP2 = "image/jp2";
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_PNG = "image/png";
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_RAW_3FR = "image/x-raw-hasselblad";
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_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_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_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_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_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_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_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_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_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";
}

4
alfresco-transform-model/src/main/java/org/alfresco/transform/router/RepositoryClientData.java → alfresco-transform-model/src/main/java/org/alfresco/transform/common/RepositoryClientData.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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";

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/util/RequestParamMap.java → alfresco-transform-model/src/main/java/org/alfresco/transform/common/RequestParamMap.java
View File

@@ -19,9 +19,9 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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.

4
alfresco-transform-model/src/main/java/org/alfresco/transform/exceptions/TransformException.java → alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformException.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.exceptions;
package org.alfresco.transform.common;
public class TransformException extends RuntimeException
{

3
alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformerDebug.java → alfresco-transform-model/src/main/java/org/alfresco/transform/common/TransformerDebug.java
View File

@@ -19,11 +19,12 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AbstractTransformOption.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/AbstractTransformOption.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/AddSupported.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/AddSupported.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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}.<p><br>

6
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreFunction.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreFunction.java
View File

@@ -19,12 +19,12 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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)

8
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/CoreVersionDecorator.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/CoreVersionDecorator.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;
/**
* <p>Class sets or clears the {@code coreVersion} property of {@link Transformer}s in a {@link TransformConfig}<p/>

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/OverrideSupported.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/OverrideSupported.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/RemoveSupported.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/RemoveSupported.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
/**
* Holds information about existing {@link SupportedSourceAndTarget} objects that should be removed.<p><br>

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedDefaults.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedDefaults.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;
import java.util.StringJoiner;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/SupportedSourceAndTarget.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/SupportedSourceAndTarget.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;
import java.util.StringJoiner;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformConfig.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformConfig.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.ArrayList;
import java.util.HashMap;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOption.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOption.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionGroup.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionGroup.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.HashSet;
import java.util.Objects;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformOptionValue.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformOptionValue.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformStep.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformStep.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Transformer.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/Transformer.java
View File

@@ -19,9 +19,9 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerAndTypes.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerAndTypes.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;
import java.util.StringJoiner;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/TransformerTypesSizeAndPriority.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/TransformerTypesSizeAndPriority.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;
import java.util.StringJoiner;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/config/Types.java → alfresco-transform-model/src/main/java/org/alfresco/transform/config/Types.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import java.util.Objects;
import java.util.StringJoiner;

3
alfresco-transform-model/src/main/java/org/alfresco/transform/client/model/TransformRequestValidator.java → alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformRequestValidator.java
View File

@@ -19,8 +19,9 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

8
alfresco-transform-model/src/main/java/org/alfresco/transform/router/TransformStack.java → alfresco-transform-model/src/main/java/org/alfresco/transform/messages/TransformStack.java
View File

@@ -19,10 +19,12 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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.<p><br/>
@@ -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;

12
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/AbstractTransformRegistry.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/AbstractTransformRegistry.java
View File

@@ -19,18 +19,18 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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

26
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/CombinedTransformConfig.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/CombinedTransformConfig.java
View File

@@ -19,19 +19,19 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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.

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Defaults.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Defaults.java
View File

@@ -19,9 +19,9 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/Origin.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/Origin.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.registry;
package org.alfresco.transform.registry;
import java.util.Collection;
import java.util.HashSet;

8
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/SupportedTransform.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/SupportedTransform.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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
{

2
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformCache.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformCache.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.registry;
package org.alfresco.transform.registry;
import static java.util.Collections.emptyMap;

12
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformRegistryHelper.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformRegistryHelper.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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
{

4
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformServiceRegistry.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformServiceRegistry.java
View File

@@ -19,9 +19,9 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

6
alfresco-transform-model/src/main/java/org/alfresco/transform/client/registry/TransformerAndSourceType.java → alfresco-transform-model/src/main/java/org/alfresco/transform/registry/TransformerAndSourceType.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

19
alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformerDebugTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/common/TransformerDebugTest.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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

2
alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreFunctionTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreFunctionTest.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #L%
*/
package org.alfresco.transform.client.model.config;
package org.alfresco.transform.config;
import org.junit.jupiter.api.Test;

14
alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/config/CoreVersionDecoratorTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/config/CoreVersionDecoratorTest.java
View File

@@ -19,7 +19,7 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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

7
alfresco-transform-model/src/test/java/org/alfresco/transform/client/model/TransformRequestValidatorTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformRequestValidatorTest.java
View File

@@ -19,16 +19,17 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

24
alfresco-transform-model/src/test/java/org/alfresco/transform/router/TransformStackTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/messages/TransformStackTest.java
View File

@@ -19,12 +19,14 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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);
};

10
alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/CombinedTransformConfigTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/registry/CombinedTransformConfigTest.java
View File

@@ -19,15 +19,15 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

18
alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/OverrideTransformConfigTests.java → alfresco-transform-model/src/test/java/org/alfresco/transform/registry/OverrideTransformConfigTests.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

8
alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TestTransformRegistry.java → alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TestTransformRegistry.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;

6
alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryHelperTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryHelperTest.java
View File

@@ -24,16 +24,16 @@
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
* #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;

20
alfresco-transform-model/src/test/java/org/alfresco/transform/client/registry/TransformRegistryTest.java → alfresco-transform-model/src/test/java/org/alfresco/transform/registry/TransformRegistryTest.java
View File

@@ -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 @@
* <http://www.gnu.org/licenses/lgpl-3.0.html>.
* #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;