Create NotFoundExceptions with id fields

This commit is contained in:
René Pfeuffer
2018-07-12 10:20:16 +02:00
parent 4e207713bf
commit 42543f6a47
7 changed files with 16 additions and 18 deletions

View File

@@ -52,7 +52,7 @@ public class GroupNotFoundException extends GroupException
* Constructs a new GroupNotFoundException.
*
*/
public GroupNotFoundException() {
super("group does not exist");
public GroupNotFoundException(Group group) {
super("group " + group.getName() + " does not exist");
}
}

View File

@@ -52,8 +52,8 @@ public class RepositoryNotFoundException extends RepositoryException
* error detail message.
*
*/
public RepositoryNotFoundException() {
super("repository does not exist");
public RepositoryNotFoundException(Repository repository) {
super("repository " + repository.getName() + "/" + repository.getNamespace() + " does not exist");
}
public RepositoryNotFoundException(String repositoryId) {

View File

@@ -51,7 +51,7 @@ public class UserNotFoundException extends UserException
* Constructs a new UserNotFoundException.
*
*/
public UserNotFoundException() {
super("user does not exist");
public UserNotFoundException(User user) {
super("user " + user.getName() + " does not exist");
}
}

View File

@@ -9,19 +9,17 @@ import java.util.function.Supplier;
public class ManagerDaoAdapter<T extends ModelObject, E extends Exception> {
private final GenericDAO<T> dao;
private final Supplier<E> notFoundException;
private final Function<T, E> notFoundException;
private final Function<T, E> alreadyExistsException;
public ManagerDaoAdapter(GenericDAO<T> dao, Supplier<E> notFoundException, Function<T, E> alreadyExistsException) {
public ManagerDaoAdapter(GenericDAO<T> dao, Function<T, E> notFoundException, Function<T, E> alreadyExistsException) {
this.dao = dao;
this.notFoundException = notFoundException;
this.alreadyExistsException = alreadyExistsException;
}
public void modify(T object, Function<T, PermissionCheck> permissionCheck, AroundHandler<T, E> beforeUpdate, AroundHandler<T, E> afterUpdate) throws E {
String name = object.getId();
T notModified = dao.get(name);
T notModified = dao.get(object.getId());
if (notModified != null) {
permissionCheck.apply(notModified).check();
AssertUtil.assertIsValid(object);
@@ -35,7 +33,7 @@ public class ManagerDaoAdapter<T extends ModelObject, E extends Exception> {
afterUpdate.handle(notModified);
} else {
throw notFoundException.get();
throw notFoundException.apply(object);
}
}

View File

@@ -154,7 +154,7 @@ public class DefaultGroupManager extends AbstractGroupManager
}
else
{
throw new GroupNotFoundException();
throw new GroupNotFoundException(group);
}
}
@@ -214,7 +214,7 @@ public class DefaultGroupManager extends AbstractGroupManager
if (fresh == null)
{
throw new GroupNotFoundException();
throw new GroupNotFoundException(group);
}
fresh.copyProperties(group);

View File

@@ -188,7 +188,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
repositoryDAO.delete(repository);
fireEvent(HandlerEventType.DELETE, repository);
} else {
throw new RepositoryNotFoundException();
throw new RepositoryNotFoundException(repository);
}
}
@@ -262,7 +262,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
if (fresh != null) {
fresh.copyProperties(repository);
} else {
throw new RepositoryNotFoundException();
throw new RepositoryNotFoundException(repository);
}
}

View File

@@ -185,7 +185,7 @@ public class DefaultUserManager extends AbstractUserManager
}
else
{
throw new UserNotFoundException();
throw new UserNotFoundException(user);
}
}
@@ -249,7 +249,7 @@ public class DefaultUserManager extends AbstractUserManager
if (fresh == null)
{
throw new UserNotFoundException();
throw new UserNotFoundException(user);
}
fresh.copyProperties(user);