From d6c812a4eb0918151bb7a0cfeb675276f0fdfef0 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 27 May 2019 17:09:24 +0200 Subject: [PATCH] #104 - Incorporate review feedback. Original pull request: #127. --- .../data/r2dbc/dialect/DialectResolver.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/springframework/data/r2dbc/dialect/DialectResolver.java b/src/main/java/org/springframework/data/r2dbc/dialect/DialectResolver.java index a48dc22..b8eb16c 100644 --- a/src/main/java/org/springframework/data/r2dbc/dialect/DialectResolver.java +++ b/src/main/java/org/springframework/data/r2dbc/dialect/DialectResolver.java @@ -25,6 +25,7 @@ import java.util.Optional; import org.springframework.core.io.support.SpringFactoriesLoader; import org.springframework.dao.NonTransientDataAccessException; +import org.springframework.data.util.Optionals; import org.springframework.util.LinkedCaseInsensitiveMap; /** @@ -55,9 +56,8 @@ public class DialectResolver { return DETECTORS.stream() // .map(it -> it.getDialect(connectionFactory)) // - .filter(Optional::isPresent) // + .flatMap(Optionals::toStream) // .findFirst() // - .flatMap(it -> it) // .orElseThrow(() -> { return new NoDialectException( String.format("Cannot determine a dialect for %s using %s. Please provide a Dialect.", @@ -127,13 +127,10 @@ public class DialectResolver { return Optional.of(r2dbcDialect); } - for (String key : BUILTIN.keySet()) { - if (metadata.getName().contains(key)) { - return Optional.of(BUILTIN.get(key)); - } - } - - return Optional.empty(); + return BUILTIN.keySet().stream() // + .filter(it -> metadata.getName().contains(it)) // + .map(BUILTIN::get) // + .findFirst(); } } }