From ecb14eb380d4e59433a225b76625476dd06f96f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 24 Feb 2022 08:59:06 +0100 Subject: [PATCH] Fix branch overview page (#1963) --- gradle/changelog/branch_overview.yaml | 2 ++ .../sonia/scm/api/v2/resources/BranchDetailsResource.java | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 gradle/changelog/branch_overview.yaml diff --git a/gradle/changelog/branch_overview.yaml b/gradle/changelog/branch_overview.yaml new file mode 100644 index 0000000000..1efe5a1355 --- /dev/null +++ b/gradle/changelog/branch_overview.yaml @@ -0,0 +1,2 @@ +- type: fixed + description: Branch decoding in overview ([#1963](https://github.com/scm-manager/scm-manager/pull/1963)) diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDetailsResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDetailsResource.java index 8b873adcd3..f9539c17e8 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDetailsResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchDetailsResource.java @@ -169,7 +169,7 @@ public class BranchDetailsResource { @QueryParam("branches") List<@Length(min = 1, max = 100) @Pattern(regexp = VALID_BRANCH_NAMES) String> branches ) { try (RepositoryService service = serviceFactory.create(new NamespaceAndName(namespace, name))) { - List dtos = getBranchDetailsDtos(service, decodeBranchNames(branches)); + List dtos = getBranchDetailsDtos(service, branches); Links links = Links.linkingTo().self(resourceLinks.branchDetailsCollection().self(namespace, name)).build(); Embedded embedded = Embedded.embeddedBuilder().with("branchDetails", dtos).build(); @@ -194,8 +194,4 @@ public class BranchDetailsResource { } return dtos; } - - private Collection decodeBranchNames(Collection branches) { - return branches.stream().map(HttpUtil::decode).collect(Collectors.toList()); - } }