Replace model object exception with generic ones and migrate guice

scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java

@@ -42,10 +42,12 @@ import com.google.inject.Singleton;
 import org.apache.shiro.concurrent.SubjectAwareExecutorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.AlreadyExistsException;
 import sonia.scm.ArgumentIsInvalidException;
 import sonia.scm.ConfigurationException;
 import sonia.scm.HandlerEventType;
 import sonia.scm.ManagerDaoAdapter;
+import sonia.scm.NotFoundException;
 import sonia.scm.SCMContextProvider;
 import sonia.scm.Type;
 import sonia.scm.config.ScmConfiguration;
@@ -57,7 +59,6 @@ import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
@@ -91,7 +92,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   private final Set<Type> types;
   private RepositoryMatcher repositoryMatcher;
   private NamespaceStrategy namespaceStrategy;
-  private final ManagerDaoAdapter<Repository, RepositoryException> managerDaoAdapter;
+  private final ManagerDaoAdapter<Repository> managerDaoAdapter;
 
 
   @Inject
@@ -118,10 +119,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
     for (RepositoryHandler handler : handlerSet) {
       addHandler(contextProvider, handler);
     }
-    managerDaoAdapter = new ManagerDaoAdapter<>(
-      repositoryDAO,
-      RepositoryNotFoundException::new,
-      RepositoryAlreadyExistsException::create);
+    managerDaoAdapter = new ManagerDaoAdapter<>(repositoryDAO);
   }
 
 
@@ -135,11 +133,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public Repository create(Repository repository) throws RepositoryException {
+  public Repository create(Repository repository) throws AlreadyExistsException {
     return create(repository, true);
   }
 
-  public Repository create(Repository repository, boolean initRepository) throws RepositoryException {
+  public Repository create(Repository repository, boolean initRepository) throws AlreadyExistsException {
     repository.setId(keyGenerator.createKey());
     repository.setNamespace(namespaceStrategy.createNamespace(repository));
 
@@ -150,7 +148,11 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
       RepositoryPermissions::create,
       newRepository -> {
         if (initRepository) {
-          getHandler(newRepository).create(newRepository);
+          try {
+            getHandler(newRepository).create(newRepository);
+          } catch (AlreadyExistsException e) {
+            throw new InternalRepositoryException("directory for repository does already exist", e);
+          }
         }
         fireEvent(HandlerEventType.BEFORE_CREATE, newRepository);
       },
@@ -160,7 +162,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public void delete(Repository repository) throws RepositoryException {
+  public void delete(Repository repository) throws NotFoundException {
     logger.info("delete repository {}/{} of type {}", repository.getNamespace(), repository.getName(), repository.getType());
     managerDaoAdapter.delete(
       repository,
@@ -170,17 +172,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
     );
   }
 
-  private void preDelete(Repository toDelete) throws RepositoryException {
+  private void preDelete(Repository toDelete) {
     if (configuration.isEnableRepositoryArchive() && !toDelete.isArchived()) {
       throw new RepositoryIsNotArchivedException();
     }
     fireEvent(HandlerEventType.BEFORE_DELETE, toDelete);
-    getHandler(toDelete).delete(toDelete);
+//    getHandler(toDelete).delete(toDelete);
   }
 
   @Override
-  public void importRepository(Repository repository)
-    throws RepositoryException, IOException {
+  public void importRepository(Repository repository) throws AlreadyExistsException {
     create(repository, false);
   }
 
@@ -189,7 +190,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   @Override
-  public void modify(Repository repository) throws RepositoryException {
+  public void modify(Repository repository) throws NotFoundException {
     logger.info("modify repository {}/{} of type {}", repository.getNamespace(), repository.getName(), repository.getType());
 
     managerDaoAdapter.modify(
@@ -197,15 +198,18 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
       RepositoryPermissions::modify,
       notModified -> {
         fireEvent(HandlerEventType.BEFORE_MODIFY, repository, notModified);
-        getHandler(repository).modify(repository);
+        try {
+          getHandler(repository).modify(repository);
+        } catch (NotFoundException e) {
+          throw new IllegalStateException("repository not found though just created", e);
+        }
       },
       notModified -> fireEvent(HandlerEventType.MODIFY, repository, notModified)
     );
   }
 
   @Override
-  public void refresh(Repository repository)
-    throws RepositoryException {
+  public void refresh(Repository repository) throws RepositoryNotFoundException {
     AssertUtil.assertIsNotNull(repository);
     RepositoryPermissions.read(repository).check();
 
@@ -417,15 +421,14 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager {
   }
 
   private RepositoryHandler getHandler(Repository repository)
-    throws RepositoryException {
+    {
     String type = repository.getType();
     RepositoryHandler handler = handlerMap.get(type);
 
     if (handler == null) {
-      throw new RepositoryHandlerNotFoundException(
-        "could not find handler for ".concat(type));
+      throw new InternalRepositoryException("could not find handler for " + type);
     } else if (!handler.isConfigured()) {
-      throw new RepositoryException("handler is not configured");
+      throw new InternalRepositoryException("handler is not configured for type " + type);
     }
 
     return handler;

scm-webapp/src/main/java/sonia/scm/repository/HealthChecker.java

@@ -36,15 +36,15 @@ package sonia.scm.repository;
 import com.github.sdorra.ssp.PermissionActionCheck;
 import com.google.common.collect.ImmutableList;
 import com.google.inject.Inject;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-//~--- JDK imports ------------------------------------------------------------
-
-import java.io.IOException;
+import sonia.scm.ConcurrentModificationException;
+import sonia.scm.NotFoundException;
 
 import java.util.Set;
 
+//~--- JDK imports ------------------------------------------------------------
+
 /**
  *
  * @author Sebastian Sdorra
@@ -77,20 +77,7 @@ public final class HealthChecker
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @param id
-   *
-   *
-   * @throws IOException
-   * @throws RepositoryException
-   * @throws RepositoryNotFoundException
-   */
-  public void check(String id)
-    throws RepositoryNotFoundException, RepositoryException, IOException
-  {
+  public void check(String id) throws NotFoundException {
     RepositoryPermissions.healthCheck(id).check();
 
     Repository repository = repositoryManager.get(id);
@@ -104,28 +91,13 @@ public final class HealthChecker
     doCheck(repository);
   }
 
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   *
-   * @throws IOException
-   * @throws RepositoryException
-   */
   public void check(Repository repository)
-    throws RepositoryException, IOException
-  {
+    throws NotFoundException, ConcurrentModificationException {
     RepositoryPermissions.healthCheck(repository).check();
 
     doCheck(repository);
   }
 
-  /**
-   * Method description
-   *
-   *
-   */
   public void checkAll()
   {
     logger.debug("check health of all repositories");
@@ -140,7 +112,7 @@ public final class HealthChecker
         {
           check(repository);
         }
-        catch (RepositoryException | IOException ex)
+        catch (ConcurrentModificationException | NotFoundException ex)
         {
           logger.error("health check ends with exception", ex);
         }
@@ -154,9 +126,7 @@ public final class HealthChecker
     }
   }
 
-  private void doCheck(Repository repository)
-    throws RepositoryException, IOException
-  {
+  private void doCheck(Repository repository) throws NotFoundException {
     logger.info("start health check for repository {}", repository.getName());
 
     HealthCheckResult result = HealthCheckResult.healthy();

scm-webapp/src/main/java/sonia/scm/repository/LastModifiedUpdateListener.java

@@ -38,6 +38,7 @@ import com.google.inject.Inject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.EagerSingleton;
+import sonia.scm.NotFoundException;
 import sonia.scm.plugin.Extension;
 import sonia.scm.web.security.AdministrationContext;
 import sonia.scm.web.security.PrivilegedAction;
@@ -146,13 +147,10 @@ public final class LastModifiedUpdateListener
         logger.info("update last modified date of repository {}", dbr.getId());
         dbr.setLastModified(System.currentTimeMillis());
 
-        try
-        {
+        try {
           repositoryManager.modify(dbr);
-        }
-        catch (RepositoryException ex)
-        {
-          logger.error("could not modify repository", ex);
+        } catch (NotFoundException e) {
+          logger.error("could not modify repository", e);
         }
       }
       else