Skip to content

Commit

Permalink
Remove deprecated methods/classes from rxjava-core
Browse files Browse the repository at this point in the history
Cleanup on path to 1.0: ReactiveX/RxJava#1001 (comment)
  • Loading branch information
benjchristensen committed Apr 20, 2014
1 parent 3358d1a commit 38dcabf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 18 deletions.
14 changes: 6 additions & 8 deletions src/main/clojure/rx/lang/clojure/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -292,16 +292,14 @@
;################################################################################
; Operators

(defn synchronize
"Synchronize execution.
(defn serialize
"Serialize execution.
See:
rx.Observable/synchronize
rx.Observable/serialize
"
([^Observable xs]
(.synchronize xs))
([lock ^Observable xs]
(.synchronize xs lock)))
(.serialize xs)))

(defn merge*
"Merge an Observable of Observables into a single Observable
Expand Down Expand Up @@ -472,10 +470,10 @@
empty Observable if xs is empty.
See:
rx.Observable/takeFirst
rx.Observable/take(1)
"
[^Observable xs]
(.takeFirst xs))
(.take xs 1))

(defn ^Observable group-by
"Returns an Observable of clojure.lang.MapEntry where the key is the result of
Expand Down
14 changes: 4 additions & 10 deletions src/test/clojure/rx/lang/clojure/core_test.clj
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,14 @@
(b/into []))]
(is (= [2 4] result))))

(deftest test-syncrhonize
; I'm going to believe synchronize works and just exercise it
(deftest test-serialize
; I'm going to believe serialize works and just exercise it
; here for sanity.
(is (= [1 2 3]
(->> [1 2 3]
(rx/seq->o)
(rx/synchronize)
(b/into []))))
(let [lock (Object.)]
(is (= [1 2 3]
(->> [1 2 3]
(rx/seq->o)
(rx/synchronize lock)
(b/into []))))))
(rx/serialize)
(b/into [])))))

(let [expected-result [[1 3 5] [2 4 6]]
sleepy-o #(f/future-generator*
Expand Down

0 comments on commit 38dcabf

Please sign in to comment.