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

DATACMNS-867 - Let lookups for a property's component and map value type use Optional.

Browse Source
This commit is contained in:
Oliver Gierke
2017-03-21 18:56:41 +01:00
parent 1c45fcfcdc
commit 7c33bcf98a
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/springframework/data/mapping/PersistentProperty.java
View File

@@ -171,10 +171,10 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
* Returns the component type of the type if it is a {@link java.util.Collection}. Will return the type of the key if
* the property is a {@link java.util.Map}.
*
* @return the component type, the map's key type or {@literal null} if neither {@link java.util.Collection} nor
* {@link java.util.Map}.
* @return the component type, the map's key type or {@link Optional#empty()} if neither {@link java.util.Collection}
* nor {@link java.util.Map}.
*/
Class<?> getComponentType();
Optional<Class<?>> getComponentType();
/**
* Returns the raw type as it's pulled from from the reflected property.
@@ -186,9 +186,9 @@ public interface PersistentProperty<P extends PersistentProperty<P>> {
/**
* Returns the type of the values if the property is a {@link java.util.Map}.
*
* @return the map's value type or {@literal null} if no {@link java.util.Map}
* @return the map's value type or {@link Optional#empty()} if no {@link java.util.Map}
*/
Class<?> getMapValueType();
Optional<Class<?>> getMapValueType();
/**
* Returns the actual type of the property. This will be the original property type if no generics were used, the

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

@@ -250,13 +250,13 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
* @see org.springframework.data.mapping.PersistentProperty#getComponentType()
*/
@Override
public Class<?> getComponentType() {
public Optional<Class<?>> getComponentType() {
if (!isMap() && !isCollectionLike()) {
return null;
return Optional.empty();
}
return information.getRequiredComponentType().getType();
return Optional.of(information.getRequiredComponentType().getType());
}
/*
@@ -264,8 +264,8 @@ public abstract class AbstractPersistentProperty<P extends PersistentProperty<P>
* @see org.springframework.data.mapping.PersistentProperty#getMapValueType()
*/
@Override
public Class<?> getMapValueType() {
return isMap() ? information.getMapValueType().map(TypeInformation::getType).orElse(null) : null;
public Optional<Class<?>> getMapValueType() {
return isMap() ? information.getMapValueType().map(TypeInformation::getType) : Optional.empty();
}
/*