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

Changed: avoid JavaObject wrapping in Ruby methods

Browse source 
aligns the Ruby/Java returns as they happen in scripted Java
e.g. as `java.lang.Thread.new` returns a JavaProxy instance

there's really no reason to use JavaObject which always needs `to_java`
conversion to be useful (and is considered legacy in JRuby).

considered breaking change e.g. `LogStash::MemoryReadClient#read_batch`
will now return a proper JavaProxy instead of the JavaObject

Fixes #11391
This commit is contained in:
Karol Bucek 2019-12-04 16:21:26 +01:00
parent 6ee050fda6
commit 9d497a13f2
5 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
logstash-core/lib/logstash/java_pipeline.rb
View file

@ -281,11 +281,7 @@ module LogStash; class JavaPipeline < JavaBasePipeline
def wait_inputs
@input_threads.each do |thread|
if thread.class == Java::JavaObject
thread.to_java.join
else
thread.join
end
thread.join # Thread or java.lang.Thread (both have #join)
end
end

11
logstash-core/src/main/java/org/logstash/RubyUtil.java
View file

@ -5,7 +5,9 @@ import org.jruby.RubyClass;
import org.jruby.RubyModule;
import org.jruby.anno.JRubyClass;
import org.jruby.exceptions.RaiseException;
import org.jruby.javasupport.JavaUtil;
import org.jruby.runtime.ObjectAllocator;
import org.jruby.runtime.builtin.IRubyObject;
import org.logstash.ackedqueue.QueueFactoryExt;
import org.logstash.ackedqueue.ext.JRubyAckedQueueExt;
import org.logstash.ackedqueue.ext.JRubyWrappedAckedQueueExt;
@ -601,4 +603,13 @@ public final class RubyUtil {
return clazz;
}
/**
* Convert a Java object to a Ruby representative.
* @param javaObject the object to convert (might be null)
* @return a Ruby wrapper
*/
public static IRubyObject toRubyObject(Object javaObject) {
return JavaUtil.convertJavaToRuby(RUBY, javaObject);
}
}

7
logstash-core/src/main/java/org/logstash/ackedqueue/ext/JRubyAckedQueueExt.java
View file

@ -9,7 +9,6 @@ import org.jruby.RubyObject;
import org.jruby.RubyString;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
import org.jruby.javasupport.JavaObject;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.logstash.Event;
@ -114,16 +113,14 @@ public final class JRubyAckedQueueExt extends RubyObject {
}
@JRubyMethod(name = "read_batch", required = 2)
public IRubyObject ruby_read_batch(ThreadContext context, IRubyObject limit,
IRubyObject timeout) {
public IRubyObject ruby_read_batch(ThreadContext context, IRubyObject limit, IRubyObject timeout) {
AckedBatch b;
try {
b = readBatch(RubyFixnum.num2int(limit), RubyFixnum.num2int(timeout));
} catch (IOException e) {
throw RubyUtil.newRubyIOError(context.runtime, e);
}
// TODO: return proper Batch object
return (b == null) ? context.nil : JavaObject.wrap(context.runtime, b);
return RubyUtil.toRubyObject(b);
}
public AckedBatch readBatch(int limit, long timeout) throws IOException {

3
logstash-core/src/main/java/org/logstash/config/ir/compiler/JavaInputDelegatorExt.java
View file

@ -6,7 +6,6 @@ import org.jruby.RubyClass;
import org.jruby.RubyObject;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
import org.jruby.javasupport.JavaObject;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.logstash.RubyUtil;
@ -66,7 +65,7 @@ public class JavaInputDelegatorExt extends RubyObject {
});
t.setName(pipeline.pipelineId().asJavaString() + "_" + input.getName() + "_" + input.getId());
t.start();
return JavaObject.wrap(context.getRuntime(), t);
return RubyUtil.toRubyObject(t);
}
@JRubyMethod(name = "metric=")

11
logstash-core/src/main/java/org/logstash/execution/QueueReadClientBase.java
View file

@ -7,8 +7,7 @@ import org.jruby.RubyNumeric;
import org.jruby.RubyObject;
import org.jruby.anno.JRubyClass;
import org.jruby.anno.JRubyMethod;
import org.jruby.java.proxies.JavaProxy;
import org.jruby.javasupport.JavaObject;
import org.jruby.javasupport.JavaUtil;
import org.jruby.runtime.ThreadContext;
import org.jruby.runtime.builtin.IRubyObject;
import org.logstash.RubyUtil;
@ -103,7 +102,7 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
@JRubyMethod(name = "read_batch")
public IRubyObject rubyReadBatch(final ThreadContext context) throws InterruptedException {
return JavaObject.wrap(context.runtime, readBatch());
return RubyUtil.toRubyObject(readBatch());
}
@Override
@ -148,11 +147,7 @@ public abstract class QueueReadClientBase extends RubyObject implements QueueRea
* @return Extracted queue batch
*/
private static QueueBatch extractQueueBatch(final IRubyObject batch) {
if (batch instanceof JavaProxy) {
return (QueueBatch) ((JavaObject)batch.dataGetStruct()).getValue();
} else {
return (QueueBatch)((JavaObject)batch).getValue();
}
return JavaUtil.unwrapIfJavaObject(batch);
}
/**