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

287 Commits

Author SHA1 Message Date
Juergen Hoeller
c3d74b4521 Polishing 2014-02-09 00:45:55 +01:00
Juergen Hoeller
61ab40cd7a Upgraded to Commons FileUpload 1.3.1, TestNG 6.8.7, Hibernate 4.2.8, Joda-Time 2.2, Jackson 1.7.9 2014-02-09 00:45:07 +01:00
Juergen Hoeller
3da9a3193c Polishing 
(cherry picked from commit 749b65b)
 2014-02-07 18:04:14 +01:00
Juergen Hoeller
ad91610796 Polishing 
(cherry picked from commit 426f52b)
 2014-02-06 23:27:46 +01:00
Juergen Hoeller
f558396e91 Introduced SpringNamingPolicy for CGLIB 
Issue: SPR-11398
(cherry picked from commit 8c4e372)
 2014-02-06 23:25:52 +01:00
Juergen Hoeller
dd5af764b5 Avoided unnecessary substring creation for field error access with wildcard 
Issue: SPR-11374
(cherry picked from commit 5be8301)
 2014-01-31 13:20:59 +01:00
Juergen Hoeller
3ffbb24211 Fixed isMatchingFieldError to properly handle empty field name 
Issue: SPR-11374
 2014-01-30 23:20:41 +01:00
Juergen Hoeller
4c385f0073 Fixed LiveBeansView to not produce invalid JSON if last bean is not eligible 
Also introducing overridable isBeanEligible template method.

Issue: SPR-11366
(cherry picked from commit c1eac20)
 2014-01-30 12:32:35 +01:00
Juergen Hoeller
edb660863b Polishing 2014-01-24 16:59:42 +01:00
Juergen Hoeller
d434ef9713 Polishing 
Issue: SPR-11344
 2014-01-22 18:23:59 +01:00
Juergen Hoeller
f8f6c5fd89 Polishing 2014-01-13 23:49:39 +01:00
Juergen Hoeller
354917c53d Polishing (backports from 4.0.1) 2014-01-13 23:36:33 +01:00
Juergen Hoeller
1e0bf493cc Backported generics/varargs signature refinements for scripting package 2014-01-13 23:30:21 +01:00
Juergen Hoeller
0ea4f8ecb7 Fixed resolveProxyTargetClass exception message 2014-01-13 23:21:33 +01:00
Juergen Hoeller
139adba96a Removed TestGroup.LONG_RUNNING marker from Groovy and JRuby tests 2014-01-13 23:21:16 +01:00
Juergen Hoeller
477e60f28a Add minor optimization to AbstractErrors 
Issue: SPR-11304
 2014-01-13 23:15:50 +01:00
Juergen Hoeller
8c8eead667 Removed AbstractAsyncConfiguration's abstract "asyncAdvisor" method for Java 8 compatibility (to avoid method overloading problem for configuration classes) 2014-01-05 02:28:27 +01:00
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
f5d5882f46 Fixed @Bean meta-annotation detection when using ASM 
This turned out to be a bug in the ASM-based AnnotationMetadata implementation where has/getAnnotatedMethods didn't consider meta-annotations., in contrast to its StandardAnnotationMetadata sibling.

Issue: SPR-10488
(cherry picked from commit 105e176)
 2013-12-16 23:09:07 +01:00
Juergen Hoeller
249d8379ae Polishing 
(cherry picked from commit aa6e6c1)
 2013-12-11 23:12:34 +01:00
Juergen Hoeller
2a6c642408 Added tests for custom qualifier annotations on scoped @Bean methods 
Issue: SPR-11116
(cherry picked from commit c5d7977)
 2013-12-11 18:44:13 +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
ec78165072 Component scanning ignores attributes and meta-annotations on non-public annotations 
Issue: SPR-11091
(cherry picked from commit 161819f)
 2013-12-11 18:42:48 +01:00
Juergen Hoeller
d0fc38ec76 Fixed inner bean name determination for multi-level nesting scenario, calculating a unique bean name as early as possible now (and for any kind of bean scope) 
Our per-bean caching in AutowiredAnnotationBeanPostProcessor and co relies on unique bean names, so this change fixes potential cache mismatch problems occuring there.

Issue: SPR-11131
(cherry picked from commit 242ecdc)
 2013-12-10 13:12:41 +01:00
Juergen Hoeller
6bed18004e Fixed detection of qualifier annotations on scoped-proxy factory methods 
Issue: SPR-11116
 2013-12-09 00:11:41 +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
df7b661702 Added test for placeholder in alias definition 
Issue: SPR-11018
(cherry picked from commit e9a24da)
 2013-11-06 00:36:56 +01: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