From 67f4fadcc4733a428e085c1ea95cf6e6ca2adfd1 Mon Sep 17 00:00:00 2001 From: alandavis Date: Wed, 27 Jul 2022 17:45:44 +0100 Subject: [PATCH] Save point: [skip ci] * tidy up --- _ci/test.sh | 2 +- .../transformer/QueueTransformService.java | 3 +- .../messaging/TransformMessageConverter.java | 17 ++++------ .../messaging/TransformReplySender.java | 31 ++++++++++--------- .../AbstractTransformerControllerTest.java | 3 +- .../alfresco/transformer/SourceTarget.java | 11 +++---- .../org/alfresco/transform/aio/AIOTest.java | 3 +- .../transform/base/QueueTransformService.java | 3 +- .../messaging/TransformMessageConverter.java | 17 ++++------ .../base/messaging/TransformReplySender.java | 7 +++-- .../alfresco/transform/base/SourceTarget.java | 7 ++--- .../imagemagick/ImageMagickTest.java | 3 +- .../org/alfresco/transform/misc/MiscTest.java | 3 +- .../pdfrenderer/PdfRendererTest.java | 3 +- .../org/alfresco/transform/tika/TikaTest.java | 3 +- 15 files changed, 48 insertions(+), 68 deletions(-) diff --git a/_ci/test.sh b/_ci/test.sh index 999b9734..95c0a5b5 100755 --- a/_ci/test.sh +++ b/_ci/test.sh @@ -11,7 +11,7 @@ pushd "$(dirname "${BASH_SOURCE[0]}")/../" # If the branch is "master" and the commit is not a Pull Request then deploy the JAR SNAPSHOT artifacts [ "${TRAVIS_PULL_REQUEST}" = "false" ] && [ "${TRAVIS_BRANCH}" = "master" ] && DEPLOY="deploy" || DEPLOY="verify" -# Do not deploy snapshots for alfresco-transform-core and alfresco-transformer-base +# Do not deploy snapshots for alfresco-transform-core, alfresco-transformer-base and alfresco-base-t-engine mvn -B -U -Dmaven.wagon.http.pool=false \ clean ${DEPLOY} \ -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \ diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java index 7a61ea48..dc2252eb 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java @@ -146,8 +146,7 @@ public class QueueTransformService { try { - TransformRequest request = (TransformRequest) transformMessageConverter - .fromMessage(msg); + TransformRequest request = (TransformRequest) transformMessageConverter.fromMessage(msg); return Optional.ofNullable(request); } catch (MessageConversionException e) diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java index cad7e95e..86161f67 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java @@ -27,14 +27,11 @@ package org.alfresco.transformer.messaging; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; - +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.type.TypeFactory; +import com.google.common.collect.ImmutableMap; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.jms.support.converter.MappingJackson2MessageConverter; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; @@ -42,9 +39,9 @@ import org.springframework.jms.support.converter.MessageType; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.type.TypeFactory; -import com.google.common.collect.ImmutableMap; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.Session; /** * TODO: Duplicated from the Router @@ -55,8 +52,6 @@ import com.google.common.collect.ImmutableMap; @Service public class TransformMessageConverter implements MessageConverter { - private static final Logger logger = LoggerFactory.getLogger(TransformMessageConverter.class); - private static final MappingJackson2MessageConverter converter; private static final JavaType TRANSFORM_REQUEST_TYPE = TypeFactory.defaultInstance().constructType(TransformRequest.class); diff --git a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java index e4583f53..26c80697 100644 --- a/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java +++ b/deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java @@ -2,7 +2,7 @@ * #%L * Alfresco Transform Core * %% - * Copyright (C) 2005 - 2019 Alfresco Software Limited + * Copyright (C) 2005 - 2022 Alfresco Software Limited * %% * This file is part of the Alfresco software. * - @@ -56,22 +56,23 @@ public class TransformReplySender send(destination, reply, reply.getRequestId()); } - public void send(final Destination destination, final TransformReply reply, - final String correlationId) + public void send(final Destination destination, final TransformReply reply, final String correlationId) { - try + if (destination != null) { - //jmsTemplate.setSessionTransacted(true); // do we need this? - jmsTemplate.convertAndSend(destination, reply, m -> { - m.setJMSCorrelationID(correlationId); - return m; - }); - logger.trace("Sent: {} - with correlation ID {}", reply, correlationId); - } - catch (Exception e) - { - logger.error( - "Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e); + try + { + //jmsTemplate.setSessionTransacted(true); // do we need this? + jmsTemplate.convertAndSend(destination, reply, m -> { + m.setJMSCorrelationID(correlationId); + return m; + }); + logger.trace("Sent: {} - with correlation ID {}", reply, correlationId); + } + catch (Exception e) + { + logger.error("Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e); + } } } } diff --git a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java index 534f3033..3408ba21 100644 --- a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java +++ b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java @@ -220,8 +220,7 @@ public abstract class AbstractTransformerControllerTest return testFileUrl == null ? null : testFile; } - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { if (sourceFile == null) { diff --git a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java index 92efa604..b86393ef 100644 --- a/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java +++ b/deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java @@ -29,12 +29,14 @@ package org.alfresco.transformer; import java.util.Objects; /** + * Source & Target media type pair + * * @author Cezar Leahu */ public class SourceTarget { - final String source; - final String target; + public final String source; + public final String target; private SourceTarget(final String source, final String target) { @@ -65,11 +67,6 @@ public class SourceTarget } public static SourceTarget of(final String source, final String target) - { - return sourceTarget(source, target); - } - - public static SourceTarget sourceTarget(final String source, final String target) { return new SourceTarget(source, target); } diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java index 6ebd33f6..7aa0a4bd 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java @@ -68,8 +68,7 @@ public class AIOTest extends AbstractBaseTest @Override // Add extra required parameters to the request. - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { return super.mockMvcRequest(url, sourceFile, params) .param("targetMimetype", targetMimetype) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java b/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java index 0f7492db..93753fbb 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java @@ -139,8 +139,7 @@ public class QueueTransformService { try { - TransformRequest request = (TransformRequest) transformMessageConverter - .fromMessage(msg); + TransformRequest request = (TransformRequest) transformMessageConverter.fromMessage(msg); return Optional.ofNullable(request); } catch (MessageConversionException e) diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java index 40f4113d..cc454874 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java @@ -27,14 +27,11 @@ package org.alfresco.transform.base.messaging; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.Session; - +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.type.TypeFactory; +import com.google.common.collect.ImmutableMap; import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformRequest; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.jms.support.converter.MappingJackson2MessageConverter; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; @@ -42,9 +39,9 @@ import org.springframework.jms.support.converter.MessageType; import org.springframework.lang.NonNull; import org.springframework.stereotype.Service; -import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.type.TypeFactory; -import com.google.common.collect.ImmutableMap; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.Session; /** * TODO: Duplicated from the Router @@ -55,8 +52,6 @@ import com.google.common.collect.ImmutableMap; @Service public class TransformMessageConverter implements MessageConverter { - private static final Logger logger = LoggerFactory.getLogger(TransformMessageConverter.class); - private static final MappingJackson2MessageConverter converter; private static final JavaType TRANSFORM_REQUEST_TYPE = TypeFactory.defaultInstance().constructType(TransformRequest.class); diff --git a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java index 7b3f561d..b448eb98 100644 --- a/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java +++ b/engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java @@ -60,14 +60,17 @@ public class TransformReplySender { if (destination != null) { - try { + try + { //jmsTemplate.setSessionTransacted(true); // do we need this? jmsTemplate.convertAndSend(destination, reply, m -> { m.setJMSCorrelationID(correlationId); return m; }); logger.trace("Sent: {} - with correlation ID {}", reply, correlationId); - } catch (Exception e) { + } + catch (Exception e) + { logger.error("Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e); } } diff --git a/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java b/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java index 37fc9fda..a7b9410f 100644 --- a/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java +++ b/engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java @@ -29,6 +29,8 @@ package org.alfresco.transform.base; import java.util.Objects; /** + * Source & Target media type pair + * * @author Cezar Leahu */ public class SourceTarget @@ -65,11 +67,6 @@ public class SourceTarget } public static SourceTarget of(final String source, final String target) - { - return sourceTarget(source, target); - } - - public static SourceTarget sourceTarget(final String source, final String target) { return new SourceTarget(source, target); } diff --git a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTest.java b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTest.java index 03b70450..87d9b3e4 100644 --- a/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTest.java +++ b/engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTest.java @@ -120,8 +120,7 @@ public class ImageMagickTest extends AbstractBaseTest } @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) .param("targetMimetype", targetMimetype) diff --git a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java index 395e0122..9c291601 100644 --- a/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java +++ b/engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java @@ -81,8 +81,7 @@ public class MiscTest extends AbstractBaseTest } @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) .param("sourceEncoding", sourceEncoding) diff --git a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererTest.java b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererTest.java index 5661cb1f..d4b00986 100644 --- a/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererTest.java +++ b/engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererTest.java @@ -108,8 +108,7 @@ public class PdfRendererTest extends AbstractBaseTest } @Override - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) .param("targetMimetype", targetMimetype) diff --git a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java index 30efa9f2..013d90fb 100644 --- a/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java +++ b/engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java @@ -183,8 +183,7 @@ public class TikaTest extends AbstractBaseTest @Override // Add extra required parameters to the request. - protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, - String... params) + protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params) { return super.mockMvcRequest(url, sourceFile, params) .param("targetEncoding", targetEncoding)