Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-01 19:15:52 +01:00
Code Issues Packages Projects Releases Activity

Bring constant home

Browse Source
This commit is contained in:
René Pfeuffer
2018-11-23 15:52:21 +01:00
parent 3d671caada
commit 0f7e49d20f
6 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
scm-core/src/main/java/sonia/scm/repository/AbstractSimpleRepositoryHandler.java
View File

@@ -58,6 +58,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
public static final String DEFAULT_VERSION_INFORMATION = "unknown"; public static final String DEFAULT_VERSION_INFORMATION = "unknown";
public static final String DOT = "."; public static final String DOT = ".";
static final String REPOSITORIES_NATIVE_DIRECTORY = "data";
/** /**
* the logger for AbstractSimpleRepositoryHandler * the logger for AbstractSimpleRepositoryHandler
@@ -76,7 +77,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
@Override @Override
public Repository create(Repository repository) { public Repository create(Repository repository) {
File repositoryRootDirectory = repositoryLocationResolver.getRepositoryDirectory(repository); File repositoryRootDirectory = repositoryLocationResolver.getRepositoryDirectory(repository);
File nativeDirectory = new File(repositoryRootDirectory, RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY); File nativeDirectory = new File(repositoryRootDirectory, REPOSITORIES_NATIVE_DIRECTORY);
try { try {
create(repository, nativeDirectory); create(repository, nativeDirectory);
postCreate(repository, nativeDirectory); postCreate(repository, nativeDirectory);
@@ -114,7 +115,7 @@ public abstract class AbstractSimpleRepositoryHandler<C extends RepositoryConfig
public File getDirectory(Repository repository) { public File getDirectory(Repository repository) {
File directory; File directory;
if (isConfigured()) { if (isConfigured()) {
directory = new File(repositoryLocationResolver.getRepositoryDirectory(repository), RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY); directory = new File(repositoryLocationResolver.getRepositoryDirectory(repository), REPOSITORIES_NATIVE_DIRECTORY);
} else { } else {
throw new ConfigurationException("RepositoryHandler is not configured"); throw new ConfigurationException("RepositoryHandler is not configured");
} }

1
scm-core/src/main/java/sonia/scm/repository/RepositoryLocationResolver.java
View File

@@ -21,7 +21,6 @@ import java.io.File;
@Singleton @Singleton
public class RepositoryLocationResolver { public class RepositoryLocationResolver {
static final String REPOSITORIES_NATIVE_DIRECTORY = "data";
private RepositoryDAO repositoryDAO; private RepositoryDAO repositoryDAO;
private InitialRepositoryLocationResolver initialRepositoryLocationResolver; private InitialRepositoryLocationResolver initialRepositoryLocationResolver;

3
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/GitRepositoryHandlerTest.java
View File

@@ -37,7 +37,6 @@ import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.MockitoJUnitRunner;
import sonia.scm.io.DefaultFileSystem;
import sonia.scm.schedule.Scheduler; import sonia.scm.schedule.Scheduler;
import sonia.scm.store.ConfigurationStoreFactory; import sonia.scm.store.ConfigurationStoreFactory;
@@ -113,6 +112,6 @@ public class GitRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
initRepository(); initRepository();
File path = repositoryHandler.getDirectory(repository); File path = repositoryHandler.getDirectory(repository);
assertEquals(repoPath.toString() + File.separator + RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath()); assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
} }
} }

2
scm-plugins/scm-hg-plugin/src/test/java/sonia/scm/repository/HgRepositoryHandlerTest.java
View File

@@ -94,6 +94,6 @@ public class HgRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
initRepository(); initRepository();
File path = repositoryHandler.getDirectory(repository); File path = repositoryHandler.getDirectory(repository);
assertEquals(repoPath.toString() + File.separator + RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath()); assertEquals(repoPath.toString() + File.separator + AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
} }
} }

2
scm-plugins/scm-svn-plugin/src/test/java/sonia/scm/repository/SvnRepositoryHandlerTest.java
View File

@@ -116,6 +116,6 @@ public class SvnRepositoryHandlerTest extends SimpleRepositoryHandlerTestBase {
initRepository(); initRepository();
File path = repositoryHandler.getDirectory(repository); File path = repositoryHandler.getDirectory(repository);
assertEquals(repoPath.toString()+File.separator+ RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath()); assertEquals(repoPath.toString()+File.separator+ AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY, path.getAbsolutePath());
} }
} }

2
scm-test/src/main/java/sonia/scm/repository/SimpleRepositoryHandlerTestBase.java
View File

@@ -114,7 +114,7 @@ public abstract class SimpleRepositoryHandlerTestBase extends AbstractTestBase {
File repoDirectory = new File(baseDirectory, repository.getId()); File repoDirectory = new File(baseDirectory, repository.getId());
repoPath = repoDirectory.toPath(); repoPath = repoDirectory.toPath();
when(repoDao.getPath(repository)).thenReturn(repoPath); when(repoDao.getPath(repository)).thenReturn(repoPath);
return new File(repoDirectory, RepositoryLocationResolver.REPOSITORIES_NATIVE_DIRECTORY); return new File(repoDirectory, AbstractSimpleRepositoryHandler.REPOSITORIES_NATIVE_DIRECTORY);
} }
protected File baseDirectory; protected File baseDirectory;