From 96233997b453d8ddea830faed53e71bc71f3256b Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Wed, 4 Nov 2020 09:27:16 +0100 Subject: [PATCH] change SvnLookupCommand implementation to match the svn lookup api --- .../java/sonia/scm/repository/spi/SvnLookupCommand.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java index 336950e8cb..14119cd851 100644 --- a/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java +++ b/scm-plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/spi/SvnLookupCommand.java @@ -28,7 +28,6 @@ import lombok.extern.slf4j.Slf4j; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.io.SVNRepository; -import java.util.Arrays; import java.util.Optional; @Slf4j @@ -41,7 +40,7 @@ public class SvnLookupCommand extends AbstractSvnCommand implements LookupComman @Override public Optional lookup(LookupCommandRequest request) { try { - if (requestContainsArg(request, "props")) { + if ("propget".equalsIgnoreCase(request.getArgs()[0])) { return lookupProps(request); } } catch (SVNException e) { @@ -52,15 +51,11 @@ public class SvnLookupCommand extends AbstractSvnCommand implements LookupComman } private Optional lookupProps(LookupCommandRequest request) throws SVNException { - if (requestContainsArg(request, "uuid")) { + if (request.getArgs()[1].equalsIgnoreCase("uuid")) { SVNRepository repository = context.open(); return Optional.of((T) repository.getRepositoryUUID(true)); } log.debug("No result found on lookup"); return Optional.empty(); } - - private boolean requestContainsArg(LookupCommandRequest request, String props) { - return Arrays.stream(request.getArgs()).anyMatch(a -> a.equalsIgnoreCase(props)); - } }