[WIP] running rubyTests gives errors

elastic · Dec 23, 2020 · db55924 · db55924
1 parent 1d0d08e
commit db55924
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 6 deletions.
diff --git a/logstash-core/lib/logstash/settings.rb b/logstash-core/lib/logstash/settings.rb
@@ -304,6 +304,7 @@ class Setting
 
     class Coercible < Setting
       def initialize(name, klass, default=nil, strict=true, &validator_proc)
+        super(name, klass, default, strict, &validator_proc)
         @name = name
         unless klass.is_a?(Class)
           raise ArgumentError.new("Setting \"#{@name}\" must be initialized with a class (received #{klass})")

diff --git a/logstash-core/src/main/java/org/logstash/settings/Setting.java b/logstash-core/src/main/java/org/logstash/settings/Setting.java
@@ -10,7 +10,7 @@
 public class Setting {
 
     private final String name;
-    private final Class<? extends Object> klass;
+    final Class<? extends Object> klass;
     private final Object defaultValue;
     private boolean valueIsSet;
     private Object value;

diff --git a/logstash-core/src/main/java/org/logstash/settings/SettingExt.java b/logstash-core/src/main/java/org/logstash/settings/SettingExt.java
@@ -1,6 +1,7 @@
 package org.logstash.settings;
 
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
 import org.jruby.RubyBoolean;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
@@ -14,7 +15,12 @@
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.logstash.RubyUtil;
+import org.logstash.util.CloudSettingAuth;
+import org.logstash.util.CloudSettingId;
+import org.logstash.util.ModulesSettingArray;
+import org.logstash.util.TimeValue;
 
+import java.util.ArrayList;
 import java.util.Map;
 import java.util.function.Predicate;
 
@@ -37,15 +43,17 @@ public SettingExt(Ruby runtime, RubyClass metaClass) {
     public SettingExt initialize(ThreadContext context, IRubyObject[] args, final Block block) {
         RubyString name = (RubyString) args[0];
         RubyModule clazz = (RubyModule) args[1];
-        Object defaultValue = null;
+        RubyObject defaultValue = null;
         if (args.length >= 3) {
-            defaultValue = args[2];
+            defaultValue = (RubyObject) args[2];
         }
         boolean strict = true;
         if (args.length >= 4) {
             strict = args[3].toJava(Boolean.class);
         }
 
+        System.out.println("DNADBG >> creating setting for " + name.asJavaString());
+        final Class<?> javaClass = rubyClassToJava(clazz);
         if (block.isGiven()) {
             Predicate<Object> validator = new Predicate<Object>() {
                 @Override
@@ -54,13 +62,55 @@ public boolean test(Object o) {
                 }
             };
 
-            setting = new Setting(name.asJavaString(), clazz.getJavaClass(), defaultValue, strict, validator);
+            setting = new Setting(name.asJavaString(), javaClass, convertTo(defaultValue, javaClass), strict, validator);
         } else {
-            setting = new Setting(name.asJavaString(), clazz.getJavaClass(), defaultValue, strict);
+            final Object coercedValue = convertTo(defaultValue, javaClass);
+            setting = new Setting(name.asJavaString(), javaClass, coercedValue, strict);
         }
         return this;
     }
 
+    @SuppressWarnings({"rawtypes", "unchecked"})
+    private Object convertTo(RubyObject defaultValue, Class<?> javaClass) {
+        if (defaultValue instanceof RubyArray) {
+            final RubyArray castedValue = (RubyArray) defaultValue;
+            return new ArrayList(castedValue);
+        }
+        if (TimeValue.class.equals(javaClass)) {
+            return TimeValue.fromValue(defaultValue.asJavaString());
+        }
+        return defaultValue.toJava(javaClass);
+    }
+
+    private Class<?> rubyClassToJava(RubyModule rclass) {
+        if ("String".equals(rclass.getName())) {
+            return String.class;
+        }
+        if ("Array".equals(rclass.getName())) {
+            return ArrayList.class;
+        }
+        if ("Java::OrgLogstashUtil::ModulesSettingArray".equals(rclass.getName())) {
+            return ModulesSettingArray.class;
+        }
+        if ("Java::OrgLogstashUtil::CloudSettingId".equals(rclass.getName())) {
+            return CloudSettingId.class;
+        }
+        if ("Java::OrgLogstashUtil::CloudSettingAuth".equals(rclass.getName())) {
+            return CloudSettingAuth.class;
+        }
+        if ("Java::OrgLogstashUtil::TimeValue".equals(rclass.getName())) {
+            return TimeValue.class;
+        }
+        // this cover Boolean (Ruby doesn't have a class for it) and StringCoercible
+        if ("Object".equals(rclass.getName())) {
+            return Object.class;
+        }
+        if ("Integer".equals(rclass.getName())) {
+            return Integer.class;
+        }
+        throw new IllegalArgumentException("Cannot find matching Java class for: " + rclass.getName());
+    }
+
     @JRubyMethod
     public IRubyObject value() {
         return (RubyObject) setting.getValue();
@@ -114,7 +164,7 @@ public IRubyObject validateValue() {
 
     @JRubyMethod(visibility = Visibility.PROTECTED)
     public IRubyObject validate(IRubyObject input) {
-        setting.validate(input);
+        setting.validate(input.toJava(setting.klass));
         return null; // TODO
     }
 }