From bcd249a33222fc63ecb5557de0831ea9d56746ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Pfeuffer?= <rene.pfeuffer@cloudogu.com>
Date: Tue, 14 May 2019 11:54:25 +0200
Subject: [PATCH] Cleanup modules

---
 .../main/java/sonia/scm/BootstrapModule.java  | 29 +++----------------
 .../main/java/sonia/scm/ScmServletModule.java | 15 ----------
 2 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java b/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java
index 3f2f0186dc..21f88f222a 100644
--- a/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/BootstrapModule.java
@@ -4,12 +4,13 @@ import com.google.inject.AbstractModule;
 import com.google.inject.throwingproviders.ThrowingProviderBinder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import sonia.scm.config.ScmConfiguration;
 import sonia.scm.io.DefaultFileSystem;
 import sonia.scm.io.FileSystem;
 import sonia.scm.plugin.DefaultPluginLoader;
 import sonia.scm.repository.RepositoryLocationResolver;
 import sonia.scm.repository.xml.PathBasedRepositoryLocationResolver;
+import sonia.scm.security.CipherHandler;
+import sonia.scm.security.CipherUtil;
 import sonia.scm.security.DefaultKeyGenerator;
 import sonia.scm.security.KeyGenerator;
 import sonia.scm.store.BlobStoreFactory;
@@ -20,28 +21,21 @@ import sonia.scm.store.FileBlobStoreFactory;
 import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
 import sonia.scm.store.JAXBConfigurationStoreFactory;
 import sonia.scm.store.JAXBDataStoreFactory;
-import sonia.scm.util.ScmConfigurationUtil;
 
 public class BootstrapModule extends AbstractModule {
 
   private static final Logger LOG = LoggerFactory.getLogger(BootstrapModule.class);
 
   private final ClassOverrides overrides;
-  private final DefaultPluginLoader pluginLoader;
 
   public BootstrapModule(DefaultPluginLoader pluginLoader) {
     this.overrides = ClassOverrides.findOverrides(pluginLoader.getUberClassLoader());
-    this.pluginLoader = pluginLoader;
   }
 
   @Override
   protected void configure() {
     install(ThrowingProviderBinder.forModule(this));
 
-//    ScmConfiguration config = getScmConfiguration();
-//
-//    CipherUtil cu = CipherUtil.getInstance();
-
     SCMContextProvider context = SCMContext.getContext();
 
     bind(SCMContextProvider.class).toInstance(context);
@@ -52,21 +46,14 @@ public class BootstrapModule extends AbstractModule {
 
     bind(FileSystem.class, DefaultFileSystem.class);
 
+    // note CipherUtil uses an other generator
+    bind(CipherHandler.class).toInstance(CipherUtil.getInstance().getCipherHandler());
 
     // bind core
     bind(ConfigurationStoreFactory.class, JAXBConfigurationStoreFactory.class);
     bind(ConfigurationEntryStoreFactory.class, JAXBConfigurationEntryStoreFactory.class);
     bind(DataStoreFactory.class, JAXBDataStoreFactory.class);
     bind(BlobStoreFactory.class, FileBlobStoreFactory.class);
-
-    //    bind(ScmConfiguration.class).toInstance(config);
-//    bind(PluginLoader.class).toInstance(pluginLoader);
-//    bind(PluginManager.class, DefaultPluginManager.class);
-
-    // note CipherUtil uses an other generator
-//    bind(KeyGenerator.class).to(DefaultKeyGenerator.class);
-//    bind(CipherHandler.class).toInstance(cu.getCipherHandler());
-//    bind(FileSystem.class, DefaultFileSystem.class);
   }
 
   private <T> void bind(Class<T> clazz, Class<? extends T> defaultImplementation) {
@@ -90,12 +77,4 @@ public class BootstrapModule extends AbstractModule {
 
     return implementation;
   }
-
-  private ScmConfiguration getScmConfiguration() {
-    ScmConfiguration configuration = new ScmConfiguration();
-
-    ScmConfigurationUtil.getInstance().load(configuration);
-
-    return configuration;
-  }
 }
diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
index e5908a7290..a9f48e9ea9 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
@@ -208,12 +208,7 @@ public class ScmServletModule extends ServletModule
   {
     install(ThrowingProviderBinder.forModule(this));
 
-//    SCMContextProvider context = SCMContext.getContext();
-//
-//    bind(SCMContextProvider.class).toInstance(context);
-
     ScmConfiguration config = getScmConfiguration();
-    CipherUtil cu = CipherUtil.getInstance();
 
     bind(NamespaceStrategy.class).toProvider(NamespaceStrategyProvider.class);
 
@@ -230,21 +225,12 @@ public class ScmServletModule extends ServletModule
     bind(ScmEventBus.class).toInstance(ScmEventBus.getInstance());
 
     // bind core
-//    bind(ConfigurationStoreFactory.class, JAXBConfigurationStoreFactory.class);
-//    bind(ConfigurationEntryStoreFactory.class, JAXBConfigurationEntryStoreFactory.class);
-//    bind(DataStoreFactory.class, JAXBDataStoreFactory.class);
-//    bind(BlobStoreFactory.class, FileBlobStoreFactory.class);
     bind(ScmConfiguration.class).toInstance(config);
     bind(PluginLoader.class).toInstance(pluginLoader);
     bind(PluginManager.class, DefaultPluginManager.class);
 
     // bind scheduler
     bind(Scheduler.class).to(QuartzScheduler.class);
-    
-    // note CipherUtil uses an other generator
-//    bind(KeyGenerator.class).to(DefaultKeyGenerator.class);
-    bind(CipherHandler.class).toInstance(cu.getCipherHandler());
-//    bind(FileSystem.class, DefaultFileSystem.class);
 
     // bind health check stuff
     bind(HealthCheckContextListener.class);
@@ -321,7 +307,6 @@ public class ScmServletModule extends ServletModule
     bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class);
 
     // bind events
-    // bind(LastModifiedUpdateListener.class);
 
     bind(AccessTokenCookieIssuer.class).to(DefaultAccessTokenCookieIssuer.class);
     bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class);