[refactor] moved Enumerator#to_java.stream support into Java

... since we're now compiling (JRuby 9.2) against Java 8
jruby · May 18, 2018 · 0a2bede · 0a2bede
1 parent d1a0bbf
commit 0a2bede
Showing 6 changed files with 26 additions and 22 deletions.
diff --git a/core/src/main/java/org/jruby/RubyEnumerator.java b/core/src/main/java/org/jruby/RubyEnumerator.java
@@ -46,8 +46,10 @@
 import org.jruby.util.cli.Options;
 
 import java.util.Arrays;
+import java.util.Spliterator;
 import java.util.concurrent.Future;
 import java.util.concurrent.SynchronousQueue;
+import java.util.stream.Stream;
 
 import static org.jruby.runtime.Visibility.PRIVATE;
 
@@ -609,6 +611,28 @@ public void remove() {
         throw new UnsupportedOperationException();
     }
 
+    // Java 8 stream support :
+
+    public Stream<Object> stream() {
+        return stream(false);
+    }
+
+    public Stream<Object> stream(final boolean parallel) {
+        return java.util.stream.StreamSupport.stream(spliterator(), parallel);
+    }
+
+    public Spliterator<Object> spliterator() {
+        final long size = size();
+        // we do not have ArrayNexter detection - assume immutable
+        int mod = java.util.Spliterator.IMMUTABLE;
+        if (size >= 0) mod |= java.util.Spliterator.SIZED;
+        return java.util.Spliterators.spliterator(this, size, mod);
+    }
+
+    public Spliterator<Object> spliterator(final int mod) {
+        return java.util.Spliterators.spliterator(this, size(), mod);
+    }
+
     /**
      * "Function" type for java-created enumerators with size.  Should be implemented so that calls to
      * SizeFn#size are kept in sync with the size of the created enum (i.e. if the object underlying an enumerator

diff --git a/core/src/main/ruby/jruby/java.rb b/core/src/main/ruby/jruby/java.rb
@@ -38,4 +38,3 @@
 
 load 'jruby/java/core_ext.rb'
 load 'jruby/java/java_ext.rb'
-load 'jruby/java/java_8.rb' if java.util.Spliterator rescue nil
diff --git a/core/src/main/ruby/jruby/java/core_ext.rb b/core/src/main/ruby/jruby/java/core_ext.rb
@@ -3,4 +3,3 @@
 # These are loads so they don't pollute LOADED_FEATURES
 load 'jruby/java/core_ext/module.rb'
 load 'jruby/java/core_ext/object.rb'
-#load 'jruby/java/core_ext/kernel.rb' - moved to org.jruby.javasupport.ext.Kernel
diff --git a/core/src/main/ruby/jruby/java/core_ext/kernel.rb b/core/src/main/ruby/jruby/java/core_ext/kernel.rb
@@ -33,4 +33,4 @@ def com
   def org
     JavaUtilities.get_package_module_dot_format('org') # stub
   end
-end if false
+end if false # only here for doc -> implementation at org.jruby.javasupport.ext.Kernel
diff --git a/core/src/main/ruby/jruby/java/java_8.rb b/core/src/main/ruby/jruby/java/java_8.rb
diff --git a/test/jruby.index b/test/jruby.index
@@ -27,6 +27,7 @@ jruby/test_dir_with_jar_without_dir_entry
 jruby/test_digest_extend
 jruby/test_digest2
 jruby/test_env
+jruby/test_enumerator
 jruby/test_etc
 jruby/test_exception
 jruby/test_file
Original file line number	Diff line number	Diff line change
		@@ -38,4 +38,3 @@

		load 'jruby/java/core_ext.rb'
		load 'jruby/java/java_ext.rb'
		load 'jruby/java/java_8.rb' if java.util.Spliterator rescue nil