Remove Eclipse warnings Remove unused variables and unnecessary casts as reported by Eclipse. Change-Id: I8bd662e607b62cda2b375ecec49fada512c99758
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ActiveWorkersCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ActiveWorkersCheck.java index dcf2f0e..8e64593 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ActiveWorkersCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ActiveWorkersCheck.java
@@ -34,7 +34,6 @@ private Integer threshold; private Integer interactiveThreadsMaxPoolSize; private MetricRegistry metricRegistry; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; @Inject public ActiveWorkersCheck(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java index cd0274d..ce9f8d9 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/AuthHealthCheck.java
@@ -36,7 +36,6 @@ private final AccountCache byIdCache; private final String username; private final String password; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; @Inject public AuthHealthCheck(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/DeadlockCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/DeadlockCheck.java index a368246..6a6ade6 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/DeadlockCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/DeadlockCheck.java
@@ -29,7 +29,6 @@ "proc/jvm/thread/num_deadlocked_threads"; private final MetricRegistry metricRegistry; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; @Inject public DeadlockCheck(
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/JGitHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/JGitHealthCheck.java index d107588..9196cdb 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/JGitHealthCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/JGitHealthCheck.java
@@ -31,8 +31,6 @@ private final GitRepositoryManager repositoryManager; private final Set<Project.NameKey> repositoryNameKeys; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; - @Inject public JGitHealthCheck( ListeningExecutorService executor,
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ProjectsListHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ProjectsListHealthCheck.java index 9850a10..c18009a 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ProjectsListHealthCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ProjectsListHealthCheck.java
@@ -33,8 +33,6 @@ private static final int PROJECTS_LIST_LIMIT = 100; private final ListProjects listProjects; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; - @Inject public ProjectsListHealthCheck( ListeningExecutorService executor,
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java index 9b6825f..a786606 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/QueryChangesHealthCheck.java
@@ -33,12 +33,9 @@ public class QueryChangesHealthCheck extends AbstractHealthCheck { private static final Logger log = LoggerFactory.getLogger(QueryChangesHealthCheck.class); private final Provider<QueryChanges> queryChangesProvider; - private final HealthCheckConfig config; private final int limit; private final OneOffRequestContext oneOffCtx; - private HealthCheckMetrics.Factory healthCheckMetricsFactory; - @Inject public QueryChangesHealthCheck( ListeningExecutorService executor,
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/AbstractHealthCheckTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/AbstractHealthCheckTest.java index f67802e..fada3bb 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/AbstractHealthCheckTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/AbstractHealthCheckTest.java
@@ -16,14 +16,12 @@ import static com.google.common.truth.Truth.assertThat; -import com.google.common.util.concurrent.ListeningExecutorService; import com.google.common.util.concurrent.MoreExecutors; import com.google.gerrit.metrics.Counter0; import com.google.gerrit.metrics.Description; import com.google.gerrit.metrics.DisabledMetricMaker; import com.google.gerrit.metrics.MetricMaker; import com.google.gerrit.metrics.Timer0; -import com.google.inject.Inject; import com.googlesource.gerrit.plugins.healthcheck.check.AbstractHealthCheck; import com.googlesource.gerrit.plugins.healthcheck.check.HealthCheck; import java.util.concurrent.Executors; @@ -33,7 +31,6 @@ public class AbstractHealthCheckTest { - private ListeningExecutorService executor; MetricMaker testMetricMaker; DummyHealthCheckMetricsFactory healthCheckMetricsFactory = new DummyHealthCheckMetricsFactory(); @@ -104,17 +101,13 @@ private TestCheck createTestCheckWithStatus(HealthCheck.Result result) { return new TestCheck( - executor, HealthCheckConfig.DEFAULT_CONFIG, "testCheck", healthCheckMetricsFactory, result); + HealthCheckConfig.DEFAULT_CONFIG, "testCheck", healthCheckMetricsFactory, result); } private static class TestCheck extends AbstractHealthCheck { - @Inject private ListeningExecutorService executor; private final Result finalResult; - private DummyHealthCheckMetricsFactory healthCheckMetricsFactory = - new DummyHealthCheckMetricsFactory(); public TestCheck( - ListeningExecutorService executor, HealthCheckConfig config, String name, HealthCheckMetrics.Factory healthCheckMetricsFactory,
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/DeadlockCheckTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/DeadlockCheckTest.java index 79a4bc4..aa880a3 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/DeadlockCheckTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/DeadlockCheckTest.java
@@ -45,9 +45,6 @@ @Test public void shouldPassCheckWhenNoDeadlock() { - - MetricRegistry metricRegistry = createMetricRegistry(0); - Injector injector = testInjector(new TestModule(createMetricRegistry(0))); DeadlockCheck check = createCheck(injector);
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckStatusEndpointTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckStatusEndpointTest.java index b2fb862..b971054 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckStatusEndpointTest.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckStatusEndpointTest.java
@@ -95,7 +95,7 @@ HealthCheckStatusEndpoint healthCheckApi = injector.getInstance(HealthCheckStatusEndpoint.class); - Response<?> resp = (Response<?>) healthCheckApi.apply(null); + Response<?> resp = healthCheckApi.apply(null); assertThat(resp.statusCode()).isEqualTo(HttpServletResponse.SC_OK); } @@ -128,7 +128,7 @@ HealthCheckStatusEndpoint healthCheckApi = injector.getInstance(HealthCheckStatusEndpoint.class); - Response<?> resp = (Response<?>) healthCheckApi.apply(null); + Response<?> resp = healthCheckApi.apply(null); assertThat(resp.statusCode()).isEqualTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); } @@ -171,7 +171,7 @@ HealthCheckStatusEndpoint healthCheckApi = injector.getInstance(HealthCheckStatusEndpoint.class); - Response<?> resp = (Response<?>) healthCheckApi.apply(null); + Response<?> resp = healthCheckApi.apply(null); assertThat(resp.statusCode()).isEqualTo(HttpServletResponse.SC_INTERNAL_SERVER_ERROR); }