Using full enum type instead of String in Stream creation request.

Graylog2 · Jul 13, 2015 · 7441478 · 7441478
1 parent ec82b2f
commit 7441478
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/...erver/src/main/java/org/graylog2/rest/resources/streams/requests/CreateStreamRequest.java b/...erver/src/main/java/org/graylog2/rest/resources/streams/requests/CreateStreamRequest.java
@@ -20,6 +20,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import org.graylog2.plugin.streams.Stream;
 import org.graylog2.rest.resources.streams.rules.requests.CreateStreamRuleRequest;
 import org.hibernate.validator.constraints.NotEmpty;
 
@@ -46,14 +47,14 @@ public abstract class CreateStreamRequest {
 
     @JsonProperty
     @Nullable
-    public abstract String matchingType();
+    public abstract Stream.MatchingType matchingType();
 
     @JsonCreator
     public static CreateStreamRequest create(@JsonProperty("title") @NotEmpty String title,
                                              @JsonProperty("description") @Nullable String description,
                                              @JsonProperty("rules") @Nullable List<CreateStreamRuleRequest> rules,
                                              @JsonProperty("content_pack") @Nullable String contentPack,
-                                             @JsonProperty("matching_type") @Nullable String matchingType) {
+                                             @JsonProperty("matching_type") @Nullable Stream.MatchingType matchingType) {
         return new AutoValue_CreateStreamRequest(title, description, rules, contentPack, matchingType);
     }
 }
diff --git a/graylog2-server/src/main/java/org/graylog2/streams/StreamServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/streams/StreamServiceImpl.java
@@ -95,7 +95,7 @@ public Stream create(CreateStreamRequest cr, String userId) {
         streamData.put(StreamImpl.FIELD_CREATOR_USER_ID, userId);
         streamData.put(StreamImpl.FIELD_CREATED_AT, Tools.iso8601());
         streamData.put(StreamImpl.FIELD_CONTENT_PACK, cr.contentPack());
-        streamData.put(StreamImpl.FIELD_MATCHING_TYPE, Stream.MatchingType.valueOfOrDefault(cr.matchingType()).toString());
+        streamData.put(StreamImpl.FIELD_MATCHING_TYPE, cr.matchingType().toString());
 
         return create(streamData);
     }

diff --git a/integration-tests/src/test/java/integration/streams/StreamsTest.java b/integration-tests/src/test/java/integration/streams/StreamsTest.java
@@ -213,12 +213,9 @@ public void creatingInvalidStreamShouldFail() throws Exception {
     @Test
     public void creatingInvalidMatchingStreamShouldFail() throws Exception {
         final int beforeCount = streamCount();
-        final String streamTitle = "Another Test Stream";
-        final String description = "This is a test stream.";
-        final String matchingType = "OR";
 
-        final ValidatableResponse response = createStreamFromRequest(jsonResourceForMethod());
-        response.statusCode(400);
+        createStreamFromRequest(jsonResourceForMethod())
+            .statusCode(400);
 
         final int afterCount = streamCount();
         assertThat(afterCount).isEqualTo(beforeCount);