From 37ea231340c62307fafe1358b4af24b2f6aad18c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Fri, 14 Sep 2018 12:11:07 +0200
Subject: [PATCH] Cleanup smells

---
 .../sonia/scm/repository/RepositoryNotFoundException.java | 8 ++++----
 .../java/sonia/scm/repository/api/RepositoryService.java  | 2 +-
 .../spi/InitializingHttpScmProtocolWrapper.java           | 6 +++---
 .../api/v2/resources/RepositoryToRepositoryDtoMapper.java | 6 ++----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
index 1208596348..9dd866daa4 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
@@ -44,8 +44,8 @@ import sonia.scm.NotFoundException;
 public class RepositoryNotFoundException extends NotFoundException
 {
 
-  /** Field description */
   private static final long serialVersionUID = -6583078808900520166L;
+  private static final String TYPE_REPOSITORY = "repository";
 
   //~--- constructors ---------------------------------------------------------
 
@@ -55,14 +55,14 @@ public class RepositoryNotFoundException extends NotFoundException
    *
    */
   public RepositoryNotFoundException(Repository repository) {
-    super("repository", repository.getName() + "/"  + repository.getNamespace());
+    super(TYPE_REPOSITORY, repository.getName() + "/"  + repository.getNamespace());
   }
 
   public RepositoryNotFoundException(String repositoryId) {
-    super("repository", repositoryId);
+    super(TYPE_REPOSITORY, repositoryId);
   }
 
   public RepositoryNotFoundException(NamespaceAndName namespaceAndName) {
-    super("repository", namespaceAndName.toString());
+    super(TYPE_REPOSITORY, namespaceAndName.toString());
   }
 }
diff --git a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
index b9e1cb2a5d..452203dd09 100644
--- a/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
+++ b/scm-core/src/main/java/sonia/scm/repository/api/RepositoryService.java
@@ -363,7 +363,7 @@ public final class RepositoryService implements Closeable {
 
   public Stream<ScmProtocol> getSupportedProtocols() {
     return protocolProviders.stream()
-      .filter(provider -> provider.getType().equals(getRepository().getType()))
+      .filter(protocolProvider -> protocolProvider.getType().equals(getRepository().getType()))
       .map(this::createProviderInstanceForRepository);
   }
 
diff --git a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
index 69ff0a83f5..0a94b1e6bf 100644
--- a/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
+++ b/scm-core/src/main/java/sonia/scm/repository/spi/InitializingHttpScmProtocolWrapper.java
@@ -44,7 +44,7 @@ public abstract class InitializingHttpScmProtocolWrapper implements ScmProtocolP
     if (!repository.getType().equals(getType())) {
       throw new IllegalArgumentException("cannot handle repository with type " + repository.getType() + " with protocol for type " + getType());
     }
-    return new ProtocolWrapper(repository);
+    return new ProtocolWrapper(repository, computeBasePath());
   }
 
   private String computeBasePath() {
@@ -70,8 +70,8 @@ public abstract class InitializingHttpScmProtocolWrapper implements ScmProtocolP
 
   private class ProtocolWrapper extends HttpScmProtocol {
 
-    public ProtocolWrapper(Repository repository) {
-      super(repository, computeBasePath());
+    public ProtocolWrapper(Repository repository, String basePath) {
+      super(repository, basePath);
     }
 
     @Override
diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
index 6675caac88..29a4107aad 100644
--- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
+++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/RepositoryToRepositoryDtoMapper.java
@@ -29,8 +29,6 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
   private ResourceLinks resourceLinks;
   @Inject
   private RepositoryServiceFactory serviceFactory;
-  @Inject
-  private ScmPathInfoStore scmPathInfoStore;
 
   abstract HealthCheckFailureDto toDto(HealthCheckFailure failure);
 
@@ -47,7 +45,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
     try (RepositoryService repositoryService = serviceFactory.create(repository)) {
       if (RepositoryPermissions.pull(repository).isPermitted()) {
         List<Link> protocolLinks = repositoryService.getSupportedProtocols()
-          .map(protocol -> createProtocolLink(protocol, repository))
+          .map(this::createProtocolLink)
           .collect(toList());
         linksBuilder.array(protocolLinks);
       }
@@ -63,7 +61,7 @@ public abstract class RepositoryToRepositoryDtoMapper extends BaseMapper<Reposit
     target.add(linksBuilder.build());
   }
 
-  private Link createProtocolLink(ScmProtocol protocol, Repository repository) {
+  private Link createProtocolLink(ScmProtocol protocol) {
     return Link.linkBuilder("protocol", protocol.getUrl()).withName(protocol.getType()).build();
   }
 }