From 63c60a4831982ec262c5965a05d72a2954461b47 Mon Sep 17 00:00:00 2001 From: Dave Borowitz Date: Mon, 17 Dec 2018 14:59:24 -0800 Subject: [PATCH] Remove UpdateUI#pruneSchema method Change-Id: Ibb5d3e74463bd72279bff6f0b104e97f1cc80194 --- java/com/google/gerrit/pgm/init/BaseInit.java | 7 ------- java/com/google/gerrit/server/schema/UpdateUI.java | 5 ----- java/com/google/gerrit/testing/TestUpdateUI.java | 10 ---------- 3 files changed, 22 deletions(-) diff --git a/java/com/google/gerrit/pgm/init/BaseInit.java b/java/com/google/gerrit/pgm/init/BaseInit.java index 3bfcf070d6..3de7947786 100644 --- a/java/com/google/gerrit/pgm/init/BaseInit.java +++ b/java/com/google/gerrit/pgm/init/BaseInit.java @@ -45,7 +45,6 @@ import com.google.gerrit.server.securestore.SecureStore; import com.google.gerrit.server.securestore.SecureStoreClassName; import com.google.gerrit.server.securestore.SecureStoreProvider; import com.google.gwtorm.server.OrmException; -import com.google.gwtorm.server.StatementExecutor; import com.google.inject.AbstractModule; import com.google.inject.CreationException; import com.google.inject.Guice; @@ -388,12 +387,6 @@ public class BaseInit extends SiteProgram { public boolean isBatch() { return consoleUi.isBatch(); } - - @Override - public void pruneSchema(StatementExecutor e, List prune) { - // Do nothing in NoteDb. - // TODO(dborowitz): Remove this method in the base class. - } } } diff --git a/java/com/google/gerrit/server/schema/UpdateUI.java b/java/com/google/gerrit/server/schema/UpdateUI.java index 0c02607214..b5a6b6e4de 100644 --- a/java/com/google/gerrit/server/schema/UpdateUI.java +++ b/java/com/google/gerrit/server/schema/UpdateUI.java @@ -14,9 +14,6 @@ package com.google.gerrit.server.schema; -import com.google.gwtorm.server.OrmException; -import com.google.gwtorm.server.StatementExecutor; -import java.util.List; import java.util.Set; public interface UpdateUI { @@ -37,6 +34,4 @@ public interface UpdateUI { String readString(String defaultValue, Set allowedValues, String message); boolean isBatch(); - - void pruneSchema(StatementExecutor e, List pruneList) throws OrmException; } diff --git a/java/com/google/gerrit/testing/TestUpdateUI.java b/java/com/google/gerrit/testing/TestUpdateUI.java index f36fc7eb5d..76671fb484 100644 --- a/java/com/google/gerrit/testing/TestUpdateUI.java +++ b/java/com/google/gerrit/testing/TestUpdateUI.java @@ -15,9 +15,6 @@ package com.google.gerrit.testing; import com.google.gerrit.server.schema.UpdateUI; -import com.google.gwtorm.server.OrmException; -import com.google.gwtorm.server.StatementExecutor; -import java.util.List; import java.util.Set; public class TestUpdateUI implements UpdateUI { @@ -41,11 +38,4 @@ public class TestUpdateUI implements UpdateUI { public boolean isBatch() { return true; } - - @Override - public void pruneSchema(StatementExecutor e, List pruneList) throws OrmException { - for (String sql : pruneList) { - e.execute(sql); - } - } }