Deprecates shareReplayLatestWhileConnected and shareReplay.

kzaher · kzaher · commit 17c24925efc9 · 2017-10-01T13:14:58.000+02:00
diff --git a/RxSwift/Deprecated.swift b/RxSwift/Deprecated.swift
@@ -112,3 +112,42 @@ extension Disposable {
         disposed(by: bag)
     }
 }
+
+
+extension ObservableType {
+
+    /**
+     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays latest element in buffer.
+
+     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
+
+     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
+
+     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
+     */
+    @available(*, deprecated, message: "use share(replay: 1) instead", renamed: "share(replay:)")
+    public func shareReplayLatestWhileConnected()
+        -> Observable<E> {
+        return share(replay: 1, scope: .whileConnected)
+    }
+}
+
+
+extension ObservableType {
+
+    /**
+     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays maximum number of elements in buffer.
+
+     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
+
+     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
+
+     - parameter bufferSize: Maximum element count of the replay buffer.
+     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
+     */
+    @available(*, deprecated, message: "Suggested replacement is `share(replay: 1)`. In case old 3.x behavior of `shareReplay` is required please use `share(replay: 1, scope: .forever)` instead.", renamed: "share(replay:)")
+    public func shareReplay(_ bufferSize: Int)
+        -> Observable<E> {
+        return self.share(replay: bufferSize, scope: .forever)
+    }
+}
diff --git a/RxSwift/Observables/ShareReplayScope.swift b/RxSwift/Observables/ShareReplayScope.swift
@@ -144,7 +144,7 @@ extension ObservableType {
         case .forever:
             switch replay {
             case 0: return self.multicast(PublishSubject()).refCount()
-            default: return shareReplay(replay)
+            default: return self.multicast(ReplaySubject.create(bufferSize: replay)).refCount()
             }
         case .whileConnected:
             switch replay {
@@ -156,44 +156,6 @@ extension ObservableType {
     }
 }
 
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays latest element in buffer.
-
-     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-
-     Unlike `shareReplay(bufferSize: Int)`, this operator will clear latest element from replay buffer in case number of subscribers drops from one to zero. In case sequence
-     completes or errors out replay buffer is also cleared.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func shareReplayLatestWhileConnected()
-        -> Observable<E> {
-        return ShareReplay1WhileConnected(source: self.asObservable())
-    }
-}
-
-extension ObservableType {
-
-    /**
-     Returns an observable sequence that shares a single subscription to the underlying sequence, and immediately upon subscription replays maximum number of elements in buffer.
-
-     This operator is a specialization of replay which creates a subscription when the number of observers goes from zero to one, then shares that subscription with all subsequent observers until the number of observers returns to zero, at which point the subscription is disposed.
-
-     - seealso: [shareReplay operator on reactivex.io](http://reactivex.io/documentation/operators/replay.html)
-
-     - parameter bufferSize: Maximum element count of the replay buffer.
-     - returns: An observable sequence that contains the elements of a sequence produced by multicasting the source sequence.
-     */
-    public func shareReplay(_ bufferSize: Int)
-        -> Observable<E> {
-        return self.replay(bufferSize).refCount()
-    }
-}
-
 fileprivate final class ShareReplay1WhileConnectedConnection<Element>
     : ObserverType
     , SynchronizedUnsubscribeType {
