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

from_json should not generate new Event on blank/empty json input

Browse source
This commit is contained in:
Colin Surprenant 2016-02-10 16:25:25 -05:00
parent ad6cb41726
commit fa5b154ef8
3 changed files with 16 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
logstash-core-event-java/spec/event_spec.rb
View file

@ -247,20 +247,16 @@ describe LogStash::Event do
expect(event["[bar]"]).to eq("baz")
end
it "should consistently handle blank string" do
it "should ignore blank strings" do
blank_strings.each do |s|
t = LogStash::Timestamp.new
expect(LogStash::Event.from_json(s).size).to eq(1)
event1 = LogStash::Event.from_json(s)[0]
event2 = LogStash::Event.new(LogStash::Json.load(s))
event1.timestamp = t
event2.timestamp = t
expect(event1.to_hash).to eq(event2.to_hash)
expect(LogStash::Event.from_json(s).size).to eq(0)
end
end
it "should raise TypeError on nil string" do
expect{LogStash::Event.from_json(nil)}.to raise_error TypeError
end
it "should consistently handle nil" do
blank_strings.each do |s|
expect{LogStash::Event.from_json(nil)}.to raise_error

7
logstash-core-event-java/src/main/java/com/logstash/Event.java
View file

@ -162,12 +162,12 @@ public class Event implements Cloneable, Serializable {
public static Event[] fromJson(String json)
throws IOException
{
Event[] result;
// empty/blank json string does not generate an event
if (json == null || json.trim().isEmpty()) {
return new Event[]{ new Event() };
return new Event[]{ };
}
Event[] result;
Object o = mapper.readValue(json, Object.class);
// we currently only support Map or Array json objects
if (o instanceof Map) {
@ -184,6 +184,7 @@ public class Event implements Cloneable, Serializable {
} else {
throw new IOException("incompatible json object type=" + o.getClass().getName() + " , only hash map or arrays are suppoted");
}
return result;
}

24
logstash-core-event-java/src/test/java/com/logstash/EventTest.java
View file

@ -121,32 +121,20 @@ public class EventTest {
@Test
public void testFromJsonWithNull() throws Exception {
Map data1 = Event.fromJson(null)[0].toMap();
data1.remove("@timestamp");
Map data2 = new Event().toMap();
data2.remove("@timestamp");
assertEquals(data1, data2);
Event[] events = Event.fromJson(null);
assertEquals(0, events.length);
}
@Test
public void testFromJsonWithEmptyString() throws Exception {
Map data1 = Event.fromJson("")[0].toMap();
data1.remove("@timestamp");
Map data2 = new Event().toMap();
data2.remove("@timestamp");
assertEquals(data1, data2);
Event[] events = Event.fromJson("");
assertEquals(0, events.length);
}
@Test
public void testFromJsonWithBlankString() throws Exception {
Map data1 = Event.fromJson(" ")[0].toMap();
data1.remove("@timestamp");
Map data2 = new Event().toMap();
data2.remove("@timestamp");
assertEquals(data1, data2);
Event[] events = Event.fromJson(" ");
assertEquals(0, events.length);
}
@Test