root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Consistent static final logger declarations

This commit is contained in:
Juergen Hoeller 2015-12-16 20:44:00 +01:00
parent 997278e3ed
commit 753347ea98
7 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-aop/src/main/java/org/springframework/aop/framework/CglibAopProxy.java
View File

@ -94,7 +94,7 @@ class CglibAopProxy implements AopProxy, Serializable {
/** Logger available to subclasses; static to optimize serialization */
protected final static Log logger = LogFactory.getLog(CglibAopProxy.class);
protected static final Log logger = LogFactory.getLog(CglibAopProxy.class);
/** Keeps track of the Classes that we have validated for final methods */
private static final Map<Class<?>, Boolean> validatedClasses = new WeakHashMap<Class<?>, Boolean>();

4
spring-context/src/main/java/org/springframework/jmx/access/ConnectorDelegate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2012 the original author or authors.
* Copyright 2002-2015 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.
@ -37,7 +37,7 @@ import org.springframework.jmx.support.JmxUtils;
*/
class ConnectorDelegate {
private final static Log logger = LogFactory.getLog(ConnectorDelegate.class);
private static final Log logger = LogFactory.getLog(ConnectorDelegate.class);
private JMXConnector connector;

2
spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java
View File

@ -50,7 +50,7 @@ import org.springframework.util.Assert;
*/
public class SubscriptionMethodReturnValueHandler implements HandlerMethodReturnValueHandler {
private static Log logger = LogFactory.getLog(SubscriptionMethodReturnValueHandler.class);
private static final Log logger = LogFactory.getLog(SubscriptionMethodReturnValueHandler.class);
private final MessageSendingOperations<String> messagingTemplate;

9
spring-websocket/src/main/java/org/springframework/web/socket/config/WebSocketMessageBrokerStats.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@ -32,7 +32,6 @@ import org.springframework.web.socket.messaging.StompSubProtocolHandler;
import org.springframework.web.socket.messaging.SubProtocolHandler;
import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler;
/**
* A central class for aggregating information about internal state and counters
* from key infrastructure components of the setup that comes with
@ -51,7 +50,7 @@ import org.springframework.web.socket.messaging.SubProtocolWebSocketHandler;
*/
public class WebSocketMessageBrokerStats {
private static Log logger = LogFactory.getLog(WebSocketMessageBrokerStats.class);
private static final Log logger = LogFactory.getLog(WebSocketMessageBrokerStats.class);
private SubProtocolWebSocketHandler webSocketHandler;
@ -181,8 +180,8 @@ public class WebSocketMessageBrokerStats {
}
private String getExecutorStatsInfo(Executor executor) {
String s = executor.toString();
return s.substring(s.indexOf("pool"), s.length() - 1);
String str = executor.toString();
return str.substring(str.indexOf("pool"), str.length() - 1);
}
public String toString() {

2
spring-websocket/src/main/java/org/springframework/web/socket/messaging/WebSocketStompClient.java
View File

@ -70,7 +70,7 @@ import org.springframework.web.util.UriComponentsBuilder;
*/
public class WebSocketStompClient extends StompClientSupport implements SmartLifecycle {
private static Log logger = LogFactory.getLog(WebSocketStompClient.class);
private static final Log logger = LogFactory.getLog(WebSocketStompClient.class);
private final WebSocketClient webSocketClient;

10
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/DefaultTransportRequest.java
View File

@ -45,7 +45,7 @@ import org.springframework.web.socket.sockjs.transport.TransportType;
*/
class DefaultTransportRequest implements TransportRequest {
private static Log logger = LogFactory.getLog(DefaultTransportRequest.class);
private static final Log logger = LogFactory.getLog(DefaultTransportRequest.class);
private final SockJsUrlInfo sockJsUrlInfo;
@ -75,10 +75,10 @@ class DefaultTransportRequest implements TransportRequest {
HttpHeaders handshakeHeaders, HttpHeaders httpRequestHeaders,
Transport transport, TransportType serverTransportType, SockJsMessageCodec codec) {
Assert.notNull(sockJsUrlInfo, "'sockJsUrlInfo' is required");
Assert.notNull(transport, "'transport' is required");
Assert.notNull(serverTransportType, "'transportType' is required");
Assert.notNull(codec, "'codec' is required");
Assert.notNull(sockJsUrlInfo, "SockJsUrlInfo is required");
Assert.notNull(transport, "Transport is required");
Assert.notNull(serverTransportType, "TransportType is required");
Assert.notNull(codec, "SockJsMessageCodec is required");
this.sockJsUrlInfo = sockJsUrlInfo;
this.handshakeHeaders = (handshakeHeaders != null ? handshakeHeaders : new HttpHeaders());
this.httpRequestHeaders = (httpRequestHeaders != null ? httpRequestHeaders : new HttpHeaders());

14
spring-websocket/src/main/java/org/springframework/web/socket/sockjs/client/WebSocketTransport.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2014 the original author or authors.
* Copyright 2002-2015 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.
@ -17,7 +17,7 @@
package org.springframework.web.socket.sockjs.client;
import java.net.URI;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@ -47,7 +47,7 @@ import org.springframework.web.socket.sockjs.transport.TransportType;
*/
public class WebSocketTransport implements Transport, Lifecycle {
private static Log logger = LogFactory.getLog(WebSocketTransport.class);
private static final Log logger = LogFactory.getLog(WebSocketTransport.class);
private final WebSocketClient webSocketClient;
@ -55,7 +55,7 @@ public class WebSocketTransport implements Transport, Lifecycle {
public WebSocketTransport(WebSocketClient webSocketClient) {
Assert.notNull(webSocketClient, "'webSocketClient' is required");
Assert.notNull(webSocketClient, "WebSocketClient is required");
this.webSocketClient = webSocketClient;
}
@ -69,7 +69,7 @@ public class WebSocketTransport implements Transport, Lifecycle {
@Override
public List<TransportType> getTransportTypes() {
return Arrays.asList(TransportType.WEBSOCKET);
return Collections.singletonList(TransportType.WEBSOCKET);
}
@Override
@ -146,7 +146,7 @@ public class WebSocketTransport implements Transport, Lifecycle {
private final AtomicInteger connectCount = new AtomicInteger(0);
private ClientSockJsWebSocketHandler(WebSocketClientSockJsSession session) {
public ClientSockJsWebSocketHandler(WebSocketClientSockJsSession session) {
Assert.notNull(session);
this.sockJsSession = session;
}
@ -173,4 +173,4 @@ public class WebSocketTransport implements Transport, Lifecycle {
}
}
}
}