Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-05-06 10:06:21 +02:00
Code Issues Packages Projects Releases Activity

Replace public method with public constant

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-22 16:41:06 +01:00
parent 00e3cbec57
commit d329ca56f8
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scm-core/src/main/java/sonia/scm/repository/InitialRepositoryLocationResolver.java
View File

@@ -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();
}
}

4
scm-dao-xml/src/test/java/sonia/scm/repository/xml/XmlRepositoryDAOTest.java
View File

@@ -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");
}
}