diff --git a/src/main/java/org/springframework/data/auditing/AuditingHandler.java b/src/main/java/org/springframework/data/auditing/AuditingHandler.java index 3898ab848..78abe4981 100644 --- a/src/main/java/org/springframework/data/auditing/AuditingHandler.java +++ b/src/main/java/org/springframework/data/auditing/AuditingHandler.java @@ -195,8 +195,8 @@ public class AuditingHandler implements InitializingBean { Assert.notNull(auditor, () -> String.format("Auditor must not be null! Returned by: %s!", AopUtils.getTargetClass(it))); - auditor.filter(__ -> isNew).ifPresent(foo -> wrapper.setCreatedBy(foo)); - auditor.filter(__ -> !isNew || modifyOnCreation).ifPresent(foo -> wrapper.setLastModifiedBy(foo)); + auditor.filter(__ -> isNew).ifPresent(wrapper::setCreatedBy); + auditor.filter(__ -> !isNew || modifyOnCreation).ifPresent(wrapper::setLastModifiedBy); return auditor; }); @@ -216,8 +216,8 @@ public class AuditingHandler implements InitializingBean { Assert.notNull(now, () -> String.format("Now must not be null! Returned by: %s!", dateTimeProvider.getClass())); - now.filter(__ -> isNew).ifPresent(it -> wrapper.setCreatedDate(it)); - now.filter(__ -> !isNew || modifyOnCreation).ifPresent(it -> wrapper.setLastModifiedDate(it)); + now.filter(__ -> isNew).ifPresent(wrapper::setCreatedDate); + now.filter(__ -> !isNew || modifyOnCreation).ifPresent(wrapper::setLastModifiedDate); return now; } diff --git a/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java b/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java index e624df8f8..56cfed394 100644 --- a/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java +++ b/src/main/java/org/springframework/data/mapping/context/PersistentEntities.java @@ -198,9 +198,9 @@ public class PersistentEntities implements Streamable> entities = contexts.stream() // .flatMap(it -> it.getPersistentEntities().stream()) // - .map(it -> it.getIdProperty()) // + .map(PersistentEntity::getIdProperty) // .filter(it -> it != null && type.equals(it.getTypeInformation().getActualType())) // - .map(it -> it.getOwner()) // + .map(PersistentProperty::getOwner) // .collect(Collectors.toList()); if (entities.size() > 1) { diff --git a/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java b/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java index ebca55677..9ffcfb886 100644 --- a/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java +++ b/src/main/java/org/springframework/data/mapping/context/PersistentPropertyPathFactory.java @@ -47,7 +47,7 @@ import org.springframework.util.StringUtils; */ class PersistentPropertyPathFactory, P extends PersistentProperty

> { - private static final Predicate>> IS_ENTITY = it -> it.isEntity(); + private static final Predicate>> IS_ENTITY = PersistentProperty::isEntity; private final Map> propertyPaths = new ConcurrentReferenceHashMap<>(); private final MappingContext context; diff --git a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java index 9c4b86d78..4999956eb 100644 --- a/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java +++ b/src/main/java/org/springframework/data/mapping/model/AnnotationBasedPersistentProperty.java @@ -310,7 +310,7 @@ public abstract class AnnotationBasedPersistentProperty

Optionals.toStream(it)) // + .flatMap(Optionals::toStream) // .map(Object::toString) // .collect(Collectors.joining(" ")); diff --git a/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java b/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java index fca7f7827..89639b38f 100644 --- a/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java +++ b/src/main/java/org/springframework/data/mapping/model/MappingInstantiationException.java @@ -92,7 +92,7 @@ public class MappingInstantiationException extends RuntimeException { } return String.format(TEXT_TEMPLATE, it.getType().getName(), - constructor.map(c -> toString(c)).orElse("NO_CONSTRUCTOR"), // + constructor.map(MappingInstantiationException::toString).orElse("NO_CONSTRUCTOR"), // String.join(",", toStringArgs)); }).orElse(defaultMessage); diff --git a/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java b/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java index 3a8a9a181..481f2df21 100644 --- a/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java +++ b/src/main/java/org/springframework/data/repository/core/support/DefaultCrudMethods.java @@ -176,8 +176,8 @@ public class DefaultCrudMethods implements CrudMethods { private static Optional getMostSpecificMethod(Method method, Class type) { return Optionals.toStream(Optional.ofNullable(ClassUtils.getMostSpecificMethod(method, type)))// - .map(it -> BridgeMethodResolver.findBridgedMethod(it))// - .peek(it -> ReflectionUtils.makeAccessible(it))// + .map(BridgeMethodResolver::findBridgedMethod)// + .peek(ReflectionUtils::makeAccessible)// .findFirst(); } diff --git a/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java b/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java index 633832224..112252c3a 100644 --- a/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java +++ b/src/main/java/org/springframework/data/repository/query/SpelEvaluator.java @@ -16,6 +16,7 @@ package org.springframework.data.repository.query; import java.util.Map; +import java.util.Map.Entry; import java.util.stream.Collectors; import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor; @@ -62,7 +63,7 @@ public class SpelEvaluator { EvaluationContext evaluationContext = evaluationContextProvider.getEvaluationContext(parameters, values); return extractor.getParameters().collect(Collectors.toMap(// - it -> it.getKey(), // + Entry::getKey, // it -> getSpElValue(evaluationContext, it.getValue()) // )); } diff --git a/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java b/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java index bb01ff201..30cb12d03 100644 --- a/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java +++ b/src/main/java/org/springframework/data/spel/EvaluationContextExtensionInformation.java @@ -250,7 +250,7 @@ class EvaluationContextExtensionInformation { * @return the methods */ public MultiValueMap getFunctions(Optional target) { - return target.map(this::getFunctions).orElseGet(() -> new LinkedMultiValueMap<>()); + return target.map(this::getFunctions).orElseGet(LinkedMultiValueMap::new); } private MultiValueMap getFunctions(Object target) { diff --git a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java index 6c94a263a..804351a64 100644 --- a/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java +++ b/src/main/java/org/springframework/data/web/PagedResourcesAssembler.java @@ -94,7 +94,7 @@ public class PagedResourcesAssembler implements RepresentationModelAssembler< @Override @SuppressWarnings("null") public PagedModel> toModel(Page entity) { - return toModel(entity, it -> EntityModel.of(it)); + return toModel(entity, EntityModel::of); } /** @@ -107,7 +107,7 @@ public class PagedResourcesAssembler implements RepresentationModelAssembler< * @return */ public PagedModel> toModel(Page page, Link selfLink) { - return toModel(page, it -> EntityModel.of(it), selfLink); + return toModel(page, EntityModel::of, selfLink); } /** @@ -230,7 +230,7 @@ public class PagedResourcesAssembler implements RepresentationModelAssembler< resources.add(createLink(base, page.previousPageable(), IanaLinkRelations.PREV)); } - Link selfLink = link.map(it -> it.withSelfRel())// + Link selfLink = link.map(Link::withSelfRel)// .orElseGet(() -> createLink(base, page.getPageable(), IanaLinkRelations.SELF)); resources.add(selfLink); diff --git a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java index 0c7ee695f..9e2a4acc8 100644 --- a/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java +++ b/src/main/java/org/springframework/data/web/config/SpringDataWebConfiguration.java @@ -169,7 +169,7 @@ public class SpringDataWebConfiguration implements WebMvcConfigurer, BeanClassLo if (ClassUtils.isPresent("org.xmlbeam.XBProjector", context.getClassLoader())) { converters.add(0, context.getBeanProvider(XmlBeamHttpMessageConverter.class) // - .getIfAvailable(() -> new XmlBeamHttpMessageConverter())); + .getIfAvailable(XmlBeamHttpMessageConverter::new)); } }