From 3a3c52dbddcc737a5893ed55982ded55f45878fa Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 1 Oct 2014 01:10:25 +0200 Subject: [PATCH] Polishing --- .../annotation/MBeanExportConfiguration.java | 9 ++++---- .../context/support/LiveBeansView.java | 2 ++ .../WebSphereMBeanServerFactoryBean.java | 8 +++---- .../JtaTransactionManagerFactoryBean.java | 2 +- .../request/async/WebAsyncManager.java | 4 ++-- .../WebSocketMessageBrokerConfigurer.java | 22 +++++++++---------- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java index f068e6fe4b7..24d1df2b631 100644 --- a/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java +++ b/spring-context/src/main/java/org/springframework/context/annotation/MBeanExportConfiguration.java @@ -32,7 +32,6 @@ import org.springframework.jmx.export.annotation.AnnotationMBeanExporter; import org.springframework.jmx.support.RegistrationPolicy; import org.springframework.jmx.support.WebSphereMBeanServerFactoryBean; import org.springframework.jndi.JndiLocatorDelegate; -import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -63,8 +62,10 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, public void setImportMetadata(AnnotationMetadata importMetadata) { Map map = importMetadata.getAnnotationAttributes(EnableMBeanExport.class.getName()); this.attributes = AnnotationAttributes.fromMap(map); - Assert.notNull(this.attributes, - "@EnableMBeanExport is not present on importing class " + importMetadata.getClassName()); + if (this.attributes == null) { + throw new IllegalArgumentException( + "@EnableMBeanExport is not present on importing class " + importMetadata.getClassName()); + } } @Override @@ -78,7 +79,7 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, } - @Bean(name=MBEAN_EXPORTER_BEAN_NAME) + @Bean(name = MBEAN_EXPORTER_BEAN_NAME) @Role(BeanDefinition.ROLE_INFRASTRUCTURE) public AnnotationMBeanExporter mbeanExporter() { AnnotationMBeanExporter exporter = new AnnotationMBeanExporter(); diff --git a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java index 7c7bb1eeaf7..b77e604634b 100644 --- a/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java +++ b/spring-context/src/main/java/org/springframework/context/support/LiveBeansView.java @@ -57,6 +57,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar private static final Set applicationContexts = new LinkedHashSet(); + static void registerApplicationContext(ConfigurableApplicationContext applicationContext) { String mbeanDomain = applicationContext.getEnvironment().getProperty(MBEAN_DOMAIN_PROPERTY_NAME); if (mbeanDomain != null) { @@ -94,6 +95,7 @@ public class LiveBeansView implements LiveBeansViewMBean, ApplicationContextAwar private ConfigurableApplicationContext applicationContext; + @Override public void setApplicationContext(ApplicationContext applicationContext) { Assert.isTrue(applicationContext instanceof ConfigurableApplicationContext, diff --git a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java index c3614801179..627b5f63350 100644 --- a/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java +++ b/spring-context/src/main/java/org/springframework/jmx/support/WebSphereMBeanServerFactoryBean.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 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. @@ -18,7 +18,6 @@ package org.springframework.jmx.support; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; - import javax.management.MBeanServer; import org.springframework.beans.factory.FactoryBean; @@ -34,8 +33,9 @@ import org.springframework.jmx.MBeanServerNotFoundException; * This FactoryBean is a direct alternative to {@link MBeanServerFactoryBean}, * which uses standard JMX 1.2 API to access the platform's MBeanServer. * - *

See Javadoc for WebSphere's {@code - * AdminServiceFactory} and {@code MBeanFactory}. + *

See the javadocs for WebSphere's + * {@code AdminServiceFactory} + * and {@code MBeanFactory}. * * @author Juergen Hoeller * @author Rob Harrop diff --git a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java index 8a80e6eaa9b..5e0a1639575 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java +++ b/spring-tx/src/main/java/org/springframework/transaction/config/JtaTransactionManagerFactoryBean.java @@ -58,7 +58,7 @@ public class JtaTransactionManagerFactoryBean implements FactoryBean clazz = (Class) - JtaTransactionManagerFactoryBean.class.getClassLoader().loadClass(className); + ClassUtils.forName(className, JtaTransactionManagerFactoryBean.class.getClassLoader()); this.transactionManager = BeanUtils.instantiate(clazz); } catch (ClassNotFoundException ex) { diff --git a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java index 647f5556ec7..2322d610271 100644 --- a/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java +++ b/spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java @@ -249,8 +249,8 @@ public final class WebAsyncManager { * @see #getConcurrentResult() * @see #getConcurrentResultContext() */ - @SuppressWarnings({"unchecked", "rawtypes" }) - public void startCallableProcessing(final Callable callable, Object... processingContext) throws Exception { + @SuppressWarnings({"unchecked", "rawtypes"}) + public void startCallableProcessing(Callable callable, Object... processingContext) throws Exception { Assert.notNull(callable, "Callable must not be null"); startCallableProcessing(new WebAsyncTask(callable), processingContext); } diff --git a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java index 786d2dfdcb1..9ddd898f5f0 100644 --- a/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java +++ b/spring-websocket/src/main/java/org/springframework/web/socket/config/annotation/WebSocketMessageBrokerConfigurer.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -16,6 +16,7 @@ package org.springframework.web.socket.config.annotation; +import java.util.List; import org.springframework.messaging.converter.MessageConverter; import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; @@ -23,13 +24,12 @@ import org.springframework.messaging.handler.invocation.HandlerMethodReturnValue import org.springframework.messaging.simp.config.ChannelRegistration; import org.springframework.messaging.simp.config.MessageBrokerRegistry; -import java.util.List; - /** * Defines methods for configuring message handling with simple messaging - * protocols (e.g. STOMP) from WebSocket clients. Typically used to customize - * the configuration provided via - * {@link org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker @EnableWebSocketMessageBroker}. + * protocols (e.g. STOMP) from WebSocket clients. + * + *

Typically used to customize the configuration provided via + * {@link EnableWebSocketMessageBroker @EnableWebSocketMessageBroker}. * * @author Rossen Stoyanchev * @since 4.0 @@ -69,7 +69,7 @@ public interface WebSocketMessageBrokerConfigurer { *

This does not override the built-in support for resolving handler * method arguments. To customize the built-in support for argument * resolution, configure {@code SimpAnnotationMethodMessageHandler} directly. - * @param argumentResolvers initially an empty list + * @param argumentResolvers the resolvers to register (initially an empty list) * @since 4.1.1 */ void addArgumentResolvers(List argumentResolvers); @@ -79,7 +79,7 @@ public interface WebSocketMessageBrokerConfigurer { *

Using this option does not override the built-in support for handling * return values. To customize the built-in support for handling return * values, configure {@code SimpAnnotationMethodMessageHandler} directly. - * @param returnValueHandlers initially an empty list + * @param returnValueHandlers the handlers to register (initially an empty list) * @since 4.1.1 */ void addReturnValueHandlers(List returnValueHandlers); @@ -88,12 +88,10 @@ public interface WebSocketMessageBrokerConfigurer { * Configure the message converters to use when extracting the payload of * messages in annotated methods and when sending messages (e.g. through the * "broker" SimpMessagingTemplate). - *

- * The provided list, initially empty, can be used to add message converters + *

The provided list, initially empty, can be used to add message converters * while the boolean return value is used to determine if default message should * be added as well. - * - * @param messageConverters initially an empty list of converters + * @param messageConverters the converters to configure (initially an empty list) * @return whether to also add default converter or not */ boolean configureMessageConverters(List messageConverters);