From d329ca56f80b1de5009142e917ab396c0be6c7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= Date: Thu, 22 Nov 2018 16:41:06 +0100 Subject: [PATCH] Replace public method with public constant --- .../scm/repository/InitialRepositoryLocationResolver.java | 8 ++------ .../sonia/scm/repository/xml/XmlRepositoryDAOTest.java | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java b/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java index d5b80cb130..10eb3242d9 100644 --- a/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java +++ b/scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java @@ -21,7 +21,7 @@ import java.io.IOException; */ public class InitialRepositoryLocationResolver { - private static final String DEFAULT_REPOSITORY_PATH = "repositories"; + public static final String DEFAULT_REPOSITORY_PATH = "repositories"; public static final String REPOSITORIES_NATIVE_DIRECTORY = "data"; private SCMContextProvider context; private FileSystem fileSystem; @@ -49,10 +49,6 @@ public class InitialRepositoryLocationResolver { } public String getRelativeRepositoryPath(Repository repository) { - return getDefaultRepositoryPath() + File.separator + repository.getId(); - } - - public String getDefaultRepositoryPath() { - return DEFAULT_REPOSITORY_PATH; + return DEFAULT_REPOSITORY_PATH + File.separator + repository.getId(); } } diff --git a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java index 3cabf4b4bd..e0e2a39bdd 100644 --- a/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java +++ b/scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java @@ -55,7 +55,7 @@ public class XmlRepositoryDAOTest { verify(db).add(argThat(repositoryPath -> { assertThat(repositoryPath.getId()).isEqualTo("id"); - assertThat(repositoryPath.getPath()).isEqualTo(initialRepositoryLocationResolver.getDefaultRepositoryPath() + "/id"); + assertThat(repositoryPath.getPath()).isEqualTo(InitialRepositoryLocationResolver.DEFAULT_REPOSITORY_PATH + "/id"); return true; })); verify(store).set(db); @@ -112,6 +112,6 @@ public class XmlRepositoryDAOTest { Repository newRepository = new Repository("id", "new", null, null); Path path = dao.getPath(newRepository); - assertThat(path.toString()).isEqualTo(context.getBaseDirectory().getPath() + "/" + initialRepositoryLocationResolver.getDefaultRepositoryPath() + "/id"); + assertThat(path.toString()).isEqualTo(context.getBaseDirectory().getPath() + "/" + InitialRepositoryLocationResolver.DEFAULT_REPOSITORY_PATH + "/id"); } }