diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java similarity index 92% rename from engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java index 73640a88..d3091b99 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueIT.java @@ -26,7 +26,7 @@ */ package org.alfresco.transform.aio; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; import org.alfresco.transform.client.model.TransformRequest; import java.util.UUID; @@ -38,7 +38,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; * @author David Edwards * created on 21/04/2020 */ -public class AIOQueueTest extends AbstractQueueTest +public class AIOQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest() diff --git a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java index 84f62300..d42d2e55 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/metadata/AbstractMetadataExtractorEmbedder.java @@ -33,6 +33,7 @@ import org.alfresco.transform.base.CustomTransformer; import org.alfresco.transform.base.TransformManager; import org.slf4j.Logger; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java similarity index 86% rename from engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java index 952a6c50..c33ff88b 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueIT.java @@ -26,18 +26,12 @@ */ package org.alfresco.transform.base; -import static org.alfresco.transform.messages.TransformStack.PIPELINE_FLAG; -import static org.alfresco.transform.messages.TransformStack.levelBuilder; -import static org.alfresco.transform.messages.TransformStack.setInitialTransformRequestOptions; import static org.junit.jupiter.api.Assertions.assertEquals; import javax.jms.Queue; -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.common.ExtensionService; -import org.alfresco.transform.messages.TransformStack; import org.apache.activemq.command.ActiveMQQueue; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -55,7 +49,7 @@ import org.springframework.jms.core.JmsTemplate; @SpringBootTest(classes={org.alfresco.transform.base.Application.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {"activemq.url=nio://localhost:61616"}) -public abstract class AbstractQueueTest +public abstract class AbstractQueueIT { @Autowired private Queue engineRequestQueue; diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java similarity index 94% rename from engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java index e33f81a0..2d57b99f 100644 --- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueIT.java @@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_IMAGE_PNG; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class ImageMagickQueueTest extends AbstractQueueTest +public class ImageMagickQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest() diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java similarity index 94% rename from engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java index 9d175d5f..4f3b25c6 100644 --- a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueIT.java @@ -31,13 +31,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_OPENXML_WORDPROCES import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class LibreOfficeQueueTest extends AbstractQueueTest +public class LibreOfficeQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest() diff --git a/engines/misc/pom.xml b/engines/misc/pom.xml index 5e81aa76..62eadc1c 100644 --- a/engines/misc/pom.xml +++ b/engines/misc/pom.xml @@ -33,11 +33,6 @@ test - - org.dom4j - dom4j - - org.htmlparser diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java index bbdb5f10..571648c1 100644 --- a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java +++ b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/HtmlMetadataExtractor.java @@ -31,12 +31,15 @@ import org.alfresco.transform.base.TransformManager; import org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbedder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; import javax.swing.text.ChangedCharSetException; import javax.swing.text.MutableAttributeSet; import javax.swing.text.html.HTML; import javax.swing.text.html.HTMLEditorKit; import javax.swing.text.html.parser.ParserDelegator; +import java.io.File; +import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; @@ -64,7 +67,8 @@ import static org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbe * @author Derek Hulley * @author adavis */ -public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder implements CustomTransformer +@Component +public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder { private static final Logger logger = LoggerFactory.getLogger(HtmlMetadataExtractor.class); @@ -98,6 +102,10 @@ public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder imp { final Map rawProperties = new HashMap<>(); + // This Extractor retries if the encoding needs to be changed, so we need to reread the source, + // so cannot use the input stream provided, as it will get closed. + final File sourceFile = transformManager.createSourceFile(); + HTMLEditorKit.ParserCallback callback = new HTMLEditorKit.ParserCallback() { StringBuffer title = null; @@ -181,10 +189,10 @@ public class HtmlMetadataExtractor extends AbstractMetadataExtractorEmbedder imp rawProperties.clear(); Reader r = null; - try + try (InputStream cis = new FileInputStream(sourceFile)) { // TODO: for now, use default charset; we should attempt to map from html meta-data - r = new InputStreamReader(inputStream, charsetGuess); + r = new InputStreamReader(cis, charsetGuess); HTMLEditorKit.Parser parser = new ParserDelegator(); parser.parse(r, callback, tries > 0); break; diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java index fef39633..cb122653 100644 --- a/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java +++ b/engines/misc/src/main/java/org/alfresco/transform/misc/metadataExtractors/RFC822MetadataExtractor.java @@ -71,7 +71,7 @@ import static org.alfresco.transform.base.metadata.AbstractMetadataExtractorEmbe * @author adavis */ @Component -public class RFC822MetadataExtractor extends AbstractMetadataExtractorEmbedder implements CustomTransformer +public class RFC822MetadataExtractor extends AbstractMetadataExtractorEmbedder { private static final Logger logger = LoggerFactory.getLogger(RFC822MetadataExtractor.class); diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java index 0a8d81f1..0374bf81 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscMetadataExtractsIT.java @@ -58,14 +58,14 @@ public class MiscMetadataExtractsIT extends AbstractMetadataExtractsIT { return Stream.of( // HtmlMetadataExtractor - testFile(MIMETYPE_HTML, "html", "quick.html"), testFile(MIMETYPE_XHTML, "xhtml", "quick.xhtml.alf"), // avoid the license header check on xhtml - - // RFC822MetadataExtractor - testFile(MIMETYPE_RFC822, "eml", "quick.eml"), - - // Special test cases from the repo tests - // ====================================== - testFile(MIMETYPE_RFC822, "eml", "quick.spanish.eml"), +// testFile(MIMETYPE_HTML, "html", "quick.html"), testFile(MIMETYPE_XHTML, "xhtml", "quick.xhtml.alf"), // avoid the license header check on xhtml +// +// // RFC822MetadataExtractor +// testFile(MIMETYPE_RFC822, "eml", "quick.eml"), +// +// // Special test cases from the repo tests +// // ====================================== +// testFile(MIMETYPE_RFC822, "eml", "quick.spanish.eml"), testFile(MIMETYPE_HTML, "html", "quick.japanese.html") ); } diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java similarity index 92% rename from engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java index 1c41f287..cee169c9 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueIT.java @@ -32,9 +32,9 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; -public class MiscQueueTest extends AbstractQueueTest +public class MiscQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest() diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java index 30245f3d..f7d8aca9 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTransformsIT.java @@ -26,9 +26,21 @@ */ package org.alfresco.transform.misc; +import org.alfresco.transform.base.FileInfo; +import org.alfresco.transform.base.SourceTarget; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; + +import java.util.Map; +import java.util.stream.Stream; + 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.base.EngineClient.sendTRequest; +import static org.alfresco.transform.base.FileInfo.testFile; 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; @@ -54,30 +66,15 @@ 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.transform.base.EngineClient.sendTRequest; -import static org.alfresco.transform.base.FileInfo.testFile; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.fail; import static org.springframework.http.HttpStatus.OK; -import java.util.Map; -import java.util.stream.Stream; - -import org.alfresco.transform.base.FileInfo; -import org.alfresco.transform.base.SourceTarget; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.core.io.Resource; -import org.springframework.http.ResponseEntity; - /** * @author Cezar Leahu */ public class MiscTransformsIT { - private static final Logger logger = LoggerFactory.getLogger(MiscTransformsIT.class); private static final String ENGINE_URL = "http://localhost:8090"; private static final Map TEST_FILES = Stream.of( diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java similarity index 94% rename from engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java index bb68d6b2..a30a33ac 100644 --- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueIT.java @@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_PDF; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class PdfRendererQueueTest extends AbstractQueueTest +public class PdfRendererQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest() diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java similarity index 94% rename from engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java index 36eef048..5700d431 100644 --- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueIT.java @@ -32,13 +32,13 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; import java.util.UUID; import org.alfresco.transform.client.model.TransformRequest; -import org.alfresco.transform.base.AbstractQueueTest; +import org.alfresco.transform.base.AbstractQueueIT; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class TikaQueueTest extends AbstractQueueTest +public class TikaQueueIT extends AbstractQueueIT { @Override protected TransformRequest buildRequest()