fix(Communication/Events): correct parameter validation logic of Disc…

…over event
coatyio · Oct 29, 2019 · a399b43 · a399b43
1 parent 248c407
commit a399b43
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/CoatySwift/Classes/Communication/Events/DiscoverEvent.swift b/CoatySwift/Classes/Communication/Events/DiscoverEvent.swift
@@ -118,19 +118,20 @@ public class DiscoverEvent<Family: ObjectFamily>: CommunicationEvent<DiscoverEve
         try super.encode(to: encoder)
     }
 
-    /// For internal use in framework only.
+    /// Validates response parameters of Resolve event against the corresponding
+    /// discover event.
     /// - Parameter eventData: event data for Resolve response event
-    /// - Returns: false and logs if the given Resolve event data does not correspond to
-    /// the event data of this Discover event.
+    /// - Returns: false and logs if the given Resolve event data does not
+    ///   correspond to the event data of this Discover event.
     internal func ensureValidResponseParameters(eventData: ResolveEventData<Family>) -> Bool {
-        if (self.data.coreTypes != nil && eventData.object != nil) {
+        if self.data.coreTypes != nil && eventData.object != nil {
             if !((self.data.coreTypes?.contains(eventData.object!.coreType))!) {
                 LogManager.log.warning("resolved coreType not contained in Discover coreTypes")
                 return false
             }
         }
 
-        if (self.data.objectId != nil && eventData.object != nil) {
+        if self.data.objectTypes != nil && eventData.object != nil {
             if !((self.data.objectTypes?.contains(eventData.object!.objectType))!) {
                 LogManager.log.warning("resolved objectType not contained in Discover objectTypes")
                 return false

diff --git a/CoatySwift/Classes/Communication/Events/UpdateEvent.swift b/CoatySwift/Classes/Communication/Events/UpdateEvent.swift
@@ -66,12 +66,12 @@ public class UpdateEvent<Family: ObjectFamily>: CommunicationEvent<UpdateEventDa
     override public func encode(to encoder: Encoder) throws {
         try super.encode(to: encoder)
     }
-    
-    /// For internal use in framework only.
-    ///
+
+    /// Validates response parameters of Complete event against the
+    /// corresponding Update event.
     /// - Parameter eventData: event data for Complete response event
-    /// - Returns: Returns false if the given Complete event data does not correspond to
-    /// the event data of this Update event.
+    /// - Returns: Returns false if the given Complete event data does not
+    ///   correspond to the event data of this Update event.
     internal func ensureValidResponseParameters(eventData: CompleteEventData<Family>) -> Bool {
 
         if self.data.isPartialUpdate && self.data.objectId != eventData.object?.objectId {