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

6348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
00a3420c6f CastorMarshaller etc 2013-02-10 21:11:13 +01:00
Juergen Hoeller
e9db785799 Polishing 2013-02-10 21:10:58 +01:00
Juergen Hoeller
aa576e70be Fixed test class name 2013-02-10 21:10:51 +01:00
Juergen Hoeller
9e9cdf5f13 Removed unused XStreamUtils class; direct access to the xstream field in XStreamMarshaller 2013-02-10 21:10:00 +01:00
Juergen Hoeller
6a2ace739f Added "entityResolver", "classDescriptorResolver", "doctypes" and further properties to CastorMarshaller 
Also deprecated CastorMarshaller's "object" property in favor of "rootObject".

Issue: SPR-8470
 2013-02-10 21:09:00 +01:00
Juergen Hoeller
1af28efe39 @Transactional in AspectJ mode works with CallbackPreferringPlatformTransactionManager (WebSphere) as well 
Effectively, AbstractTransactionAspect got refactored into around advice, reusing former TransactionInterceptor code which now lives in slightly generalized form in TransactionAspectSupport, and using a workaround for rethrowing checked exceptions.

Issue: SPR-9268
 2013-02-10 18:06:50 +01:00
Juergen Hoeller
01c44c8bf6 Further enhancements for 3.2.2 2013-02-10 00:02:45 +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
c1c27e7142 Deprecated JdbcTemplate's queryForInt/Long operations in favor of queryForObject (following NamedParameterJdbcTemplate) 
Issue: SPR-10257
 2013-02-09 17:06:30 +01:00
Juergen Hoeller
3fa6723748 Added useful query variants without parameters to NamedParameterJdbcTemplate, for convenience in DAOs 
Also deprecated NamedParameterJdbcTemplate's queryForInt/Long operations in favor of queryForObject.

Issue: SPR-10256
Issue: SPR-10257
 2013-02-09 16:59:38 +01:00
Juergen Hoeller
9881517f61 Further enhancements for 3.2.2 2013-02-08 22:26:03 +01:00
Juergen Hoeller
f57bc1aaaa MappingJackson(2)JsonView allows subclasses to access the ObjectMapper and to override content writing 
Issue: SPR-7619
 2013-02-08 22:25:26 +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
Phillip Webb
584e79c677 Promote use of @PostConstruct and @PreDestroy 
Update reference documentation to promote the use of the JSR-250
@PostConstruct and @PreDestroy annotations.

Issue: SPR-8493
 2013-02-07 17:25:16 -08:00
Juergen Hoeller
0058503cf0 @Scheduled provides String variants of fixedDelay, fixedRate, initialDelay for placeholder support 
Issue: SPR-8067
 2013-02-08 01:13:08 +01:00
Juergen Hoeller
f9bac48d84 Further preparations for 3.2.2 2013-02-08 00:59:45 +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
b3c9a11bd1 Folded a FactoryBean-specific check into predictBeanType now 
This change means that we effectively revert SPR-8954's code change in favor of the isFactoryBean implementation simply relying on predictBeanType to sort it out, filtering a post-processed predictedType for FactoryBean applicability.

Issue: SPR-9177
Issue: SPR-9143
 2013-02-07 23:23:25 +01:00
Phillip Webb
7bbb4ec7af Fix Assert.instanceOf exception message 
Update the exception message used when Assert.instanceOf fails such
that it expects the provided message to end with '.'. This reverts
commit 5874383ef0 which caused the
implementation to be at odds with the JavaDoc and the previous
release.

The updated code also has the benefit of protecting against a null
message.

Issue: SPR-10269
 2013-02-07 13:35:31 -08:00
Juergen Hoeller
2aaa66f86b Allow for ordering of mixed AspectJ before/after advices 
Issue: SPR-9438
 2013-02-07 22:02:40 +01:00
Juergen Hoeller
e3c83bb769 Minor javadoc and source layout polishing 2013-02-07 15:36:19 +01:00
Juergen Hoeller
9ffbee332c Fixed documentation for "depends-on" attribute 2013-02-07 15:28:25 +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
d3969de101 Allow for ordering of mixed AspectJ before/after advices 
Issue: SPR-9438
 2013-02-07 14:11:24 +01:00
Juergen Hoeller
1ed26d6389 Preparations for 3.2.2 2013-02-06 21:48:28 +01:00
Juergen Hoeller
c6cf911931 Marked spring-web module as 'distributable' in order for session replication to work on Tomcat 
Issue: SPR-10219
 2013-02-06 21:44:34 +01:00
Juergen Hoeller
8a4ce142c4 SQLErrorCodeSQLExceptionTranslator tries to find SQLException with actual error code, looping through the causes. 
Issue: SPR-10260
 2013-02-06 21:32:42 +01:00
Juergen Hoeller
188a11bdb9 Fixed setFavorPathExtension delegation code 2013-02-06 21:01:51 +01:00
Juergen Hoeller
ab3aa6c8c2 Added ContentNegotiationManager(Collection<ContentNegotiationStrategy>) constructor 2013-02-06 21:01:50 +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
1cc58e0a99 Limit auto grow collection size when using SpEL 
Provide an additional constructor on SpelParserConfiguration that can
be used to limit the maximum size that a collection will auto grow when
being accessed via a SpEL expression.

This constraint is particularly useful when SpEL is used with data
binding as it prevents a malicious user from crafting a request that
causes OutOfMemory exceptions.

Issue: SPR-10229
 2013-02-06 10:42:46 -08:00
Phillip Webb
1c724069c3 Improve presentation of code blocks in Javadoc 
Include custom javadoc css that formats <pre class="code"> blocks.

Issue: SPR-10155
 2013-02-04 15:05:08 -08:00
Phillip Webb
501ce65055 Polish @Configuration javadoc 2013-02-04 15:00:45 -08:00
Phillip Webb
a6b70722fa Update Quartz documentation to use FactoryBeans 
Update examples for Quartz scheduling to use SimpleTriggerFactoryBean
and CronTriggerFactoryBean instead of SimpleTriggerBean and
CronTriggerBean.

Issue: SPR-10209
 2013-02-04 13:57:48 -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
3252cb5a0f Merge branch 'cleanup-3.2.x' into 3.2.x 
* cleanup-3.2.x:
  Polish formatting
 2013-02-04 10:37:11 -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
0a6da1e42d Merge branch '3.2.x' into cleanup-3.2.x 
* 3.2.x:
  Polish documentation in Hibernate support classes
  Improve 3.2 migration guide re: JUnit & Hamcrest
 2013-02-04 10:29:05 -08:00
Sam Brannen
220d2311c7 Polish documentation in Hibernate support classes 
This commit fixes some minor typos in Hibernate support classes.
 2013-02-01 23:51:07 +01:00
Sam Brannen
ae0c34baaf Improve 3.2 migration guide re: JUnit & Hamcrest 
This commit improves the "Spring Test Dependencies" section of the 3.2
migration guide by correctly explaining that Hamcrest Core is now a
required transitive dependency of JUnit.

Issue: SPR-10251
 2013-02-01 15:40:01 +01:00
Phillip Webb
4849205c6a Merge branch '3.2.x' into cleanup-3.2.x 2013-01-31 13:54:28 -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
a694db2933 Removed logging from GenericTypeResolver's resolveReturnTypeForGenericMethod 
GenericTypeResolver is very low-level and quite a hotspot, so let's not do any logging there and rather use the debugger instead.
 2013-01-31 18:01:01 +01:00
Juergen Hoeller
7d798acd35 Added getOriginalValue() accessor to (Real)Literal 
Issue: SPR-10248
 2013-01-31 17:50:37 +01:00
Juergen Hoeller
bd72fcd469 Initial preparations for 3.2.2 2013-01-31 16:53:58 +01:00
Juergen Hoeller
b3af29b8f6 DefaultMessageListenerContainer invokes specified ExceptionListener for recovery exceptions as well 
Also, DefaultMessageListenerContainer logs recovery failures at error level and exposes an "isRecovering()" method now.

Issue: SPR-10230
 2013-01-31 16:53:04 +01: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
Juergen Hoeller
58f59d6851 MediaType throws dedicated InvalidMediaTypeException instead of generic IllegalArgumentException 
Issue: SPR-10226
 2013-01-30 14:58:36 +01:00
Juergen Hoeller
6a98b40e1c Consistent use of LinkedHashMaps and independent getAttributeNames Enumeration in Servlet/Portlet mocks 
Issue: SPR-10224
 2013-01-30 14:57:36 +01:00