From 88d4490da91712a373399285bff68ec4ebe48f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Tue, 2 Jun 2020 17:04:47 +0200 Subject: [PATCH] Remove wrong last line break from commit message --- .../DefaultChangesetToChangesetDtoMapper.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java index 7cb5009246..3a7262362c 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/DefaultChangesetToChangesetDtoMapper.java @@ -49,7 +49,6 @@ import java.util.List; import java.util.Scanner; import java.util.Set; import java.util.function.Function; -import java.util.regex.Pattern; import java.util.stream.Collectors; import static de.otto.edison.hal.Embedded.embeddedBuilder; @@ -95,11 +94,13 @@ public abstract class DefaultChangesetToChangesetDtoMapper extends HalAppenderMa void removeTrailerFromChangesetDescription(@MappingTarget ChangesetDto target) { StringBuilder builder = new StringBuilder(); try (Scanner scanner = new Scanner(target.getDescription())) { - scanner.useDelimiter(Pattern.compile("[\\n]")); - while (scanner.hasNext()) { - String line = scanner.next(); + while (scanner.hasNextLine()) { + String line = scanner.nextLine(); if (!line.contains("-by:")) { - builder.append(line).append("\n"); + builder.append(line); + if (scanner.hasNextLine()) { + builder.append("\n"); + } } } }