Move AutoValue-aware getCanonicalName into separate helper class

graylog2-server/src/main/java/org/graylog2/events/ClusterEventPeriodical.java

@@ -32,6 +32,7 @@
 import org.graylog2.database.MongoConnection;
 import org.graylog2.plugin.periodical.Periodical;
 import org.graylog2.plugin.system.NodeId;
+import org.graylog2.shared.utilities.AutoValueUtils;
 import org.mongojack.DBCursor;
 import org.mongojack.DBSort;
 import org.mongojack.DBUpdate;
@@ -176,7 +177,7 @@ public void publishClusterEvent(Object event) {
             return;
         }
 
-        final String className = getCanonicalName(event.getClass());
+        final String className = AutoValueUtils.getCanonicalName(event.getClass());
         final ClusterEvent clusterEvent = ClusterEvent.create(nodeId.toString(), className, event);
 
         try {
@@ -218,24 +219,4 @@ private Object extractPayload(Object payload, String eventClass) {
 
         }
     }
-
-    /**
-     * Get the canonical class name of the provided {@link Class} with special handling of Google AutoValue classes.
-     *
-     * @param aClass a class
-     * @return the canonical class name of {@code aClass} or its super class in case of an auto-generated class by
-     * Google AutoValue
-     * @see Class#getCanonicalName()
-     * @see com.google.auto.value.AutoValue
-     */
-    private String getCanonicalName(final Class<?> aClass) {
-        final Class<?> cls;
-        if (aClass.getSimpleName().startsWith("AutoValue_")) {
-            cls = aClass.getSuperclass();
-        } else {
-            cls = aClass;
-        }
-
-        return cls.getCanonicalName();
-    }
 }

graylog2-shared/src/main/java/org/graylog2/shared/utilities/AutoValueUtils.java

@@ -0,0 +1,45 @@
+/**
+ * This file is part of Graylog.
+ *
+ * Graylog is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Graylog is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Graylog.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.graylog2.shared.utilities;
+
+/**
+ * Utility methods related to Google AutoValue
+ */
+public final class AutoValueUtils {
+    private AutoValueUtils() {
+    }
+
+    /**
+     * Get the canonical class name of the provided {@link Class} with special handling of Google AutoValue classes.
+     *
+     * @param aClass a class
+     * @return the canonical class name of {@code aClass} or its super class in case of an auto-generated class by
+     * Google AutoValue
+     * @see Class#getCanonicalName()
+     * @see com.google.auto.value.AutoValue
+     */
+    public static String getCanonicalName(final Class<?> aClass) {
+        final Class<?> cls;
+        if (aClass.getSimpleName().startsWith("AutoValue_")) {
+            cls = aClass.getSuperclass();
+        } else {
+            cls = aClass;
+        }
+
+        return cls.getCanonicalName();
+    }
+}