From 571fee9524c3678820ebff86e8933c944b79d623 Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sun, 9 Aug 2015 00:38:23 +0200 Subject: [PATCH] simplified DI, where possible --- main/pom.xml | 9 ++++-- main/ui/pom.xml | 28 ++----------------- .../org/cryptomator/ui/CryptomatorModule.java | 20 ------------- .../cryptomator/ui/model/VaultFactory.java | 2 ++ .../ui/model/VaultObjectMapperProvider.java | 2 ++ .../ui/settings/SettingsModule.java | 20 ------------- .../ui/settings/SettingsProvider.java | 2 ++ 7 files changed, 16 insertions(+), 67 deletions(-) delete mode 100644 main/ui/src/main/java/org/cryptomator/ui/settings/SettingsModule.java diff --git a/main/pom.xml b/main/pom.xml index 67d4ccc0d..43f6ebba3 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -131,6 +131,12 @@ dagger 2.0 + + com.google.dagger + dagger-compiler + 2.0 + provided + @@ -139,14 +145,13 @@ ${jackson-databind.version} - + junit junit ${junit.version} test - org.mockito mockito-core diff --git a/main/ui/pom.xml b/main/ui/pom.xml index cb61cf0d6..4b1027518 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -59,31 +59,9 @@ dagger - javax.inject - javax.inject - 1 - compile + com.google.dagger + dagger-compiler + provided - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.2 - - - com.google.dagger - dagger-compiler - 2.0 - - - - - true - - - - diff --git a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java index c93392c1f..1376de2d7 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java @@ -5,13 +5,11 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.inject.Named; -import javax.inject.Provider; import javax.inject.Singleton; import org.cryptomator.crypto.Cryptor; import org.cryptomator.crypto.SamplingCryptorDecorator; import org.cryptomator.crypto.aes256.Aes256Cryptor; -import org.cryptomator.ui.model.VaultFactory; import org.cryptomator.ui.model.VaultObjectMapperProvider; import org.cryptomator.ui.settings.Settings; import org.cryptomator.ui.settings.SettingsProvider; @@ -58,12 +56,6 @@ class CryptomatorModule { return new SemVerComparator(); } - @Provides - @Singleton - VaultObjectMapperProvider provideVaultObjectMapperProvider(VaultFactory vaultFactory) { - return new VaultObjectMapperProvider(vaultFactory); - } - @Provides @Singleton @Named("VaultJsonMapper") @@ -71,12 +63,6 @@ class CryptomatorModule { return vaultObjectMapperProvider.get(); } - @Provides - @Singleton - SettingsProvider provideSettingsProvider(DeferredCloser closer, @Named("VaultJsonMapper") Provider objectMapper) { - return new SettingsProvider(closer, objectMapper.get()); - } - @Provides Settings provideSettings(SettingsProvider settingsProvider) { return settingsProvider.get(); @@ -88,12 +74,6 @@ class CryptomatorModule { return closeLater(Executors.newCachedThreadPool(), ExecutorService::shutdown); } - @Provides - @Singleton - VaultFactory provideVaultFactory(WebDavServer server, Provider cryptorProvider, WebDavMounter mounter, DeferredCloser closer) { - return new VaultFactory(server, cryptorProvider, mounter, closer); - } - @Provides @Singleton WebDavMounter provideWebDavMounterProvider(WebDavServer server, ExecutorService executorService) { diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java index 715b526ad..5ff52adb4 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultFactory.java @@ -4,12 +4,14 @@ import java.nio.file.Path; import javax.inject.Inject; import javax.inject.Provider; +import javax.inject.Singleton; import org.cryptomator.crypto.Cryptor; import org.cryptomator.ui.util.DeferredCloser; import org.cryptomator.ui.util.mount.WebDavMounter; import org.cryptomator.webdav.WebDavServer; +@Singleton public class VaultFactory { private final WebDavServer server; diff --git a/main/ui/src/main/java/org/cryptomator/ui/model/VaultObjectMapperProvider.java b/main/ui/src/main/java/org/cryptomator/ui/model/VaultObjectMapperProvider.java index d4b6dce8a..7b5932752 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/model/VaultObjectMapperProvider.java +++ b/main/ui/src/main/java/org/cryptomator/ui/model/VaultObjectMapperProvider.java @@ -6,6 +6,7 @@ import java.nio.file.Path; import javax.inject.Inject; import javax.inject.Provider; +import javax.inject.Singleton; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; @@ -18,6 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; +@Singleton public class VaultObjectMapperProvider implements Provider { private final VaultFactory vaultFactoy; diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsModule.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsModule.java deleted file mode 100644 index a9dde775d..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsModule.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.cryptomator.ui.settings; - -import javax.inject.Provider; -import javax.inject.Singleton; - -import org.cryptomator.ui.util.DeferredCloser; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import dagger.Module; - -@Module -public class SettingsModule { - - @Singleton - Provider provideSettingsProvider(Provider objectMapper) { - return new SettingsProvider(new DeferredCloser(), objectMapper.get()); - } - -} \ No newline at end of file diff --git a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java index afcaa7b54..48f0cf7dc 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java +++ b/main/ui/src/main/java/org/cryptomator/ui/settings/SettingsProvider.java @@ -12,6 +12,7 @@ import java.nio.file.StandardOpenOption; import javax.inject.Inject; import javax.inject.Named; import javax.inject.Provider; +import javax.inject.Singleton; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.ui.util.DeferredCloser; @@ -20,6 +21,7 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; +@Singleton public class SettingsProvider implements Provider { private static final Logger LOG = LoggerFactory.getLogger(Settings.class);