Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,773 Commits 18 Branches 0 Tags
be2d915cc2f9129db030a12cf193c5caa19e65c3
Commit Graph

206 Commits

Author SHA1 Message Date
Juergen Hoeller
be2d915cc2 Consistent equals/hashCode/toString implementations in AnnotationMatchingPointcut/ClassFilter/MethodMatcher 
Issue: SPR-11275
Issue: SPR-11276
(cherry picked from commit 0de307b)
 2014-01-05 00:02:47 +01:00
Juergen Hoeller
6045914057 Polishing 2014-01-03 23:02:51 +01:00
Juergen Hoeller
c48da0d9a4 Avoid hard reference to LocalValidatorFactoryBean in <mvc:annotation-driven> parser 
Issue: SPR-11272
 2014-01-03 12:18:49 +01:00
Juergen Hoeller
2e123b01e5 Polishing 
Issue: SPR-11259
(cherry picked from commit f0d2151)
 2014-01-01 19:24:37 +01:00
Juergen Hoeller
5dddb492b8 Polishing around @Enable processing and @EnableTransactionManagement 
Issue: SPR-11251
 2013-12-23 23:09:00 +01:00
Juergen Hoeller
ecee20f1fe @Enable registrars called with correct metadata when placed on superclass 
Issue: SPR-11251
 2013-12-23 23:07:59 +01:00
Juergen Hoeller
08aa22ff1f InjectionMetadata caching per bean name needs to refresh when bean class changes 
Issue: SPR-11246
 2013-12-20 00:15:09 +01:00
Juergen Hoeller
7ad6df8c75 Moved AnnotationBeanNameGenerator's String value check right before cast 
Issue: SPR-11221
 2013-12-20 00:02:27 +01:00
Juergen Hoeller
1ea218cee2 MBean registration happens in a fully synchronized fashion for consistent results 
Issue: SPR-11002
(cherry picked from commit 8d6d6be)
 2013-12-11 18:43:33 +01:00
Juergen Hoeller
25c7e3645b Polishing (including removal of javadoc imports that show as package cycles in IntelliJ) 
(cherry picked from commit 2a52dec)
 2013-12-03 00:00:31 +01:00
Juergen Hoeller
5639eb66b6 Polishing 2013-12-02 16:32:02 +01:00
Juergen Hoeller
c1b772cd9c Optimized ImportAware processing to avoid re-reading class files 
(cherry picked from commit 519f78c)
 2013-12-02 16:10:34 +01:00
Phillip Webb
73a8a1b966 Detect cache hit with multiple @Cachables 
Fix CacheAspectSupport to consider a cache hit from any of the multiple
@Cachables that may have been specified using the @Caching annotation.

Prior to this commit the following scenario would never produce a hit:

    @Caching(cacheable = {
            @Cacheable(value = "c1", unless = "#result.size() < 4"),
            @Cacheable(value = "c2", unless = "#result.size() > 3")
     })

Issue: SPR-11124
 2013-11-26 17:13:50 -08:00
Juergen Hoeller
fe46a01a57 JndiObjectFactoryBean converts a "defaultObject" value to the expected type if necessary 
Issue: SPR-11039
(cherry picked from commit 0aedd81)
 2013-11-06 00:36:48 +01:00
Juergen Hoeller
863570abb7 Perform setParent's Environment merging for ClassPathXmlApplicationContext etc constructors with parent argument as well 
Issue: SPR-11068
(cherry picked from commit c5fcf19)
 2013-11-05 14:18:14 +01:00
Juergen Hoeller
494cc22bcd Polishing (along with SPR-10992) 2013-11-05 00:52:49 +01:00
Juergen Hoeller
044d68b336 @Bean method metadata is always being picked from the most concrete subclass 
As a side effect, @Bean overrides and overloads work with 'allowBeanDefinitionOverriding'=false as well now.

Issue: SPR-10992
 2013-11-05 00:52:28 +01:00
Juergen Hoeller
a95eb1d044 Polishing (selectively backported from recent 4.0 commits) 2013-11-04 16:22:46 +01:00
Juergen Hoeller
b00c31a620 Use non-lenient constructor resolution mode for @Bean methods 
Since @Bean methods are never used with externally specified constructor argument values but rather just with autowiring, the non-lenient constructor resolution mode is appropriate in case of an overloaded @Bean method, not performing any type difference weight checks. This change includes a refinement of Spring's existing non-lenient constructor resolution (which needs to be explicitly turned on and is therefore not well tested), narrowing the conditions for the ambiguity check (only in case of the same number of arguments and not for overridden methods).

Issue: SPR-10988
(cherry picked from commit b093b84)
 2013-11-04 16:11:04 +01:00
Juergen Hoeller
23cc44f16e Javadoc polishing 2013-11-01 23:04:07 +01:00
Juergen Hoeller
1ac8e48ebf Polishing (backported from several master changes) 2013-10-30 22:47:16 +01:00
Phillip Webb
1ea7f741fe Multicaster support for events with null source 
Update `AbstractApplicationEventMulticaster` to support `EventObjects`
with a null source (which can happen if they have been serialized).

Issue: SPR-10945
(cherry picked from commit b0ff834e)
 2013-10-30 13:02:07 -07:00
Phillip Webb
8c6fe2cb42 Consistent ordering for @PropertySource locations 
Ensure that property source locations are processed in the same order
regardless if the 'name' attribute is set or not.

Prior to this commit multiple locations from a `@PropertySource` with
a name were added to a `CompositePropertySource` in such a way that
the first location would take precedence. This has now been reversed
for consistence with unnamed `@PropertySource`s

Issue: SPR-10820
(cherry picked from commit e3d3d8cd)
 2013-10-30 13:02:06 -07:00
Juergen Hoeller
3eaec64ee8 Fixed source location of setEncoding method 2013-10-27 00:57:37 +02:00
Juergen Hoeller
ce001c23f7 Cache InjectionMetadata per bean name instead of per Class, if possible 
Issue: SPR-11027
(cherry picked from commit 4675bc4)
 2013-10-26 15:56:57 +02:00
Juergen Hoeller
93405fb289 Made processCommonDefinitionAnnotations(AnnotatedBeanDefinition) public 
Issue: SPR-11032
(cherry picked from commit 8bd4804)
 2013-10-26 15:55:48 +02:00
Juergen Hoeller
ad9049e68a Polishing 2013-10-17 22:19:17 +02:00
Juergen Hoeller
fce02d94b8 Changed JSR-330 detection logging from info to debug 
Issue: SPR-10974
(cherry picked from commit 7a9d583)
 2013-10-17 21:07:44 +02:00
Phillip Webb
2dca5b6815 Filter source @Configuration with @ComponentScan 
Exclude self @Component when parsing @ComponentScan annotations.

Issue: SPR-10531
(cherry picked from d91ffb)
 2013-10-10 17:03:36 -07:00
Juergen Hoeller
a302c4ac45 Polishing 
(cherry picked from commit 52cca48)
 2013-10-04 23:31:18 +02:00
Juergen Hoeller
7994b63c13 Polishing 2013-09-26 21:38:54 +02:00
Juergen Hoeller
0a31892475 Fixed handling of @Resource's shareable value 
Issue: SPR-10931
(cherry picked from commit 7bc3e3b)
 2013-09-25 13:04:50 +02:00
Juergen Hoeller
77298a19c9 Javadoc fixes 
(cherry picked from commit facf31f)
 2013-09-04 21:52:41 +02:00
Juergen Hoeller
9317d8f43e Polishing 
(cherry picked from commit caa1218)
 2013-08-29 19:21:24 +02:00
Juergen Hoeller
692908b722 Javadoc fixes 
(cherry picked from commit 465e629)
 2013-08-29 19:20:54 +02:00
Juergen Hoeller
5a49d657d8 AnnotationConfigWebApplicationContext allows for repeated register/scan calls 
Restoring consistency with AnnotationConfigApplicationContext.

Issue: SPR-10852
(cherry picked from commit 01b8d93)
 2013-08-28 00:24:22 +02:00
Juergen Hoeller
0765a05434 Marked @Profile as @Documented 
(cherry picked from commit e812b6c)
 2013-08-28 00:20:52 +02:00
Juergen Hoeller
2d646ca79e Polishing 2013-08-06 01:58:46 +02:00
Juergen Hoeller
1245919331 Polishing 2013-08-06 01:15:17 +02:00
Juergen Hoeller
d32a77a5f0 Optimized TomcatInstrumentableClassLoader implementation 
Issue: SPR-10788
 2013-08-01 15:49:58 +02:00
Juergen Hoeller
b40263e06b PropertySourcesPlaceholderConfigurer's "ignoreUnresolvablePlaceholders" setting reliably applies to nested placeholders as well 
Issue: SPR-10549
(cherry picked from commit 127b91f)
 2013-07-31 18:38:31 +02:00
Juergen Hoeller
14b83c3fcc Polishing 
Issue: SPR-10609
 2013-07-30 23:27:30 +02:00
Phillip Webb
a72209aad3 Make ConfClassPostPro Ordered.HIGHEST_PRECEDENCE 
Make ConfigurationClassPostProcessor Ordered.HIGHEST_PRECEDENCE in
case several BeanDefinitionRegistryPostProcessors are registered.

Issue: SPR-10645
(cherry picked from 350cb9b)
 2013-07-19 14:16:39 -07:00
Phillip Webb
67f41b15eb Resolve ${} placeholders in @ImportResource 
Update ConfigurationClassParser to resolve any ${} placeholders from
@ImportResource values.

Issue: SPR-10686
(cherry picked from commit 700a08e)
 2013-07-19 13:14:05 -07:00
Phillip Webb
4ba43b4737 Support meta @Component with non-string value 
Update AnnotationBeanNameGenerator to only use the value attribute of
a @Component meta-annotated annotation when it is a String.

Issue: SPR-10580
 2013-06-04 10:24:14 -07:00
Juergen Hoeller
a8adec7673 Avoid unnecessary creation of default StandardEnvironment instances 
Issue: SPR-10568
(cherry picked from commit 7e01578)
 2013-05-15 23:59:29 +02:00
Juergen Hoeller
c2b2f30669 Polishing 2013-05-15 16:57:57 +02:00
Juergen Hoeller
6e4317ebfb Properly handle knownSuperclasses in case of an overridden ConfigurationClass 
Issue: SPR-10546
 2013-05-15 13:47:03 +02:00
Juergen Hoeller
0c76cb7e80 Clarified that CronTrigger never schedules overlapping executions 
Issue: SPR-10556
(cherry picked from commit 5dbbd8f)
 2013-05-15 11:34:57 +02:00
Rob Winch
940011e233 Ensure Parent ConfigurationClass loaded on overrides 
Previously ConfigurationClassParser could override a nested
@Configuration without consideration of @Bean's defined in parent
classes.

This commit ensures that if the original ConfigurationClass contains
additional bean definitions it is processed again.

Issue: SPR-10546
 2013-05-15 11:34:56 +02:00