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

Cleanup modules

Browse Source
This commit is contained in:
René Pfeuffer
2019-05-14 11:54:25 +02:00
parent 58dcdaa24d
commit bcd249a332
2 changed files with 4 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-webapp/src/main/java/sonia/scm/BootstrapModule.java
View File

@@ -4,12 +4,13 @@ import com.google.inject.AbstractModule;
import com.google.inject.throwingproviders.ThrowingProviderBinder; import com.google.inject.throwingproviders.ThrowingProviderBinder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.io.DefaultFileSystem; import sonia.scm.io.DefaultFileSystem;
import sonia.scm.io.FileSystem; import sonia.scm.io.FileSystem;
import sonia.scm.plugin.DefaultPluginLoader; import sonia.scm.plugin.DefaultPluginLoader;
import sonia.scm.repository.RepositoryLocationResolver; import sonia.scm.repository.RepositoryLocationResolver;
import sonia.scm.repository.xml.PathBasedRepositoryLocationResolver; 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.DefaultKeyGenerator;
import sonia.scm.security.KeyGenerator; import sonia.scm.security.KeyGenerator;
import sonia.scm.store.BlobStoreFactory; import sonia.scm.store.BlobStoreFactory;
@@ -20,28 +21,21 @@ import sonia.scm.store.FileBlobStoreFactory;
import sonia.scm.store.JAXBConfigurationEntryStoreFactory; import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
import sonia.scm.store.JAXBConfigurationStoreFactory; import sonia.scm.store.JAXBConfigurationStoreFactory;
import sonia.scm.store.JAXBDataStoreFactory; import sonia.scm.store.JAXBDataStoreFactory;
import sonia.scm.util.ScmConfigurationUtil;
public class BootstrapModule extends AbstractModule { public class BootstrapModule extends AbstractModule {
private static final Logger LOG = LoggerFactory.getLogger(BootstrapModule.class); private static final Logger LOG = LoggerFactory.getLogger(BootstrapModule.class);
private final ClassOverrides overrides; private final ClassOverrides overrides;
private final DefaultPluginLoader pluginLoader;
public BootstrapModule(DefaultPluginLoader pluginLoader) { public BootstrapModule(DefaultPluginLoader pluginLoader) {
this.overrides = ClassOverrides.findOverrides(pluginLoader.getUberClassLoader()); this.overrides = ClassOverrides.findOverrides(pluginLoader.getUberClassLoader());
this.pluginLoader = pluginLoader;
} }
@Override @Override
protected void configure() { protected void configure() {
install(ThrowingProviderBinder.forModule(this)); install(ThrowingProviderBinder.forModule(this));
// ScmConfiguration config = getScmConfiguration();
//
// CipherUtil cu = CipherUtil.getInstance();
SCMContextProvider context = SCMContext.getContext(); SCMContextProvider context = SCMContext.getContext();
bind(SCMContextProvider.class).toInstance(context); bind(SCMContextProvider.class).toInstance(context);
@@ -52,21 +46,14 @@ public class BootstrapModule extends AbstractModule {
bind(FileSystem.class, DefaultFileSystem.class); bind(FileSystem.class, DefaultFileSystem.class);
// note CipherUtil uses an other generator
bind(CipherHandler.class).toInstance(CipherUtil.getInstance().getCipherHandler());
// bind core // bind core
bind(ConfigurationStoreFactory.class, JAXBConfigurationStoreFactory.class); bind(ConfigurationStoreFactory.class, JAXBConfigurationStoreFactory.class);
bind(ConfigurationEntryStoreFactory.class, JAXBConfigurationEntryStoreFactory.class); bind(ConfigurationEntryStoreFactory.class, JAXBConfigurationEntryStoreFactory.class);
bind(DataStoreFactory.class, JAXBDataStoreFactory.class); bind(DataStoreFactory.class, JAXBDataStoreFactory.class);
bind(BlobStoreFactory.class, FileBlobStoreFactory.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) { private <T> void bind(Class<T> clazz, Class<? extends T> defaultImplementation) {
@@ -90,12 +77,4 @@ public class BootstrapModule extends AbstractModule {
return implementation; return implementation;
} }
private ScmConfiguration getScmConfiguration() {
ScmConfiguration configuration = new ScmConfiguration();
ScmConfigurationUtil.getInstance().load(configuration);
return configuration;
}
} }

15
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -208,12 +208,7 @@ public class ScmServletModule extends ServletModule
{ {
install(ThrowingProviderBinder.forModule(this)); install(ThrowingProviderBinder.forModule(this));
// SCMContextProvider context = SCMContext.getContext();
//
// bind(SCMContextProvider.class).toInstance(context);
ScmConfiguration config = getScmConfiguration(); ScmConfiguration config = getScmConfiguration();
CipherUtil cu = CipherUtil.getInstance();
bind(NamespaceStrategy.class).toProvider(NamespaceStrategyProvider.class); bind(NamespaceStrategy.class).toProvider(NamespaceStrategyProvider.class);
@@ -230,10 +225,6 @@ public class ScmServletModule extends ServletModule
bind(ScmEventBus.class).toInstance(ScmEventBus.getInstance()); bind(ScmEventBus.class).toInstance(ScmEventBus.getInstance());
// bind core // 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(ScmConfiguration.class).toInstance(config);
bind(PluginLoader.class).toInstance(pluginLoader); bind(PluginLoader.class).toInstance(pluginLoader);
bind(PluginManager.class, DefaultPluginManager.class); bind(PluginManager.class, DefaultPluginManager.class);
@@ -241,11 +232,6 @@ public class ScmServletModule extends ServletModule
// bind scheduler // bind scheduler
bind(Scheduler.class).to(QuartzScheduler.class); 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 health check stuff
bind(HealthCheckContextListener.class); bind(HealthCheckContextListener.class);
@@ -321,7 +307,6 @@ public class ScmServletModule extends ServletModule
bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class); bind(ObjectMapper.class).toProvider(ObjectMapperProvider.class);
// bind events // bind events
// bind(LastModifiedUpdateListener.class);
bind(AccessTokenCookieIssuer.class).to(DefaultAccessTokenCookieIssuer.class); bind(AccessTokenCookieIssuer.class).to(DefaultAccessTokenCookieIssuer.class);
bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class); bind(PushStateDispatcher.class).toProvider(PushStateDispatcherProvider.class);