commit f66892abb539507e6b6a2775780767c7fd3c3311
author Dave Borowitz <dborowitz@google.com> Fri May 24 10:44:32 2019 -0700
committer David Pursehouse <dpursehouse@collab.net> Mon May 27 08:35:58 2019 +0900
tree 3a40ddf0d778cbe844a6b977488ac9294c7a1e3f
parent aebb4eae25ff20727e6c958641c4f2ece984765b

Error Prone: Enable and fix GetClassOnEnum

Change-Id: I42b0df3926b8c8633067e5d8cab81987fb6a71bf

java/com/google/gerrit/pgm/init/api/Section.java

diff --git a/java/com/google/gerrit/pgm/init/api/Section.java b/java/com/google/gerrit/pgm/init/api/Section.java
index baf37b6..cbf32a1 100644
--- a/java/com/google/gerrit/pgm/init/api/Section.java
+++ b/java/com/google/gerrit/pgm/init/api/Section.java
@@ -127,8 +127,10 @@
 
   public <T extends Enum<?>, E extends EnumSet<? extends T>> T select(
       String title, String name, T defValue, boolean nullIfDefault) {
+    @SuppressWarnings("rawtypes")
+    Class<? extends Enum> declaringClass = defValue.getDeclaringClass();
     @SuppressWarnings("unchecked")
-    E allowedValues = (E) EnumSet.allOf(defValue.getClass());
+    E allowedValues = (E) EnumSet.allOf(declaringClass);
     return select(title, name, defValue, allowedValues, nullIfDefault);
   }
 

tools/BUILD

diff --git a/tools/BUILD b/tools/BUILD
index c3cc95b..8d34156 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -60,7 +60,7 @@
         "-Xep:FragmentNotInstantiable:ERROR",
         "-Xep:FunctionalInterfaceClash:ERROR",
         "-Xep:FutureReturnValueIgnored:ERROR",
-        #"-Xep:GetClassOnEnum:ERROR",
+        "-Xep:GetClassOnEnum:ERROR",
         "-Xep:ImmutableAnnotationChecker:ERROR",
         #"-Xep:ImmutableEnumChecker:ERROR",
         "-Xep:IncompatibleModifiers:ERROR",