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

DATACMNS-867 - Lazify lookups in AbstractPersistentProperty.

Browse Source
This commit is contained in:
Oliver Gierke
2017-03-21 18:48:36 +01:00
parent 417e728e77
commit 1c45fcfcdc
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/springframework/data/mapping/model/AbstractPersistentProperty.java
View File

@@ -50,10 +50,10 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
CAUSE_FIELD = ReflectionUtils.findField(Throwable.class, "cause");
}
protected final String name;
protected final TypeInformation<?> information;
protected final Class<?> rawType;
protected final Optional<Association<P>> association;
private final String name;
private final TypeInformation<?> information;
private final Class<?> rawType;
private final Lazy<Optional<Association<P>>> association;
private final @Getter PersistentEntity<?, P> owner;
private final @Getter(AccessLevel.PROTECTED) Property property;
private final Lazy<Integer> hashCode;
@@ -71,7 +71,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
this.information = PropertyPath.from(Pattern.quote(property.getName()), owner.getTypeInformation())
.getTypeInformation();
this.property = property;
this.association = isAssociation() ? Optional.of(createAssociation()) : Optional.empty();
this.association = Lazy.of(() -> isAssociation() ? Optional.of(createAssociation()) : Optional.empty());
this.owner = owner;
this.hashCode = Lazy.of(property::hashCode);
@@ -206,7 +206,7 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
*/
@Override
public Optional<Association<P>> getAssociation() {
return association;
return association.get();
}
/*

12
src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java
View File

@@ -56,8 +56,11 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
private final Optional<Value> value;
private final Map<Class<? extends Annotation>, Optional<? extends Annotation>> annotationCache = new HashMap<>();
private Lazy<Boolean> isTransient;
private Lazy<Boolean> usePropertyAccess;
private final Lazy<Boolean> usePropertyAccess = Lazy.of(() -> findPropertyOrOwnerAnnotation(AccessType.class)//
.map(it -> Type.PROPERTY.equals(it.value()))//
.orElse(super.usePropertyAccess()));
private final Lazy<Boolean> isTransient = Lazy.of(() -> super.isTransient() || isAnnotationPresent(Transient.class)
|| isAnnotationPresent(Value.class) || isAnnotationPresent(Autowired.class));
/**
* Creates a new {@link AnnotationBasedPersistentProperty}.
@@ -73,11 +76,6 @@ public abstract class AnnotationBasedPersistentProperty<P extends PersistentProp
populateAnnotationCache(property);
this.value = findAnnotation(Value.class);
this.usePropertyAccess = Lazy.of(() -> findPropertyOrOwnerAnnotation(AccessType.class)//
.map(it -> Type.PROPERTY.equals(it.value()))//
.orElse(super.usePropertyAccess()));
this.isTransient = Lazy.of(() -> super.isTransient() || isAnnotationPresent(Transient.class)
|| isAnnotationPresent(Value.class) || isAnnotationPresent(Autowired.class));
}
/**