Commit Graph

682 Commits

Author SHA1 Message Date
Juergen Hoeller 5079575535 introduced AnnotationUtils.getAnnotation(AnnotatedElement, annotationType)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4761 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-22 09:34:42 +00:00
Juergen Hoeller f565d216b6 added "acceptProxyClasses" flag to RemoteInvocationSerializingExporter
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4749 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 09:04:42 +00:00
Juergen Hoeller 50b79a5178 fixed @ExceptionHandler exception type matching (ExceptionDepthComparator; SPR-8231)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4742 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-21 07:15:26 +00:00
Juergen Hoeller 1c959c2972 alignment with backported 3.0.6 code (SPR-8538)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4734 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-20 19:59:41 +00:00
Juergen Hoeller edf13fd338 ConvertiblePair implements equals and hashCode (SPR-8459)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4730 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 15:51:19 +00:00
Rossen Stoyanchev 6d01c8d589 Remove unnecessary javax.servlet dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4728 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-19 14:04:15 +00:00
Sam Brannen 021febbce8 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4711 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-17 16:35:22 +00:00
Chris Beams de5781acea Introduce GenericTypeResolver#resolveReturnTypeArgument
Issue: SPR-8514

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4680 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-06 09:15:32 +00:00
Chris Beams 075dfc3cb4 Deprecate/move CGLIB methods AopUtils=>ClassUtils
isCglibProxy* methods in AopUtils are useful in lower-level modules,
i.e. those that cannot depend on .aop.  Therefore copied these methods
to ClassUtils; deprecated the existing ones in AopUtils and now
delegating to the new location; switched all usage of
AopUtils#isCglibProxy* within the framework to use
ClassUtils#isCglibProxy* instead.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4679 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-06 09:15:27 +00:00
Juergen Hoeller ffec3a88b6 added joptsimple dependency
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4651 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-03 16:24:55 +00:00
Chris Beams e4c1be808f Rename {DEFAULT_=>}COMMAND_LINE_PROPERTY_SOURCE_NAME
For consistency with all other constants representing default
property source names, such as
StandardServletEnvironment#SERVLET_CONTEXT_PROPERTY_SOURCE_NAME and
StandardEnvironment#SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME

Issue: SPR-8482

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4649 50f2f4bb-b051-0410-bef5-90022cba6387
2011-07-02 21:39:52 +00:00
Chris Beams 843106388e Introduce CommandLinePropertySource and impls
Users may now work with command line arguments as a source of
properties for use with the PropertySource and Environment APIs.
An implementation based on the jopt library and a "simple"
implementation requiring no external libraries are are provided
out-of-the box.

See Javadoc for CommandLinePropertySource, JOptCommandLinePropertySource
and SimpleCommandLinePropertySource for details.

Issue: SPR-8482

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4643 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-30 22:33:56 +00:00
Keith Donald 0997b2ef16 javadoc update
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4633 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-27 21:37:34 +00:00
Keith Donald f606eb3012 SPR-8465
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4632 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-27 21:36:48 +00:00
Sam Brannen 01a490225f fixed typo
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4624 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-25 15:53:43 +00:00
Rossen Stoyanchev 0f36ee7f26 SPR-7787 Allow qualifiers in regular expressions of URI template patterns.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4606 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-22 20:39:10 +00:00
Arjen Poutsma 12faecff7b SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4565 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 09:07:12 +00:00
Arjen Poutsma 8836abe57d SPR-8457 - XMLEventStreamReader.getText() fails for COMMENT and ENTITY_REFERENCE events
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4564 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-17 09:06:02 +00:00
Chris Beams efb738cd04 Fix regression with covariant property return types
Prior to this change, the Property class introduced in 3.1 M2 validated
read/write property method pairs based on whether their parameter/return
types were equal to one another.  This precluded the valid possibility
of read method that returns a subtype of the write method's parameter
type, and represented a regression against 3.1 M1 and earlier versions.

The implementation now uses isAssignableFrom rather than a straight
equals check against the types.

Issue: SPR-8432

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4561 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-16 07:53:42 +00:00
Chris Beams b3e77d9ef2 Add syntax highlighting to Javadoc where necessary
Issue: SPR-8426

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4514 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-12 06:56:17 +00:00
Juergen Hoeller 03adc3b632 shortened build properties "org.junit.version" to "junit.version" and "org.testng.version" to "testng.version"; reverted SLF4J version back to 1.5.3 (for Hibernate 3.3.1 compatibility)
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4502 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-09 09:58:15 +00:00
Juergen Hoeller 6ff99b54d8 full support for arbitrary nesting of collections in fields (SPR-8394); proper type detection in nested collections within arrays
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4487 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 22:34:35 +00:00
Juergen Hoeller 0574baa690 full support for arbitrary nesting of collections in fields (SPR-8394); proper type detection in nested collections within arrays
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4486 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 22:33:23 +00:00
Keith Donald 031e9b64a7 added utility method to reduce code duplication
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4485 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:44:02 +00:00
Keith Donald 2410603cc4 assignability examples
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4484 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:14:02 +00:00
Keith Donald f40c101d6d implemented collection/map converter conditional matching checks; updated SpEL to reflect this behavior
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4483 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 20:00:28 +00:00
Keith Donald a87adacbfe fixed failing test; initial conditional converter impls for collections, arrays, and maps
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4481 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:56:51 +00:00
Keith Donald 2e88435aa4 added back element type checks in TypeDescriptor#isAssignable; clarified semantics in javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4480 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 15:33:44 +00:00
Keith Donald b0a9781f0f restored TypeDescriptor getElementType, getMapKeyType, and getMapValueType compatibility; StringToCollection and Array Converters are now conditional and check targetElementType if present; TypeDesciptor#isAssignable no longer bothers with element type and map key/value types in checking assignability for consistency elsewhere; improved javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4478 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-07 02:51:44 +00:00
Keith Donald 034edc9e1f string to collection and array converters now are conditional and apply target element type match
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4477 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-06 22:48:00 +00:00
Sam Brannen b8d36919f4 Introduced toClassArray(Collection<Class<?>>).
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4464 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:13:13 +00:00
Sam Brannen 0c787ff902 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4463 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 19:12:58 +00:00
Keith Donald 7f93b47b4a narrow and elementType/keyValueType tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4461 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 18:51:37 +00:00
Keith Donald 90bb4c2256 added convert(Object, TypeDescriptor) convenience method; collection and map tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4460 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 18:36:58 +00:00
Keith Donald eaa8a4271c improved null handling and javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4458 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 17:41:08 +00:00
Keith Donald c5425d0f43 broke out to top-level class for readability
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4456 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 08:37:08 +00:00
Keith Donald 89096b46b8 removed dependency on java.beans
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4455 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 08:29:14 +00:00
Keith Donald 911eb5fca8 javadoc and polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4454 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 07:14:34 +00:00
Keith Donald b58386da08 polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4451 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 05:46:27 +00:00
Keith Donald a34147a53d revised TypeDescriptor NULL and element/mapKey/mapValue type semantics
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4450 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-05 04:43:18 +00:00
Keith Donald 4ee2900296 added TypeDescriptor resolveCollectionElement and Map key/value types
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4445 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-04 05:38:51 +00:00
Chris Beams 976955f6ad Fix system environment tests on all platforms
Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4430 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 05:16:35 +00:00
Keith Donald b93a2b121d broke out pkg private classes from TypeDescriptor to improve manageability and testability
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4429 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 03:09:05 +00:00
Keith Donald 21e2dd87c9 more tests; several assertions for the programmer
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4428 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:18:22 +00:00
Keith Donald 0b33eb8842 javadoc polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4427 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 02:01:28 +00:00
Keith Donald 6af117037f more tests
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4426 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 01:55:41 +00:00
Keith Donald f13b99f4ea javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4425 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-03 00:51:17 +00:00
Keith Donald c7cae10364 simplified TypeDescriptor usage and updated use of the API across BeanWrapper and SpEL; collapsed PropertyTypeDescriptor into TypeDescriptor for simplicity and ease of use; improved docs
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4424 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 23:37:19 +00:00
Chris Beams 569e6a4c37 Introduce ConfigurableConversionService interface
Consolidates ConversionService and ConverterRegistry interfaces;
implemented by GenericConversionService.

ConfigurablePropertyResolver#getConversionService now returns this
new type (hence so too does
ConfigurableEnvironment#getConversionService). This allows for
convenient addition / removal of Converter instances from Environment's
existing ConversionService.  For example:

    ConfigurableApplicationContext ctx = new ...
    ConfigurableEnvironment env = ctx.getEnvironment();
    env.getConversionService().addConverter(new FooConverter());

Issue: SPR-8389

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4406 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:42 +00:00
Chris Beams 3d91946b73 Polish ConfigurablePropertyResolver Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4405 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:50:00 +00:00