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

#1901 - Use Optional.or(…) instead of custom method in PropertyUtils.

Browse Source
This commit is contained in:
Oliver Drotbohm
2023-02-15 10:29:21 +01:00
parent 14036b1523
commit c550f8ccef
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/springframework/hateoas/mediatype/PropertyUtils.java
View File

@@ -331,7 +331,6 @@ public class PropertyUtils {
*
* @param property must not be {@literal null}.
*/
@SuppressWarnings("unchecked")
public AnnotatedProperty(Property property) {
Assert.notNull(property, "Property must not be null!");
@@ -340,10 +339,10 @@ public class PropertyUtils {
Field field = ReflectionUtils.findField(property.getObjectType(), property.getName());
this.type = firstNonEmpty( //
() -> Optional.ofNullable(property.getReadMethod()).map(ResolvableType::forMethodReturnType), //
() -> Optional.ofNullable(property.getWriteMethod()).map(it -> ResolvableType.forMethodParameter(it, 0)), //
() -> Optional.ofNullable(field).map(ResolvableType::forField));
this.type = Optional.ofNullable(property.getReadMethod()).map(ResolvableType::forMethodReturnType)
.or(() -> Optional.ofNullable(property.getWriteMethod()).map(it -> ResolvableType.forMethodParameter(it, 0))) //
.or(() -> Optional.ofNullable(field).map(ResolvableType::forField))
.orElseThrow(() -> new IllegalStateException("Could not resolve value!"));
this.annotations = Stream.of(property.getReadMethod(), property.getWriteMethod(), field) //
.filter(it -> it != null) //
@@ -353,17 +352,6 @@ public class PropertyUtils {
this.typeAnnotations = MergedAnnotations.from(this.type.resolve(Object.class));
}
@SuppressWarnings("unchecked")
private static <T> T firstNonEmpty(Supplier<Optional<T>>... suppliers) {
Assert.notNull(suppliers, "Suppliers must not be null!");
return Stream.of(suppliers) //
.map(Supplier::get).flatMap(it -> it.map(Stream::of).orElseGet(Stream::empty)) //
.findFirst() //
.orElseThrow(() -> new IllegalStateException("Could not resolve value!"));
}
/**
* Returns the name of the property.
*