627 Commits

Author	SHA1	Message	Date
Juergen Hoeller	7f8d611598	Defensive reset/restore of JNDI environment (avoiding test side effects) ... Issue: SPR-12223	2014-09-20 00:23:42 +02:00
Phillip Webb	a2b983a4e4	Further refine property source ordering ... Refine property source ordering so that sources already contained in the environment remain before those added by @PropertySource annotations. Issue: SPR-12198	2014-09-19 00:10:30 -07:00
Phillip Webb	2077388f38	Improve JNDI detection logic ... Update JndiLocatorDelegate.isDefaultJndiEnvironmentAvailable() to call `getEnvironment()` on the `InitialContext` in order to actually trigger a NamingException if JNDI is not available. Issue: SPR-12223	2014-09-18 23:09:45 -07:00
Juergen Hoeller	f259ca1b1f	Refined tests for property source ordering ... Issue: SPR-12198 (cherry picked from commit 205e681)	2014-09-19 00:53:07 +02:00
Juergen Hoeller	90b93ffe3f	Restored property source ordering (fixing regression from 4.0.x) ... Issue: SPR-12198	2014-09-18 23:48:35 +02:00
Juergen Hoeller	f4219ca06b	Consistent exclusion of bridge methods in annotation post-processors (for Java 8 compatibility) ... Issue: SPR-12187	2014-09-18 23:45:42 +02:00
Phillip Webb	70b5f319a9	Support @Ordering of Conditions ... Update ConditionEvaluator to collect then sort Conditions before evaluation. By annotating Conditions with @Ordered expensive operations can be pushed to the back of the queue. Issue: SPR-12219	2014-09-17 21:39:38 -07:00
Juergen Hoeller	a833889c2a	Polishing	2014-09-17 21:55:46 +02:00
Juergen Hoeller	58b22ceddc	Scheduled/JmsListenerAnnotationBeanPostProcessor avoids needless re-scanning of non-annotated classes ... Issue: SPR-12189	2014-09-17 21:55:35 +02:00
Juergen Hoeller	40cd277b7e	ReloadableResourceBundleMessageSource prevents accidental exposure of incomplete holder ... Issue: SPR-12177	2014-09-17 15:00:22 +02:00
Juergen Hoeller	15320db414	Polishing	2014-09-17 02:35:41 +02:00
Juergen Hoeller	824c90d2bf	ConfigurationClassParser avoids double registration of nested classes which extend their containing class ... Issue: SPR-12195	2014-09-16 17:08:30 +02:00
Juergen Hoeller	20c2ba35dc	Polishing	2014-09-04 00:55:38 +02:00
Juergen Hoeller	c6d29f1a31	Refactored support for @Order on @Bean methods as well as @Priority handling ... Issue: SPR-11310 Issue: SPR-10548	2014-09-04 00:41:13 +02:00
Juergen Hoeller	2f93759d1b	Cache.get(key, type) explicitly defines an IllegalStateException in case of a type mismatch ... Issue: SPR-12145	2014-09-03 13:00:20 +02:00
Juergen Hoeller	6563405be5	ImportRegistry as a package-visible top-level interface which can easily be shared within the package ... Issue: SPR-12128	2014-09-03 12:59:51 +02:00
Phillip Webb	abc343f407	Prevent incorrect ImportAware metdata injection ... Update ImportRegistry to track all import registrations that occur against an importing class (rather than just keeping the last). In addition, prune imported classes from the registry when a configuration class is removed during the REGISTER_BEAN ConfigurationPhase. This update prevents incorrect metadata from being injected into an ImportAware class which is imported twice by different configurations classes (when one of the configuration classes will be ultimately skipped due to a @Condition). Issue: SPR-12128	2014-09-02 20:47:30 -07:00
Juergen Hoeller	f617d28eef	Polishing	2014-09-03 00:31:19 +02:00
Juergen Hoeller	4432c41dbd	AbstractAutowireCapableBeanFactory avoids early FactoryBean instantiation on currently created configuration bean ... Issue: SPR-12141	2014-09-03 00:28:05 +02:00
Juergen Hoeller	98eb0f75bc	Polishing	2014-09-02 22:15:53 +02:00
Juergen Hoeller	8c9274e017	LazyInitTargetSource works for @Bean targets as well ... Issue: SPR-10508 Issue: SPR-8080	2014-09-02 22:13:35 +02:00
Juergen Hoeller	53fbf1a509	ConfigurationClassParser checks REGISTER_BEAN conditions before processing configuration class imports ... Issue: SPR-12128	2014-09-02 22:07:51 +02:00
Juergen Hoeller	078f23d6e6	Polishing	2014-08-23 01:07:01 +02:00
Juergen Hoeller	9dfbc5326b	Revised ResourcePropertySource in order to avoid ConfigurationClassProcessor's AnnotationPropertySource subclass ... Issue: SPR-12115	2014-08-22 13:54:39 +02:00
Phillip Webb	84564a0c7b	Rework @PropertySource early parsing logic ... Rework the @PropertySource parsing logic recently changed in commit 7c608886 to deal with the same source appearing on a @Configuration class and an @Import class. Processing now occurs in a single sweep, with any previously added sources being converted to a CompositePropertySource. Issue: SPR-12115	2014-08-21 21:21:15 -07:00
Juergen Hoeller	7c6088861f	@PropertySource gets parsed as early as possible ... Other PropertySources and in particular @ComponentScan can benefit from previously declared property sources on the same configuration class. Issue: SPR-12110 Issue: SPR-12111	2014-08-21 22:43:08 +02:00
Juergen Hoeller	a000dd782a	ReloadableResourceBundleMessageSource uses ConcurrentHashMaps and ReentrantLocks instead of synchronization ... Issue: SPR-10500	2014-08-21 14:24:28 +02:00
Juergen Hoeller	b5763fe326	Consistent attribute documentation/formatting in spring-context and spring-mvc schemas	2014-08-20 16:36:12 +02:00
Juergen Hoeller	9d3d6d5919	DefaultListableBeanFactory defensively handles BeanDefinition access in getBean(Class) ... Issue: SPR-10542	2014-08-20 10:48:35 +02:00
Juergen Hoeller	2ef3d66c89	Polishing	2014-08-18 19:27:08 +02:00
Stephane Nicoll	bccb3bb70b	polishing	2014-08-18 11:03:58 +02:00
Stephane Nicoll	8fc191c95e	Apply AsyncUncaughtExceptionHandler to AspectJ ... Prior to this commit, only @Async annotated methods with proxy style had their custom uncaught exception handler applied. This commit harmonizes the configuration so that AspectJ applies that behaviour as well. Issue: SPR-12090	2014-08-18 10:51:21 +02:00
Juergen Hoeller	b3add794d7	Polishing	2014-08-15 00:55:40 +02:00
Juergen Hoeller	d2e269e697	Fixed fragile tests for @Bean method overloading	2014-08-15 00:55:14 +02:00
Juergen Hoeller	69587f3fa4	Polishing	2014-08-14 23:49:29 +02:00
Phillip Webb	e142fd11e0	Add tests for ImportSelector meta-data ... Issue: SPR-12059	2014-08-14 07:35:16 -07:00
Juergen Hoeller	fd5dbddac4	BeanFactory supports bean creation arguments for by-type lookup as well ... Issue: SPR-11235	2014-08-12 22:07:12 +02:00
Juergen Hoeller	71c6eb2bb5	Additional configuration classes get detected when imported through XML or registrars ... Issue: SPR-11430 Issue: SPR-11723	2014-08-12 17:23:21 +02:00
Phillip Webb	ac8326d2df	Polish mockito usage ... Consistent use of BDDMockito rather than standard Mockito.	2014-08-11 16:23:11 -07:00
Juergen Hoeller	ad475ffadf	Consistent vararg declarations for String array setters	2014-08-08 17:17:09 +02:00
Juergen Hoeller	47006eeff1	Fixed side effect on other tests ... Issue: SPR-10459	2014-08-08 17:02:59 +02:00
Juergen Hoeller	f2e4ad2364	ComponentScan annotation allows for registering beans with lazy initialization ... Issue: SPR-10459	2014-08-08 15:39:06 +02:00
Juergen Hoeller	ef51d4dbdb	AnnotatedElementUtils adapts post-processed values to AnnotationAttributes as well ... Issue: SPR-12065	2014-08-08 15:15:29 +02:00
Juergen Hoeller	3a419872c8	Polishing	2014-08-07 23:06:08 +02:00
Stephane Nicoll	3da68cfe21	Remove unused imports	2014-08-04 14:13:40 +02:00
Juergen Hoeller	9f3c1cf762	Polishing	2014-07-28 23:05:08 +02:00
Juergen Hoeller	036896a6b8	Split configuration constants into local XConfigUtils classes instead of piling them up in AnnotationConfigUtils	2014-07-28 21:58:21 +02:00
Juergen Hoeller	92c657e12d	JmsListener/ScheduledAnnotationBeanPostProcessor uses SmartInitializingSingleton instead of ContextRefreshedEvent ... Also reducing the container dependencies to BeanFactory instead of ApplicationContext, wherever possible. Issue: SPR-12039	2014-07-28 15:58:13 +02:00
Juergen Hoeller	78484129f5	ConcurrentMapCacheManager recreates caches in case of setAllowNullValues change ... Issue: SPR-12026	2014-07-24 15:06:36 +02:00
Juergen Hoeller	496492b2d8	Autowiring rejects self references to a factory method on the same bean as well ... Issue: SPR-12018	2014-07-24 12:13:25 +02:00