Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing

Browse Source 
(cherry picked from commit 67ba187)
This commit is contained in:
Juergen Hoeller
2016-08-10 14:20:42 +02:00
parent 349f2ad578
commit 7b33cd6476
26 changed files with 224 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-messaging/src/main/java/org/springframework/messaging/core/GenericMessagingTemplate.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2016 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.
@@ -98,13 +98,13 @@ public class GenericMessagingTemplate extends AbstractDestinationResolvingMessag
@Override
public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
super.setDestinationResolver(new BeanFactoryMessageChannelDestinationResolver(beanFactory));
setDestinationResolver(new BeanFactoryMessageChannelDestinationResolver(beanFactory));
}
@Override
protected final void doSend(MessageChannel channel, Message<?> message) {
Assert.notNull(channel, "'channel' is required");
Assert.notNull(channel, "MessageChannel is required");
MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class);
if (accessor != null && accessor.isMutable()) {
@@ -116,13 +116,13 @@ public class GenericMessagingTemplate extends AbstractDestinationResolvingMessag
if (!sent) {
throw new MessageDeliveryException(message,
"failed to send message to channel '" + channel + "' within timeout: " + timeout);
"Failed to send message to channel '" + channel + "' within timeout: " + timeout);
}
}
@Override
protected final Message<?> doReceive(MessageChannel channel) {
Assert.notNull(channel, "'channel' is required");
Assert.notNull(channel, "MessageChannel is required");
Assert.state(channel instanceof PollableChannel, "A PollableChannel is required to receive messages");
long timeout = this.receiveTimeout;
@@ -208,7 +208,7 @@ public class GenericMessagingTemplate extends AbstractDestinationResolvingMessag
}
}
}
catch (InterruptedException e) {
catch (InterruptedException ex) {
Thread.currentThread().interrupt();
}
return this.replyMessage;

28
spring-messaging/src/main/java/org/springframework/messaging/simp/user/MultiServerUserRegistry.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -61,10 +61,10 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
*/
public MultiServerUserRegistry(SimpUserRegistry localRegistry) {
Assert.notNull(localRegistry, "'localRegistry' is required.");
this.id = generateId();
this.localRegistry = localRegistry;
this.listener = (this.localRegistry instanceof SmartApplicationListener ?
(SmartApplicationListener) this.localRegistry : new NoOpSmartApplicationListener());
this.id = generateId();
}
@@ -73,7 +73,7 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
try {
host = InetAddress.getLocalHost().getHostAddress();
}
catch (UnknownHostException e) {
catch (UnknownHostException ex) {
host = "unknown";
}
return host + "-" + UUID.randomUUID();
@@ -160,11 +160,10 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
@Override
public String toString() {
return "local=[" + this.localRegistry + "], remote=" + this.remoteRegistries + "]";
return "local=[" + this.localRegistry + "], remote=" + this.remoteRegistries;
}
@SuppressWarnings("unused")
private static class UserRegistryDto {
private String id;
@@ -173,6 +172,10 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
private long expirationTime;
/**
* Default constructor for JSON deserialization.
*/
@SuppressWarnings("unused")
public UserRegistryDto() {
}
@@ -235,13 +238,16 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
}
@SuppressWarnings("unused")
private static class SimpUserDto implements SimpUser {
private String name;
private Set<SimpSessionDto> sessions;
/**
* Default constructor for JSON deserialization.
*/
@SuppressWarnings("unused")
public SimpUserDto() {
this.sessions = new HashSet<SimpSessionDto>(1);
}
@@ -312,7 +318,6 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
}
@SuppressWarnings("unused")
private static class SimpSessionDto implements SimpSession {
private String id;
@@ -321,6 +326,10 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
private final Set<SimpSubscriptionDto> subscriptions;
/**
* Default constructor for JSON deserialization.
*/
@SuppressWarnings("unused")
public SimpSessionDto() {
this.subscriptions = new HashSet<SimpSubscriptionDto>(4);
}
@@ -384,7 +393,6 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
}
@SuppressWarnings("unused")
private static class SimpSubscriptionDto implements SimpSubscription {
private String id;
@@ -393,6 +401,10 @@ public class MultiServerUserRegistry implements SimpUserRegistry, SmartApplicati
private String destination;
/**
* Default constructor for JSON deserialization.
*/
@SuppressWarnings("unused")
public SimpSubscriptionDto() {
}