Moving and extracting DTOs to proper places.

(cherry picked from commit 5a0c646)

Conflicts:
	graylog2-rest-client/src/main/java/org/graylog2/restclient/models/Radio.java
	graylog2-rest-models/src/main/java/org/graylog2/rest/models/sources/responses/SourcesList.java
	graylog2-server/src/main/java/org/graylog2/rest/resources/system/DeflectorResource.java

graylog2-rest-client/src/main/java/org/graylog2/restclient/models/BufferInfo.java

@@ -18,6 +18,7 @@
 
 import com.google.common.base.MoreObjects;
 import com.google.common.collect.Maps;
+import org.graylog2.rest.models.system.buffers.responses.BuffersUtilizationSummary;
 import org.graylog2.restclient.models.api.responses.BufferSummaryResponse;
 import org.graylog2.restclient.models.api.responses.BuffersResponse;
 
@@ -35,6 +36,12 @@ public BufferInfo(BuffersResponse br) {
         outputBuffer = br.buffers.get("output");
     }
 
+    public BufferInfo(BuffersUtilizationSummary bus) {
+        inputBuffer = BufferSummaryResponse.fromSingleRingUtilization(bus.buffers().input());
+        processBuffer = BufferSummaryResponse.EMPTY;
+        outputBuffer = BufferSummaryResponse.fromSingleRingUtilization(bus.buffers().output());
+    }
+
     public BufferSummaryResponse getInputBuffer() {
         return MoreObjects.firstNonNull(inputBuffer, BufferSummaryResponse.EMPTY);
     }

graylog2-rest-client/src/main/java/org/graylog2/restclient/models/Node.java

@@ -21,6 +21,7 @@
 import com.google.common.net.MediaType;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
+import org.graylog2.rest.models.system.buffers.responses.BufferClasses;
 import org.graylog2.rest.models.system.inputs.requests.InputLaunchRequest;
 import org.graylog2.restclient.lib.APIException;
 import org.graylog2.restclient.lib.ApiClient;
@@ -91,13 +92,13 @@ public interface Factory {
     private AtomicInteger failureCount = new AtomicInteger(0);
 
     private BufferInfo bufferInfo;
-    private BufferClassesResponse bufferClasses;
+    private BufferClasses bufferClasses;
     private JournalInfo journalInfo;
 
     /* for initial set up in test */
-    public Node(NodeSummaryResponse r) {
+    /*public Node(NodeSummaryResponse r) {
         this(null, null, null, r);
-    }
+    }*/
 
     @AssistedInject
     public Node(ApiClient api,
@@ -152,9 +153,10 @@ public BufferInfo loadBufferInfo() {
         return BufferInfo.buildEmpty();
     }
 
-    public synchronized BufferClassesResponse getBufferClasses() {
+    public synchronized BufferClasses getBufferClasses() {
         if (this.bufferClasses == null) {
-            this.bufferClasses = loadBufferClasses();
+            final BufferClassesResponse response = loadBufferClasses();
+            this.bufferClasses = BufferClasses.create(response.processBufferClass, response.outputBufferClass);
         }
         return this.bufferClasses;
     }
@@ -187,7 +189,7 @@ public JournalInfo loadJournalInfo() {
     public Map<String, InternalLoggerSubsystem> allLoggerSubsystems() {
         Map<String, InternalLoggerSubsystem> subsystems = Maps.newHashMap();
         try {
-            LoggerSubsystemsResponse response = api.path(routes.LoggersResource().subsytems(), LoggerSubsystemsResponse.class)
+            LoggerSubsystemsResponse response = api.path(routes.LoggersResource().subsystems(), LoggerSubsystemsResponse.class)
                     .node(this)
                     .execute();
 

graylog2-rest-client/src/main/java/org/graylog2/restclient/models/api/responses/BufferSummaryResponse.java

@@ -17,6 +17,7 @@
 package org.graylog2.restclient.models.api.responses;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import org.graylog2.rest.models.system.buffers.responses.SingleRingUtilization;
 
 /**
  * @author Lennart Koopmann <lennart@torch.sh>
@@ -29,4 +30,11 @@ public class BufferSummaryResponse {
     @JsonProperty("utilization_percent")
     public float utilizationPercent;
 
+    public static BufferSummaryResponse fromSingleRingUtilization(SingleRingUtilization sru) {
+        final BufferSummaryResponse bur = new BufferSummaryResponse();
+        bur.utilization = sru.utilization();
+        bur.utilizationPercent = sru.utilizationPercent();
+
+        return bur;
+    }
 }

graylog2-rest-models/pom.xml

@@ -52,5 +52,13 @@
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.ext</groupId>
+            <artifactId>jersey-bean-validation</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
     </dependencies>
 </project>

graylog2-server/src/main/java/org/graylog2/rest/resources/count/responses/MessageCountResponse.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/count/responses/MessageCountResponse.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.count.responses;
+package org.graylog2.rest.models.count.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;

graylog2-server/src/main/java/org/graylog2/rest/resources/dashboards/requests/AddWidgetRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/dashboards/requests/AddWidgetRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.dashboards.requests;
+package org.graylog2.rest.models.dashboards.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/dashboards/requests/CreateDashboardRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/dashboards/requests/CreateDashboardRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.dashboards.requests;
+package org.graylog2.rest.models.dashboards.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/dashboards/requests/UpdateDashboardRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/dashboards/requests/UpdateDashboardRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.dashboards.requests;
+package org.graylog2.rest.models.dashboards.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/dashboards/requests/UpdateWidgetRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/dashboards/requests/UpdateWidgetRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.dashboards.requests;
+package org.graylog2.rest.models.dashboards.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/dashboards/responses/DashboardList.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/dashboards/responses/DashboardList.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.dashboards.responses;
+package org.graylog2.rest.models.dashboards.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;

graylog2-server/src/main/java/org/graylog2/rest/resources/messages/responses/MessageTokens.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/messages/responses/MessageTokens.java

@@ -14,9 +14,10 @@
  * 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.rest.resources.messages.responses;
+package org.graylog2.rest.models.messages.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 
@@ -28,7 +29,8 @@ public abstract class MessageTokens {
     @JsonProperty
     public abstract List<String> tokens();
 
-    public static MessageTokens create(List<String> tokens) {
+    @JsonCreator
+    public static MessageTokens create(@JsonProperty("tokens") List<String> tokens) {
         return new AutoValue_MessageTokens(tokens);
     }
 }

graylog2-rest-models/src/main/java/org/graylog2/rest/models/messages/responses/ResultMessageSummary.java

@@ -0,0 +1,30 @@
+package org.graylog2.rest.models.messages.responses;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.auto.value.AutoValue;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Range;
+
+import java.util.Map;
+
+@AutoValue
+@JsonAutoDetect
+public abstract class ResultMessageSummary {
+    @JsonProperty("highlight_ranges")
+    public abstract Multimap<String, Range<Integer>> highlightRanges();
+
+    @JsonProperty
+    public abstract Map<String, Object> message();
+
+    @JsonProperty
+    public abstract String index();
+
+    @JsonCreator
+    public static ResultMessageSummary create(@JsonProperty("highlight_ranges") Multimap<String, Range<Integer>> highlightRanges,
+                                              @JsonProperty("message") Map<String, Object> message,
+                                              @JsonProperty("index") String index) {
+        return new AutoValue_ResultMessageSummary(highlightRanges, message, index);
+    }
+}

graylog2-server/src/main/java/org/graylog2/rest/resources/search/responses/FieldStatsResult.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/search/responses/FieldStatsResult.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.search.responses;
+package org.graylog2.rest.models.search.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;

graylog2-server/src/main/java/org/graylog2/rest/resources/search/responses/HistogramResult.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/search/responses/HistogramResult.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.search.responses;
+package org.graylog2.rest.models.search.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;

graylog2-server/src/main/java/org/graylog2/rest/resources/search/responses/TermsResult.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/search/responses/TermsResult.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.search.responses;
+package org.graylog2.rest.models.search.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;

graylog2-server/src/main/java/org/graylog2/rest/resources/search/responses/TermsStatsResult.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/search/responses/TermsStatsResult.java

@@ -14,9 +14,10 @@
  * 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.rest.resources.search.responses;
+package org.graylog2.rest.models.search.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 
@@ -35,7 +36,8 @@ public abstract class TermsStatsResult {
     @JsonProperty
     public abstract String builtQuery();
 
-    public static TermsStatsResult create(long time, List<Map<String, Object>> terms, String builtQuery) {
+    @JsonCreator
+    public static TermsStatsResult create(@JsonProperty("time") long time, @JsonProperty("terms") List<Map<String, Object>> terms, @JsonProperty("built_query") String builtQuery) {
         return new AutoValue_TermsStatsResult(time, terms, builtQuery);
     }
 }

graylog2-server/src/main/java/org/graylog2/rest/resources/search/responses/TimeRange.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/search/responses/TimeRange.java

@@ -14,9 +14,10 @@
  * 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.rest.resources.search.responses;
+package org.graylog2.rest.models.search.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 import org.joda.time.DateTime;
@@ -30,7 +31,8 @@ public abstract class TimeRange {
     @JsonProperty
     public abstract DateTime to();
 
-    public static TimeRange create(DateTime from, DateTime to) {
+    @JsonCreator
+    public static TimeRange create(@JsonProperty("from") DateTime from, @JsonProperty("to") DateTime to) {
         return new AutoValue_TimeRange(from, to);
     }
 }

graylog2-server/src/main/java/org/graylog2/rest/resources/sources/responses/SourcesList.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/sources/responses/SourcesList.java

@@ -14,9 +14,10 @@
  * 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.rest.resources.sources.responses;
+package org.graylog2.rest.models.sources.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 
@@ -37,7 +38,11 @@ public abstract class SourcesList {
     @JsonProperty
     public abstract int range();
 
-    public static SourcesList create(int total, Map<String, Long> sources, long tookMs, int range) {
+    @JsonCreator
+    public static SourcesList create(@JsonProperty("total") int total,
+                                     @JsonProperty("sources") Map<String, Long> sources,
+                                     @JsonProperty("took_ms") long tookMs,
+                                     @JsonProperty("range") int range) {
         return new AutoValue_SourcesList(total, sources, tookMs, range);
     }
 

graylog2-server/src/main/java/org/graylog2/rest/resources/streams/alerts/requests/CreateConditionRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/streams/alerts/requests/CreateConditionRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.streams.alerts.requests;
+package org.graylog2.rest.models.streams.alerts.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/streams/outputs/OutputListResponse.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/streams/outputs/OutputListResponse.java

@@ -14,12 +14,12 @@
  * 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.rest.resources.streams.outputs;
+package org.graylog2.rest.models.streams.outputs;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
-import org.graylog2.plugin.streams.Output;
 import org.graylog2.rest.models.system.outputs.responses.OutputSummary;
 
 import java.util.Collection;
@@ -33,7 +33,8 @@ public abstract class OutputListResponse {
     @JsonProperty
     public abstract Collection<OutputSummary> outputs();
 
-    public static OutputListResponse create(long total, Collection<OutputSummary> outputs) {
+    @JsonCreator
+    public static OutputListResponse create(@JsonProperty("total") long total, @JsonProperty("outputs") Collection<OutputSummary> outputs) {
         return new AutoValue_OutputListResponse(total, outputs);
     }
 

graylog2-server/src/main/java/org/graylog2/rest/resources/streams/outputs/AddOutputRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/streams/outputs/requests/AddOutputRequest.java

@@ -14,7 +14,7 @@
  * 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.rest.resources.streams.outputs;
+package org.graylog2.rest.models.streams.outputs.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/streams/outputs/CreateOutputRequest.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/streams/outputs/requests/CreateOutputRequest.java

@@ -14,7 +14,7 @@
  * 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.streams.outputs;
+package org.graylog2.rest.models.streams.outputs.requests;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonCreator;

graylog2-server/src/main/java/org/graylog2/rest/resources/system/indexer/responses/ClosedIndices.java → graylog2-rest-models/src/main/java/org/graylog2/rest/models/system/indexer/responses/ClosedIndices.java

@@ -14,9 +14,10 @@
  * 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.rest.resources.system.indexer.responses;
+package org.graylog2.rest.models.system.indexer.responses;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
 
@@ -31,7 +32,8 @@ public abstract class ClosedIndices {
     @JsonProperty
     public abstract int total();
 
-    public static ClosedIndices create(Set<String> indices, int total) {
+    @JsonCreator
+    public static ClosedIndices create(@JsonProperty("indices") Set<String> indices, @JsonProperty("total") int total) {
         return new AutoValue_ClosedIndices(indices, total);
     }
 }