From e1963d45dd196300abb6cb4d0337ad9e02d94d34 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Wed, 11 Jul 2018 12:03:04 +0200
Subject: [PATCH] Some polishing during review

---
 .../repository/AbstractSimpleRepositoryHandler.java   |  1 +
 .../resources/CollectionResourceManagerAdapter.java   |  5 +++--
 .../sonia/scm/api/v2/resources/PermissionDto.java     | 11 -----------
 .../v2/resources/RepositoryCollectionResource.java    |  5 ++---
 .../v2/resources/SingleResourceManagerAdapter.java    |  4 +++-
 .../api/v2/resources/GroupToGroupDtoMapperTest.java   |  1 +
 .../RepositoryToRepositoryDtoMapperTest.java          |  7 ++++---
 .../scm/api/v2/resources/UserRootResourceTest.java    |  2 +-
 .../scm/api/v2/resources/UserToUserDtoMapperTest.java |  1 +
 .../scm/repository/DefaultRepositoryManagerTest.java  |  4 ----
 10 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 100644 scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionDto.java

diff --git a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
index fb044a325c..b49d4355b9 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -143,6 +143,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends SimpleRepository
       }
 
       Throwables.propagateIfPossible(ex, RepositoryException.class);
+      // This point will never be reached
       return null;
     }
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
index 00f5f9914b..3169088331 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/CollectionResourceManagerAdapter.java
@@ -8,7 +8,6 @@ import sonia.scm.api.rest.resources.AbstractManagerResource;
 
 import javax.ws.rs.core.GenericEntity;
 import javax.ws.rs.core.Response;
-import java.io.IOException;
 import java.net.URI;
 import java.util.Collection;
 import java.util.function.Function;
@@ -17,13 +16,15 @@ import java.util.function.Supplier;
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 
 /**
- * Adapter from resource http endpoints to managers.
+ * Adapter from resource http endpoints to managers, for Collection resources (e.g. {@code /users}).
  *
  * Provides common CRUD operations and DTO to Model Object mapping to keep Resources more DRY.
  *
  * @param <MODEL_OBJECT> The type of the model object, eg. {@link sonia.scm.user.User}.
  * @param <DTO> The corresponding transport object, eg. {@link UserDto}.
  * @param <EXCEPTION> The exception type for the model object, eg. {@link sonia.scm.user.UserException}.
+ *
+ * @see SingleResourceManagerAdapter
  */
 @SuppressWarnings("squid:S00119") // "MODEL_OBJECT" is much more meaningful than "M", right?
 class CollectionResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionDto.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionDto.java
deleted file mode 100644
index 293a16dd17..0000000000
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionDto.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package sonia.scm.api.v2.resources;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter @Setter
-public class PermissionDto {
-  private String type;
-  private String name;
-  private boolean groupPermission;
-}
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
index 1a90e3cf8d..a1cf349abd 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryCollectionResource.java
@@ -19,7 +19,6 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.Response;
-import java.io.IOException;
 
 public class RepositoryCollectionResource {
 
@@ -39,7 +38,7 @@ public class RepositoryCollectionResource {
   @GET
   @Path("")
   @Produces(VndMediaType.REPOSITORY_COLLECTION)
-  @TypeHint(UserDto[].class)
+  @TypeHint(RepositoryDto[].class)
   @StatusCodes({
     @ResponseCode(code = 200, condition = "success"),
     @ResponseCode(code = 401, condition = "not authenticated / invalid credentials"),
@@ -66,7 +65,7 @@ public class RepositoryCollectionResource {
   })
   @TypeHint(TypeHint.NO_CONTENT.class)
   @ResponseHeaders(@ResponseHeader(name = "Location", description = "uri to the created repository"))
-  public Response create(RepositoryDto repositoryDto) throws IOException, RepositoryException {
+  public Response create(RepositoryDto repositoryDto) throws RepositoryException {
     return adapter.create(repositoryDto,
       () -> dtoToRepositoryMapper.map(repositoryDto, null),
       repository -> resourceLinks.repository().self(repository.getNamespace(), repository.getName()));
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
index 96c9d05d2c..6cd12c9dd6 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/SingleResourceManagerAdapter.java
@@ -15,13 +15,15 @@ import java.util.function.Supplier;
 import static javax.ws.rs.core.Response.Status.BAD_REQUEST;
 
 /**
- * Adapter from resource http endpoints to managers.
+ * Adapter from resource http endpoints to managers, for Single resources (e.g. {@code /user/name}).
  *
  * Provides common CRUD operations and DTO to Model Object mapping to keep Resources more DRY.
  *
  * @param <MODEL_OBJECT> The type of the model object, eg. {@link sonia.scm.user.User}.
  * @param <DTO> The corresponding transport object, eg. {@link UserDto}.
  * @param <EXCEPTION> The exception type for the model object, eg. {@link sonia.scm.user.UserException}.
+ *
+ * @see CollectionResourceManagerAdapter
  */
 @SuppressWarnings("squid:S00119") // "MODEL_OBJECT" is much more meaningful than "M", right?
 class SingleResourceManagerAdapter<MODEL_OBJECT extends ModelObject,
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java
index 831a4b7c2a..e519a9c3e5 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/GroupToGroupDtoMapperTest.java
@@ -23,6 +23,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
 public class GroupToGroupDtoMapperTest {
 
   private final URI baseUri = URI.create("http://example.com/base/");
+  @SuppressWarnings("unused") // Is injected
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
 
   @InjectMocks
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
index a90a8b1eca..fd41291d9d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapperTest.java
@@ -15,7 +15,7 @@ import sonia.scm.repository.Repository;
 
 import java.net.URI;
 
-import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.mockito.MockitoAnnotations.initMocks;
@@ -31,6 +31,7 @@ public class RepositoryToRepositoryDtoMapperTest {
   public final ShiroRule rule = new ShiroRule();
 
   private final URI baseUri = URI.create("http://example.com/base/");
+  @SuppressWarnings("unused") // Is injected
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
 
   @InjectMocks
@@ -140,8 +141,8 @@ public class RepositoryToRepositoryDtoMapperTest {
     repository.setContact("none@example.com");
     repository.setId("1");
     repository.setCreationDate(System.currentTimeMillis());
-    repository.setHealthCheckFailures(asList(new HealthCheckFailure("1", "summary", "url", "failure")));
-    repository.setPermissions(asList(new Permission("permission", PermissionType.READ)));
+    repository.setHealthCheckFailures(singletonList(new HealthCheckFailure("1", "summary", "url", "failure")));
+    repository.setPermissions(singletonList(new Permission("permission", PermissionType.READ)));
 
     return repository;
   }
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
index 7fb1ae5cdc..049d8ab1c8 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserRootResourceTest.java
@@ -64,7 +64,7 @@ public class UserRootResourceTest {
   private ArgumentCaptor<User> userCaptor = ArgumentCaptor.forClass(User.class);
 
   @Before
-  public void prepareEnvironment() throws IOException, UserException {
+  public void prepareEnvironment() throws UserException {
     initMocks(this);
     User dummyUser = createDummyUser("Neo");
     when(userManager.create(userCaptor.capture())).thenAnswer(invocation -> invocation.getArguments()[0]);
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
index 0ac980df45..330dd2a89e 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
@@ -23,6 +23,7 @@ import static org.mockito.MockitoAnnotations.initMocks;
 public class UserToUserDtoMapperTest {
 
   private final URI baseUri = URI.create("http://example.com/base/");
+  @SuppressWarnings("unused") // Is injected
   private final ResourceLinks resourceLinks = ResourceLinksMock.createMock(baseUri);
 
   @InjectMocks
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
index 0371b4974b..d057a97a84 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryManagerTest.java
@@ -93,10 +93,6 @@ import static org.mockito.Mockito.when;
 )
 public class DefaultRepositoryManagerTest extends ManagerTestBase<Repository, RepositoryException> {
 
-  {
-    ThreadContext.unbindSecurityManager();
-  }
-
   @Rule
   public ShiroRule shiro = new ShiroRule();