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

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

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

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

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

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

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;
}
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile,
String... params)
protected MockHttpServletRequestBuilder mockMvcRequest(String url, MockMultipartFile sourceFile, String... params)
{
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;
/**
* 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);
}