From e1da26dda6853ad1d79930cc13316b2695dc8793 Mon Sep 17 00:00:00 2001 From: Armin Date: Sun, 9 Jul 2017 23:15:01 +0200 Subject: [PATCH] MINOR: Cleanup redundant casts Fixes #7626 --- .../src/main/java/org/logstash/Cloner.java | 14 +++++++------- .../src/main/java/org/logstash/Event.java | 6 +++--- .../ext/JrubyAckedBatchExtLibrary.java | 4 +++- .../org/logstash/bivalues/TimestampBiValue.java | 2 +- .../org/logstash/ext/JrubyEventExtLibrary.java | 2 +- .../logstash/ext/JrubyTimestampExtLibrary.java | 17 +++++++++++------ 6 files changed, 26 insertions(+), 19 deletions(-) diff --git a/logstash-core/src/main/java/org/logstash/Cloner.java b/logstash-core/src/main/java/org/logstash/Cloner.java index d2588064d..d51e3e652 100644 --- a/logstash-core/src/main/java/org/logstash/Cloner.java +++ b/logstash-core/src/main/java/org/logstash/Cloner.java @@ -21,11 +21,11 @@ public final class Cloner { private static List deepList(final List list) { List clone; if (list instanceof LinkedList) { - clone = new LinkedList(); + clone = new LinkedList<>(); } else if (list instanceof ArrayList) { - clone = new ArrayList(); + clone = new ArrayList<>(); } else if (list instanceof ConvertedList) { - clone = new ArrayList(); + clone = new ArrayList<>(); } else { throw new ClassCastException("unexpected List type " + list.getClass()); } @@ -40,13 +40,13 @@ public final class Cloner { private static Map deepMap(final Map map) { Map clone; if (map instanceof LinkedHashMap) { - clone = new LinkedHashMap(); + clone = new LinkedHashMap<>(); } else if (map instanceof TreeMap) { - clone = new TreeMap(); + clone = new TreeMap<>(); } else if (map instanceof HashMap) { - clone = new HashMap(); + clone = new HashMap<>(); } else if (map instanceof ConvertedMap) { - clone = new HashMap(); + clone = new HashMap<>(); } else { throw new ClassCastException("unexpected Map type " + map.getClass()); } diff --git a/logstash-core/src/main/java/org/logstash/Event.java b/logstash-core/src/main/java/org/logstash/Event.java index 60a1994e1..c592ac442 100644 --- a/logstash-core/src/main/java/org/logstash/Event.java +++ b/logstash-core/src/main/java/org/logstash/Event.java @@ -185,10 +185,10 @@ public class Event implements Cloneable, Serializable, Queueable { private static Map> fromBinaryToMap(byte[] source) throws IOException { Object o = CBOR_MAPPER.readValue(source, HashMap.class); - if (o instanceof Map) { - return (HashMap>) o; + if (o == null) { + throw new IOException("incompatible from binary object type only HashMap is supported"); } else { - throw new IOException("incompatible from binary object type=" + o.getClass().getName() + " , only HashMap is supported"); + return (Map>) o; } } diff --git a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java index 693abac5b..c1a751d3c 100644 --- a/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java +++ b/logstash-core/src/main/java/org/logstash/ackedqueue/ext/JrubyAckedBatchExtLibrary.java @@ -1,5 +1,6 @@ package org.logstash.ackedqueue.ext; +import java.util.List; import org.jruby.Ruby; import org.jruby.RubyClass; import org.jruby.RubyModule; @@ -13,6 +14,7 @@ import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.load.Library; import org.logstash.ackedqueue.Batch; import org.logstash.Event; +import org.logstash.ackedqueue.Queueable; import org.logstash.ext.JrubyEventExtLibrary; import java.io.IOException; @@ -59,7 +61,7 @@ public class JrubyAckedBatchExtLibrary implements Library { context.runtime.newArgumentError("expected queue AckedQueue"); } - this.batch = new Batch(((RubyArray)events), ((RubyArray)seqNums), ((JrubyAckedQueueExtLibrary.RubyAckedQueue)queue).getQueue()); + this.batch = new Batch((List) events, (List) seqNums, ((JrubyAckedQueueExtLibrary.RubyAckedQueue)queue).getQueue()); return context.nil; } diff --git a/logstash-core/src/main/java/org/logstash/bivalues/TimestampBiValue.java b/logstash-core/src/main/java/org/logstash/bivalues/TimestampBiValue.java index b1d98ca9e..9fc2858e2 100644 --- a/logstash-core/src/main/java/org/logstash/bivalues/TimestampBiValue.java +++ b/logstash-core/src/main/java/org/logstash/bivalues/TimestampBiValue.java @@ -22,7 +22,7 @@ public class TimestampBiValue extends BiValueCommon im } protected void addRuby(Ruby runtime) { - rubyValue = RubyTimestamp.newRubyTimestamp(runtime, (Timestamp) javaValue); + rubyValue = RubyTimestamp.newRubyTimestamp(runtime, javaValue); } protected void addJava() { diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java b/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java index 4e7cf4bb2..e514a45dc 100644 --- a/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java +++ b/logstash-core/src/main/java/org/logstash/ext/JrubyEventExtLibrary.java @@ -281,7 +281,7 @@ public class JrubyEventExtLibrary implements Library { public IRubyObject ruby_tag(ThreadContext context, RubyString value) { //TODO(guy) should these tags be BiValues? - this.event.tag(((RubyString) value).asJavaString()); + this.event.tag(value.asJavaString()); return context.nil; } diff --git a/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java b/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java index d5533c801..858d43318 100644 --- a/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java +++ b/logstash-core/src/main/java/org/logstash/ext/JrubyTimestampExtLibrary.java @@ -1,10 +1,17 @@ package org.logstash.ext; -import org.jruby.*; +import java.io.IOException; +import org.jruby.Ruby; +import org.jruby.RubyClass; +import org.jruby.RubyFixnum; +import org.jruby.RubyFloat; +import org.jruby.RubyModule; +import org.jruby.RubyObject; +import org.jruby.RubyString; +import org.jruby.RubyTime; import org.jruby.anno.JRubyClass; import org.jruby.anno.JRubyMethod; import org.jruby.exceptions.RaiseException; -import org.jruby.ext.bigdecimal.RubyBigDecimal; import org.jruby.javasupport.JavaUtil; import org.jruby.runtime.Arity; import org.jruby.runtime.ObjectAllocator; @@ -13,8 +20,6 @@ import org.jruby.runtime.builtin.IRubyObject; import org.jruby.runtime.load.Library; import org.logstash.Timestamp; -import java.io.IOException; - public class JrubyTimestampExtLibrary implements Library { private static final ObjectAllocator ALLOCATOR = new ObjectAllocator() { @@ -90,7 +95,7 @@ public class JrubyTimestampExtLibrary implements Library { this.timestamp = new Timestamp(((RubyTime)time).getDateTime()); } else if (time instanceof RubyString) { try { - this.timestamp = new Timestamp(((RubyString) time).toString()); + this.timestamp = new Timestamp(time.toString()); } catch (IllegalArgumentException e) { throw new RaiseException( getRuntime(), @@ -161,7 +166,7 @@ public class JrubyTimestampExtLibrary implements Library { } else if (time instanceof RubyTime) { return new Timestamp(((RubyTime)time).getDateTime()); } else if (time instanceof RubyString) { - return new Timestamp(((RubyString) time).toString()); + return new Timestamp(time.toString()); } else if (time instanceof RubyTimestamp) { return new Timestamp(((RubyTimestamp) time).timestamp); } else {