use checkedprovider for repository injection

scm-webapp/src/main/java/sonia/scm/ScmServletModule.java

@@ -36,7 +36,9 @@ package sonia.scm;
 //~--- non-JDK imports --------------------------------------------------------
 
 import com.google.inject.name.Names;
+import com.google.inject.servlet.RequestScoped;
 import com.google.inject.servlet.ServletModule;
+import com.google.inject.throwingproviders.ThrowingProviderBinder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +63,7 @@ import sonia.scm.plugin.PluginLoader;
 import sonia.scm.plugin.PluginManager;
 import sonia.scm.plugin.ScriptResourceServlet;
 import sonia.scm.repository.ChangesetViewerUtil;
+import sonia.scm.repository.DefaultRepositoryProvider;
 import sonia.scm.repository.Repository;
 import sonia.scm.repository.RepositoryBrowserUtil;
 import sonia.scm.repository.RepositoryManager;
@@ -198,6 +201,8 @@ public class ScmServletModule extends ServletModule
   @Override
   protected void configureServlets()
   {
+    install(ThrowingProviderBinder.forModule(this));
+
     SCMContextProvider context = SCMContext.getContext();
 
     bind(SCMContextProvider.class).toInstance(context);
@@ -205,7 +210,12 @@ public class ScmServletModule extends ServletModule
     ScmConfiguration config = getScmConfiguration(context);
     CipherUtil cu = CipherUtil.getInstance();
 
-    bind(Repository.class).toProvider(RepositoryProvider.class);
+    // bind repository provider
+    ThrowingProviderBinder.create(binder()).bind(
+        RepositoryProvider.class, Repository.class).to(
+        DefaultRepositoryProvider.class).in(RequestScoped.class);
+
+    // bind core
     bind(StoreFactory.class).to(JAXBStoreFactory.class);
     bind(ScmConfiguration.class).toInstance(config);
     bind(PluginLoader.class).toInstance(pluginLoader);

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

@@ -39,6 +39,8 @@ import com.google.inject.Inject;
 import com.google.inject.Provider;
 import com.google.inject.servlet.RequestScoped;
 
+import sonia.scm.security.ScmSecurityException;
+
 //~--- JDK imports ------------------------------------------------------------
 
 import javax.servlet.http.HttpServletRequest;
@@ -48,7 +50,7 @@ import javax.servlet.http.HttpServletRequest;
  * @author Sebastian Sdorra
  */
 @RequestScoped
-public class RepositoryProvider implements Provider<Repository>
+public class DefaultRepositoryProvider implements RepositoryProvider
 {
 
   /** Field description */
@@ -64,8 +66,9 @@ public class RepositoryProvider implements Provider<Repository>
    * @param manager
    */
   @Inject
-  public RepositoryProvider(Provider<HttpServletRequest> requestProvider,
-                            RepositoryManager manager)
+  public DefaultRepositoryProvider(
+          Provider<HttpServletRequest> requestProvider,
+          RepositoryManager manager)
   {
     this.requestProvider = requestProvider;
     this.manager = manager;
@@ -78,9 +81,11 @@ public class RepositoryProvider implements Provider<Repository>
    *
    *
    * @return
+   *
+   * @throws ScmSecurityException
    */
   @Override
-  public Repository get()
+  public Repository get() throws ScmSecurityException
   {
     Repository repository = null;
     HttpServletRequest request = requestProvider.get();

scm-webapp/src/main/java/sonia/scm/repository/xml/XmlRepositoryManager.java

@@ -669,10 +669,8 @@ public class XmlRepositoryManager extends AbstractRepositoryManager
       {
         if (type.equals(r.getType()) && isNameMatching(r, uri))
         {
-          if (isReader(r))
-          {
-            repository = r.clone();
-          }
+          assertIsReader(r);
+          repository = r.clone();
 
           break;
         }