Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-916 - Fix setter lookup in ClassGeneratingPropertyAccessorFactory.

Browse Source 
Previously, ClassGeneratingPropertyAccessorFactory uses boxed types for primitive type setters. This threw NoSuchMethodExceptions and caused ExceptionInInitializerError as the generated class could not be initialized. We now use the appropriate argument type to look up setters.

Also, we now only generate accessor usage if the property is configured to use property access in the first place.

Original pull request: #178.
This commit is contained in:
Mark Paluch
2016-09-23 14:12:26 +02:00
committed by Oliver Gierke
parent 3811ce5873
commit 0e29af3a15
3 changed files with 126 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryDatatypeTests.java
View File

@@ -22,6 +22,7 @@ import static org.junit.Assert.*;
import lombok.Data;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -68,7 +69,7 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
public static List<Object[]> parameters() throws Exception {
List<Object[]> parameters = new ArrayList<Object[]>();
List<Class<?>> types = Arrays.asList(FieldAccess.class, PropertyAccess.class);
List<Class<?>> types = Arrays.asList(FieldAccess.class, PropertyAccess.class, PrivateFinalFieldAccess.class, PrivateFinalPropertyAccess.class);
parameters.addAll(parameters(types, "primitiveInteger", Integer.valueOf(1)));
parameters.addAll(parameters(types, "primitiveIntegerArray", new int[] { 1, 2, 3 }));
@@ -113,8 +114,11 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
List<Object[]> parameters = new ArrayList<Object[]>();
for (Class<?> type : types) {
Constructor<?>[] constructors = type.getDeclaredConstructors();
constructors[0].setAccessible(true);
parameters
.add(new Object[] { type.newInstance(), propertyName, value, type.getSimpleName() + "/" + propertyName });
.add(new Object[] { constructors[0].newInstance(), propertyName, value, type.getSimpleName() + "/" + propertyName });
}
return parameters;
@@ -257,4 +261,105 @@ public class ClassGeneratingPropertyAccessorFactoryDatatypeTests {
String string;
String stringArray[];
}
/**
* @see DATACMNS-916
*/
@AccessType(Type.FIELD)
private final static class PrivateFinalFieldAccess {
int primitiveInteger;
int primitiveIntegerArray[];
Integer boxedInteger;
Integer boxedIntegerArray[];
short primitiveShort;
short primitiveShortArray[];
Short boxedShort;
Short boxedShortArray[];
byte primitiveByte;
byte primitiveByteArray[];
Byte boxedByte;
Byte boxedByteArray[];
char primitiveChar;
char primitiveCharArray[];
Character boxedChar;
Character boxedCharArray[];
boolean primitiveBoolean;
boolean primitiveBooleanArray[];
Boolean boxedBoolean;
Boolean boxedBooleanArray[];
float primitiveFloat;
float primitiveFloatArray[];
Float boxedFloat;
Float boxedFloatArray[];
double primitiveDouble;
double primitiveDoubleArray[];
Double boxedDouble;
Double boxedDoubleArray[];
long primitiveLong;
long primitiveLongArray[];
Long boxedLong;
Long boxedLongArray[];
String string;
String stringArray[];
}
/**
* @see DATACMNS-916
*/
@AccessType(Type.PROPERTY)
@Data
private final static class PrivateFinalPropertyAccess {
int primitiveInteger;
int primitiveIntegerArray[];
Integer boxedInteger;
Integer boxedIntegerArray[];
short primitiveShort;
short primitiveShortArray[];
Short boxedShort;
Short boxedShortArray[];
byte primitiveByte;
byte primitiveByteArray[];
Byte boxedByte;
Byte boxedByteArray[];
char primitiveChar;
char primitiveCharArray[];
Character boxedChar;
Character boxedCharArray[];
boolean primitiveBoolean;
boolean primitiveBooleanArray[];
Boolean boxedBoolean;
Boolean boxedBooleanArray[];
float primitiveFloat;
float primitiveFloatArray[];
Float boxedFloat;
Float boxedFloatArray[];
double primitiveDouble;
double primitiveDoubleArray[];
Double boxedDouble;
Double boxedDoubleArray[];
long primitiveLong;
long primitiveLongArray[];
Long boxedLong;
Long boxedLongArray[];
String string;
String stringArray[];
}
}

4
src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java
View File

@@ -71,7 +71,7 @@ public class ClassGeneratingPropertyAccessorFactoryTests {
"privateProperty", "packageDefaultProperty", "protectedProperty", "publicProperty", "syntheticProperty");
parameters.addAll(parameters(new InnerPrivateType(), propertyNames, Object.class));
parameters.addAll(parameters(new InnerTypeWithPrivateAncesor(), propertyNames, InnerTypeWithPrivateAncesor.class));
parameters.addAll(parameters(new InnerTypeWithPrivateAncestor(), propertyNames, InnerTypeWithPrivateAncestor.class));
parameters.addAll(parameters(new InnerPackageDefaultType(), propertyNames, InnerPackageDefaultType.class));
parameters.addAll(parameters(new InnerProtectedType(), propertyNames, InnerProtectedType.class));
parameters.addAll(parameters(new InnerPublicType(), propertyNames, InnerPublicType.class));
@@ -247,7 +247,7 @@ public class ClassGeneratingPropertyAccessorFactoryTests {
/**
* @see DATACMNS-809
*/
public static class InnerTypeWithPrivateAncesor extends InnerPrivateType {
public static class InnerTypeWithPrivateAncestor extends InnerPrivateType {
}