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: Save a few null checks in Valuefier

Browse source 
Fixes #7938
This commit is contained in:
Armin 2017-08-08 11:32:22 +02:00 • committed by Armin Braun
parent b4e9161fd0
commit 07f9411345
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
logstash-core/src/main/java/org/logstash/Valuefier.java
View file

@ -1,6 +1,7 @@
package org.logstash;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import org.joda.time.DateTime;
@ -19,22 +20,19 @@ import org.logstash.bivalues.BiValue;
import org.logstash.bivalues.BiValues;
import org.logstash.ext.JrubyTimestampExtLibrary;
public class Valuefier {
public final class Valuefier {
private static final String PROXY_ERR_TEMPLATE = "Missing Valuefier handling for full class name=%s, simple name=%s, wrapped object=%s";
private static final String ERR_TEMPLATE = "Missing Valuefier handling for full class name=%s, simple name=%s";
private Valuefier(){}
private static Object convertJavaProxy(JavaProxy jp) {
if(jp == null) {
return BiValues.NULL_BI_VALUE;
}
Object obj = JavaUtil.unwrapJavaObject(jp);
private static Object convertJavaProxy(final JavaProxy jp) {
final Object obj = JavaUtil.unwrapJavaObject(jp);
if (obj instanceof IRubyObject[]) {
return ConvertedList.newFromRubyArray((IRubyObject[]) obj);
}
if (obj instanceof List) {
return ConvertedList.newFromList((List<Object>) obj);
return ConvertedList.newFromList((Collection<?>) obj);
}
try {
return BiValues.newBiValue(jp);
@ -44,16 +42,16 @@ public class Valuefier {
}
}
public static Object convertNonCollection(Object o) {
private static Object convertNonCollection(Object o) {
try {
return o == null ? BiValues.NULL_BI_VALUE : BiValues.newBiValue(o);
return BiValues.newBiValue(o);
} catch (IllegalArgumentException e) {
final Class<?> cls = o.getClass();
throw new IllegalArgumentException(String.format(ERR_TEMPLATE, cls.getName(), cls.getSimpleName()), e);
}
}
public static Object convert(Object o) throws IllegalArgumentException {
public static Object convert(Object o) {
if (o instanceof RubyString) {
return o;
}
@ -100,6 +98,6 @@ public class Valuefier {
Timestamp ts = new Timestamp((DateTime) o);
return convertNonCollection(ts);
}
return convertNonCollection(o);
return o == null ? BiValues.NULL_BI_VALUE : convertNonCollection(o);
}
}