From efc72b21ec9c0e3d444df7081abdcb01b0fef613 Mon Sep 17 00:00:00 2001 From: Philipp Czora Date: Thu, 9 Aug 2018 11:21:29 +0200 Subject: [PATCH] Minor changes due to review --- .../sonia/scm/repository/api/BranchesCommandBuilder.java | 4 ---- .../java/sonia/scm/api/v2/resources/BranchRootResource.java | 5 +---- .../java/sonia/scm/api/v2/resources/RepositoryResource.java | 1 - .../src/test/java/sonia/scm/security/BearerRealmTest.java | 2 -- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/api/BranchesCommandBuilder.java b/scm-core/src/main/java/sonia/scm/repository/api/BranchesCommandBuilder.java index 784c9534fd..5a456de936 100644 --- a/scm-core/src/main/java/sonia/scm/repository/api/BranchesCommandBuilder.java +++ b/scm-core/src/main/java/sonia/scm/repository/api/BranchesCommandBuilder.java @@ -29,11 +29,8 @@ * */ - package sonia.scm.repository.api; -//~--- non-JDK imports -------------------------------------------------------- - import com.google.common.base.Objects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +46,6 @@ import sonia.scm.repository.spi.BranchesCommand; import java.io.IOException; -//~--- JDK imports ------------------------------------------------------------ /** * The branches command list all repository branches.
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java index 293827b0cf..b06b5b9eba 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/BranchRootResource.java @@ -56,10 +56,8 @@ public class BranchRootResource { @ResponseCode(code = 500, condition = "internal server error") }) public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("branch") String branchName) throws IOException, RepositoryException { - System.out.println("in branch resource"); try (RepositoryService repositoryService = servicefactory.create(new NamespaceAndName(namespace, name))) { Branches branches = repositoryService.getBranchesCommand().getBranches(); - System.out.println("found branches: " + branches); return branches.getBranches() .stream() .filter(branch -> branchName.equals(branch.getName())) @@ -71,7 +69,6 @@ public class BranchRootResource { } catch (CommandNotSupportedException ex) { return Response.status(Response.Status.BAD_REQUEST).build(); } catch (RepositoryNotFoundException e) { - System.out.println("got RepositoryNotFoundException"); return Response.status(Response.Status.NOT_FOUND).build(); } } @@ -79,7 +76,7 @@ public class BranchRootResource { @Path("{branch}/changesets/") @GET public Response history(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("branch") String branchName) { - return null; + throw new UnsupportedOperationException(); } /** diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java index b4e427b9d5..43aa6de608 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryResource.java @@ -138,7 +138,6 @@ public class RepositoryResource { @Path("branches/") public BranchRootResource branches(@PathParam("namespace") String namespace, @PathParam("name") String name) { - System.out.println("got request for branches"); return branchRootResource.get(); } diff --git a/scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java b/scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java index 8176ed453c..e6061e61a1 100644 --- a/scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java +++ b/scm-webapp/src/test/java/sonia/scm/security/BearerRealmTest.java @@ -72,8 +72,6 @@ import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.any; import static org.mockito.Mockito.when; -//~--- JDK imports ------------------------------------------------------------ - /** * Unit tests for {@link BearerRealm}. *