From 2d5a65b953d8df21fe40d7f6dc9ff5fe3747ff5e Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Mon, 26 Jul 2021 18:09:42 +0200 Subject: [PATCH] removing dummy checks --- .../ui/health/DummyHealthChecks.java | 78 ------------------- .../ui/health/HealthCheckModule.java | 8 +- 2 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java diff --git a/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java b/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java deleted file mode 100644 index 718b16860..000000000 --- a/src/main/java/org/cryptomator/ui/health/DummyHealthChecks.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.cryptomator.ui.health; - -import org.cryptomator.cryptofs.VaultConfig; -import org.cryptomator.cryptofs.health.api.DiagnosticResult; -import org.cryptomator.cryptofs.health.api.HealthCheck; -import org.cryptomator.cryptolib.api.Cryptor; -import org.cryptomator.cryptolib.api.Masterkey; - -import java.io.IOException; -import java.nio.file.Path; -import java.util.function.Consumer; - -/** - * FIXME: Remove in production release - */ -public class DummyHealthChecks { - - public static class DummyCheck1 implements HealthCheck { - - @Override - public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { - // no-op - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - consumer.accept(() -> DiagnosticResult.Severity.GOOD); - } - } - - public static class DummyCheck2 implements HealthCheck { - - @Override - public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { - // no-op - throw new RuntimeException("asd"); - } - } - - public static class DummyCheck3 implements HealthCheck { - - @Override - public void check(Path path, VaultConfig vaultConfig, Masterkey masterkey, Cryptor cryptor, Consumer consumer) { - // no-op - consumer.accept(() -> DiagnosticResult.Severity.GOOD); - consumer.accept(() -> DiagnosticResult.Severity.CRITICAL); - consumer.accept(() -> DiagnosticResult.Severity.INFO); - consumer.accept(new DiagnosticResult() { - @Override - public Severity getSeverity() { - return Severity.WARN; - } - - @Override - public void fix(Path pathToVault, VaultConfig config, Masterkey masterkey, Cryptor cryptor) throws IOException { - try { - Thread.sleep(3000); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - }); - consumer.accept(new DiagnosticResult() { - @Override - public Severity getSeverity() { - return Severity.WARN; - } - - @Override - public void fix(Path pathToVault, VaultConfig config, Masterkey masterkey, Cryptor cryptor) throws IOException { - throw new IOException("asd"); - } - }); - } - } - -} diff --git a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java index b5d13c7ae..ad5ac6156 100644 --- a/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java +++ b/src/main/java/org/cryptomator/ui/health/HealthCheckModule.java @@ -70,13 +70,7 @@ abstract class HealthCheckModule { @Provides @HealthCheckScoped static List provideAvailableChecks() { - //return HealthCheck.allChecks().stream().map(Check::new).toList(); - //TODO: remove below lines and uncomment above one - var realChecks = HealthCheck.allChecks().stream().map(Check::new).toList(); - var tmp = new ArrayList<>(realChecks); - var tmp2 = List.of(new DummyHealthChecks.DummyCheck1(), new DummyHealthChecks.DummyCheck2(), new DummyHealthChecks.DummyCheck3()).stream().map(Check::new).toList(); - tmp.addAll(tmp2); - return tmp; + return HealthCheck.allChecks().stream().map(Check::new).toList(); } @Provides