From ac1cf49e7a5fbc690c14dad40ae700f15cb887b2 Mon Sep 17 00:00:00 2001 From: Dennis Oelkers Date: Thu, 26 Mar 2015 17:28:45 +0100 Subject: [PATCH] Moving helper method from resource to separate class. --- .../java/org/graylog2/plugin/Capabilities.java | 16 ++++++++++++++++ .../resources/system/SystemPluginResource.java | 12 ++---------- 2 files changed, 18 insertions(+), 10 deletions(-) create mode 100644 graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/Capabilities.java diff --git a/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/Capabilities.java b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/Capabilities.java new file mode 100644 index 000000000000..d1af507d9352 --- /dev/null +++ b/graylog2-plugin-interfaces/src/main/java/org/graylog2/plugin/Capabilities.java @@ -0,0 +1,16 @@ +package org.graylog2.plugin; + +import com.google.common.collect.Sets; + +import java.util.Set; + +public class Capabilities { + public static Set toStringSet(Set capabilities) { + final Set stringSet = Sets.newHashSetWithExpectedSize(capabilities.size()); + for (ServerStatus.Capability capability : capabilities) { + stringSet.add(capability.toString()); + } + + return stringSet; + } +} diff --git a/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemPluginResource.java b/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemPluginResource.java index b823637dd80f..42d12dfae619 100644 --- a/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemPluginResource.java +++ b/graylog2-shared/src/main/java/org/graylog2/shared/rest/resources/system/SystemPluginResource.java @@ -19,6 +19,7 @@ import com.codahale.metrics.annotation.Timed; import com.google.common.collect.Lists; import com.google.common.collect.Sets; +import org.graylog2.plugin.Capabilities; import org.graylog2.plugin.PluginMetaData; import org.graylog2.plugin.ServerStatus; import com.wordnik.swagger.annotations.Api; @@ -61,19 +62,10 @@ public PluginList list() { pluginMetaData.getVersion().toString(), pluginMetaData.getDescription(), pluginMetaData.getRequiredVersion().toString(), - capabilityToStringSet(pluginMetaData.getRequiredCapabilities()) + Capabilities.toStringSet(pluginMetaData.getRequiredCapabilities()) )); } return PluginList.create(pluginMetaDataValues); } - - private Set capabilityToStringSet(Set capabilities) { - final Set stringSet = Sets.newHashSetWithExpectedSize(capabilities.size()); - for (ServerStatus.Capability capability : capabilities) { - stringSet.add(capability.toString()); - } - - return stringSet; - } }