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

Correct usage of RepositoryNotFoundException

Browse Source
This commit is contained in:
René Pfeuffer
2018-09-10 08:36:05 +02:00
parent eff51c3b37
commit 9198cac0a5
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-core/src/main/java/sonia/scm/repository/RepositoryNotFoundException.java
View File

@@ -61,4 +61,8 @@ public class RepositoryNotFoundException extends NotFoundException
public RepositoryNotFoundException(String repositoryId) {
super("repository", repositoryId);
}
public RepositoryNotFoundException(NamespaceAndName namespaceAndName) {
super("repository", namespaceAndName.toString());
}
}

4
scm-core/src/main/java/sonia/scm/repository/api/RepositoryServiceFactory.java
View File

@@ -208,9 +208,7 @@ public final class RepositoryServiceFactory
if (repository == null)
{
String msg = "could not find a repository with namespace/name " + namespaceAndName;
throw new RepositoryNotFoundException(msg);
throw new RepositoryNotFoundException(namespaceAndName);
}
return create(repository);

5
scm-webapp/src/main/java/sonia/scm/api/v2/resources/PermissionRootResource.java
View File

@@ -210,8 +210,9 @@ public class PermissionRootResource {
* @throws RepositoryNotFoundException if the repository does not exists
*/
private Repository load(String namespace, String name) throws RepositoryNotFoundException {
return Optional.ofNullable(manager.get(new NamespaceAndName(namespace, name)))
.orElseThrow(() -> new RepositoryNotFoundException(name));
NamespaceAndName namespaceAndName = new NamespaceAndName(namespace, name);
return Optional.ofNullable(manager.get(namespaceAndName))
.orElseThrow(() -> new RepositoryNotFoundException(namespaceAndName));
}
/**

3
scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java
View File

@@ -61,8 +61,7 @@ public final class HealthChecker {
Repository repository = repositoryManager.get(id);
if (repository == null) {
throw new RepositoryNotFoundException(
"could not find repository with id ".concat(id));
throw new RepositoryNotFoundException(id);
}
doCheck(repository);