Skip to content

Commit 1cc5afe

Browse files
committed
1 parent 8ad212d commit 1cc5afe

File tree

197 files changed

+1687
-993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+1687
-993
lines changed

spring-messaging/src/main/java/org/springframework/messaging/converter/MappingJackson2MessageConverter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,9 @@ protected Object convertFromInternal(Message<?> message, Class<?> targetClass, @
236236

237237
@Override
238238
@Nullable
239-
protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers, @Nullable Object conversionHint) {
239+
protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
240+
@Nullable Object conversionHint) {
241+
240242
try {
241243
Class<?> view = getSerializationView(conversionHint);
242244
if (byte[].class == getSerializedPayloadClass()) {

spring-messaging/src/main/java/org/springframework/messaging/converter/MarshallingMessageConverter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,9 @@ private Source getSource(Object payload) {
166166

167167
@Override
168168
@Nullable
169-
protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers, @Nullable Object conversionHint) {
169+
protected Object convertToInternal(Object payload, @Nullable MessageHeaders headers,
170+
@Nullable Object conversionHint) {
171+
170172
Assert.notNull(this.marshaller, "Property 'marshaller' is required");
171173
try {
172174
if (byte[].class == getSerializedPayloadClass()) {

spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageSendingTemplate.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,16 @@ public void convertAndSend(D destination, Object payload) throws MessagingExcept
122122
}
123123

124124
@Override
125-
public void convertAndSend(D destination, Object payload, @Nullable Map<String, Object> headers) throws MessagingException {
125+
public void convertAndSend(D destination, Object payload, @Nullable Map<String, Object> headers)
126+
throws MessagingException {
127+
126128
convertAndSend(destination, payload, headers, null);
127129
}
128130

129131
@Override
130-
public void convertAndSend(Object payload, @Nullable MessagePostProcessor postProcessor) throws MessagingException {
132+
public void convertAndSend(Object payload, @Nullable MessagePostProcessor postProcessor)
133+
throws MessagingException {
134+
131135
convertAndSend(getRequiredDefaultDestination(), payload, postProcessor);
132136
}
133137

spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public interface MessageSendingOperations<D> {
104104
* @param headers headers for the message to send
105105
* @param postProcessor the post processor to apply to the message
106106
*/
107-
void convertAndSend(D destination, Object payload, @Nullable Map<String, Object> headers, @Nullable MessagePostProcessor postProcessor)
108-
throws MessagingException;
107+
void convertAndSend(D destination, Object payload, @Nullable Map<String, Object> headers,
108+
@Nullable MessagePostProcessor postProcessor) throws MessagingException;
109109

110110
}

spring-messaging/src/main/java/org/springframework/messaging/handler/DestinationPatternsMessageCondition.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@
3939
* @author Rossen Stoyanchev
4040
* @since 4.0
4141
*/
42-
public class DestinationPatternsMessageCondition extends AbstractMessageCondition<DestinationPatternsMessageCondition> {
42+
public class DestinationPatternsMessageCondition
43+
extends AbstractMessageCondition<DestinationPatternsMessageCondition> {
4344

4445
public static final String LOOKUP_DESTINATION_HEADER = "lookupDestination";
4546

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle
7676
* and {@code #{...}} SpEL expressions in default values, or {@code null} if default
7777
* values are not expected to contain expressions
7878
*/
79-
protected AbstractNamedValueMethodArgumentResolver(ConversionService cs, @Nullable ConfigurableBeanFactory beanFactory) {
79+
protected AbstractNamedValueMethodArgumentResolver(ConversionService cs,
80+
@Nullable ConfigurableBeanFactory beanFactory) {
81+
8082
this.conversionService = (cs != null ? cs : DefaultConversionService.getSharedInstance());
8183
this.configurableBeanFactory = beanFactory;
8284
this.expressionContext = (beanFactory != null ? new BeanExpressionContext(beanFactory, null) : null);

spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/DefaultMessageHandlerMethodFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@
5555
* @see #setValidator
5656
* @see #setCustomArgumentResolvers
5757
*/
58-
public class DefaultMessageHandlerMethodFactory implements MessageHandlerMethodFactory, BeanFactoryAware, InitializingBean {
58+
public class DefaultMessageHandlerMethodFactory
59+
implements MessageHandlerMethodFactory, BeanFactoryAware, InitializingBean {
5960

6061
private ConversionService conversionService = new DefaultFormattingConversionService();
6162

spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ public HandlerMethodArgumentResolverComposite addResolvers(@Nullable HandlerMeth
6868
/**
6969
* Add the given {@link HandlerMethodArgumentResolver}s.
7070
*/
71-
public HandlerMethodArgumentResolverComposite addResolvers(@Nullable List<? extends HandlerMethodArgumentResolver> argumentResolvers) {
71+
public HandlerMethodArgumentResolverComposite addResolvers(
72+
@Nullable List<? extends HandlerMethodArgumentResolver> argumentResolvers) {
73+
7274
if (argumentResolvers != null) {
7375
for (HandlerMethodArgumentResolver resolver : argumentResolvers) {
7476
this.argumentResolvers.add(resolver);

spring-messaging/src/main/java/org/springframework/messaging/simp/SimpAttributes.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public class SimpAttributes {
4343
public static final String SESSION_COMPLETED_NAME = SimpAttributes.class.getName() + ".COMPLETED";
4444

4545
/** Prefix for the name of session attributes used to store destruction callbacks. */
46-
public static final String DESTRUCTION_CALLBACK_NAME_PREFIX = SimpAttributes.class.getName() + ".DESTRUCTION_CALLBACK.";
46+
public static final String DESTRUCTION_CALLBACK_NAME_PREFIX =
47+
SimpAttributes.class.getName() + ".DESTRUCTION_CALLBACK.";
4748

4849
private static final Log logger = LogFactory.getLog(SimpAttributes.class);
4950

spring-messaging/src/main/java/org/springframework/messaging/simp/SimpMessageHeaderAccessor.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ public class SimpMessageHeaderAccessor extends NativeMessageHeaderAccessor {
8888
* A constructor for creating new message headers.
8989
* This constructor is protected. See factory methods in this and sub-classes.
9090
*/
91-
protected SimpMessageHeaderAccessor(SimpMessageType messageType, @Nullable Map<String, List<String>> externalSourceHeaders) {
91+
protected SimpMessageHeaderAccessor(SimpMessageType messageType,
92+
@Nullable Map<String, List<String>> externalSourceHeaders) {
93+
9294
super(externalSourceHeaders);
9395
Assert.notNull(messageType, "MessageType must not be null");
9496
setHeader(MESSAGE_TYPE_HEADER, messageType);

0 commit comments

Comments
 (0)