diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java index 8b6cb8f..5da4433 100644 --- a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java +++ b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java @@ -603,7 +603,7 @@ public class GitOperations { checkout(project, branch); } catch (RuntimeException o_O) { - logger.log(project, "Couldn't check out branch %s. Skipping cherrypick of commit %s.", branch, id.getName()); + logger.warn(project, "Couldn't check out branch %s. Skipping cherrypick of commit %s.", branch, id.getName()); return; } diff --git a/release-tools/src/main/java/org/springframework/data/release/utils/ExecutionUtils.java b/release-tools/src/main/java/org/springframework/data/release/utils/ExecutionUtils.java index 4356637..29f7ce6 100644 --- a/release-tools/src/main/java/org/springframework/data/release/utils/ExecutionUtils.java +++ b/release-tools/src/main/java/org/springframework/data/release/utils/ExecutionUtils.java @@ -18,6 +18,7 @@ package org.springframework.data.release.utils; import lombok.extern.slf4j.Slf4j; import java.util.Collection; +import java.util.Objects; import java.util.concurrent.CompletableFuture; import java.util.function.Function; import java.util.stream.Collector; @@ -28,7 +29,7 @@ import org.springframework.util.Assert; /** * Utility method to easily execute functionality in parallel. - * + * * @author Oliver Gierke */ @Slf4j @@ -38,7 +39,7 @@ public class ExecutionUtils { * Runs the given {@link ConsumerWithException} for each element in the given {@link Iterable} in parallel waiting for * all executions to complete before returning. Exceptions being thrown in the {@link ConsumerWithException} will be * converted into {@link RuntimeException}s. - * + * * @param streamable must not be {@literal null}. * @param consumer must not be {@literal null}. */ @@ -55,13 +56,13 @@ public class ExecutionUtils { log.error(o_O.getMessage(), o_O); throw new RuntimeException(o_O); } - })).collect(Collectors.toList()).forEach(future -> future.join()); + })).collect(Collectors.toList()).forEach(CompletableFuture::join); } /** * Runs the given {@link Function} for each element in the given {@link Streamable} in parallel waiting for all * executions to complete before returning the results. - * + * * @param streamable must not be {@literal null}. * @param function must not be {@literal null}. * @return @@ -78,10 +79,10 @@ public class ExecutionUtils { return streamable.stream().// map(it -> CompletableFuture.supplyAsync(() -> function.apply(it))).// - filter(it -> it != null).// + filter(Objects::nonNull).// collect(Collectors.toList()).// stream().// - map(future -> future.join()).// + map(CompletableFuture::join).// collect(collector); } diff --git a/release-tools/src/main/java/org/springframework/data/release/utils/Logger.java b/release-tools/src/main/java/org/springframework/data/release/utils/Logger.java index 90f449a..6e90fe4 100644 --- a/release-tools/src/main/java/org/springframework/data/release/utils/Logger.java +++ b/release-tools/src/main/java/org/springframework/data/release/utils/Logger.java @@ -54,19 +54,19 @@ public class Logger { } public void warn(ModuleIteration module, Object template, Object... args) { - log(module.getProject(), template, args); + warn(module.getProject(), template, args); } public void warn(Project project, Object template, Object... args) { - log(project.getName(), template, args); + warn(project.getName(), template, args); } public void warn(TrainIteration iteration, Object template, Object... args) { - log(iteration.toString(), template, args); + warn(iteration.toString(), template, args); } public void warn(Train train, Object template, Object... args) { - log(train.getName(), template, args); + warn(train.getName(), template, args); } public void warn(String context, Object template, Object... args) {