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

Save point: [skip ci]

Browse Source 
* tidy up
This commit is contained in:
alandavis
2022-07-27 17:45:44 +01:00
parent e9c149a440
commit 67f4fadcc4
15 changed files with 48 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_ci/test.sh
View File

@@ -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 # 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" [ "${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 \ mvn -B -U -Dmaven.wagon.http.pool=false \
clean ${DEPLOY} \ clean ${DEPLOY} \
-DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \ -DadditionalOption=-Xdoclint:none -Dmaven.javadoc.skip=true \

3
deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/QueueTransformService.java
View File

@@ -146,8 +146,7 @@ public class QueueTransformService
{ {
try try
{ {
TransformRequest request = (TransformRequest) transformMessageConverter TransformRequest request = (TransformRequest) transformMessageConverter.fromMessage(msg);
.fromMessage(msg);
return Optional.ofNullable(request); return Optional.ofNullable(request);
} }
catch (MessageConversionException e) catch (MessageConversionException e)

17
deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformMessageConverter.java
View File

@@ -27,14 +27,11 @@
package org.alfresco.transformer.messaging; package org.alfresco.transformer.messaging;
import javax.jms.JMSException; import com.fasterxml.jackson.databind.JavaType;
import javax.jms.Message; import com.fasterxml.jackson.databind.type.TypeFactory;
import javax.jms.Session; import com.google.common.collect.ImmutableMap;
import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformReply;
import org.alfresco.transform.client.model.TransformRequest; 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.MappingJackson2MessageConverter;
import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter; 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.lang.NonNull;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.JavaType; import javax.jms.JMSException;
import com.fasterxml.jackson.databind.type.TypeFactory; import javax.jms.Message;
import com.google.common.collect.ImmutableMap; import javax.jms.Session;
/** /**
* TODO: Duplicated from the Router * TODO: Duplicated from the Router
@@ -55,8 +52,6 @@ import com.google.common.collect.ImmutableMap;
@Service @Service
public class TransformMessageConverter implements MessageConverter public class TransformMessageConverter implements MessageConverter
{ {
private static final Logger logger = LoggerFactory.getLogger(TransformMessageConverter.class);
private static final MappingJackson2MessageConverter converter; private static final MappingJackson2MessageConverter converter;
private static final JavaType TRANSFORM_REQUEST_TYPE = private static final JavaType TRANSFORM_REQUEST_TYPE =
TypeFactory.defaultInstance().constructType(TransformRequest.class); TypeFactory.defaultInstance().constructType(TransformRequest.class);

11
deprecated/alfresco-transformer-base/src/main/java/org/alfresco/transformer/messaging/TransformReplySender.java
View File

@@ -2,7 +2,7 @@
* #%L * #%L
* Alfresco Transform Core * 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. * This file is part of the Alfresco software.
* - * -
@@ -56,8 +56,9 @@ public class TransformReplySender
send(destination, reply, reply.getRequestId()); send(destination, reply, reply.getRequestId());
} }
public void send(final Destination destination, final TransformReply reply, public void send(final Destination destination, final TransformReply reply, final String correlationId)
final String correlationId) {
if (destination != null)
{ {
try try
{ {
@@ -70,8 +71,8 @@ public class TransformReplySender
} }
catch (Exception e) catch (Exception e)
{ {
logger.error( logger.error("Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e);
"Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e); }
} }
} }
} }

3
deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/AbstractTransformerControllerTest.java
View File

@@ -220,8 +220,7 @@ public abstract class AbstractTransformerControllerTest
return testFileUrl == null ? null : testFile; return testFileUrl == null ? null : testFile;
} }
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
if (sourceFile == null) if (sourceFile == null)
{ {

11
deprecated/alfresco-transformer-base/src/test/java/org/alfresco/transformer/SourceTarget.java
View File

@@ -29,12 +29,14 @@ package org.alfresco.transformer;
import java.util.Objects; import java.util.Objects;
/** /**
* Source & Target media type pair
*
* @author Cezar Leahu * @author Cezar Leahu
*/ */
public class SourceTarget public class SourceTarget
{ {
final String source; public final String source;
final String target; public final String target;
private SourceTarget(final String source, 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) 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); return new SourceTarget(source, target);
} }

3
engines/aio/src/test/java/org/alfresco/transform/aio/AIOTest.java
View File

@@ -68,8 +68,7 @@ public class AIOTest extends AbstractBaseTest
@Override @Override
// Add extra required parameters to the request. // Add extra required parameters to the request.
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
return super.mockMvcRequest(url, sourceFile, params) return super.mockMvcRequest(url, sourceFile, params)
.param("targetMimetype", targetMimetype) .param("targetMimetype", targetMimetype)

3
engines/base/src/main/java/org/alfresco/transform/base/QueueTransformService.java
View File

@@ -139,8 +139,7 @@ public class QueueTransformService
{ {
try try
{ {
TransformRequest request = (TransformRequest) transformMessageConverter TransformRequest request = (TransformRequest) transformMessageConverter.fromMessage(msg);
.fromMessage(msg);
return Optional.ofNullable(request); return Optional.ofNullable(request);
} }
catch (MessageConversionException e) catch (MessageConversionException e)

17
engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformMessageConverter.java
View File

@@ -27,14 +27,11 @@
package org.alfresco.transform.base.messaging; package org.alfresco.transform.base.messaging;
import javax.jms.JMSException; import com.fasterxml.jackson.databind.JavaType;
import javax.jms.Message; import com.fasterxml.jackson.databind.type.TypeFactory;
import javax.jms.Session; import com.google.common.collect.ImmutableMap;
import org.alfresco.transform.client.model.TransformReply; import org.alfresco.transform.client.model.TransformReply;
import org.alfresco.transform.client.model.TransformRequest; 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.MappingJackson2MessageConverter;
import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConversionException;
import org.springframework.jms.support.converter.MessageConverter; 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.lang.NonNull;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.fasterxml.jackson.databind.JavaType; import javax.jms.JMSException;
import com.fasterxml.jackson.databind.type.TypeFactory; import javax.jms.Message;
import com.google.common.collect.ImmutableMap; import javax.jms.Session;
/** /**
* TODO: Duplicated from the Router * TODO: Duplicated from the Router
@@ -55,8 +52,6 @@ import com.google.common.collect.ImmutableMap;
@Service @Service
public class TransformMessageConverter implements MessageConverter public class TransformMessageConverter implements MessageConverter
{ {
private static final Logger logger = LoggerFactory.getLogger(TransformMessageConverter.class);
private static final MappingJackson2MessageConverter converter; private static final MappingJackson2MessageConverter converter;
private static final JavaType TRANSFORM_REQUEST_TYPE = private static final JavaType TRANSFORM_REQUEST_TYPE =
TypeFactory.defaultInstance().constructType(TransformRequest.class); TypeFactory.defaultInstance().constructType(TransformRequest.class);

7
engines/base/src/main/java/org/alfresco/transform/base/messaging/TransformReplySender.java
View File

@@ -60,14 +60,17 @@ public class TransformReplySender
{ {
if (destination != null) if (destination != null)
{ {
try { try
{
//jmsTemplate.setSessionTransacted(true); // do we need this? //jmsTemplate.setSessionTransacted(true); // do we need this?
jmsTemplate.convertAndSend(destination, reply, m -> { jmsTemplate.convertAndSend(destination, reply, m -> {
m.setJMSCorrelationID(correlationId); m.setJMSCorrelationID(correlationId);
return m; return m;
}); });
logger.trace("Sent: {} - with correlation ID {}", reply, correlationId); 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); logger.error("Failed to send T-Reply " + reply + " - for correlation ID " + correlationId, e);
} }
} }

7
engines/base/src/test/java/org/alfresco/transform/base/SourceTarget.java
View File

@@ -29,6 +29,8 @@ package org.alfresco.transform.base;
import java.util.Objects; import java.util.Objects;
/** /**
* Source & Target media type pair
*
* @author Cezar Leahu * @author Cezar Leahu
*/ */
public class SourceTarget public class SourceTarget
@@ -65,11 +67,6 @@ public class SourceTarget
} }
public static SourceTarget of(final String source, final String target) 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); return new SourceTarget(source, target);
} }

3
engines/imagemagick/src/test/java/org/alfresco/transform/imagemagick/ImageMagickTest.java
View File

@@ -120,8 +120,7 @@ public class ImageMagickTest extends AbstractBaseTest
} }
@Override @Override
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params)
.param("targetMimetype", targetMimetype) .param("targetMimetype", targetMimetype)

3
engines/misc/src/test/java/org/alfresco/transform/misc/MiscTest.java
View File

@@ -81,8 +81,7 @@ public class MiscTest extends AbstractBaseTest
} }
@Override @Override
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params)
.param("sourceEncoding", sourceEncoding) .param("sourceEncoding", sourceEncoding)

3
engines/pdfrenderer/src/test/java/org/alfresco/transform/pdfrenderer/PdfRendererTest.java
View File

@@ -108,8 +108,7 @@ public class PdfRendererTest extends AbstractBaseTest
} }
@Override @Override
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params) final MockHttpServletRequestBuilder builder = super.mockMvcRequest(url, sourceFile, params)
.param("targetMimetype", targetMimetype) .param("targetMimetype", targetMimetype)

3
engines/tika/src/test/java/org/alfresco/transform/tika/TikaTest.java
View File

@@ -183,8 +183,7 @@ public class TikaTest extends AbstractBaseTest
@Override @Override
// Add extra required parameters to the request. // Add extra required parameters to the request.
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
String... params)
{ {
return super.mockMvcRequest(url, sourceFile, params) return super.mockMvcRequest(url, sourceFile, params)
.param("targetEncoding", targetEncoding) .param("targetEncoding", targetEncoding)