commit 15f81ed7b204feb8142c54c0494a16d25c1bbd52
author Edwin Kempin <ekempin@google.com> Tue Apr 09 14:16:55 2019 +0200
committer Edwin Kempin <ekempin@google.com> Wed Apr 10 09:01:16 2019 +0200
tree c184206e1464ce39de35c93c26f5901e4dc3f2bf
parent db3446b556ba7274b2f5e8650affec4de25a9dd0

CheckerConfigEntry: Remove unused code for reading enums from subsections

The checker configs don't have any subsection. Hence the code for
reading enums from subsections is not used and cannot be covered by
tests.

Signed-off-by: Edwin Kempin <ekempin@google.com>
Change-Id: I1169cca60b932856c1783c4300375fa45559737a

java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java

diff --git a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
index fb6fbf6..e506bce 100644
--- a/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
+++ b/java/com/google/gerrit/plugins/checks/db/CheckerConfigEntry.java
@@ -259,7 +259,7 @@
     void readFromConfig(CheckerUuid checkerUuid, Checker.Builder checker, Config config)
         throws ConfigInvalidException {
       checker.setBlockingConditions(
-          getEnumSet(config, SECTION_NAME, null, super.keyName, BlockingCondition.values()));
+          getEnumSet(config, SECTION_NAME, super.keyName, BlockingCondition.values()));
     }
 
     @Override
@@ -307,18 +307,16 @@
   };
 
   private static <T extends Enum<T>> ImmutableSortedSet<T> getEnumSet(
-      Config config, String section, @Nullable String subsection, String name, T[] all)
-      throws ConfigInvalidException {
+      Config config, String section, String name, T[] all) throws ConfigInvalidException {
     ImmutableSortedSet.Builder<T> enumBuilder = ImmutableSortedSet.naturalOrder();
-    for (String value : config.getStringList(section, subsection, name)) {
-      enumBuilder.add(resolveEnum(section, subsection, name, value, all));
+    for (String value : config.getStringList(section, null, name)) {
+      enumBuilder.add(resolveEnum(section, name, value, all));
     }
     return enumBuilder.build();
   }
 
   private static <T extends Enum<T>> T resolveEnum(
-      String section, @Nullable String subsection, String name, String value, T[] all)
-      throws ConfigInvalidException {
+      String section, String name, String value, T[] all) throws ConfigInvalidException {
     // Match some resolution semantics of DefaultTypedConfigGetter#getEnum.
     // TODO(dborowitz): Sure would be nice if Config exposed this logic (or getEnumList) so we
     // didn't have to replicate it.
@@ -328,11 +326,6 @@
         return e;
       }
     }
-    if (subsection != null) {
-      throw new ConfigInvalidException(
-          MessageFormat.format(
-              JGitText.get().enumValueNotSupported3, section, subsection, name, value));
-    }
     throw new ConfigInvalidException(
         MessageFormat.format(JGitText.get().enumValueNotSupported2, section, name, value));
   }