Remove java.util.Date workaround now that we correctly serialize Date…

…Time (#3202) Serialization of DateTime has been fixed in #3198.
Graylog2 · Dec 14, 2016 · b52b625 · b52b625
1 parent fe76627
commit b52b625
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 38 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AlertImpl.java b/graylog2-server/src/main/java/org/graylog2/alerts/AlertImpl.java
@@ -28,7 +28,6 @@
 import org.mongojack.ObjectId;
 
 import javax.annotation.Nullable;
-import java.util.Date;
 import java.util.Map;
 
 @AutoValue
@@ -58,9 +57,11 @@ public abstract class AlertImpl implements Alert {
     @Override
     public abstract String getConditionId();
 
+    @JsonProperty(FIELD_TRIGGERED_AT)
     @Override
     public abstract DateTime getTriggeredAt();
 
+    @JsonProperty(FIELD_RESOLVED_AT)
     @Override
     @Nullable
     public abstract DateTime getResolvedAt();
@@ -77,17 +78,6 @@ public abstract class AlertImpl implements Alert {
     @Override
     public abstract boolean isInterval();
 
-    @JsonProperty(FIELD_TRIGGERED_AT)
-    private Date getTriggeredAtDate() {
-        return getTriggeredAt().toDate();
-    }
-
-    @JsonProperty(FIELD_RESOLVED_AT)
-    @Nullable
-    private Date getResolvedAtDate() {
-        return getResolvedAt() == null ? null : getResolvedAt().toDate();
-    }
-
     static Builder builder() {
         return new AutoValue_AlertImpl.Builder();
     }
@@ -98,15 +88,21 @@ static Builder builder() {
     public static AlertImpl create(@JsonProperty(FIELD_ID) @ObjectId @Id String id,
                                    @JsonProperty(FIELD_STREAM_ID) String streamId,
                                    @JsonProperty(FIELD_CONDITION_ID) String conditionId,
-                                   @JsonProperty(FIELD_TRIGGERED_AT) Date triggeredAtDate,
-                                   @JsonProperty(FIELD_RESOLVED_AT) @Nullable Date resolvedAtDate,
+                                   @JsonProperty(FIELD_TRIGGERED_AT) DateTime triggeredAt,
+                                   @JsonProperty(FIELD_RESOLVED_AT) @Nullable DateTime resolvedAt,
                                    @JsonProperty(FIELD_DESCRIPTION) String description,
                                    @JsonProperty(FIELD_CONDITION_PARAMETERS) Map<String, Object> conditionParameters,
                                    @JsonProperty(FIELD_IS_INTERVAL) boolean isInterval) {
-        final DateTime triggeredAt = new DateTime(triggeredAtDate);
-        // We need to ensure that Alerts with a non-existing or null resolvedAt do not set the field to the current time.
-        final DateTime resolvedAt = resolvedAtDate == null ? null : new DateTime(resolvedAtDate);
-        return create(id, streamId, conditionId, triggeredAt, resolvedAt, description, conditionParameters, isInterval);
+        return builder()
+                .id(id)
+                .streamId(streamId)
+                .conditionId(conditionId)
+                .triggeredAt(triggeredAt)
+                .resolvedAt(resolvedAt)
+                .description(description)
+                .conditionParameters(conditionParameters)
+                .interval(isInterval)
+                .build();
     }
 
     public static AlertImpl fromCheckResult(AlertCondition.CheckResult checkResult) {
@@ -120,25 +116,6 @@ public static AlertImpl fromCheckResult(AlertCondition.CheckResult checkResult)
                 true);
     }
 
-    public static AlertImpl create(String id,
-                                   String streamId,
-                                   String conditionId,
-                                   DateTime triggeredAt,
-                                   DateTime resolvedAt,
-                                   String description,
-                                   Map<String, Object> conditionParameters,
-                                   boolean isInterval) {
-        return builder()
-            .id(id)
-            .streamId(streamId)
-            .conditionId(conditionId)
-            .triggeredAt(triggeredAt)
-            .resolvedAt(resolvedAt)
-            .description(description)
-            .conditionParameters(conditionParameters)
-            .interval(isInterval)
-            .build();
-    }
 
     @AutoValue.Builder
     public interface Builder {

diff --git a/graylog2-server/src/main/java/org/graylog2/alerts/AlertServiceImpl.java b/graylog2-server/src/main/java/org/graylog2/alerts/AlertServiceImpl.java
@@ -74,7 +74,7 @@ public List<Alert> loadRecentOfStreams(List<String> streamIds, DateTime since, i
         final DateTime effectiveSince = (since == null ? new DateTime(0L, DateTimeZone.UTC) : since);
         final DBQuery.Query query = DBQuery.and(
                 getFindAnyStreamQuery(streamIds),
-                DBQuery.greaterThanEquals(AlertImpl.FIELD_TRIGGERED_AT, effectiveSince.toDate())
+                DBQuery.greaterThanEquals(AlertImpl.FIELD_TRIGGERED_AT, effectiveSince)
         );
 
         return Collections.unmodifiableList(this.coll.find(query)