mirror of
https://github.com/Alfresco/alfresco-transform-core.git
synced 2026-09-16 18:12:54 +00:00
AAE-41879 Migrate jackson 2 -> 3
This commit is contained in:
+7
-7
@@ -55,12 +55,12 @@ import org.alfresco.transform.client.model.TransformRequest;
|
||||
@Service
|
||||
public class TransformMessageConverter implements MessageConverter
|
||||
{
|
||||
private static final JacksonJsonMessageConverter CONVERTER;
|
||||
private static final JacksonJsonMessageConverter converter;
|
||||
private static final JavaType TRANSFORM_REQUEST_TYPE = TypeFactory.createDefaultInstance().constructType(TransformRequest.class);
|
||||
|
||||
static
|
||||
{
|
||||
CONVERTER = new JacksonJsonMessageConverter() {
|
||||
converter = new JacksonJsonMessageConverter() {
|
||||
@Override
|
||||
@NonNull protected JavaType getJavaTypeForMessage(final Message message) throws JMSException
|
||||
{
|
||||
@@ -71,9 +71,9 @@ public class TransformMessageConverter implements MessageConverter
|
||||
return super.getJavaTypeForMessage(message);
|
||||
}
|
||||
};
|
||||
CONVERTER.setTargetType(MessageType.BYTES);
|
||||
CONVERTER.setTypeIdPropertyName("_type");
|
||||
CONVERTER.setTypeIdMappings(ImmutableMap.of(
|
||||
converter.setTargetType(MessageType.BYTES);
|
||||
converter.setTypeIdPropertyName("_type");
|
||||
converter.setTypeIdMappings(ImmutableMap.of(
|
||||
TransformRequest.class.getName(), TransformRequest.class,
|
||||
TransformReply.class.getName(), TransformReply.class));
|
||||
}
|
||||
@@ -83,12 +83,12 @@ public class TransformMessageConverter implements MessageConverter
|
||||
@NonNull final Object object,
|
||||
@NonNull final Session session) throws JMSException, MessageConversionException
|
||||
{
|
||||
return CONVERTER.toMessage(object, session);
|
||||
return converter.toMessage(object, session);
|
||||
}
|
||||
|
||||
@Override
|
||||
@NonNull public Object fromMessage(@NonNull final Message message) throws JMSException
|
||||
{
|
||||
return CONVERTER.fromMessage(message);
|
||||
return converter.fromMessage(message);
|
||||
}
|
||||
}
|
||||
|
||||
+6
-5
@@ -38,6 +38,7 @@ import org.springframework.jms.support.converter.JacksonJsonMessageConverter;
|
||||
import org.springframework.jms.support.converter.MessageConversionException;
|
||||
import org.springframework.jms.support.converter.MessageConverter;
|
||||
import org.springframework.jms.support.converter.MessageType;
|
||||
import org.springframework.lang.NonNull;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import org.alfresco.transform.client.model.TransformReply;
|
||||
@@ -58,7 +59,7 @@ public class TransformMessageConverter implements MessageConverter
|
||||
{
|
||||
converter = new JacksonJsonMessageConverter() {
|
||||
@Override
|
||||
protected JavaType getJavaTypeForMessage(final Message message) throws JMSException
|
||||
@NonNull protected JavaType getJavaTypeForMessage(final Message message) throws JMSException
|
||||
{
|
||||
if (message.getStringProperty("_type") == null)
|
||||
{
|
||||
@@ -75,15 +76,15 @@ public class TransformMessageConverter implements MessageConverter
|
||||
}
|
||||
|
||||
@Override
|
||||
public Message toMessage(
|
||||
final Object object,
|
||||
final Session session) throws JMSException, MessageConversionException
|
||||
@NonNull public Message toMessage(
|
||||
@NonNull final Object object,
|
||||
@NonNull final Session session) throws JMSException, MessageConversionException
|
||||
{
|
||||
return converter.toMessage(object, session);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object fromMessage(final Message message) throws JMSException
|
||||
@NonNull public Object fromMessage(@NonNull final Message message) throws JMSException
|
||||
{
|
||||
return converter.fromMessage(message);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user