Fixed SettingPortRange.coerce when Long value is provided. Added method eachWithIndex to Range to loop on the interval

Author: andsel

logstash-core/lib/logstash/environment.rb

@@ -33,8 +33,8 @@ module Environment
     end
   end
 
-  def as_java_range(r)
-    org::logstash::settings::Range.new(r.first, r.last)
+  def self.as_java_range(r)
+    org::logstash::settings::Range.new(r.first.to_java(java.lang.Integer), r.last.to_java(java.lang.Integer))
   end
 
   [

logstash-core/src/main/java/org/logstash/settings/Range.java

@@ -1,9 +1,8 @@
 package org.logstash.settings;
 
-import org.jruby.RubyRange;
-import org.jruby.runtime.ThreadContext;
+import java.util.function.BiConsumer;
 
-public class Range<T extends Comparable<? super T>> {
+public class Range<T extends Integer> {
 
     private final T first;
     private final T last;
@@ -25,8 +24,20 @@ public T getLast() {
         return last;
     }
 
-//    public static Range<T> fromRubyRange(RubyRange r) {
-//        ThreadContext context = r.getRuntime().getCurrentContext();
-//        r.last(context);
-//    }
+    // TODO cover with tests
+    public void eachWithIndex(BiConsumer<Integer, Integer> consumer) {
+        // In case of a single value range, we should still yield once
+        if (first.intValue() == last.intValue()) {
+            consumer.accept(first.intValue(), 0);
+            return;
+        }
+        int index = 0;
+        for (int value = first.intValue(); first.intValue() < last.intValue(); value++) {
+            consumer.accept(value, index++);
+        }
+    }
+
+    public int count() {
+        return last.intValue() - first.intValue() + 1;
+    }
 }

logstash-core/src/main/java/org/logstash/settings/SettingPortRange.java

@@ -16,6 +16,7 @@ public static boolean isValid(Range<Integer> range) {
         return VALID_PORT_RANGE.contains(range);
     }
 
+    // TODO cover with tests
     @Override
     public Range<Integer> coerce(Object obj) {
         if (obj instanceof Range) {
@@ -27,6 +28,11 @@ public Range<Integer> coerce(Object obj) {
             return new Range<>(val, val);
         }
 
+        if (obj instanceof Long) {
+            Long val = (Long) obj;
+            return new Range<>(val.intValue(), val.intValue());
+        }
+
         if (obj instanceof String) {
             String val = (String) obj;
             String[] parts = val.split(PORT_SEPARATOR);
@@ -42,10 +48,10 @@ public Range<Integer> coerce(Object obj) {
                 int last = Integer.parseInt(lastStr);
                 return new Range<>(first, last);
             } catch(NumberFormatException e) {
-                throw new IllegalArgumentException("Could not coerce " + obj + " into a port range");
+                throw new IllegalArgumentException("Could not coerce [" + obj + "](type: " + obj.getClass() + ") into a port range");
             }
         }
-        throw new IllegalArgumentException("Could not coerce " + obj + " into a port range");
+        throw new IllegalArgumentException("Could not coerce [" + obj + "](type: " + obj.getClass() + ") into a port range");
     }
 
     @Override