From 5dba2f4c59cf0bc40023681e7cc2896f17b8c258 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Tue, 16 May 2017 19:11:38 +0200 Subject: [PATCH] DATACMNS-1066 - Polishing. Formatting and removal of obsolete methods. --- ...lassGeneratingPropertyAccessorFactory.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java index a34fb18eb..863232b54 100644 --- a/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java +++ b/src/main/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactory.java @@ -355,10 +355,12 @@ public class ClassGeneratingPropertyAccessorFactory implements PersistentPropert for (PersistentProperty property : persistentProperties) { - property.getSetter().filter(it -> generateMethodHandle(entity, it)).ifPresent(it -> cw.visitField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, setterName(property), - referenceName(JAVA_LANG_INVOKE_METHOD_HANDLE), null, null).visitEnd()); - property.getGetter().filter(it -> generateMethodHandle(entity, it)).ifPresent(it -> cw.visitField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, getterName(property), - referenceName(JAVA_LANG_INVOKE_METHOD_HANDLE), null, null).visitEnd()); + property.getSetter().filter(it -> generateMethodHandle(entity, it)) + .ifPresent(it -> cw.visitField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, setterName(property), + referenceName(JAVA_LANG_INVOKE_METHOD_HANDLE), null, null).visitEnd()); + property.getGetter().filter(it -> generateMethodHandle(entity, it)) + .ifPresent(it -> cw.visitField(ACC_PRIVATE + ACC_FINAL + ACC_STATIC, getterName(property), + referenceName(JAVA_LANG_INVOKE_METHOD_HANDLE), null, null).visitEnd()); property.getField().filter(it -> generateSetterMethodHandle(entity, it)).ifPresent(it -> { @@ -487,12 +489,15 @@ public class ClassGeneratingPropertyAccessorFactory implements PersistentPropert if (property.usePropertyAccess()) { - property.getGetter().filter(it -> generateMethodHandle(entity, it)).ifPresent(it -> visitPropertyGetterInitializer(property, mv, entityClasses, internalClassName)); + property.getGetter().filter(it -> generateMethodHandle(entity, it)) + .ifPresent(it -> visitPropertyGetterInitializer(property, mv, entityClasses, internalClassName)); - property.getSetter().filter(it -> generateMethodHandle(entity, it)).ifPresent(it -> visitPropertySetterInitializer(property, mv, entityClasses, internalClassName)); + property.getSetter().filter(it -> generateMethodHandle(entity, it)) + .ifPresent(it -> visitPropertySetterInitializer(property, mv, entityClasses, internalClassName)); } - property.getField().filter(it -> generateSetterMethodHandle(entity, it)).ifPresent(it -> visitFieldGetterSetterInitializer(property, mv, entityClasses, internalClassName)); + property.getField().filter(it -> generateSetterMethodHandle(entity, it)) + .ifPresent(it -> visitFieldGetterSetterInitializer(property, mv, entityClasses, internalClassName)); } mv.visitLabel(l1);