Merge pull request #324 from benjchristensen/0.11-cleanup

0.11 Cleanup

Author: benjchristensen

language-adaptors/rxjava-clojure/build.gradle

@@ -6,14 +6,16 @@ dependencies {
 
     // clojure
     compile 'org.clojure:clojure:1.4.+'
-    //compile 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
+    provided 'clj-http:clj-http:0.6.4' // https://clojars.org/clj-http
 }
 
+tasks.compileExamplesClojure.classpath = files(tasks.compileClojure.destinationDir) + tasks.compileClojure.classpath
+
 /*
  * Clojure
  */
 aotCompile = true
-warnOnReflection = true
+warnOnReflection = false
 
 buildscript {
   repositories { maven { url "http://clojars.org/repo" } }
@@ -37,10 +39,6 @@ tasks.clojureTest {
     classpath = classpath + configurations.provided
 }
 
-tasks.compileExamplesClojure {  
-    classpath = classpath + configurations.provided
-}
-
 jar {
     manifest {
         name = 'rxjava-clojure'

language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/http_examples.txt renamed to language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/http_examples.clj

@@ -1,3 +1,18 @@
+;
+; Copyright 2013 Netflix, Inc.
+;  
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
 (ns rx.lang.clojure.examples.http-examples
   (:require [rx.lang.clojure.interop :as rx]
             [clj-http.client :as http])

language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/rx_examples.txt renamed to language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/rx_examples.clj

@@ -1,3 +1,18 @@
+;
+; Copyright 2013 Netflix, Inc.
+;  
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
 (ns rx.lang.clojure.examples.rx-examples
   (:require [rx.lang.clojure.interop :as rx])
   (:import rx.Observable rx.subscriptions.Subscriptions))

language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/video_example.txt renamed to language-adaptors/rxjava-clojure/src/examples/clojure/rx/lang/clojure/examples/video_example.clj

@@ -1,3 +1,18 @@
+;
+; Copyright 2013 Netflix, Inc.
+;  
+; Licensed under the Apache License, Version 2.0 (the "License");
+; you may not use this file except in compliance with the License.
+; You may obtain a copy of the License at
+;
+; http://www.apache.org/licenses/LICENSE-2.0
+; 
+; Unless required by applicable law or agreed to in writing, software
+; distributed under the License is distributed on an "AS IS" BASIS,
+; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+; See the License for the specific language governing permissions and
+; limitations under the License.
+;
 (ns rx.lang.clojure.examples.video-example
   (:require [rx.lang.clojure.interop :as rx])
   (:import [rx Observable Observer Subscription]
@@ -128,7 +143,7 @@
                        (.onCompleted observer)
                        (Subscriptions/empty))))
 
-(comment (.subscribe (video-list->videos (video-list 2)) println))
+(comment (.subscribe (video-list->videos (video-list 2)) (rx/action* println)))
 
 (defn ^Observable video->metadata
   [video-id]
@@ -163,5 +178,5 @@
                                           :actual-star-rating    (rand-int 5) })
                        (.onCompleted observer))))
 
-(comment (.subscribe (video->rating 234345 8888) println))
+(comment (.subscribe (video->rating 234345 8888) (rx/action* println)))
 

rxjava-core/src/main/java/rx/Observable.java

@@ -19,7 +19,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
@@ -77,7 +76,6 @@
 import rx.util.OnErrorNotImplementedException;
 import rx.util.Range;
 import rx.util.Timestamped;
-import rx.util.functions.Action;
 import rx.util.functions.Action0;
 import rx.util.functions.Action1;
 import rx.util.functions.Func0;
@@ -87,7 +85,6 @@
 import rx.util.functions.Func4;
 import rx.util.functions.FuncN;
 import rx.util.functions.Function;
-import rx.util.functions.Functions;
 
 /**
  * The Observable interface that implements the Reactive Pattern.
@@ -781,13 +778,11 @@ public static <T> Observable<T> switchDo(Observable<Observable<T>> sequenceOfSeq
     }
 
     /**
-     * Given an Observable that emits Observables, creates a single Observable that
+     * On an Observable that emits Observables, creates a single Observable that
      * emits the items emitted by the most recently published of those Observables.
      * <p>
      * <img width="640" src="https://github.com/Netflix/RxJava/wiki/images/rx-operators/switchDo.png">
      * 
-     * @param sequenceOfSequences
-     *            the source Observable that emits Observables
      * @return an Observable that emits only the items emitted by the most recently published
      *         Observable
      * @throws ClassCastException
@@ -1133,7 +1128,7 @@ public Observable<List<T>> buffer(int count) {
      *            The maximum size of each buffer before it should be emitted.
      * @param skip
      *            How many produced values need to be skipped before starting a new buffer. Note that when "skip" and
-     *            "count" are equals that this is the same operation as {@link Observable#buffer(Observable, int)}.
+     *            "count" are equals that this is the same operation as {@link Observable#buffer(int)}.
      * @return
      *         An {@link Observable} which produces buffers every "skipped" values containing at most
      *         "count" produced values.

rxjava-core/src/main/java/rx/Scheduler.java

@@ -29,7 +29,6 @@
 import rx.concurrency.TestScheduler;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action0;
-import rx.util.functions.Func0;
 import rx.util.functions.Func1;
 import rx.util.functions.Func2;
 

rxjava-core/src/main/java/rx/Subscription.java

@@ -20,7 +20,7 @@
 /**
  * Subscription returns from {@link Observable#subscribe(Observer)} to allow unsubscribing.
  * <p>
- * See utilities in {@link Subscriptions} and implementations in the {@link rx.subscriptions} package.
+ * See utilities in {@link Subscriptions} and implementations in the {@code rx.subscriptions} package.
  * <p>
  * This interface is the RxJava equivalent of {@code IDisposable} in Microsoft's Rx implementation.
  */

rxjava-core/src/main/java/rx/observables/BlockingObservable.java

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2013 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package rx.observables;
 
 import static org.junit.Assert.*;
@@ -15,18 +30,16 @@
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
-import rx.operators.SafeObservableSubscription;
-import rx.operators.SafeObserver;
 import rx.operators.OperationMostRecent;
 import rx.operators.OperationNext;
 import rx.operators.OperationToFuture;
 import rx.operators.OperationToIterator;
+import rx.operators.SafeObservableSubscription;
+import rx.operators.SafeObserver;
 import rx.subscriptions.BooleanSubscription;
 import rx.subscriptions.Subscriptions;
 import rx.util.functions.Action1;
 import rx.util.functions.Func1;
-import rx.util.functions.FuncN;
-import rx.util.functions.Functions;
 
 /**
  * An extension of {@link Observable} that provides blocking operators.

rxjava-core/src/main/java/rx/observables/GroupedObservable.java

@@ -24,7 +24,7 @@
  * An {@link Observable} that has been grouped by a key whose value can be obtained using
  * {@link #getKey()} <p>
  *
- * @see Observable#groupBy(Observable, Func1)
+ * @see Observable#groupBy(Func1)
  *
  * @param <K> the type of the key
  * @param <T> the type of the elements in the group

rxjava-core/src/main/java/rx/operators/OperationAll.java

@@ -1,17 +1,31 @@
+/**
+ * Copyright 2013 Netflix, Inc.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package rx.operators;
 
+import static org.mockito.Mockito.*;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.junit.Test;
+
 import rx.Observable;
 import rx.Observer;
 import rx.Subscription;
 import rx.util.functions.Func1;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
-
 /**
  * Returns an Observable that emits a Boolean that indicates whether all items emitted by an
  * Observable satisfy a condition.