commit 1edc8418fd85eae616e72519eb880f9d0009b4b7
author Saša Živkov <sasa.zivkov@sap.com> Mon Apr 06 14:47:34 2020 +0200
committer Saša Živkov <sasa.zivkov@sap.com> Mon Apr 06 14:47:34 2020 +0200
tree f25636e4634951e145927872bb6f00cf7f6c3354
parent befa5f3a89ce8ebca2effdfe21c66e4e98a0f020

FanoutReplicationConfig: Make methods static where possible

Change-Id: I95cf2fdf933cfde3f291e8822e00b3845ac48f11

src/main/java/com/googlesource/gerrit/plugins/replication/FanoutReplicationConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/replication/FanoutReplicationConfig.java b/src/main/java/com/googlesource/gerrit/plugins/replication/FanoutReplicationConfig.java
index c3ae895..4cc9974 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/replication/FanoutReplicationConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/replication/FanoutReplicationConfig.java
@@ -55,18 +55,18 @@
     try (Stream<Path> files = Files.list(remoteConfigsDirPath)) {
       files
           .filter(Files::isRegularFile)
-          .filter(this::isConfig)
-          .map(this::loadConfig)
+          .filter(FanoutReplicationConfig::isConfig)
+          .map(FanoutReplicationConfig::loadConfig)
           .filter(Optional::isPresent)
           .map(Optional::get)
-          .filter(this::isValid)
+          .filter(FanoutReplicationConfig::isValid)
           .forEach(cfg -> addRemoteConfig(cfg, config));
     } catch (IllegalStateException e) {
       throw new ConfigInvalidException(e.getMessage());
     }
   }
 
-  private void removeRemotes(Config config) {
+  private static void removeRemotes(Config config) {
     Set<String> remoteNames = config.getSubsections("remote");
     if (remoteNames.size() > 0) {
       logger.atSevere().log(
@@ -79,7 +79,7 @@
     }
   }
 
-  private void addRemoteConfig(FileBasedConfig source, Config destination) {
+  private static void addRemoteConfig(FileBasedConfig source, Config destination) {
     String remoteName = getNameWithoutExtension(source.getFile().getName());
     for (String name : source.getNames("remote")) {
       destination.setStringList(
@@ -90,7 +90,7 @@
     }
   }
 
-  private boolean isValid(Config cfg) {
+  private static boolean isValid(Config cfg) {
     if (cfg.getSections().size() != 1 || !cfg.getSections().contains("remote")) {
       logger.atSevere().log(
           "Remote replication configuration file %s must contain only one remote section.", cfg);
@@ -105,7 +105,7 @@
     return true;
   }
 
-  private Optional<FileBasedConfig> loadConfig(Path path) {
+  private static Optional<FileBasedConfig> loadConfig(Path path) {
     FileBasedConfig cfg = new FileBasedConfig(path.toFile(), FS.DETECTED);
     try {
       cfg.load();
@@ -117,7 +117,7 @@
     return Optional.of(cfg);
   }
 
-  private boolean isConfig(Path p) {
+  private static boolean isConfig(Path p) {
     return p.toString().endsWith(".config");
   }
 
@@ -158,7 +158,7 @@
     try (Stream<Path> files = Files.list(remoteConfigsDirPath)) {
       files
           .filter(Files::isRegularFile)
-          .filter(this::isConfig)
+          .filter(FanoutReplicationConfig::isConfig)
           .sorted()
           .map(Path::toFile)
           .map(FileSnapshot::save)