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

MINOR: Remove dead and duplicate code from Event and EventTest

Browse source 
Fixes #7360
This commit is contained in:
Armin 2017-06-07 14:13:45 +02:00 • committed by Armin Braun
parent 12264efad2
commit 554b4ad229
2 changed files with 8 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

56
logstash-core/src/main/java/org/logstash/Event.java
View file

@ -96,26 +96,10 @@ public class Event implements Cloneable, Serializable, Queueable {
return this.metadata;
}
public void setData(Map<String, Object> data) {
this.data = ConvertedMap.newFromMap(data);
}
public Accessors getAccessors() {
private Accessors getAccessors() {
return this.accessors;
}
public Accessors getMetadataAccessors() {
return this.metadata_accessors;
}
public void setAccessors(Accessors accessors) {
this.accessors = accessors;
}
public void setMetadataAccessors(Accessors accessors) {
this.metadata_accessors = accessors;
}
public void cancel() {
this.cancelled = true;
}
@ -180,10 +164,6 @@ public class Event implements Cloneable, Serializable, Queueable {
}
}
public byte[] toBinary() throws IOException {
return toBinaryFromMap(toSerializableMap());
}
private Map<String, Map<String, Object>> toSerializableMap() {
HashMap<String, Map<String, Object>> hashMap = new HashMap<>();
hashMap.put(DATA_MAP_KEY, this.data);
@ -191,11 +171,6 @@ public class Event implements Cloneable, Serializable, Queueable {
return hashMap;
}
private static byte[] toBinaryFromMap(Map<String, Map<String, Object>> representation)
throws IOException {
return CBOR_MAPPER.writeValueAsBytes(representation);
}
private static Event fromSerializableMap(Map<String, Map<String, Object>> representation) throws IOException{
if (!representation.containsKey(DATA_MAP_KEY)) {
throw new IOException("The deserialized Map must contain the \"DATA\" key");
@ -208,13 +183,6 @@ public class Event implements Cloneable, Serializable, Queueable {
return new Event(dataMap);
}
public static Event fromBinary(byte[] source) throws IOException {
if (source == null || source.length == 0) {
return new Event();
}
return fromSerializableMap(fromBinaryToMap(source));
}
private static Map<String, Map<String, Object>> fromBinaryToMap(byte[] source) throws IOException {
Object o = CBOR_MAPPER.readValue(source, HashMap.class);
if (o instanceof Map) {
@ -290,14 +258,9 @@ public class Event implements Cloneable, Serializable, Queueable {
return StringInterpolation.getInstance().evaluate(this, s);
}
public Event clone()
throws CloneNotSupportedException
{
// Event clone = (Event)super.clone();
// clone.setAccessors(new Accessors(clone.getData()));
Event clone = new Event(Cloner.deep(getData()));
return clone;
@Override
public Event clone() throws CloneNotSupportedException {
return new Event(Cloner.deep(getData()));
}
public String toString() {
@ -378,20 +341,15 @@ public class Event implements Cloneable, Serializable, Queueable {
this.setField("tags", tags);
}
@Override
public byte[] serialize() throws IOException {
Map<String, Map<String, Object>> dataMap = toSerializableMap();
return toBinaryFromMap(dataMap);
}
public byte[] serializeWithoutSeqNum() throws IOException {
return toBinary();
return CBOR_MAPPER.writeValueAsBytes(toSerializableMap());
}
public static Event deserialize(byte[] data) throws IOException {
if (data == null || data.length == 0) {
return new Event();
}
Map<String, Map<String, Object>> dataMap = fromBinaryToMap(data);
return fromSerializableMap(dataMap);
return fromSerializableMap(fromBinaryToMap(data));
}
}

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

@ -13,26 +13,6 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
public class EventTest {
@Test
public void queueableInterfaceWithoutSeqNumRoundTrip() throws Exception {
Event e = new Event();
e.setField("foo", 42L);
e.setField("bar", 42);
HashMap inner = new HashMap(2);
inner.put("innerFoo", 42L);
inner.put("innerQuux", 42.42);
e.setField("baz", inner);
e.setField("[@metadata][foo]", 42L);
byte[] binary = e.serializeWithoutSeqNum();
Event er = Event.deserialize(binary);
assertEquals(42L, er.getField("foo"));
assertEquals(42, er.getField("bar"));
assertEquals(42L, er.getField("[baz][innerFoo]"));
assertEquals(42.42, er.getField("[baz][innerQuux]"));
assertEquals(42L, er.getField("[@metadata][foo]"));
assertEquals(e.getTimestamp().toIso8601(), er.getTimestamp().toIso8601());
}
@Test
public void queueableInterfaceRoundTrip() throws Exception {
@ -65,8 +45,7 @@ public class EventTest {
inner.put("innerQuux", 42.42);
e.setField("baz", inner);
e.setField("[@metadata][foo]", 42L);
byte[] binary = e.toBinary();
Event er = Event.fromBinary(binary);
Event er = Event.deserialize(e.serialize());
assertEquals(42L, er.getField("foo"));
assertEquals(42, er.getField("bar"));
assertEquals(42L, er.getField("[baz][innerFoo]"));