nits

Author: flovilmart

Sources/ParseLiveQuery/Client.swift

@@ -128,8 +128,7 @@ extension Client {
         _ query: PFQuery<T>,
         subclassType: T.Type = T.self
         ) -> Subscription<T> where T: PFObject {
-        return Subscription<T>()
-        //return subscribe(query, handler: Subscription<T>())
+        return subscribe(query, handler: Subscription<T>())
     }
 
     /**
@@ -140,10 +139,10 @@ extension Client {
 
      - returns: Your subscription handler, for easy chaining.
     */
-    public func subscribe<T: PFObject, U>(
+    public func subscribe<T, U>(
         _ query: PFQuery<T>,
         handler: U
-        ) -> U where T: PFObject, U: SubscriptionHandling, U.PFGenericObject == T {
+        ) -> U where T: PFObject, U: SubscriptionHandling, U.PFObjectSubclass == T {
         let subscriptionRecord = SubscriptionRecord(
             query: query,
             requestId: requestIdGenerator(),
@@ -169,7 +168,8 @@ extension Client {
 
      - parameter query: The query to unsubscribe from.
      */
-    public func unsubscribe<T>(_ query: PFQuery<T>) where T: PFObject {
+    @objc(unsubscribeFromQuery:)
+    public func unsubscribe(_ query: PFQuery<PFObject>) {
         unsubscribe { $0.query == query }
     }
 
@@ -179,7 +179,7 @@ extension Client {
      - parameter query:   The query to unsubscribe from.
      - parameter handler: The specific handler to unsubscribe from.
      */
-    public func unsubscribe<T, U>(_ query: PFQuery<U>, handler: T) where T: SubscriptionHandling, U: PFObject {
+    public func unsubscribe<T, U>(_ query: PFQuery<T>, handler: U) where T: PFObject, U: SubscriptionHandling, U.PFObjectSubclass == T {
         unsubscribe { $0.query == query && $0.subscriptionHandler === handler }
     }
 

Sources/ParseLiveQuery/Internal/ClientPrivate.swift

@@ -58,7 +58,7 @@ extension Client {
         let query: PFQuery<PFObject>
         let requestId: RequestId
 
-        init<T>(query: PFQuery<T.PFGenericObject>, requestId: RequestId, handler: T) where T:SubscriptionHandling {
+        init<T>(query: PFQuery<T.PFObjectSubclass>, requestId: RequestId, handler: T) where T:SubscriptionHandling {
             self.query = query as! PFQuery<PFObject>
             self.requestId = requestId
 

Sources/ParseLiveQuery/Subscription.swift

@@ -18,7 +18,7 @@ import BoltsSwift
  */
 public protocol SubscriptionHandling: AnyObject {
     /// The type of the PFObject subclass that this handler uses.
-    associatedtype PFGenericObject: PFObject
+    associatedtype PFObjectSubclass: PFObject
 
     /**
      Tells the handler that an event has been received from the live query server.
@@ -27,7 +27,7 @@ public protocol SubscriptionHandling: AnyObject {
      - parameter query: The query that the event occurred on.
      - parameter client: The live query client which received this event.
      */
-    func didReceive(_ event: Event<PFGenericObject>, forQuery query: PFQuery<PFGenericObject>, inClient client: Client)
+    func didReceive(_ event: Event<PFObjectSubclass>, forQuery query: PFQuery<PFObjectSubclass>, inClient client: Client)
 
     /**
      Tells the handler that an error has been received from the live query server.
@@ -36,7 +36,7 @@ public protocol SubscriptionHandling: AnyObject {
      - parameter query: The query that the error occurred on.
      - parameter client: The live query client which received this error.
      */
-    func didEncounter(_ error: Error, forQuery query: PFQuery<PFGenericObject>, inClient client: Client)
+    func didEncounter(_ error: Error, forQuery query: PFQuery<PFObjectSubclass>, inClient client: Client)
 
     /**
      Tells the handler that a query has been successfully registered with the server.
@@ -46,7 +46,7 @@ public protocol SubscriptionHandling: AnyObject {
      - parameter query: The query that has been subscribed.
      - parameter client: The live query client which subscribed this query.
      */
-    func didSubscribe(toQuery query: PFQuery<PFGenericObject>, inClient client: Client)
+    func didSubscribe(toQuery query: PFQuery<PFObjectSubclass>, inClient client: Client)
 
     /**
      Tells the handler that a query has been successfully deregistered from the server.
@@ -56,7 +56,7 @@ public protocol SubscriptionHandling: AnyObject {
      - parameter query: The query that has been unsubscribed.
      - parameter client: The live query client which unsubscribed this query.
      */
-    func didUnsubscribe(fromQuery query: PFQuery<PFGenericObject>, inClient client: Client)
+    func didUnsubscribe(fromQuery query: PFQuery<PFObjectSubclass>, inClient client: Client)
 }
 
 /**