No need to check for ReviewDb on master On Gerrit master there is no ReviewDb anymore. Get rid of all references to checks and tests related to it. Change-Id: I36fa9059181bace434e52e7bec12f78f233ee7f0
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckSubsystemsModule.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckSubsystemsModule.java index 5857bc4..d57a1f9 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckSubsystemsModule.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckSubsystemsModule.java
@@ -19,13 +19,11 @@ import com.googlesource.gerrit.plugins.healthcheck.check.HealthCheck; import com.googlesource.gerrit.plugins.healthcheck.check.JGitHealthCheck; import com.googlesource.gerrit.plugins.healthcheck.check.ProjectsListHealthCheck; -import com.googlesource.gerrit.plugins.healthcheck.check.ReviewDbHealthCheck; public class HealthCheckSubsystemsModule extends AbstractModule { @Override protected void configure() { - bindChecker(ReviewDbHealthCheck.class); bindChecker(JGitHealthCheck.class); bindChecker(ProjectsListHealthCheck.class); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/HealthCheckNames.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/HealthCheckNames.java index 2eb896e..9a87490 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/HealthCheckNames.java +++ b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/HealthCheckNames.java
@@ -15,7 +15,6 @@ package com.googlesource.gerrit.plugins.healthcheck.check; public interface HealthCheckNames { - String REVIEWDB = "reviewdb"; String JGIT = "jgit"; String PROJECTSLIST = "projectslist"; }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ReviewDbHealthCheck.java b/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ReviewDbHealthCheck.java deleted file mode 100644 index 138997b..0000000 --- a/src/main/java/com/googlesource/gerrit/plugins/healthcheck/check/ReviewDbHealthCheck.java +++ /dev/null
@@ -1,41 +0,0 @@ -// Copyright (C) 2019 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.googlesource.gerrit.plugins.healthcheck.check; - -import static com.googlesource.gerrit.plugins.healthcheck.check.HealthCheckNames.REVIEWDB; - -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.gerrit.reviewdb.client.CurrentSchemaVersion; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Inject; - -public class ReviewDbHealthCheck extends AbstractHealthCheck { - private final SchemaFactory<ReviewDb> reviewDb; - - @Inject - public ReviewDbHealthCheck(ListeningExecutorService executor, SchemaFactory<ReviewDb> reviewDb) { - super(executor, REVIEWDB); - this.reviewDb = reviewDb; - } - - @Override - protected Result doCheck() throws Exception { - try (ReviewDb db = reviewDb.open()) { - db.schemaVersion().get(new CurrentSchemaVersion.Key()); - return Result.PASSED; - } - } -}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java index 86a0965..ec338b6 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java +++ b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/HealthCheckIT.java
@@ -17,7 +17,6 @@ import static com.google.common.net.HttpHeaders.CONTENT_TYPE; import static com.google.common.truth.Truth.assertThat; import static com.googlesource.gerrit.plugins.healthcheck.check.HealthCheckNames.JGIT; -import static com.googlesource.gerrit.plugins.healthcheck.check.HealthCheckNames.REVIEWDB; import com.google.gerrit.acceptance.LightweightPluginDaemonTest; import com.google.gerrit.acceptance.RestResponse; @@ -44,16 +43,6 @@ } @Test - public void shouldReturnReviewDbCheck() throws Exception { - RestResponse resp = getHealthCheckStatus(); - resp.assertOK(); - - JsonObject respPayload = gson.fromJson(resp.getReader(), JsonObject.class); - - assertCheckResult(respPayload, REVIEWDB, "passed"); - } - - @Test public void shouldReturnJGitCheck() throws Exception { RestResponse resp = getHealthCheckStatus(); resp.assertOK();
diff --git a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ReviewDbHealthCheckTest.java b/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ReviewDbHealthCheckTest.java deleted file mode 100644 index 2dfd8bd..0000000 --- a/src/test/java/com/googlesource/gerrit/plugins/healthcheck/ReviewDbHealthCheckTest.java +++ /dev/null
@@ -1,64 +0,0 @@ -// Copyright (C) 2019 The Android Open Source Project -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.googlesource.gerrit.plugins.healthcheck; - -import static com.google.common.truth.Truth.assertThat; - -import com.google.common.util.concurrent.ListeningExecutorService; -import com.google.gerrit.lifecycle.LifecycleManager; -import com.google.gerrit.reviewdb.server.ReviewDb; -import com.google.gerrit.testing.DisabledReviewDb; -import com.google.gerrit.testing.InMemoryDatabase; -import com.google.gwtorm.server.SchemaFactory; -import com.google.inject.Guice; -import com.google.inject.Inject; -import com.googlesource.gerrit.plugins.healthcheck.check.HealthCheck; -import com.googlesource.gerrit.plugins.healthcheck.check.ReviewDbHealthCheck; -import org.junit.Before; -import org.junit.Test; - -public class ReviewDbHealthCheckTest { - private SchemaFactory<ReviewDb> workingReviewDbFactory; - - @Inject private ListeningExecutorService executor; - - @Before - public void setUp() throws Exception { - Guice.createInjector(new HealthCheckModule()).injectMembers(this); - workingReviewDbFactory = InMemoryDatabase.newDatabase(new LifecycleManager()).create(); - } - - @Test - public void shouldBeHealthyWhenReviewDbIsWorking() { - ReviewDbHealthCheck reviewDbCheck = new ReviewDbHealthCheck(executor, workingReviewDbFactory); - assertThat(reviewDbCheck.run().result).isEqualTo(HealthCheck.Result.PASSED); - } - - @Test - public void shouldBeUnhealthyWhenReviewDbIsFailing() { - ReviewDbHealthCheck reviewDbCheck = - new ReviewDbHealthCheck(executor, getFailingReviewDbProvider()); - assertThat(reviewDbCheck.run().result).isEqualTo(HealthCheck.Result.FAILED); - } - - private SchemaFactory<ReviewDb> getFailingReviewDbProvider() { - return new SchemaFactory<ReviewDb>() { - @Override - public ReviewDb open() { - return new DisabledReviewDb(); - } - }; - } -}