From 62447139700a86bb61a7b9bedfb276c519a74957 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Mon, 3 Jun 2019 13:47:05 +0200
Subject: [PATCH] Move constant to interface

---
 .../scm/repository/AbstractSimpleRepositoryHandler.java      | 3 ---
 .../sonia/scm/repository/RepositoryDirectoryHandler.java     | 2 ++
 .../java/sonia/scm/repository/GitRepositoryHandlerTest.java  | 2 +-
 .../java/sonia/scm/repository/HgRepositoryHandlerTest.java   | 2 +-
 .../java/sonia/scm/repository/SvnRepositoryHandlerTest.java  | 2 +-
 .../scm/repository/SimpleRepositoryHandlerTestBase.java      | 2 +-
 .../sonia/scm/repository/update/CopyMigrationStrategy.java   | 4 ++--
 .../sonia/scm/repository/update/InlineMigrationStrategy.java | 5 ++---
 .../sonia/scm/repository/update/MoveMigrationStrategy.java   | 4 ++--
 9 files changed, 12 insertions(+), 14 deletions(-)

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 1335001cdc..62dfd476af 100644
--- a/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
@@ -59,9 +59,6 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
 
   public static final String DEFAULT_VERSION_INFORMATION = "unknown";
 
-  public static final String DOT = ".";
-  public static final String REPOSITORIES_NATIVE_DIRECTORY = "data";
-
   /**
    * the logger for AbstractSimpleRepositoryHandler
    */
diff --git a/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java b/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
index fd8e8a25f3..837aaa496b 100644
--- a/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
+++ b/scm-core/src/main/java/sonia/scm/repository/RepositoryDirectoryHandler.java
@@ -42,6 +42,8 @@ import java.io.File;
  */
 public interface RepositoryDirectoryHandler extends RepositoryHandler {
 
+  String REPOSITORIES_NATIVE_DIRECTORY = "data";
+
   /**
    * Get the current directory of the repository for the given id.
    * @return the current directory of the given repository
diff --git a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
index 66ec320067..2f5a8c4984 100644
--- a/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
+++ b/scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
@@ -117,6 +117,6 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
 
     initRepository();
     File path = repositoryHandler.getDirectory(repository.getId());
-    assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
+    assertEquals(repoPath.toString() + File.separator + RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
index c3b66525f9..c2ed5af42e 100644
--- a/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
+++ b/scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
@@ -96,6 +96,6 @@ public class HgRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
 
     initRepository();
     File path = repositoryHandler.getDirectory(repository.getId());
-    assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
+    assertEquals(repoPath.toString() + File.separator + RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
index c81c6311e1..932ff007e0 100644
--- a/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
+++ b/scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
@@ -112,6 +112,6 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
 
     initRepository();
     File path = repositoryHandler.getDirectory(repository.getId());
-    assertEquals(repoPath.toString()+File.separator+ AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
+    assertEquals(repoPath.toString()+File.separator+ RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
   }
 }
diff --git a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
index 000835156a..063681bbc4 100644
--- a/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
+++ b/scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
@@ -113,7 +113,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
     File repoDirectory = new File(baseDirectory, repository.getId());
     repoPath = repoDirectory.toPath();
 //    when(repoDao.getPath(repository.getId())).thenReturn(repoPath);
-    return new File(repoDirectory, AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
+    return new File(repoDirectory, RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
   }
 
   protected File baseDirectory;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java
index 84835543e0..c5550b29af 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/update/CopyMigrationStrategy.java
@@ -1,7 +1,7 @@
 package sonia.scm.repository.update;
 
 import sonia.scm.SCMContextProvider;
-import sonia.scm.repository.AbstractSimpleRepositoryHandler;
+import sonia.scm.repository.RepositoryDirectoryHandler;
 import sonia.scm.repository.RepositoryLocationResolver;
 
 import javax.inject.Inject;
@@ -22,7 +22,7 @@ class CopyMigrationStrategy extends BaseMigrationStrategy {
   public Path migrate(String id, String name, String type) {
     Path repositoryBasePath = locationResolver.forClass(Path.class).getLocation(id);
     Path targetDataPath = repositoryBasePath
-      .resolve(AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
+      .resolve(RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
     Path sourceDataPath = getSourceDataPath(name, type);
     copyData(sourceDataPath, targetDataPath);
     return repositoryBasePath;
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java
index dc4fdb067d..ace6a63ab8 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/update/InlineMigrationStrategy.java
@@ -1,10 +1,9 @@
 package sonia.scm.repository.update;
 
 import sonia.scm.SCMContextProvider;
-import sonia.scm.repository.AbstractSimpleRepositoryHandler;
+import sonia.scm.repository.RepositoryDirectoryHandler;
 
 import javax.inject.Inject;
-import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -19,7 +18,7 @@ class InlineMigrationStrategy extends BaseMigrationStrategy {
   public Path migrate(String id, String name, String type) {
     Path repositoryBasePath = getSourceDataPath(name, type);
     Path targetDataPath = repositoryBasePath
-      .resolve(AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
+      .resolve(RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
     moveData(repositoryBasePath, targetDataPath);
     return repositoryBasePath;
   }
diff --git a/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java b/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java
index e0abc7ad9b..e42d4138bb 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/update/MoveMigrationStrategy.java
@@ -3,7 +3,7 @@ package sonia.scm.repository.update;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.SCMContextProvider;
-import sonia.scm.repository.AbstractSimpleRepositoryHandler;
+import sonia.scm.repository.RepositoryDirectoryHandler;
 import sonia.scm.repository.RepositoryLocationResolver;
 
 import javax.inject.Inject;
@@ -30,7 +30,7 @@ class MoveMigrationStrategy extends BaseMigrationStrategy {
   public Path migrate(String id, String name, String type) {
     Path repositoryBasePath = locationResolver.forClass(Path.class).getLocation(id);
     Path targetDataPath = repositoryBasePath
-      .resolve(AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
+      .resolve(RepositoryDirectoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
     Path sourceDataPath = getSourceDataPath(name, type);
     moveData(sourceDataPath, targetDataPath);
     deleteOldDataDir(getTypeDependentPath(type), name);