Remove command sub-package
Have all commands under the same package for consistency.
Consequently, decrease no longer needed public methods visibility to
package protected.
Change-Id: I4c6e815ead1697de001ad7204ea85fe0e1208e4c
diff --git a/BUILD b/BUILD
index 7859dc2..22dd6f0 100644
--- a/BUILD
+++ b/BUILD
@@ -11,7 +11,7 @@
name = "cache-chroniclemap",
srcs = glob(["src/main/java/**/*.java"]),
manifest_entries = [
- "Gerrit-SshModule: com.googlesource.gerrit.modules.cache.chroniclemap.command.SSHCommandModule",
+ "Gerrit-SshModule: com.googlesource.gerrit.modules.cache.chroniclemap.SSHCommandModule",
],
resources = glob(["src/main/resources/**/*"]),
deps = [
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2Caches.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2Caches.java
similarity index 97%
rename from src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2Caches.java
rename to src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2Caches.java
index 474ec46..bf86e78 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2Caches.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2Caches.java
@@ -11,7 +11,7 @@
// 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.modules.cache.chroniclemap.command;
+package com.googlesource.gerrit.modules.cache.chroniclemap;
import com.google.gerrit.server.config.GerritServerConfig;
import com.google.gerrit.server.config.SitePaths;
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2AggregateData.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2AggregateData.java
similarity index 70%
rename from src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2AggregateData.java
rename to src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2AggregateData.java
index 8f22f86..8e1ca68 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2AggregateData.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2AggregateData.java
@@ -11,30 +11,30 @@
// 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.modules.cache.chroniclemap.command;
+package com.googlesource.gerrit.modules.cache.chroniclemap;
import com.google.auto.value.AutoValue;
@AutoValue
-public abstract class H2AggregateData {
- public abstract String cacheName();
+abstract class H2AggregateData {
+ protected abstract String cacheName();
- public abstract long size();
+ protected abstract long size();
- public abstract long avgKeySize();
+ protected abstract long avgKeySize();
- public abstract long avgValueSize();
+ protected abstract long avgValueSize();
- public static H2AggregateData create(
+ protected static H2AggregateData create(
String cacheName, long size, long avgKeySize, long avgValueSize) {
return new AutoValue_H2AggregateData(cacheName, size, avgKeySize, avgValueSize);
}
- public static H2AggregateData empty(String cacheName) {
+ protected static H2AggregateData empty(String cacheName) {
return new AutoValue_H2AggregateData(cacheName, 0L, 0L, 0L);
}
- public boolean isEmpty() {
+ protected boolean isEmpty() {
return size() == 0L;
}
}
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2CacheSshCommand.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2CacheSshCommand.java
similarity index 94%
rename from src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2CacheSshCommand.java
rename to src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2CacheSshCommand.java
index e971ff1..ab964ce 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/H2CacheSshCommand.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/H2CacheSshCommand.java
@@ -11,7 +11,7 @@
// 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.modules.cache.chroniclemap.command;
+package com.googlesource.gerrit.modules.cache.chroniclemap;
import com.google.common.flogger.FluentLogger;
import com.google.gerrit.server.config.SitePaths;
@@ -30,7 +30,7 @@
public abstract class H2CacheSshCommand extends SshCommand {
protected static final FluentLogger logger = FluentLogger.forEnclosingClass();
- public static final String H2_SUFFIX = "h2.db";
+ protected static final String H2_SUFFIX = "h2.db";
protected Config gerritConfig;
protected SitePaths site;
@@ -39,7 +39,7 @@
return FilenameUtils.removeExtension(FilenameUtils.getBaseName(h2File.toString()));
}
- public static H2AggregateData getStats(Path h2File) throws UnloggedFailure {
+ protected static H2AggregateData getStats(Path h2File) throws UnloggedFailure {
String url = jdbcUrl(h2File);
String baseName = baseName(h2File);
try {
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2Caches.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2Caches.java
index e36d1e0..d61fb85 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2Caches.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2Caches.java
@@ -26,8 +26,6 @@
import com.google.inject.Inject;
import com.google.inject.Injector;
import com.google.inject.Key;
-import com.googlesource.gerrit.modules.cache.chroniclemap.command.H2AggregateData;
-import com.googlesource.gerrit.modules.cache.chroniclemap.command.H2CacheSshCommand;
import java.nio.file.Files;
import java.nio.file.Path;
import java.sql.Connection;
diff --git a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/SSHCommandModule.java b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/SSHCommandModule.java
similarity index 80%
rename from src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/SSHCommandModule.java
rename to src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/SSHCommandModule.java
index a1cd840..81c2a62 100644
--- a/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/SSHCommandModule.java
+++ b/src/main/java/com/googlesource/gerrit/modules/cache/chroniclemap/SSHCommandModule.java
@@ -11,11 +11,9 @@
// 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.modules.cache.chroniclemap.command;
+package com.googlesource.gerrit.modules.cache.chroniclemap;
import com.google.gerrit.sshd.PluginCommandModule;
-import com.googlesource.gerrit.modules.cache.chroniclemap.ChronicleMapCacheConfig;
-import com.googlesource.gerrit.modules.cache.chroniclemap.MigrateH2Caches;
public class SSHCommandModule extends PluginCommandModule {
@Override
diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2CachesIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
similarity index 97%
rename from src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2CachesIT.java
rename to src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
index d6ae02d..e7074e0 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/command/AnalyzeH2CachesIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/AnalyzeH2CachesIT.java
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.googlesource.gerrit.modules.cache.chroniclemap.command;
+package com.googlesource.gerrit.modules.cache.chroniclemap;
import static com.google.common.truth.Truth.assertThat;
@@ -32,7 +32,7 @@
@UseSsh
@TestPlugin(
name = "cache-chroniclemap",
- sshModule = "com.googlesource.gerrit.modules.cache.chroniclemap.command.SSHCommandModule")
+ sshModule = "com.googlesource.gerrit.modules.cache.chroniclemap.SSHCommandModule")
public class AnalyzeH2CachesIT extends LightweightPluginDaemonTest {
@Inject private SitePaths sitePaths;
diff --git a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesIT.java b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesIT.java
index 2c82131..89fe5f6 100644
--- a/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesIT.java
+++ b/src/test/java/com/googlesource/gerrit/modules/cache/chroniclemap/MigrateH2CachesIT.java
@@ -15,9 +15,9 @@
package com.googlesource.gerrit.modules.cache.chroniclemap;
import static com.google.common.truth.Truth.assertThat;
+import static com.googlesource.gerrit.modules.cache.chroniclemap.H2CacheSshCommand.H2_SUFFIX;
import static com.googlesource.gerrit.modules.cache.chroniclemap.MigrateH2Caches.DEFAULT_MAX_BLOAT_FACTOR;
import static com.googlesource.gerrit.modules.cache.chroniclemap.MigrateH2Caches.DEFAULT_SIZE_MULTIPLIER;
-import static com.googlesource.gerrit.modules.cache.chroniclemap.command.H2CacheSshCommand.H2_SUFFIX;
import com.google.common.base.Joiner;
import com.google.common.cache.CacheLoader;
@@ -43,7 +43,6 @@
import com.google.inject.Binding;
import com.google.inject.Inject;
import com.google.inject.Key;
-import com.googlesource.gerrit.modules.cache.chroniclemap.command.H2CacheSshCommand;
import java.io.IOException;
import java.lang.annotation.Annotation;
import java.nio.file.Path;
@@ -57,7 +56,7 @@
@UseSsh
@TestPlugin(
name = "cache-chroniclemap",
- sshModule = "com.googlesource.gerrit.modules.cache.chroniclemap.command.SSHCommandModule")
+ sshModule = "com.googlesource.gerrit.modules.cache.chroniclemap.SSHCommandModule")
public class MigrateH2CachesIT extends LightweightPluginDaemonTest {
private final Duration LOAD_CACHE_WAIT_TIMEOUT = Duration.ofSeconds(4);
private String ACCOUNTS_CACHE_NAME = "accounts";
