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

Use namespace strategy to set new namespace

Browse Source
This commit is contained in:
René Pfeuffer
2020-07-01 20:25:36 +02:00
parent 3e0638f852
commit 5baf3bd9c0
2 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
View File

@@ -246,11 +246,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
public Repository rename(Repository repository, String newNamespace, String newName) {
if (!configuration.getNamespaceStrategy().equals("CustomNamespaceStrategy")
&& !repository.getNamespace().equals(newNamespace)) {
throw new ChangeNamespaceNotAllowedException(repository);
}
if (hasNamespaceOrNameNotChanged(repository, newNamespace, newName)) {
throw new NoChangesMadeException(repository);
}
@@ -259,8 +254,13 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
if (!Strings.isNullOrEmpty(newName)) {
changedRepository.setName(newName);
}
if (!Strings.isNullOrEmpty(newNamespace)) {
changedRepository.setNamespace(newNamespace);
if (!Strings.isNullOrEmpty(newNamespace) && !repository.getNamespace().equals(newNamespace)) {
NamespaceStrategy strategy = namespaceStrategyProvider.get();
if (!strategy.canBeChanged()) {
throw new ChangeNamespaceNotAllowedException(repository);
}
changedRepository.setNamespace(strategy.createNamespace(changedRepository));
}
managerDaoAdapter.modify(