Polishing

Author: jhoeller

spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperBuilder.java

@@ -237,7 +237,7 @@ public Jackson2ObjectMapperBuilder serializers(JsonSerializer<?>... serializers)
 	 * @since 4.1.2
 	 */
 	public Jackson2ObjectMapperBuilder serializerByType(Class<?> type, JsonSerializer<?> serializer) {
-		if (serializers != null) {
+		if (serializer != null) {
 			this.serializers.put(type, serializer);
 		}
 		return this;
@@ -259,7 +259,7 @@ public Jackson2ObjectMapperBuilder serializersByType(Map<Class<?>, JsonSerialize
 	 * @since 4.1.2
 	 */
 	public Jackson2ObjectMapperBuilder deserializerByType(Class<?> type, JsonDeserializer<?> deserializer) {
-		if (deserializers != null) {
+		if (deserializer != null) {
 			this.deserializers.put(type, deserializer);
 		}
 		return this;
@@ -566,7 +566,9 @@ else if (this.findWellKnownModules) {
 		if (this.annotationIntrospector != null) {
 			objectMapper.setAnnotationIntrospector(this.annotationIntrospector);
 		}
-
+		if (this.propertyNamingStrategy != null) {
+			objectMapper.setPropertyNamingStrategy(this.propertyNamingStrategy);
+		}
 		if (this.serializationInclusion != null) {
 			objectMapper.setSerializationInclusion(this.serializationInclusion);
 		}
@@ -583,13 +585,11 @@ else if (this.findWellKnownModules) {
 			configureFeature(objectMapper, feature, this.features.get(feature));
 		}
 
-		if (this.propertyNamingStrategy != null) {
-			objectMapper.setPropertyNamingStrategy(this.propertyNamingStrategy);
-		}
 		for (Class<?> target : this.mixIns.keySet()) {
 			// Deprecated as of Jackson 2.5, but just in favor of a fluent variant.
 			objectMapper.addMixInAnnotations(target, this.mixIns.get(target));
 		}
+
 		if (this.handlerInstantiator != null) {
 			objectMapper.setHandlerInstantiator(this.handlerInstantiator);
 		}

spring-websocket/src/main/java/org/springframework/web/socket/messaging/StompSubProtocolHandler.java

@@ -115,9 +115,7 @@ public class StompSubProtocolHandler implements SubProtocolHandler, ApplicationE
 	 * Since a STOMP message can be received in multiple WebSocket messages,
 	 * buffering may be required and therefore it is necessary to know the maximum
 	 * allowed message size.
-	 *
 	 * <p>By default this property is set to 64K.
-	 *
 	 * @since 4.0.3
 	 */
 	public void setMessageSizeLimit(int messageSizeLimit) {
@@ -126,7 +124,6 @@ public void setMessageSizeLimit(int messageSizeLimit) {
 
 	/**
 	 * Get the configured message buffer size limit in bytes.
-	 *
 	 * @since 4.0.3
 	 */
 	public int getMessageSizeLimit() {
@@ -142,7 +139,7 @@ public void setUserSessionRegistry(UserSessionRegistry registry) {
 	}
 
 	/**
-	 * @return the configured UserSessionRegistry.
+	 * Return the configured UserSessionRegistry.
 	 */
 	public UserSessionRegistry getUserSessionRegistry() {
 		return this.userSessionRegistry;
@@ -152,7 +149,6 @@ public UserSessionRegistry getUserSessionRegistry() {
 	 * Configure a {@link MessageHeaderInitializer} to apply to the headers of all
 	 * messages created from decoded STOMP frames and other messages sent to the
 	 * client inbound channel.
-	 *
 	 * <p>By default this property is not set.
 	 */
 	public void setHeaderInitializer(MessageHeaderInitializer headerInitializer) {
@@ -161,7 +157,7 @@ public void setHeaderInitializer(MessageHeaderInitializer headerInitializer) {
 	}
 
 	/**
-	 * @return the configured header initializer.
+	 * Return the configured header initializer.
 	 */
 	public MessageHeaderInitializer getHeaderInitializer() {
 		return this.headerInitializer;
@@ -274,7 +270,6 @@ else if (StompCommand.UNSUBSCRIBE.equals(headerAccessor.getCommand())) {
 				logger.error("Failed to send client message to application via MessageChannel" +
 						" in session " + session.getId() + ". Sending STOMP ERROR to client.", ex);
 				sendErrorMessage(session, ex);
-
 			}
 		}
 	}
@@ -300,13 +295,14 @@ private void publishEvent(ApplicationEvent event) {
 			this.eventPublisher.publishEvent(event);
 		}
 		catch (Throwable ex) {
-			logger.error("Error publishing " + event + ".", ex);
+			logger.error("Error publishing " + event, ex);
 		}
 	}
 
 	protected void sendErrorMessage(WebSocketSession session, Throwable error) {
 		StompHeaderAccessor headerAccessor = StompHeaderAccessor.create(StompCommand.ERROR);
 		headerAccessor.setMessage(error.getMessage());
+
 		byte[] bytes = this.stompEncoder.encode(headerAccessor.getMessageHeaders(), EMPTY_PAYLOAD);
 		try {
 			session.sendMessage(new TextMessage(bytes));
@@ -327,8 +323,10 @@ public void handleMessageToClient(WebSocketSession session, Message<?> message)
 			logger.error("Expected byte[] payload. Ignoring " + message + ".");
 			return;
 		}
+
 		StompHeaderAccessor stompAccessor = getStompHeaderAccessor(message);
 		StompCommand command = stompAccessor.getCommand();
+
 		if (StompCommand.MESSAGE.equals(command)) {
 			if (stompAccessor.getSubscriptionId() == null) {
 				logger.warn("No STOMP \"subscription\" header in " + message);
@@ -374,7 +372,7 @@ else if (StompCommand.CONNECTED.equals(command)) {
 		}
 		catch (Throwable ex) {
 			// Could be part of normal workflow (e.g. browser tab closed)
-			logger.debug("Failed to send WebSocket message to client in session " + session.getId() + ".", ex);
+			logger.debug("Failed to send WebSocket message to client in session " + session.getId(), ex);
 			command = StompCommand.ERROR;
 		}
 		finally {
@@ -393,7 +391,7 @@ private  StompHeaderAccessor getStompHeaderAccessor(Message<?> message) {
 		MessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, MessageHeaderAccessor.class);
 		if (accessor == null) {
 			// Shouldn't happen (only broker broadcasts directly to clients)
-			throw new IllegalStateException("No header accessor in " + message + ".");
+			throw new IllegalStateException("No header accessor in " + message);
 		}
 		StompHeaderAccessor stompAccessor;
 		if (accessor instanceof StompHeaderAccessor) {
@@ -415,7 +413,7 @@ else if (stompAccessor.getCommand() == null || StompCommand.SEND.equals(stompAcc
 		else {
 			// Shouldn't happen (only broker broadcasts directly to clients)
 			throw new IllegalStateException(
-					"Unexpected header accessor type: " + accessor.getClass() + " in " + message + ".");
+					"Unexpected header accessor type: " + accessor.getClass() + " in " + message);
 		}
 		return stompAccessor;
 	}
@@ -465,13 +463,15 @@ private StompHeaderAccessor afterStompSessionConnected(Message<?> message, Stomp
 				this.userSessionRegistry.registerSessionId(userName, session.getId());
 			}
 		}
+
 		long[] heartbeat = accessor.getHeartbeat();
 		if (heartbeat[1] > 0) {
 			session = WebSocketSessionDecorator.unwrap(session);
 			if (session instanceof SockJsSession) {
 				((SockJsSession) session).disableHeartbeat();
 			}
 		}
+
 		return accessor;
 	}
 
@@ -499,11 +499,13 @@ public void afterSessionStarted(WebSocketSession session, MessageChannel outputC
 	@Override
 	public void afterSessionEnded(WebSocketSession session, CloseStatus closeStatus, MessageChannel outputChannel) {
 		this.decoders.remove(session.getId());
+
 		Principal principal = session.getPrincipal();
 		if (principal != null && this.userSessionRegistry != null) {
 			String userName = getSessionRegistryUserName(principal);
 			this.userSessionRegistry.unregisterSessionId(userName, session.getId());
 		}
+
 		Message<byte[]> message = createDisconnectMessage(session);
 		SimpAttributes simpAttributes = SimpAttributes.fromMessage(message);
 		try {
@@ -535,15 +537,15 @@ public String toString() {
 		return "StompSubProtocolHandler" + getSupportedProtocols();
 	}
 
-	private class Stats {
+
+	private static class Stats {
 
 		private final AtomicInteger connect = new AtomicInteger();
 
 		private final AtomicInteger connected = new AtomicInteger();
 
 		private final AtomicInteger disconnect = new AtomicInteger();
 
-
 		public void incrementConnectCount() {
 			this.connect.incrementAndGet();
 		}
@@ -556,7 +558,6 @@ public void incrementDisconnectCount() {
 			this.disconnect.incrementAndGet();
 		}
 
-
 		public String toString() {
 			return "processed CONNECT(" + this.connect.get() + ")-CONNECTED(" +
 					this.connected.get() + ")-DISCONNECT(" + this.disconnect.get() + ")";