diff --git a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java index 3e7847ef1c..4afb5ce674 100644 --- a/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java +++ b/spring-context/src/main/java/org/springframework/cache/annotation/AbstractCachingConfiguration.java @@ -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,6 @@ package org.springframework.cache.annotation; import java.util.Collection; -import javax.annotation.PostConstruct; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.CacheManager; @@ -28,12 +27,11 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; /** - * Abstract base {@code @Configuration} class providing common structure for enabling - * Spring's annotation-driven cache management capability. + * Abstract base {@code @Configuration} class providing common structure + * for enabling Spring's annotation-driven cache management capability. * * @author Chris Beams * @author Stephane Nicoll @@ -53,13 +51,15 @@ public abstract class AbstractCachingConfiguration protected CacheErrorHandler errorHandler; + @Override public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableCaching = AnnotationAttributes.fromMap( importMetadata.getAnnotationAttributes(EnableCaching.class.getName(), false)); - Assert.notNull(this.enableCaching, - "@EnableCaching is not present on importing class " + - importMetadata.getClassName()); + if (this.enableCaching == null) { + throw new IllegalArgumentException( + "@EnableCaching is not present on importing class " + importMetadata.getClassName()); + } } @Autowired(required = false) 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 24d1df2b63..b934db9403 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 @@ -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. @@ -51,7 +51,7 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, private static final String MBEAN_EXPORTER_BEAN_NAME = "mbeanExporter"; - private AnnotationAttributes attributes; + private AnnotationAttributes enableMBeanExport; private Environment environment; @@ -61,8 +61,8 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, @Override public void setImportMetadata(AnnotationMetadata importMetadata) { Map map = importMetadata.getAnnotationAttributes(EnableMBeanExport.class.getName()); - this.attributes = AnnotationAttributes.fromMap(map); - if (this.attributes == null) { + this.enableMBeanExport = AnnotationAttributes.fromMap(map); + if (this.enableMBeanExport == null) { throw new IllegalArgumentException( "@EnableMBeanExport is not present on importing class " + importMetadata.getClassName()); } @@ -90,7 +90,7 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, } private void setupDomain(AnnotationMBeanExporter exporter) { - String defaultDomain = this.attributes.getString("defaultDomain"); + String defaultDomain = this.enableMBeanExport.getString("defaultDomain"); if (defaultDomain != null && this.environment != null) { defaultDomain = this.environment.resolvePlaceholders(defaultDomain); } @@ -100,7 +100,7 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, } private void setupServer(AnnotationMBeanExporter exporter) { - String server = this.attributes.getString("server"); + String server = this.enableMBeanExport.getString("server"); if (server != null && this.environment != null) { server = this.environment.resolvePlaceholders(server); } @@ -116,7 +116,7 @@ public class MBeanExportConfiguration implements ImportAware, EnvironmentAware, } private void setupRegistrationPolicy(AnnotationMBeanExporter exporter) { - RegistrationPolicy registrationPolicy = this.attributes.getEnum("registration"); + RegistrationPolicy registrationPolicy = this.enableMBeanExport.getEnum("registration"); exporter.setRegistrationPolicy(registrationPolicy); } diff --git a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java index e13320921e..887fb6b690 100644 --- a/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java +++ b/spring-context/src/main/java/org/springframework/scheduling/annotation/AbstractAsyncConfiguration.java @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportAware; import org.springframework.core.annotation.AnnotationAttributes; import org.springframework.core.type.AnnotationMetadata; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; /** @@ -51,8 +50,10 @@ public abstract class AbstractAsyncConfiguration implements ImportAware { public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableAsync = AnnotationAttributes.fromMap( importMetadata.getAnnotationAttributes(EnableAsync.class.getName(), false)); - Assert.notNull(this.enableAsync, - "@EnableAsync is not present on importing class " + importMetadata.getClassName()); + if (this.enableAsync == null) { + throw new IllegalArgumentException( + "@EnableAsync is not present on importing class " + importMetadata.getClassName()); + } } /** diff --git a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java index e41829892b..2f857911b2 100644 --- a/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java +++ b/spring-jms/src/main/java/org/springframework/jms/listener/AbstractMessageListenerContainer.java @@ -114,13 +114,11 @@ import org.springframework.util.ReflectionUtils; * runtime processing overhead. * * - *

Note that even if - * {@link org.springframework.jms.connection.JmsTransactionManager} used to - * only provide fully synchronized Spring transactions based - * on local JMS transactions, "sessionTransacted" offers now the same feature and - * is the recommended option when transactions are not managed externally. In - * other words, set the transaction manager only if you are using JTA , or - * synchronizing transactions. + *

Note that the "sessionTransacted" flag is strongly recommended over + * {@link org.springframework.jms.connection.JmsTransactionManager}, provided + * that transactions do not need to be managed externally. As a consequence, + * set the transaction manager only if you are using JTA or if you need to + * synchronize with custom external transaction arrangements. * * @author Juergen Hoeller * @author Stephane Nicoll diff --git a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java index 35c6d96fff..dd759298ff 100644 --- a/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java +++ b/spring-tx/src/main/java/org/springframework/transaction/annotation/AbstractTransactionManagementConfiguration.java @@ -29,7 +29,6 @@ import org.springframework.core.type.AnnotationMetadata; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.config.TransactionManagementConfigUtils; import org.springframework.transaction.event.TransactionalEventListenerFactory; -import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; /** @@ -52,18 +51,14 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo protected PlatformTransactionManager txManager; - @Bean(name = TransactionManagementConfigUtils.TRANSACTIONAL_EVENT_LISTENER_FACTORY_BEAN_NAME) - @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - public TransactionalEventListenerFactory transactionalEventListenerFactory() { - return new TransactionalEventListenerFactory(); - } - @Override public void setImportMetadata(AnnotationMetadata importMetadata) { this.enableTx = AnnotationAttributes.fromMap( importMetadata.getAnnotationAttributes(EnableTransactionManagement.class.getName(), false)); - Assert.notNull(this.enableTx, - "@EnableTransactionManagement is not present on importing class " + importMetadata.getClassName()); + if (this.enableTx == null) { + throw new IllegalArgumentException( + "@EnableTransactionManagement is not present on importing class " + importMetadata.getClassName()); + } } @Autowired(required = false) @@ -78,4 +73,11 @@ public abstract class AbstractTransactionManagementConfiguration implements Impo this.txManager = configurer.annotationDrivenTransactionManager(); } + + @Bean(name = TransactionManagementConfigUtils.TRANSACTIONAL_EVENT_LISTENER_FACTORY_BEAN_NAME) + @Role(BeanDefinition.ROLE_INFRASTRUCTURE) + public TransactionalEventListenerFactory transactionalEventListenerFactory() { + return new TransactionalEventListenerFactory(); + } + } diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java index 899c440d61..bf384ce8ea 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfiguration.java @@ -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. @@ -42,6 +42,7 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { private final WebMvcConfigurerComposite configurers = new WebMvcConfigurerComposite(); + @Autowired(required = false) public void setConfigurers(List configurers) { if (configurers == null || configurers.isEmpty()) { @@ -50,6 +51,7 @@ public class DelegatingWebMvcConfiguration extends WebMvcConfigurationSupport { this.configurers.addWebMvcConfigurers(configurers); } + @Override protected void addInterceptors(InterceptorRegistry registry) { this.configurers.addInterceptors(registry);