Move rx.util.functions to rx.functions

Eliminate dumping ground of rx.util

Author: benjchristensen

language-adaptors/rxjava-clojure/src/main/java/rx/lang/clojure/interop/DummyObservable.java

@@ -23,19 +23,19 @@ public String call(Object f) {
         return "Object";
     }
 
-    public String call(rx.util.functions.Func1 f) {
+    public String call(rx.functions.Func1 f) {
         return "rx.util.functions.Func1";
     }
 
-    public String call(rx.util.functions.Func2 f) {
+    public String call(rx.functions.Func2 f) {
         return "rx.util.functions.Func2";
     }
 
-    public String call(rx.util.functions.Action1 f) {
+    public String call(rx.functions.Action1 f) {
         return "rx.util.functions.Action1";
     }
 
-    public String call(rx.util.functions.Action2 f) {
+    public String call(rx.functions.Action2 f) {
         return "rx.util.functions.Action2";
     }
 

language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/RxExamples.groovy

@@ -19,8 +19,8 @@ import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.subscriptions.Subscriptions;
-import rx.util.functions.Action0
-import rx.util.functions.Func1;
+import rx.functions.Action0
+import rx.functions.Func1;
 
 // --------------------------------------------------
 // Hello World!

language-adaptors/rxjava-groovy/src/examples/groovy/rx/lang/groovy/examples/VideoExample.groovy

@@ -19,7 +19,7 @@ import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.subscriptions.BooleanSubscription;
-import rx.util.functions.Func1;
+import rx.functions.Func1;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyActionWrapper.java

@@ -16,11 +16,11 @@
 package rx.lang.groovy;
 
 import groovy.lang.Closure;
-import rx.util.functions.Action;
-import rx.util.functions.Action0;
-import rx.util.functions.Action1;
-import rx.util.functions.Action2;
-import rx.util.functions.Action3;
+import rx.functions.Action;
+import rx.functions.Action0;
+import rx.functions.Action1;
+import rx.functions.Action2;
+import rx.functions.Action3;
 
 /**
  * Concrete wrapper that accepts a {@link Closure} and produces any needed Rx {@link Action}.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/GroovyFunctionWrapper.java

@@ -16,18 +16,18 @@
 package rx.lang.groovy;
 
 import groovy.lang.Closure;
-import rx.util.functions.Func0;
-import rx.util.functions.Func1;
-import rx.util.functions.Func2;
-import rx.util.functions.Func3;
-import rx.util.functions.Func4;
-import rx.util.functions.Func5;
-import rx.util.functions.Func6;
-import rx.util.functions.Func7;
-import rx.util.functions.Func8;
-import rx.util.functions.Func9;
-import rx.util.functions.FuncN;
-import rx.util.functions.Function;
+import rx.functions.Func0;
+import rx.functions.Func1;
+import rx.functions.Func2;
+import rx.functions.Func3;
+import rx.functions.Func4;
+import rx.functions.Func5;
+import rx.functions.Func6;
+import rx.functions.Func7;
+import rx.functions.Func8;
+import rx.functions.Func9;
+import rx.functions.FuncN;
+import rx.functions.Function;
 
 /**
  * Concrete wrapper that accepts a {@link Closure} and produces any needed Rx {@link Function}.

language-adaptors/rxjava-groovy/src/main/java/rx/lang/groovy/RxGroovyExtensionModule.java

@@ -29,9 +29,9 @@
 
 import rx.Observable;
 import rx.Observable.OnSubscribeFunc;
+import rx.functions.Action;
+import rx.functions.Function;
 import rx.observables.BlockingObservable;
-import rx.util.functions.Action;
-import rx.util.functions.Function;
 
 /**
  * ExtensionModule that adds extension methods to support groovy.lang.Closure

language-adaptors/rxjava-groovy/src/test/groovy/rx/lang/groovy/TestParallel.groovy

@@ -20,7 +20,7 @@ import org.junit.Test
 import rx.Observable
 import rx.Scheduler
 import rx.schedulers.Schedulers
-import rx.util.functions.Func1
+import rx.functions.Func1
 
 class TestParallel {
 

language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyActionWrapper.java

@@ -21,11 +21,11 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
-import rx.util.functions.Action;
-import rx.util.functions.Action0;
-import rx.util.functions.Action1;
-import rx.util.functions.Action2;
-import rx.util.functions.Action3;
+import rx.functions.Action;
+import rx.functions.Action0;
+import rx.functions.Action1;
+import rx.functions.Action2;
+import rx.functions.Action3;
 
 /**
  * Concrete wrapper that accepts a {@link RubyProc} and produces any needed Rx {@link Action}.

language-adaptors/rxjava-jruby/src/main/java/rx/lang/jruby/JRubyFunctionWrapper.java

@@ -21,18 +21,18 @@
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
 
-import rx.util.functions.Func0;
-import rx.util.functions.Func1;
-import rx.util.functions.Func2;
-import rx.util.functions.Func3;
-import rx.util.functions.Func4;
-import rx.util.functions.Func5;
-import rx.util.functions.Func6;
-import rx.util.functions.Func7;
-import rx.util.functions.Func8;
-import rx.util.functions.Func9;
-import rx.util.functions.FuncN;
-import rx.util.functions.Function;
+import rx.functions.Func0;
+import rx.functions.Func1;
+import rx.functions.Func2;
+import rx.functions.Func3;
+import rx.functions.Func4;
+import rx.functions.Func5;
+import rx.functions.Func6;
+import rx.functions.Func7;
+import rx.functions.Func8;
+import rx.functions.Func9;
+import rx.functions.FuncN;
+import rx.functions.Function;
 
 /**
  * Concrete wrapper that accepts a {@link RubyProc} and produces any needed Rx {@link Function}.

language-adaptors/rxjava-scala/src/examples/java/rx/lang/scala/examples/MovieLibUsage.java

@@ -16,9 +16,9 @@
 package rx.lang.scala.examples;
 
 import rx.Observable;
+import rx.functions.Action1;
 import rx.lang.scala.examples.Movie;
 import rx.lang.scala.examples.MovieLib;
-import rx.util.functions.Action1;
 import static rx.lang.scala.JavaConversions.toScalaObservable;
 
 public class MovieLibUsage {