Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
8,466 Commits 18 Branches 0 Tags
42c090efa40f5f63122e1e4fce59882153b13c19
Commit Graph

526 Commits

Author SHA1 Message Date
Juergen Hoeller
a7492fa55b Polishing 2014-08-12 22:24:50 +02:00
Juergen Hoeller
c08ded769a Polishing (includes varargs for selected String array setters) 2014-08-09 00:19:56 +02:00
Juergen Hoeller
d61353db51 AnnotatedElementUtils adapts post-processed values to AnnotationAttributes as well 
Issue: SPR-12065
(cherry picked from commit ef51d4d)
 2014-08-09 00:19:28 +02:00
Juergen Hoeller
9ad6618207 Polishing 2014-07-28 22:47:22 +02:00
Juergen Hoeller
6e95b2613e Polishing 2014-07-24 18:35:49 +02:00
Juergen Hoeller
acbd61b87a ConcurrentMapCacheManager recreates caches in case of setAllowNullValues change 
Issue: SPR-12026
(cherry picked from commit 7848412)
 2014-07-24 17:54:22 +02:00
Juergen Hoeller
dcb83c2daf Autowiring rejects self references to a factory method on the same bean as well 
Issue: SPR-12018
(cherry picked from commit 496492b)
 2014-07-24 17:53:21 +02:00
Juergen Hoeller
abd5f18e85 AbstractApplicationContext logs initialization exception before trying to cancel refresh attempt 
Issue: SPR-12010
(cherry picked from commit 5e2fbe7)
 2014-07-24 17:48:08 +02:00
Juergen Hoeller
ed88155f55 Reverted test for 1.8 bytecode parsing - 4.0.x tests are still on target 1.7 
Issue: SPR-11979
 2014-07-10 17:45:08 +02:00
Juergen Hoeller
10a039000b Test ASM5's bytecode parsing of INVOKESPECIAL/STATIC on interfaces 
Issue: SPR-11979
(cherry picked from commit 29f6f3d)
 2014-07-10 16:44:59 +02:00
Juergen Hoeller
adb73d5f35 Remaining polishing 2014-07-08 00:21:17 +02:00
Juergen Hoeller
7eee7d2e30 Polishing 
Issue: SPR-8045
 2014-07-08 00:04:19 +02:00
Juergen Hoeller
48f753f368 Polishing (backported from master) 2014-07-01 12:12:42 +02:00
Juergen Hoeller
c16032b98a Consistent declaration of private static final logger variables 
Issue: SPR-11905
(cherry picked from commit 18131bf)
 2014-07-01 12:09:29 +02:00
Juergen Hoeller
178d58cc75 ConfigurationClassParser falls back to ASM-based resolution of member classes in case of NoClassDefFoundError 
Issue: SPR-11844
(cherry picked from commit 6aa9c40)
 2014-07-01 12:02:27 +02:00
Juergen Hoeller
7b38b41bf5 ConfigurationClassPostProcessor skips pre-processed bean definitions now (avoiding side effects in case of multiple CCPPs) 
Issue: SPR-11858
(cherry picked from commit b625512)
 2014-07-01 12:01:50 +02:00
Juergen Hoeller
0a34f86333 MBeanExportConfiguration's SpecificPlatform properly calls afterPropertiesSet 
Also makes the nested SpecificPlatform enum public for Spring Boot to reuse it.

Issue: SPR-11877
(cherry picked from commit 6f68b03)
 2014-07-01 11:52:53 +02:00
Rossen Stoyanchev
87077d3fad Add support for setting removeOnCancelPolicy 
This change introduces removeOnCancelPolicy on ThreadPoolTaskScheduler
and ScheduledExecutorFactoryBean and sets it to true for SockJS.
This ensures that cancelled tasks are removed immediately to avoid
the "unbounded retention of cancelled tasks" that is mentioned in
the Javadoc ScheduledThreadPoolExecutor:

"By default, such a cancelled task is not automatically removed from
the work queue until its delay elapses. While this enables further
inspection and monitoring, it may also cause unbounded retention of
cancelled tasks. To avoid this, set setRemoveOnCancelPolicy to true,
which causes tasks to be immediately removed from the work queue at
time of cancellation."

This is a backport for:
7441f23012

Issue: SPR-11918
 2014-06-29 16:57:58 -04:00
Juergen Hoeller
c70a81a805 Javadoc fixes 2014-05-19 00:08:46 +02:00
Juergen Hoeller
7d78c65187 Properly evaluate @Conditional in case of multiple imports for same config class (fixing regression in Spring Boot) 
Issue: SPR-11788
 2014-05-18 02:00:11 +02:00
Juergen Hoeller
ea9ad4ee9b Properly evaluate @Conditional in case of multiple imports for same config class 
Issue: SPR-11788
(cherry picked from commit 52f44b3)
 2014-05-16 15:35:56 +02:00
Juergen Hoeller
ef290ff95c Additional tests for configuration class importing via ASM 
Issue: SPR-11647
(cherry picked from commit 8c9116f)
 2014-05-08 16:31:07 +02:00
Juergen Hoeller
93b0f0b126 JRubyScriptUtils defensively handles null Nodes in findClassNode (fails against JRuby 1.7.12 otherwise) 
Issue: SPR-11747
(cherry picked from commit adb616b)
 2014-04-30 14:32:07 +02:00
Juergen Hoeller
1afdd9bd75 Polishing 
(cherry picked from commit 02aca9c)
 2014-04-30 00:10:58 +02:00
Juergen Hoeller
744727b8aa AbstractAdvisingBeanPostProcessor uses target class check for existing proxy but checks against actual exposed object otherwise (catching introductions) 
Issue: SPR-11725
(cherry picked from commit a0658c5)
 2014-04-29 16:01:44 +02:00
Juergen Hoeller
a679f3e7a3 Polishing 
(cherry picked from commit be5f2a8)
 2014-04-28 23:52:23 +02:00
Juergen Hoeller
bd5b3749c5 Revised @PropertySource parsing for consistent PropertySource naming, avoiding accidental overriding by name 
Issue: SPR-11637
(cherry picked from commit ab24dda)
 2014-04-28 23:47:33 +02:00
Juergen Hoeller
d0f9853769 Test for overriding singleton @Bean method with scoped proxy in configuration subclass 
Issue: SPR-10744
(cherry picked from commit 299776f)
 2014-04-28 23:46:51 +02:00
Juergen Hoeller
c97c246940 Polishing 2014-04-28 00:29:04 +02:00
Juergen Hoeller
59cef3ce81 General defensiveness about the bootstrap ClassLoader (i.e. null ClassLoader) 
Issue: SPR-11721
 2014-04-28 00:26:18 +02:00
Juergen Hoeller
c8ea80d7ed Configuration class processing explicitly skips java.* classes since we'll never find @Bean annotations there anyway 
Issue: SPR-11718
(cherry picked from commit 470e9c8)
 2014-04-28 00:17:19 +02:00
Juergen Hoeller
656fc52ff9 @Bean processing explicitly ignores bridge methods (for method overrides with return type narrowing on JDK 8) 
Issue: SPR-11718
(cherry picked from commit dc93406)
 2014-04-28 00:16:38 +02:00
Juergen Hoeller
271fe4f554 Polishing 
(cherry picked from commit 48c977a)
 2014-04-17 22:14:31 +02:00
Juergen Hoeller
d9cb44527c Backported tests for package-visible methods with CGLIB proxies 
Issue: SPR-11618
(cherry picked from commit 90309ab)
 2014-04-17 21:38:01 +02:00
Juergen Hoeller
d28c6d8bdb Consistent documentation for both 'close' and 'shutdown' as inferred destroy methods 
Issue: SPR-11680
(cherry picked from commit 14f9dbf)
 2014-04-17 21:32:09 +02:00
Stephane Nicoll
2d8e0c8f87 Fix expression cache 
Prior to this commit, only the java.lang.reflect.Method was used to
identify an annotated method. As a result, if different annotations
were placed on different methods (method overriding, interface
implementation) only the first one (cached) was used.

LazyParamAwareEvaluationContext was affected by the exact
same problem and has been also fixed.

Issue: SPR-11692
(cherry picked from commit df34bab)
 2014-04-15 09:29:56 +02:00
Juergen Hoeller
21874627d2 Polishing 
Issue: SPR-11637
(cherry picked from commit 0041e24)
 2014-04-09 19:00:23 +02:00
Juergen Hoeller
b70148c12d Consistent PropertyAccessor method order as declared in the interface 
Issue: SPR-11609
 2014-03-26 21:47:56 +01:00
Juergen Hoeller
3388573646 AbstractApplicationEventMulticaster only caches if event type and source type are cache-safe 
Issue: SPR-11606
 2014-03-26 15:29:50 +01:00
Juergen Hoeller
90512f036b Fixed SPR issue reference and aligned exception messages 
Issue: SPR-11592
 2014-03-26 00:31:38 +01:00
Juergen Hoeller
9fc13e1d23 CacheAspectSupport checks Cache.get(key) once per invocation only 
Issue: SPR-11592
 2014-03-25 23:56:16 +01:00
Juergen Hoeller
8b73c0affb Added ASM-based tests for custom scoping annotations 
Issue: SPR-11574
 2014-03-24 11:51:21 +01:00
Juergen Hoeller
3aff973d13 Javadoc: @ComponentScan is subject to @Conditional as well 
Issue: SPR-11579
 2014-03-21 14:32:57 +01:00
Stephane Nicoll
4cd818b9e4 Harmonize log configuration 
Prior to this commit, the codebase was using a mix of log4j.xml
and log4j.properties for test-related logging configuration. This
can be an issue as log4j takes the xml variant first when looking
for a default bootstrap configuration.

In practice, some modules declaring the properties variant were
taking the xml variant configuration from another module.

The general structure of the configuration has also been
harmonized to provide a standard console output as well as an
easy way to enable trace logs for the current module.
 2014-03-20 09:43:29 -07:00
Sam Brannen
9cee70ff66 Polish ComponentScanParserTests and clean up warnings 2014-03-20 01:28:59 +01:00
Sam Brannen
99cd2f6098 Support meta-annotation overrides in ASM processing 
Prior to this commit, Spring supported meta-annotation attribute
overrides in custom composed annotations with reflection-based
annotation processing but not with ASM-based annotation processing.

This commit ensures that meta-annotation attribute overrides are
supported in AnnotationMetadataReadingVisitor.getAnnotationAttributes().

Issue: SPR-11574
 2014-03-19 23:44:13 +01:00
Sam Brannen
b640b9fdfe Update TODOs for SPR-11574 
Issue: SPR-11574
 2014-03-18 18:33:26 +01:00
Sam Brannen
9ce0df89ff Support Class meta-annotation attributes with ASM 
Prior to this commit, AnnotationAttributesReadingVisitor treated Class
annotation attributes as Strings instead of Classes. As a result,
look-ups for Class attributes in meta-annotations failed with an
IllegalArgumentException.

This commit fixes this issue by consistently treating Class attributes
as Classes in AnnotationAttributesReadingVisitor.

Issue: SPR-11557
 2014-03-18 18:20:15 +01:00
Juergen Hoeller
38e7c4776b Cache.get(key, type) should also work in case of null value found in cache 
Issue: SPR-11567
 2014-03-18 00:50:59 +01:00
Sam Brannen
e7b8a657b4 Add more tests for @ComponentScan as a meta-annotation 
Issue: SPR-11557
 2014-03-15 15:28:17 +01:00