Delete duplicate DisabledSharedRefLogger class The DisabledSharedRefLogger was duplicated between the global-refdb library and the multi-site plugin. Also adapt the SharedRefDatabaseWrapper constructor to restore a green build on the CI. Change-Id: Ide10917a5647e2b1e3939f635638196c7fbd9732
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/DisabledSharedRefLogger.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/DisabledSharedRefLogger.java deleted file mode 100644 index fc2259f..0000000 --- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/DisabledSharedRefLogger.java +++ /dev/null
@@ -1,42 +0,0 @@ -// Copyright (C) 2022 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.multisite.validation; - -import com.gerritforge.gerrit.globalrefdb.validation.SharedRefLogger; -import org.eclipse.jgit.lib.ObjectId; -import org.eclipse.jgit.lib.Ref; -import org.junit.Ignore; - -@Ignore -public class DisabledSharedRefLogger implements SharedRefLogger { - - @Override - public void logRefUpdate(String project, Ref currRef, ObjectId newRefValue) {} - - @Override - public void logProjectDelete(String project) {} - - @Override - public void logLockAcquisition(String project, String refName) {} - - @Override - public void logLockRelease(String project, String refName) {} - - @Override - public <T> void logRefUpdate(String project, String refName, T currRef, T newRefValue) {} - - @Override - public <T> void logRefUpdate(String project, String refName, T newRefValue) {} -}
diff --git a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/FakeSharedRefDatabaseWrapper.java b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/FakeSharedRefDatabaseWrapper.java index bf98a4b..74bd41b 100644 --- a/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/FakeSharedRefDatabaseWrapper.java +++ b/src/test/java/com/googlesource/gerrit/plugins/multisite/validation/FakeSharedRefDatabaseWrapper.java
@@ -17,6 +17,7 @@ import com.gerritforge.gerrit.globalrefdb.GlobalRefDatabase; import com.gerritforge.gerrit.globalrefdb.GlobalRefDbLockException; import com.gerritforge.gerrit.globalrefdb.GlobalRefDbSystemError; +import com.gerritforge.gerrit.globalrefdb.validation.DisabledSharedRefLogger; import com.gerritforge.gerrit.globalrefdb.validation.SharedRefDBMetrics; import com.gerritforge.gerrit.globalrefdb.validation.SharedRefDatabaseWrapper; import com.google.gerrit.entities.Project; @@ -79,6 +80,7 @@ } }), new DisabledSharedRefLogger(), - new SharedRefDBMetrics(new DisabledMetricMaker())); + new SharedRefDBMetrics(new DisabledMetricMaker()), + ((project, refName) -> () -> {})); } }