If {@code true}, a {@code null} path location will be populated * with a default object value and traversed instead of resulting in a * {@link NullValueInNestedPathException}. - *
Default is {@code false} on a plain instance. + *
Default is {@code false} on a plain PropertyAccessor instance. */ void setAutoGrowNestedPaths(boolean autoGrowNestedPaths); diff --git a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java index cdf53480fe..ee24536ca5 100644 --- a/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/BeanWrapperAutoGrowingTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,15 +31,17 @@ import static org.junit.Assert.*; */ public class BeanWrapperAutoGrowingTests { - Bean bean = new Bean(); + private final Bean bean = new Bean(); + + private final BeanWrapperImpl wrapper = new BeanWrapperImpl(bean); - BeanWrapperImpl wrapper = new BeanWrapperImpl(bean); @Before public void setUp() { wrapper.setAutoGrowNestedPaths(true); } + @Test public void getPropertyValueNullValueInNestedPath() { assertNull(wrapper.getPropertyValue("nested.prop")); @@ -51,7 +53,7 @@ public class BeanWrapperAutoGrowingTests { assertEquals("test", bean.getNested().getProp()); } - @Test(expected=NullValueInNestedPathException.class) + @Test(expected = NullValueInNestedPathException.class) public void getPropertyValueNullValueInNestedPathNoDefaultConstructor() { wrapper.getPropertyValue("nestedNoConstructor.prop"); } @@ -139,7 +141,7 @@ public class BeanWrapperAutoGrowingTests { assertThat(bean.getMultiList().get(0).get(0), instanceOf(Bean.class)); } - @Test(expected=InvalidPropertyException.class) + @Test(expected = InvalidPropertyException.class) public void getPropertyValueAutoGrowListNotParameterized() { wrapper.getPropertyValue("listNotParameterized[0]"); } diff --git a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java index b605032d8f..e3fe172ff9 100644 --- a/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java +++ b/spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java @@ -141,7 +141,7 @@ public class TypeDescriptor implements Serializable { *
Returns primitive types as-is. *
See {@link #getObjectType()} for a variation of this operation that * resolves primitive types to their corresponding Object types if necessary. - * @return the type, or {@code null} + * @return the type, or {@code null} if it cannot be determined * @see #getObjectType() */ public Class getType() {