github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

BUG: Fix RubyTimestamp not being serialized correctly

Browse source 
Fixes #7996
This commit is contained in:
Armin 2017-08-15 13:37:32 +02:00 • committed by Armin Braun
parent 35101f18ee
commit 691d3d01f3
3 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java
View file

@ -1,5 +1,6 @@
package org.logstash.ext; package org.logstash.ext;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import java.io.IOException; import java.io.IOException;
import org.jruby.Ruby; import org.jruby.Ruby;
import org.jruby.RubyClass; import org.jruby.RubyClass;
@ -19,6 +20,7 @@ import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.builtin.IRubyObject;
import org.jruby.runtime.load.Library; import org.jruby.runtime.load.Library;
import org.logstash.Timestamp; import org.logstash.Timestamp;
import org.logstash.json.RubyTimestampSerializer;
public class JrubyTimestampExtLibrary implements Library { public class JrubyTimestampExtLibrary implements Library {
@ -40,6 +42,7 @@ public class JrubyTimestampExtLibrary implements Library {
} }
@JRubyClass(name = "Timestamp") @JRubyClass(name = "Timestamp")
@JsonSerialize(using = RubyTimestampSerializer.class)
public static class RubyTimestamp extends RubyObject { public static class RubyTimestamp extends RubyObject {
private Timestamp timestamp; private Timestamp timestamp;

22
logstash-core/src/main/java/org/logstash/json/RubyTimestampSerializer.java Normal file
View file

@ -0,0 +1,22 @@
package org.logstash.json;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.JsonSerializer;
import com.fasterxml.jackson.databind.SerializerProvider;
import java.io.IOException;
import org.logstash.ext.JrubyTimestampExtLibrary;
/**
* Serializer for {@link JrubyTimestampExtLibrary.RubyTimestamp} that serializes it exactly the same
* way {@link TimestampSerializer} serializes {@link org.logstash.Timestamp} to ensure consistent
* serialization across Java and Ruby representation of {@link org.logstash.Timestamp}.
*/
public final class RubyTimestampSerializer
extends JsonSerializer<JrubyTimestampExtLibrary.RubyTimestamp> {
@Override
public void serialize(final JrubyTimestampExtLibrary.RubyTimestamp value,
final JsonGenerator jgen, final SerializerProvider provider) throws IOException {
jgen.writeString(value.getTimestamp().toIso8601());
}
}

14
logstash-core/src/test/java/org/logstash/EventTest.java
View file

@ -6,6 +6,7 @@ import java.util.Arrays;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.jruby.RubyTime;
import org.junit.Test; import org.junit.Test;
import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals; import static net.javacrumbs.jsonunit.JsonAssert.assertJsonEquals;
@ -106,6 +107,19 @@ public final class EventTest {
assertJsonEquals("{\"@timestamp\":\"" + e.getTimestamp().toIso8601() + "\",\"foo\":{\"0\":{\"baz\":1}},\"@version\":\"1\"}", e.toJson()); assertJsonEquals("{\"@timestamp\":\"" + e.getTimestamp().toIso8601() + "\",\"foo\":{\"0\":{\"baz\":1}},\"@version\":\"1\"}", e.toJson());
} }
@Test
public void testTimestampFieldToJson() throws Exception {
Event e = new Event();
final RubyTime time = RubyUtil.RUBY.newTime(1000L);
e.setField("[foo][bar][baz]", time);
assertJsonEquals(
String.format(
"{\"@timestamp\":\"%s\",\"foo\":{\"bar\":{\"baz\":\"%s\"}},\"@version\":\"1\"}",
e.getTimestamp().toIso8601(), new Timestamp(time.getDateTime()).toIso8601()
), e.toJson()
);
}
@Test @Test
public void testGetFieldList() throws Exception { public void testGetFieldList() throws Exception {
Map<String, Object> data = new HashMap<>(); Map<String, Object> data = new HashMap<>();