Commit Graph

663 Commits

Author SHA1 Message Date
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
Chris Beams 4c66a044d5 Revert "Introduce Ordered#NOT_ORDERED"
This reverts commit da914bcfb4 and also
removes the use of Ordered#NOT_ORDERED from EnableTransactionManagement
and ProxyTransactionManagementConfiguration in favor of defaulting to
Ordered#LOWEST_PRIORITY, which is actually the default that results
when no 'order' attribute is specified in XML.

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4404 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-02 06:49:15 +00:00
Sam Brannen f70fd0965d [SPR-8388] Cleared up confusing documentation regarding PropertyResolver and Environment.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4403 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 21:05:23 +00:00
Sam Brannen d81b19e958 [SPR-8388] Improved documentation on default registered PropertyEditors; fixed typos and grammar in JavaDoc; suppressed warnings due to generics; etc.
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4402 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 20:54:48 +00:00
Sam Brannen 98202beb7a fixed typos
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4395 50f2f4bb-b051-0410-bef5-90022cba6387
2011-06-01 12:55:26 +00:00
Chris Beams 55707983a1 Ignore failing tests on Windows
Attempt to access and modify the system environment works on OS X /
Linux but not under Windows. Does not represent any real failure for
production code - the need to modify the system environment is a
testing concern only, and one we can probably live without, considering
the losing battle necessary to make such a hack cross-platform.

Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4392 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 10:58:24 +00:00
Chris Beams a38c086e62 Fix failing system environment tests on Windows
Issue: SPR-8245

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4390 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-31 06:42:06 +00:00
Chris Beams 2a896753d4 Polish PropertySource and Environment Javadoc
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4363 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-25 10:52:03 +00:00
Keith Donald fbf43508f1 Revised converter search algorithm to favor super classes before interface hierarchy
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4361 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 22:20:54 +00:00
Keith Donald 7d7e8ef7fb SPR-6749
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4360 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 19:40:14 +00:00
Keith Donald 8b9196ab7c polish
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4359 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 18:32:01 +00:00
Keith Donald 115348b6be added null binding check for primitives for all conversion results; polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4358 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 17:53:18 +00:00
Keith Donald c3a037d7be added new ConverterRegistry operation; polishing
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4356 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-24 03:47:50 +00:00
Keith Donald 00bcadcbe5 added symmetry to ToString converters: SPR-8306
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4355 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 23:00:43 +00:00
Sam Brannen 1b71b04a3b Added Eclipse project dependency on org.springframework.asm
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4354 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 17:18:14 +00:00
Keith Donald 02d58b6a97 SPR-8364
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4348 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 07:38:27 +00:00
Keith Donald 888da26094 revised findCommonElement handling within TypeDescriptor.forObject(Object); we now fully introspect the collection elements to resolve the common type. We also support nested introspection e.g. collections of collections. Object.class is used to indicate no common type, and TypeDescriptor.NULL is used to indicate a null element value
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4347 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 05:21:02 +00:00
Keith Donald c9789d3a37 moved applyIndexedObject internal, now invoked inside forObject static factory method
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4346 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-23 01:08:18 +00:00
Keith Donald c42976ba7a SPR-8364
git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4345 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-22 19:10:40 +00:00
Chris Beams a9530596bf Guard against null in #visitInnerClass
Issue: SPR-8358,SPR-8186

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4344 50f2f4bb-b051-0410-bef5-90022cba6387
2011-05-21 01:39:50 +00:00