Polishing

(cherry picked from commit d2cc97a)

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/AbstractSubscriptionRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2015 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -40,7 +40,6 @@ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegist
 	private static MultiValueMap<String, String> EMPTY_MAP =
 			CollectionUtils.unmodifiableMultiValueMap(new LinkedMultiValueMap<String, String>(0));
 
-
 	protected final Log logger = LogFactory.getLog(getClass());
 
 
@@ -55,19 +54,25 @@ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegist
 
 		String sessionId = SimpMessageHeaderAccessor.getSessionId(headers);
 		if (sessionId == null) {
-			logger.error("No sessionId in  " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No sessionId in  " + message);
+			}
 			return;
 		}
 
 		String subscriptionId = SimpMessageHeaderAccessor.getSubscriptionId(headers);
 		if (subscriptionId == null) {
-			logger.error("No subscriptionId in " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No subscriptionId in " + message);
+			}
 			return;
 		}
 
 		String destination = SimpMessageHeaderAccessor.getDestination(headers);
 		if (destination == null) {
-			logger.error("No destination in " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No destination in " + message);
+			}
 			return;
 		}
 
@@ -85,13 +90,17 @@ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegist
 
 		String sessionId = SimpMessageHeaderAccessor.getSessionId(headers);
 		if (sessionId == null) {
-			logger.error("No sessionId in " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No sessionId in " + message);
+			}
 			return;
 		}
 
 		String subscriptionId = SimpMessageHeaderAccessor.getSubscriptionId(headers);
 		if (subscriptionId == null) {
-			logger.error("No subscriptionId " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No subscriptionId " + message);
+			}
 			return;
 		}
 
@@ -109,7 +118,9 @@ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegist
 
 		String destination = SimpMessageHeaderAccessor.getDestination(headers);
 		if (destination == null) {
-			logger.error("No destination in " + message);
+			if (logger.isErrorEnabled()) {
+				logger.error("No destination in " + message);
+			}
 			return EMPTY_MAP;
 		}
 
@@ -117,14 +128,13 @@ public abstract class AbstractSubscriptionRegistry implements SubscriptionRegist
 	}
 
 
-	protected abstract void addSubscriptionInternal(String sessionId, String subscriptionId,
+	protected abstract void addSubscriptionInternal(
+			String sessionId, String subscriptionId, String destination, Message<?> message);
+
+	protected abstract void removeSubscriptionInternal(
+			String sessionId, String subscriptionId, Message<?> message);
+
+	protected abstract MultiValueMap<String, String> findSubscriptionsInternal(
 			String destination, Message<?> message);
 
-	protected abstract void removeSubscriptionInternal(String sessionId, String subscriptionId, Message<?> message);
-
-	@Override
-	public abstract void unregisterAllSubscriptions(String sessionId);
-
-	protected abstract MultiValueMap<String, String> findSubscriptionsInternal(String destination, Message<?> message);
-
 }

spring-messaging/src/main/java/org/springframework/messaging/simp/broker/DefaultSubscriptionRegistry.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2016 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -136,8 +136,8 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 
 
 	@Override
-	protected void addSubscriptionInternal(String sessionId, String subsId, String destination,
-			Message<?> message) {
+	protected void addSubscriptionInternal(
+			String sessionId, String subsId, String destination, Message<?> message) {
 
 		Expression expression = null;
 		MessageHeaders headers = message.getHeaders();
@@ -410,7 +410,7 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 				new ConcurrentHashMap<String, Set<Subscription>>(4);
 
 		public SessionSubscriptionInfo(String sessionId) {
-			Assert.notNull(sessionId, "sessionId must not be null");
+			Assert.notNull(sessionId, "'sessionId' must not be null");
 			this.sessionId = sessionId;
 		}
 
@@ -480,13 +480,14 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 	}
 
 
-	private static class Subscription {
+	private static final class Subscription {
 
 		private final String id;
 
 		private final Expression selectorExpression;
 
 		public Subscription(String id, Expression selector) {
+			Assert.notNull(id, "Subscription id must not be null");
 			this.id = id;
 			this.selectorExpression = selector;
 		}
@@ -501,19 +502,12 @@ public class DefaultSubscriptionRegistry extends AbstractSubscriptionRegistry {
 
 		@Override
 		public boolean equals(Object other) {
-			if (this == other) {
-				return true;
-			}
-			if (other == null || getClass() != other.getClass()) {
-				return false;
-			}
-			return getId().equals(((Subscription) other).getId());
-
+			return (this == other || (other instanceof Subscription && this.id.equals(((Subscription) other).id)));
 		}
 
 		@Override
 		public int hashCode() {
-			return getId().hashCode();
+			return this.id.hashCode();
 		}
 
 		@Override

spring-messaging/src/main/java/org/springframework/messaging/tcp/ReconnectStrategy.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2017 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.
@@ -16,7 +16,6 @@
 
 package org.springframework.messaging.tcp;
 
-
 /**
  * A contract to determine the frequency of reconnect attempts after connection failure.
  *