Polish (minor)

rstoyanchev · rstoyanchev · commit ba87743087d1 · 2013-04-29T10:17:57.000-04:00
diff --git a/spring-websocket/src/main/java/org/springframework/websocket/adapter/WebSocketHandlerInvoker.java b/spring-websocket/src/main/java/org/springframework/websocket/adapter/WebSocketHandlerInvoker.java
@@ -61,7 +61,6 @@ public void afterConnectionEstablished(WebSocketSession session) {
 		}
 		try {
 			Assert.isTrue(this.sessionCount.compareAndSet(0, 1), "Unexpected new session");
-
 			this.handler.afterConnectionEstablished(session);
 		}
 		catch (Throwable ex) {
diff --git a/spring-websocket/src/main/java/org/springframework/websocket/support/BeanCreatingHandlerProvider.java b/spring-websocket/src/main/java/org/springframework/websocket/support/BeanCreatingHandlerProvider.java
@@ -34,14 +34,14 @@ public class BeanCreatingHandlerProvider<T> implements BeanFactoryAware {
 
 	private static final Log logger = LogFactory.getLog(BeanCreatingHandlerProvider.class);
 
-	private final Class<? extends T> handlerClass;
+	private final Class<? extends T> handlerType;
 
 	private AutowireCapableBeanFactory beanFactory;
 
 
-	public BeanCreatingHandlerProvider(Class<? extends T> handlerClass) {
-		Assert.notNull(handlerClass, "handlerClass is required");
-		this.handlerClass = handlerClass;
+	public BeanCreatingHandlerProvider(Class<? extends T> handlerType) {
+		Assert.notNull(handlerType, "handlerType is required");
+		this.handlerType = handlerType;
 	}
 
 
@@ -52,24 +52,20 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		}
 	}
 
-	public boolean isSingleton() {
-		return false;
-	}
-
 	public Class<? extends T> getHandlerType() {
-		return this.handlerClass;
+		return this.handlerType;
 	}
 
 	public T getHandler() {
 		if (logger.isTraceEnabled()) {
-			logger.trace("Creating instance for handler type " + this.handlerClass);
+			logger.trace("Creating instance for handler type " + this.handlerType);
 		}
 		if (this.beanFactory == null) {
 			logger.warn("No BeanFactory available, attempting to use default constructor");
-			return BeanUtils.instantiate(this.handlerClass);
+			return BeanUtils.instantiate(this.handlerType);
 		}
 		else {
-			return this.beanFactory.createBean(this.handlerClass);
+			return this.beanFactory.createBean(this.handlerType);
 		}
 	}
 
@@ -84,7 +80,7 @@ public void destroy(T handler) {
 
 	@Override
 	public String toString() {
-		return "BeanCreatingHandlerProvider [handlerClass=" + handlerClass + "]";
+		return "BeanCreatingHandlerProvider [handlerClass=" + handlerType + "]";
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,6 @@ public void afterConnectionEstablished(WebSocketSession session) {`
`61`	`61`	`}`
`62`	`62`	`try {`
`63`	`63`	`Assert.isTrue(this.sessionCount.compareAndSet(0, 1), "Unexpected new session");`
`64`		`-`
`65`	`64`	`this.handler.afterConnectionEstablished(session);`
`66`	`65`	`}`
`67`	`66`	`catch (Throwable ex) {`
Original file line number	Diff line number	Diff line change
`@@ -34,14 +34,14 @@ public class BeanCreatingHandlerProvider<T> implements BeanFactoryAware {`
`34`	`34`
`35`	`35`	`private static final Log logger = LogFactory.getLog(BeanCreatingHandlerProvider.class);`
`36`	`36`
`37`		`- private final Class<? extends T> handlerClass;`
	`37`	`+ private final Class<? extends T> handlerType;`
`38`	`38`
`39`	`39`	`private AutowireCapableBeanFactory beanFactory;`
`40`	`40`
`41`	`41`
`42`		`- public BeanCreatingHandlerProvider(Class<? extends T> handlerClass) {`
`43`		`- Assert.notNull(handlerClass, "handlerClass is required");`
`44`		`- this.handlerClass = handlerClass;`
	`42`	`+ public BeanCreatingHandlerProvider(Class<? extends T> handlerType) {`
	`43`	`+ Assert.notNull(handlerType, "handlerType is required");`
	`44`	`+ this.handlerType = handlerType;`
`45`	`45`	`}`
`46`	`46`
`47`	`47`
`@@ -52,24 +52,20 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- public boolean isSingleton() {`
`56`		`- return false;`
`57`		`- }`
`58`		`-`
`59`	`55`	`public Class<? extends T> getHandlerType() {`
`60`		`- return this.handlerClass;`
	`56`	`+ return this.handlerType;`
`61`	`57`	`}`
`62`	`58`
`63`	`59`	`public T getHandler() {`
`64`	`60`	`if (logger.isTraceEnabled()) {`
`65`		`- logger.trace("Creating instance for handler type " + this.handlerClass);`
	`61`	`+ logger.trace("Creating instance for handler type " + this.handlerType);`
`66`	`62`	`}`
`67`	`63`	`if (this.beanFactory == null) {`
`68`	`64`	`logger.warn("No BeanFactory available, attempting to use default constructor");`
`69`		`- return BeanUtils.instantiate(this.handlerClass);`
	`65`	`+ return BeanUtils.instantiate(this.handlerType);`
`70`	`66`	`}`
`71`	`67`	`else {`
`72`		`- return this.beanFactory.createBean(this.handlerClass);`
	`68`	`+ return this.beanFactory.createBean(this.handlerType);`
`73`	`69`	`}`
`74`	`70`	`}`
`75`	`71`
`@@ -84,7 +80,7 @@ public void destroy(T handler) {`
`84`	`80`
`85`	`81`	`@Override`
`86`	`82`	`public String toString() {`
`87`		`- return "BeanCreatingHandlerProvider [handlerClass=" + handlerClass + "]";`
	`83`	`+ return "BeanCreatingHandlerProvider [handlerClass=" + handlerType + "]";`
`88`	`84`	`}`
`89`	`85`
`90`	`86`	`}`