Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,510 Commits 18 Branches 0 Tags
2bb3522bbb8b3ea21443e6936df281dfd4cb2260
Commit Graph

849 Commits

Author SHA1 Message Date
Juergen Hoeller
2302b9b48b Added locale-independent "commonMessages" property to AbstractMessageSource 
Issue: SPR-10291
 2013-03-06 09:53:12 +01:00
Chris Beams
ce4be3b46b Merge branch '3.2.x' into master 
Conflicts:
	gradle.properties
	spring-beans/src/main/java/org/springframework/beans/factory/support/StaticListableBeanFactory.java
	spring-context-support/src/main/java/org/springframework/cache/ehcache/EhCacheManagerFactoryBean.java
	spring-core/src/main/java/org/springframework/core/convert/support/StringToEnumConverterFactory.java
	spring-core/src/main/java/org/springframework/core/env/ReadOnlySystemAttributesMap.java
	spring-jdbc/src/main/java/org/springframework/jdbc/datasource/LazyConnectionDataSourceProxy.java
	spring-jdbc/src/main/java/org/springframework/jdbc/support/lob/AbstractLobHandler.java
	spring-web/src/main/java/org/springframework/http/client/BufferingClientHttpRequestWrapper.java
	spring-web/src/main/java/org/springframework/http/client/SimpleBufferingClientHttpRequest.java
	spring-web/src/main/java/org/springframework/http/converter/BufferedImageHttpMessageConverter.java
	spring-web/src/main/java/org/springframework/http/converter/FormHttpMessageConverter.java
 2013-03-04 15:41:15 +01:00
Juergen Hoeller
1bae80a241 Polishing 2013-02-27 00:31:05 +01:00
Juergen Hoeller
add6a7faa0 Updated note on Bean Validation 1.1 2013-02-15 18:24:11 +01:00
Phillip Webb
66ae626f91 Only register Date converters with global format 
Change JodaTimeFormatterRegistrar and DateFormatterRegistrar to only
register converters for the Date and Calendar types when a global format
has been defined. This means that the ObjectToObject converter will
handle String->Date conversion using the deprecated Date(String)
constructor (as was the case with Spring 3.1).

Issue: SPR-10105
 2013-02-12 11:09:32 -08:00
Phillip Webb
dbe3c234d6 Polish 2013-02-12 10:33:01 -08:00
Juergen Hoeller
cef97819c5 Fixed regression in SpringValidatorAdapter's retrieval of invalid values 
Issue: SPR-10243
 2013-02-11 12:21:46 +01:00
Juergen Hoeller
e9db785799 Polishing 2013-02-10 21:10:58 +01:00
Juergen Hoeller
a86a77ad81 ConfigurationClassPostProcessor detects covariant return type mismatch, avoiding infinite recursion 
Issue: SPR-10261
 2013-02-09 23:21:35 +01:00
Juergen Hoeller
af8e6255e2 Refined CronSequenceGenerator's rounding up of seconds to address second-specific cron expressions 
Issue: SPR-9459
 2013-02-08 21:13:04 +01:00
Juergen Hoeller
89c3d03083 @Async's qualifier works for target class annotations behind a JDK proxy as well 
Also optimized AsyncExecutionAspectSupport's Executor-per-Method caching to use a ConcurrentHashMap.

Issue: SPR-10274
 2013-02-08 16:08:05 +01:00
Juergen Hoeller
9255d3038f @Scheduled provides String variants of fixedDelay, fixedRate, initialDelay for placeholder support 
Issue: SPR-8067
 2013-02-08 00:58:39 +01:00
Juergen Hoeller
0d66df26da "depends-on" attribute on lang namespace element actually respected at runtime now 
Issue: SPR-8625
 2013-02-07 15:27:43 +01:00
Juergen Hoeller
6b82d293d5 ConfigurationClassPostProcessor allows for overriding of scoped-proxy bean definitions 
Issue: SPR-10265
 2013-02-06 21:01:49 +01:00
Phillip Webb
501ce65055 Polish @Configuration javadoc 2013-02-04 15:00:45 -08:00
Phillip Webb
8c2ace33cb Support 'unless' expression for cache veto 
Allow @Cachable, @CachePut and equivalent XML configuration to provide
a SpEL expression that can be used to veto putting an item into the
cache. Unlike 'condition' the 'unless' parameter is evaluated after
the method has been called and can therefore reference the #result.

For example:

    @Cacheable(value="book",
        condition="#name.length < 32",
        unless="#result.hardback")

This commit also allows #result to be referenced from @CacheEvict
expressions as long as 'beforeInvocation' is false.

Issue: SPR-8871
 2013-02-04 11:59:15 -08:00
Phillip Webb
f464a45ba4 Polish formatting 
Minor formatting polish across that codebase. Primarily fixing
whitespace issues.
 2013-02-04 10:35:25 -08:00
Phillip Webb
aac6b913d6 Merge branch 'cleanup-3.2.x' into 3.2.x 
* cleanup-3.2.x:
  Fix unnecessary @SupressWarnings annotations
  Fix Javadoc warnings
  Fix unused local variable warnings
  Fix unused type compiler warnings
  Fix 'is already an instance of type' warnings
 2013-01-31 12:52:51 -08:00
Juergen Hoeller
6d77f1cf3b ConfigurationClassPostProcessor consistently uses ClassLoader, not loading core JDK annotations via ASM 
Issue: SPR-10249
 2013-01-31 16:51:56 +01:00
Phillip Webb
d89e30b864 Fix unnecessary @SupressWarnings annotations 2013-01-29 15:37:25 -08:00
Juergen Hoeller
ede9d535ea Updated resolvePath javadoc to reflect Environment-based placeholder resolution 
Issue: SPR-9455
 2013-01-23 22:00:35 +01:00
Juergen Hoeller
a425d717b7 ThreadPoolExecutorFactoryBean exposes "createExecutor" method for custom ThreadPoolExecutor subclasses 
Issue: SPR-9435
 2013-01-23 22:00:32 +01:00
Juergen Hoeller
4dde7c4c16 MBeanInfoAssembler impls expose actual method parameter names if possible 
Issue: SPR-9985
 2013-01-23 22:00:31 +01:00
Sam Brannen
3b8aba9ccd Fix typo in ContextLifecycleScheduledTaskRegistrar 2013-01-23 16:48:08 +01:00
Juergen Hoeller
d5af9dc0a5 Polishing 2013-01-23 01:32:28 +01:00
Juergen Hoeller
89db04ec75 Added "awaitTerminationSeconds" property to ThreadPoolTaskExecutor/ThreadPoolTaskScheduler 
Issue: SPR-5387
 2013-01-23 01:32:27 +01:00
Juergen Hoeller
0efdd3d566 Aligned XML scheduled-task elements with @Scheduled in terms of kicking in after context refresh 
Issue: SPR-9231
 2013-01-22 23:29:19 +01:00
Juergen Hoeller
8e75eee9b2 SpringValidationAdapter properly detects invalid value for JSR-303 field-level bean constraints 
Issue: SPR-9332
 2013-01-22 21:12:04 +01:00
Phillip Webb
21becef1bd Support Date to String in JodaTimeConverters 
Update JodaTimeConverters in include support for Date to String
conversion.

The JodaTimeFormattingTests and DateFormattingTests have been extended
to ensure that Date to String conversion is supported with or without
Joda.

Issue: SPR-10198
 2013-01-21 10:55:25 -08:00
Juergen Hoeller
cca255bc79 Added "exposeAccessContext" flag JndiRmiClientInterceptor/ProxyFactoryBean (for WebLogic) 
Issue: SPR-9428
 2013-01-18 16:51:21 +01:00
Juergen Hoeller
3dd817585b MBeanExporter does not log warnings for manually unregistered MBeans 
Issue: SPR-9451
 2013-01-18 14:43:11 +01:00
Juergen Hoeller
721fa9db6a SpringBeanAutowiringInterceptor eagerly releases BeanFactory if post-construction fails 
Issue: SPR-10013
 2013-01-18 14:12:02 +01:00
Juergen Hoeller
2cd23a79a3 Polishing 2013-01-15 22:09:16 +01:00
Juergen Hoeller
a3211782a6 AbstractCacheManager accepts no caches defined, allowing for EHCache default cache setup 
Issue: SPR-7955
 2013-01-15 15:54:14 +01:00
Rossen Stoyanchev
54c873b4c4 Support multiple Validators in DataBinder 
DataBinder now allows registering additional Validator instances.
This may be useful when adding a Spring Validator to a globally
registered JSR-303 LocalValidatorFactoryBean.

Issue: SPR-9436
 2013-01-11 16:28:19 -05:00
Juergen Hoeller
3a9ca4a6bb MessageSourceResourceBundle overrides JDK 1.6 containsKey method, avoiding NPE in getKeys 
Issue: SPR-10136
 2013-01-10 17:00:40 +01:00
Chris Beams
961dbdb68a Merge branch '3.2.x' into master 
* 3.2.x:
  Exclude spring-build-src from maven publish
  Move spring-build-junit into spring-core
  Relocate MergePlugin package
  Develop a gradle plugin to add test dependencies
  Expose Gradle buildSrc for IDE support
  Fix [deprecation] compiler warnings
  Upgrade to xmlunit version 1.3
  Improve 'build' folder ignores
  Fix regression in static setter method support
  Fix SpEL JavaBean compliance for setters

Conflicts:
	spring-beans/src/test/java/org/springframework/beans/ExtendedBeanInfoTests.java
 2013-01-02 10:36:57 +01:00
Chris Beams
70eaf02b7f Revert "Merge branch 'SPR-10130' into cleanup-master" 
This reverts commit 45fa50821a, reversing
changes made to a312d900f8.
 2013-01-02 10:33:59 +01:00
Phillip Webb
6626a38730 Fix [deprecation] compiler warnings 
Fix deprecation compiler warnings by refactoring code or applying
@SuppressWarnings("deprecation") annotations. JUnit tests of
internally deprecated classes are now themselves marked as
@Deprecated.

Numerous EasyMock deprecation warnings will remain until the
migration to mockito can be completed.
 2013-01-01 13:42:15 -08:00
Chris Beams
b2a048b6f3 Update Apache license headers for affected sources 2012-12-28 23:57:33 +01:00
Chris Beams
3b40ce76bf Add @Override annotations to main sources 
Issue: SPR-10130
 2012-12-28 23:53:24 +01:00
Chris Beams
8472a2b2ab Update Apache license headers for affected sources 2012-12-28 23:09:31 +01:00
Phillip Webb
6c14eaad61 Fix [cast] compiler warnings 2012-12-28 22:41:06 +01:00
Phillip Webb
b0986049a3 Fix [serial] compiler warnings 
Fix serialization warnings by applying @SuppressWarnings("serial")
when appropriate.

In certain cases and for unknown reasons, a correctly-placed
@SuppressWarnings("serial") annotation will fix the warning at the
javac level (i.e. the Gradle command-line), but will produce an
"unnecessary @SuppressWarnings" warning within Eclipse. In these
cases, a private static final serialVersionUID field has been added
with the default value of 1L.
 2012-12-28 22:41:06 +01:00
Phillip Webb
7f0aa5cfb2 Fix [varargs] compiler warnings 
Remove unnecessary 'null' argument from calls to vararg supported
methods and fix cast in ValidationUtils.invokeValidator().
 2012-12-28 22:40:49 +01:00
Phillip Webb
731d5be644 Fix warnings due to unused import statements 2012-12-28 22:40:49 +01:00
Chris Beams
9540d2c81b Replace <code> with {@code} throughout Javadoc 
Issue: SPR-10128
 2012-12-28 22:36:02 +01:00
Chris Beams
8597ec25ec Fix various Javadoc warnings 
Issue: SPR-10128
 2012-12-28 22:36:02 +01:00
Phillip Webb
2cf45bad86 Replace space indentation with tabs 
Issue: SPR-10127
 2012-12-28 20:49:56 +01:00
Phillip Webb
1762157ad1 Remove trailing whitespace in source files 
find . -type f -name "*.java" -or -name "*.aj" | \
    xargs perl -p -i -e "s/[ \t]*$//g" {} \;

Issue: SPR-10127
 2012-12-28 20:49:45 +01:00