From 81c50dc674614529618bb72889bdeac7b1d77833 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 28 Feb 2018 16:29:46 +0100 Subject: [PATCH] Polishing --- .../jms/support/JmsHeaderMapper.java | 13 ++++++++----- .../jms/support/SimpleJmsHeaderMapper.java | 9 +++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java index b3f31f585b..3bd63dbcbc 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/JmsHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ import javax.jms.Message; import org.springframework.messaging.support.HeaderMapper; /** - * Strategy interface for mapping messaging Message headers to an outbound - * JMS Message (e.g. to configure JMS properties) or extracting messaging - * header values from an inbound JMS Message. + * Strategy interface for mapping {@link org.springframework.messaging.Message} + * headers to an outbound JMS {@link javax.jms.Message} (e.g. to configure JMS + * properties) or extracting messaging header values from an inbound JMS Message. * * @author Mark Fisher * @author Oleg Zhurakousky @@ -32,7 +32,10 @@ import org.springframework.messaging.support.HeaderMapper; */ public interface JmsHeaderMapper extends HeaderMapper { - static final String CONTENT_TYPE_PROPERTY = "content_type"; + /** + * The JMS-compliant {@code content_type} property. + */ + String CONTENT_TYPE_PROPERTY = "content_type"; } diff --git a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java index 5320daf264..f32018fb2f 100644 --- a/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java +++ b/spring-jms/src/main/java/org/springframework/jms/support/SimpleJmsHeaderMapper.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -205,7 +205,6 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme logger.info("Failed to read JMSTimestamp property - skipping", ex); } - Enumeration jmsPropertyNames = jmsMessage.getPropertyNames(); if (jmsPropertyNames != null) { while (jmsPropertyNames.hasMoreElements()) { @@ -233,7 +232,8 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme /** * Add the outbound prefix if necessary. - *

Convert {@link MessageHeaders#CONTENT_TYPE} to content_type for JMS compliance. + *

Convert {@link MessageHeaders#CONTENT_TYPE} to {@code content_type} for JMS compliance. + * @see #CONTENT_TYPE_PROPERTY */ protected String fromHeaderName(String headerName) { if (MessageHeaders.CONTENT_TYPE.equals(headerName)) { @@ -244,7 +244,8 @@ public class SimpleJmsHeaderMapper extends AbstractHeaderMapper impleme /** * Add the inbound prefix if necessary. - *

Convert content_type to {@link MessageHeaders#CONTENT_TYPE}. + *

Convert the JMS-compliant {@code content_type} to {@link MessageHeaders#CONTENT_TYPE}. + * @see #CONTENT_TYPE_PROPERTY */ protected String toHeaderName(String propertyName) { if (CONTENT_TYPE_PROPERTY.equals(propertyName)) {