From e837feb559c363f54f384ee723818be1e8623414 Mon Sep 17 00:00:00 2001 From: alandavis Date: Thu, 21 Jul 2022 16:54:51 +0100 Subject: [PATCH] Save point: [skip ci] * Rename AbstractQueueTransformServiceIT to AbstractQueueTest and change names of subclasses Cleaned up the logic and added a comment to say what it was doing (sends messages ok, but fails the transform) * Clean up application-default.yaml values (duplicate values) * Renamed probe test files to be probe.??? --- .../main/resources/application-default.yaml | 21 ------------------ .../src/main/resources/application.properties | 1 - ...nsformServiceIT.java => AIOQueueTest.java} | 5 ++--- engines/base/README.md | 17 ++++++++++---- .../base/src/main/resources/application.yaml | 7 +----- ...mServiceIT.java => AbstractQueueTest.java} | 9 ++++++-- .../{HttpRequestTest.java => HttpTest.java} | 6 +++-- .../example/HelloTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 2 ++ .../main/resources/{jane.txt => probe.txt} | 0 .../ImageMagickTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 1 - .../main/resources/{quick.jpg => probe.jpg} | Bin ...rviceIT.java => ImageMagickQueueTest.java} | 5 ++--- .../LibreOfficeTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 1 - .../src/main/resources/application.properties | 1 - .../main/resources/{quick.doc => probe.doc} | Bin ...rviceIT.java => LibreOfficeQueueTest.java} | 5 ++--- .../transform/misc/MiscTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 3 --- .../main/resources/{quick.html => probe.html} | 0 ...sformServiceIT.java => MiscQueueTest.java} | 5 ++--- .../PdfRendererTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 1 - .../main/resources/{quick.pdf => probe.pdf} | Bin ...rviceIT.java => PdfRendererQueueTest.java} | 5 ++--- .../transform/tika/TikaTransformEngine.java | 2 +- .../main/resources/application-default.yaml | 1 - .../main/resources/{quick.pdf => probe.pdf} | Bin ...sformServiceIT.java => TikaQueueTest.java} | 5 ++--- 31 files changed, 45 insertions(+), 68 deletions(-) delete mode 100644 engines/aio/src/main/resources/application.properties rename engines/aio/src/test/java/org/alfresco/transform/aio/{AIOQueueTransformServiceIT.java => AIOQueueTest.java} (87%) rename engines/base/src/test/java/org/alfresco/transform/base/{AbstractQueueTransformServiceIT.java => AbstractQueueTest.java} (90%) rename engines/base/src/test/java/org/alfresco/transform/base/{HttpRequestTest.java => HttpTest.java} (94%) create mode 100644 engines/example/src/main/resources/application-default.yaml rename engines/example/src/main/resources/{jane.txt => probe.txt} (100%) rename engines/imagemagick/src/main/resources/{quick.jpg => probe.jpg} (100%) rename engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/{ImageMagickQueueTransformServiceIT.java => ImageMagickQueueTest.java} (89%) delete mode 100644 engines/libreoffice/src/main/resources/application.properties rename engines/libreoffice/src/main/resources/{quick.doc => probe.doc} (100%) rename engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/{LibreOfficeQueueTransformServiceIT.java => LibreOfficeQueueTest.java} (89%) rename engines/misc/src/main/resources/{quick.html => probe.html} (100%) rename engines/misc/src/test/java/org/alfresco/transform/misc/{MiscQueueTransformServiceIT.java => MiscQueueTest.java} (87%) rename engines/pdfrenderer/src/main/resources/{quick.pdf => probe.pdf} (100%) rename engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/{AlfrescoPdfRendererQueueTransformServiceIT.java => PdfRendererQueueTest.java} (89%) rename engines/tika/src/main/resources/{quick.pdf => probe.pdf} (100%) rename engines/tika/src/test/java/org/alfresco/transform/tika/{TikaQueueTransformServiceIT.java => TikaQueueTest.java} (90%) diff --git a/engines/aio/src/main/resources/application-default.yaml b/engines/aio/src/main/resources/application-default.yaml index a57aa716..be48db07 100644 --- a/engines/aio/src/main/resources/application-default.yaml +++ b/engines/aio/src/main/resources/application-default.yaml @@ -1,23 +1,2 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.aio.acs} -transform: - core: - version: @project.version@ - pdfrenderer: - exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer} - libreoffice: - path: ${LIBREOFFICE_HOME:/opt/libreoffice7.2} - maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} - timeout: ${LIBREOFFICE_TIMEOUT:1200000} - portNumbers: ${LIBREOFFICE_PORT_NUMBERS:8100} - templateProfileDir: ${LIBREOFFICE_TEMPLATE_PROFILE_DIR:} - isEnabled: ${LIBREOFFICE_IS_ENABLED:true} - imagemagick: - root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.10} - dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.10/lib} - exe: ${IMAGEMAGICK_EXE:/usr/bin/convert} - coders: ${IMAGEMAGICK_CODERS:} - config: ${IMAGEMAGICK_CONFIG:} - tika: - pdfBox: - notExtractBookmarksTextDefault: ${PDFBOX_NOTEXTRACTBOOKMARKS_DEFAULT:false} \ No newline at end of file diff --git a/engines/aio/src/main/resources/application.properties b/engines/aio/src/main/resources/application.properties deleted file mode 100644 index 441c89eb..00000000 --- a/engines/aio/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -#logging.level.org.alfresco.transformer.metadataExtractors=debug \ No newline at end of file diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java similarity index 87% rename from engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java rename to engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java index 1c203927..8e03922d 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTransformServiceIT.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOQueueTest.java @@ -26,9 +26,8 @@ */ package org.alfresco.transform.aio; -import org.alfresco.transform.base.AbstractQueueTransformServiceIT; +import org.alfresco.transform.base.AbstractQueueTest; import org.alfresco.transform.client.model.TransformRequest; -import org.springframework.boot.test.context.SpringBootTest; import java.util.UUID; @@ -39,7 +38,7 @@ import static org.alfresco.transform.common.Mimetype.MIMETYPE_TEXT_PLAIN; * @author David Edwards * created on 21/04/2020 */ -public class AIOQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class AIOQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest() diff --git a/engines/base/README.md b/engines/base/README.md index 4a358058..e1c554ce 100644 --- a/engines/base/README.md +++ b/engines/base/README.md @@ -19,8 +19,9 @@ A T-Engine project which extends this base is expected to provide the following: * An implementation of the [TransformEngine](https://github.com/Alfresco/alfresco-transform-core/blob/master/engines/base/src/main/java/org/alfresco/transform/base/TransformEngine.java) interface to describe the T-Engine. * Implementations of the [CustomTransformer](engines/base/src/main/java/org/alfresco/transform/base/CustomTransformer.java) - interface with the actual transform code. - + interface with the actual transform code. +* An `application-default.yaml` file to define a unique name for the message queue to the T-Engine. + The `TransformEngine` and `CustomTransformer` implementations should have an `@Component` annotation and be in or below the`org.alfresco.transform` package, so that they will be discovered by the base T-Engine. @@ -72,7 +73,7 @@ public class HelloTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("jane.txt", "text/plain", "text/plain", + return new ProbeTransform("probe.txt", "text/plain", "text/plain", ImmutableMap.of("sourceEncoding", "UTF-8", "language", "English"), 11, 10, 150, 1024, 1, 60 * 2); } @@ -141,7 +142,15 @@ public class HelloTransformer implements CustomTransformer } ``` -**Example `ProbeTransform` test file** `jane.txt` +**Example properties** `resources/application-default.yaml` + +As can be seen the following defines a default which can be overridden by an environment variable. +```yaml +queue: + engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs} +``` + +**Example ProbeTransform test file** `resources/probe.txt` ```json Jane ``` \ No newline at end of file diff --git a/engines/base/src/main/resources/application.yaml b/engines/base/src/main/resources/application.yaml index 37e771ef..8f6032c6 100644 --- a/engines/base/src/main/resources/application.yaml +++ b/engines/base/src/main/resources/application.yaml @@ -29,12 +29,7 @@ transform: logging: level: # org.alfresco.util.exec.RuntimeExec: debug - org.alfresco.transformer.LibreOfficeController: debug - org.alfresco.transformer.JodConverterSharedInstance: debug - org.alfresco.transformer.AlfrescoPdfRendererController: debug - org.alfresco.transformer.ImageMagickController: debug - org.alfresco.transformer.TikaController: debug - org.alfresco.transformer.MiscellaneousTransformersController: debug + # org.alfresco.transform.base.metadataExtractors: debug org.alfresco.transform.common.TransformerDebug: debug fileStoreUrl: ${FILE_STORE_URL:http://localhost:8099/alfresco/api/-default-/private/sfs/versions/1/file} diff --git a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java b/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java similarity index 90% rename from engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java rename to engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java index 11fb7b2e..90664786 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTransformServiceIT.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/AbstractQueueTest.java @@ -45,13 +45,16 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.jms.core.JmsTemplate; /** + * Checks that a t-engine can respond to its message queue. This is really just checking that + * ${queue.engineRequestQueue} has been configured. The transform request can (and does fail). + * * @author Lucian Tuca * created on 15/01/2019 */ @SpringBootTest(classes={org.alfresco.transform.base.Application.class}, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, properties = {"activemq.url=nio://localhost:61616"}) -public abstract class AbstractQueueTransformServiceIT +public abstract class AbstractQueueTest { @Autowired private Queue engineRequestQueue; @@ -79,7 +82,6 @@ public abstract class AbstractQueueTransformServiceIT "transformerName", request.getSourceMediaType(), request.getTargetMediaType())); -// TransformStack.setReference(request.getInternalContext(), reference); jmsTemplate.convertAndSend(engineRequestQueue, request, m -> { m.setJMSCorrelationID(request.getRequestId()); @@ -89,6 +91,9 @@ public abstract class AbstractQueueTransformServiceIT this.jmsTemplate.setReceiveTimeout(1_000); TransformReply reply = (TransformReply) this.jmsTemplate.receiveAndConvert(testingQueue); + + // The transform may fail (for example the SFS is unavailable), but we check we get a response with the + // correct id, so we know that the message was processed. assertEquals(request.getRequestId(), reply.getRequestId()); } diff --git a/engines/base/src/test/java/org/alfresco/transform/base/HttpRequestTest.java b/engines/base/src/test/java/org/alfresco/transform/base/HttpTest.java similarity index 94% rename from engines/base/src/test/java/org/alfresco/transform/base/HttpRequestTest.java rename to engines/base/src/test/java/org/alfresco/transform/base/HttpTest.java index a11da146..367f5245 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/HttpRequestTest.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/HttpTest.java @@ -51,7 +51,9 @@ import static org.springframework.http.HttpMethod.POST; import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; /** - * Super class with a server test harness, which talks to the TransformController using http. + * Very basic requests to the TransformController using http. No longer extended in t-engines as all http interaction + * is now done by the base. Also see {@link TransformControllerTest} and {@link TransformHandlerTest} for more extensive + * tests. */ @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes={org.alfresco.transform.base.Application.class}) @@ -59,7 +61,7 @@ import static org.springframework.http.MediaType.MULTIPART_FORM_DATA; FakeTransformEngineWithTwoCustomTransformers.class, FakeTransformerTxT2Pdf.class, FakeTransformerPdf2Png.class}) -public class HttpRequestTest +public class HttpTest { @Autowired private TestRestTemplate restTemplate; diff --git a/engines/example/src/main/java/org/alfresco/transform/example/HelloTransformEngine.java b/engines/example/src/main/java/org/alfresco/transform/example/HelloTransformEngine.java index 76f5b465..9122cc02 100644 --- a/engines/example/src/main/java/org/alfresco/transform/example/HelloTransformEngine.java +++ b/engines/example/src/main/java/org/alfresco/transform/example/HelloTransformEngine.java @@ -61,7 +61,7 @@ public class HelloTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("jane.txt", "text/plain", "text/plain", + return new ProbeTransform("probe.txt", "text/plain", "text/plain", ImmutableMap.of("sourceEncoding", "UTF-8", "language", "English"), 11, 10, 150, 1024, 1, 60 * 2); } diff --git a/engines/example/src/main/resources/application-default.yaml b/engines/example/src/main/resources/application-default.yaml new file mode 100644 index 00000000..237dc746 --- /dev/null +++ b/engines/example/src/main/resources/application-default.yaml @@ -0,0 +1,2 @@ +queue: + engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.example.acs} \ No newline at end of file diff --git a/engines/example/src/main/resources/jane.txt b/engines/example/src/main/resources/probe.txt similarity index 100% rename from engines/example/src/main/resources/jane.txt rename to engines/example/src/main/resources/probe.txt diff --git a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java index 7a1041a2..6d844090 100644 --- a/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java +++ b/engines/imagemagick/src/main/java/org/alfresco/transform/imagemagick/ImageMagickTransformEngine.java @@ -68,7 +68,7 @@ public class ImageMagickTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("quick.jpg", MIMETYPE_IMAGE_JPEG, MIMETYPE_IMAGE_PNG, Collections.emptyMap(), + return new ProbeTransform("probe.jpg", MIMETYPE_IMAGE_JPEG, MIMETYPE_IMAGE_PNG, Collections.emptyMap(), 35593, 1024, 150, 1024, 60 * 15 + 1, 60 * 15); } } diff --git a/engines/imagemagick/src/main/resources/application-default.yaml b/engines/imagemagick/src/main/resources/application-default.yaml index cc408054..3eea8e42 100644 --- a/engines/imagemagick/src/main/resources/application-default.yaml +++ b/engines/imagemagick/src/main/resources/application-default.yaml @@ -2,7 +2,6 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.imagemagick.acs} transform: core: - version: @project.version@ imagemagick: root: ${IMAGEMAGICK_ROOT:/usr/lib64/ImageMagick-7.0.10} dyn: ${IMAGEMAGICK_DYN:/usr/lib64/ImageMagick-7.0.10/lib} diff --git a/engines/imagemagick/src/main/resources/quick.jpg b/engines/imagemagick/src/main/resources/probe.jpg similarity index 100% rename from engines/imagemagick/src/main/resources/quick.jpg rename to engines/imagemagick/src/main/resources/probe.jpg diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java similarity index 89% rename from engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java rename to engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java index 2c7cd80d..4ccf1a21 100644 --- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTransformServiceIT.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickQueueTest.java @@ -32,14 +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.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import org.alfresco.transform.base.AbstractQueueTest; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class ImageMagickQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class ImageMagickQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest() diff --git a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java index 53ef2901..2f7979c6 100644 --- a/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java +++ b/engines/libreoffice/src/main/java/org/alfresco/transform/libreoffice/LibreOfficeTransformEngine.java @@ -69,7 +69,7 @@ public class LibreOfficeTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("quick.doc", MIMETYPE_WORD, MIMETYPE_PDF, Collections.emptyMap(), + return new ProbeTransform("probe.jpg", MIMETYPE_WORD, MIMETYPE_PDF, Collections.emptyMap(), 11817, 1024, 150, 10240, 60 * 30 + 1, 60 * 15 + 20); } } diff --git a/engines/libreoffice/src/main/resources/application-default.yaml b/engines/libreoffice/src/main/resources/application-default.yaml index e3c39ad5..d408b95b 100644 --- a/engines/libreoffice/src/main/resources/application-default.yaml +++ b/engines/libreoffice/src/main/resources/application-default.yaml @@ -2,7 +2,6 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.libreoffice.acs} transform: core: - version: @project.version@ libreoffice: path: ${LIBREOFFICE_HOME:/opt/libreoffice7.2} maxTasksPerProcess: ${LIBREOFFICE_MAX_TASKS_PER_PROCESS:200} diff --git a/engines/libreoffice/src/main/resources/application.properties b/engines/libreoffice/src/main/resources/application.properties deleted file mode 100644 index 56add62d..00000000 --- a/engines/libreoffice/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -#logging.level.org.alfresco.transformer.LibreOfficeController=debug \ No newline at end of file diff --git a/engines/libreoffice/src/main/resources/quick.doc b/engines/libreoffice/src/main/resources/probe.doc similarity index 100% rename from engines/libreoffice/src/main/resources/quick.doc rename to engines/libreoffice/src/main/resources/probe.doc diff --git a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java similarity index 89% rename from engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java rename to engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java index 7b9fc2ce..eaccb949 100644 --- a/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTransformServiceIT.java +++ b/engines/libreoffice/src/test/java/org/alfresco/transform/libreoffice/LibreOfficeQueueTest.java @@ -31,14 +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.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import org.alfresco.transform.base.AbstractQueueTest; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class LibreOfficeQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class LibreOfficeQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest() diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java b/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java index 64abc611..1f66c3c1 100644 --- a/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java +++ b/engines/misc/src/main/java/org/alfresco/transform/misc/MiscTransformEngine.java @@ -73,7 +73,7 @@ public class MiscTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("quick.html", MIMETYPE_HTML, MIMETYPE_TEXT_PLAIN, transformOptions, + return new ProbeTransform("probe.html", MIMETYPE_HTML, MIMETYPE_TEXT_PLAIN, transformOptions, 119, 30, 150, 1024, 60 * 2 + 1, 60 * 2); } } diff --git a/engines/misc/src/main/resources/application-default.yaml b/engines/misc/src/main/resources/application-default.yaml index ccc774b6..62e91ec6 100644 --- a/engines/misc/src/main/resources/application-default.yaml +++ b/engines/misc/src/main/resources/application-default.yaml @@ -1,5 +1,2 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.misc.acs} -transform: - core: - version: @project.version@ \ No newline at end of file diff --git a/engines/misc/src/main/resources/quick.html b/engines/misc/src/main/resources/probe.html similarity index 100% rename from engines/misc/src/main/resources/quick.html rename to engines/misc/src/main/resources/probe.html diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java similarity index 87% rename from engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java rename to engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java index 5cea0fb1..3f474754 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTransformServiceIT.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscQueueTest.java @@ -32,10 +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.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import org.alfresco.transform.base.AbstractQueueTest; -public class MiscQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class MiscQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest() diff --git a/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java index d74f4b72..12a05ee3 100644 --- a/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java +++ b/engines/pdfrenderer/src/main/java/org/alfresco/transform/pdfrenderer/PdfRendererTransformEngine.java @@ -67,7 +67,7 @@ public class PdfRendererTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("quick.pdf", MIMETYPE_PDF, MIMETYPE_IMAGE_PNG, Collections.emptyMap(), + return new ProbeTransform("probe.pdf", MIMETYPE_PDF, MIMETYPE_IMAGE_PNG, Collections.emptyMap(), 7455, 1024, 150, 10240, 60 * 20 + 1, 60 * 15 - 15); } } \ No newline at end of file diff --git a/engines/pdfrenderer/src/main/resources/application-default.yaml b/engines/pdfrenderer/src/main/resources/application-default.yaml index 921f7323..217b93ab 100644 --- a/engines/pdfrenderer/src/main/resources/application-default.yaml +++ b/engines/pdfrenderer/src/main/resources/application-default.yaml @@ -2,6 +2,5 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.alfresco-pdf-renderer.acs} transform: core: - version: @project.version@ pdfrenderer: exe: ${PDFRENDERER_EXE:/usr/bin/alfresco-pdf-renderer} \ No newline at end of file diff --git a/engines/pdfrenderer/src/main/resources/quick.pdf b/engines/pdfrenderer/src/main/resources/probe.pdf similarity index 100% rename from engines/pdfrenderer/src/main/resources/quick.pdf rename to engines/pdfrenderer/src/main/resources/probe.pdf diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java similarity index 89% rename from engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java rename to engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java index bf114752..85465cdc 100644 --- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/AlfrescoPdfRendererQueueTransformServiceIT.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererQueueTest.java @@ -32,14 +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.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import org.alfresco.transform.base.AbstractQueueTest; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class AlfrescoPdfRendererQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class PdfRendererQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest() diff --git a/engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java b/engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java index 70b17b9b..b548d583 100644 --- a/engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java +++ b/engines/tika/src/main/java/org/alfresco/transform/tika/TikaTransformEngine.java @@ -68,7 +68,7 @@ public class TikaTransformEngine implements TransformEngine @Override public ProbeTransform getProbeTransform() { - return new ProbeTransform("quick.pdf", MIMETYPE_PDF, MIMETYPE_TEXT_PLAIN, Collections.emptyMap(), + return new ProbeTransform("probe.pdf", MIMETYPE_PDF, MIMETYPE_TEXT_PLAIN, Collections.emptyMap(), 60, 16, 400, 10240, 60 * 30 + 1, 60 * 15 + 20); } } diff --git a/engines/tika/src/main/resources/application-default.yaml b/engines/tika/src/main/resources/application-default.yaml index e056ae7d..d39257e9 100644 --- a/engines/tika/src/main/resources/application-default.yaml +++ b/engines/tika/src/main/resources/application-default.yaml @@ -2,7 +2,6 @@ queue: engineRequestQueue: ${TRANSFORM_ENGINE_REQUEST_QUEUE:org.alfresco.transform.engine.tika.acs} transform: core: - version: @project.version@ tika: pdfBox: notExtractBookmarksTextDefault: ${PDFBOX_NOTEXTRACTBOOKMARKS_DEFAULT:false} \ No newline at end of file diff --git a/engines/tika/src/main/resources/quick.pdf b/engines/tika/src/main/resources/probe.pdf similarity index 100% rename from engines/tika/src/main/resources/quick.pdf rename to engines/tika/src/main/resources/probe.pdf diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java similarity index 90% rename from engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java rename to engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java index 7d1adfbb..8c75c470 100644 --- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTransformServiceIT.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaQueueTest.java @@ -32,14 +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.AbstractQueueTransformServiceIT; -import org.springframework.boot.test.context.SpringBootTest; +import org.alfresco.transform.base.AbstractQueueTest; /** * @author Lucian Tuca * created on 15/01/2019 */ -public class TikaQueueTransformServiceIT extends AbstractQueueTransformServiceIT +public class TikaQueueTest extends AbstractQueueTest { @Override protected TransformRequest buildRequest()