diff --git a/src/darwin/Framework/CHIP/MTRBaseDevice.mm b/src/darwin/Framework/CHIP/MTRBaseDevice.mm index da40f1ca24d9ac..331d61129b9daf 100644 --- a/src/darwin/Framework/CHIP/MTRBaseDevice.mm +++ b/src/darwin/Framework/CHIP/MTRBaseDevice.mm @@ -2290,12 +2290,8 @@ + (MTRAttributeRequestPath *)requestPathWithEndpointID:(NSNumber * _Nullable)end - (BOOL)isEqualToAttributeRequestPath:(MTRAttributeRequestPath *)path { - if (!path) - return NO; - - return (path.endpoint && [_endpoint isEqualToNumber:path.endpoint]) - && (path.cluster && [_cluster isEqualToNumber:path.cluster]) - && (path.attribute && [_attribute isEqualToNumber:path.attribute]); + return [_endpoint isEqualToNumber:path.endpoint] && [_cluster isEqualToNumber:path.cluster] && + [_attribute isEqualToNumber:path.attribute]; } - (BOOL)isEqual:(id)object @@ -2366,12 +2362,8 @@ + (MTREventRequestPath *)requestPathWithEndpointID:(NSNumber * _Nullable)endpoin - (BOOL)isEqualToEventRequestPath:(MTREventRequestPath *)path { - if (!path) - return NO; - - return (path.endpoint && [_endpoint isEqualToNumber:path.endpoint]) - && (path.cluster && [_cluster isEqualToNumber:path.cluster]) - && (path.event && [_event isEqualToNumber:path.event]); + return + [_endpoint isEqualToNumber:path.endpoint] && [_cluster isEqualToNumber:path.cluster] && [_event isEqualToNumber:path.event]; } - (BOOL)isEqual:(id)object @@ -2440,11 +2432,7 @@ ConcreteClusterPath path(static_cast([endpointID unsignedShort - (BOOL)isEqualToClusterPath:(MTRClusterPath *)clusterPath { - if (!clusterPath) - return NO; - - return (clusterPath.endpoint && [_endpoint isEqualToNumber:clusterPath.endpoint]) - && (clusterPath.cluster && [_cluster isEqualToNumber:clusterPath.cluster]); + return [_endpoint isEqualToNumber:clusterPath.endpoint] && [_cluster isEqualToNumber:clusterPath.cluster]; } - (BOOL)isEqual:(id)object @@ -2532,10 +2520,7 @@ ConcreteDataAttributePath path(static_cast([endpointID unsigne - (BOOL)isEqualToAttributePath:(MTRAttributePath *)attributePath { - if (!attributePath) - return NO; - - return [self isEqualToClusterPath:attributePath] && attributePath.attribute && [_attribute isEqualToNumber:attributePath.attribute]; + return [self isEqualToClusterPath:attributePath] && [_attribute isEqualToNumber:attributePath.attribute]; } - (BOOL)isEqual:(id)object @@ -2628,10 +2613,7 @@ ConcreteEventPath path(static_cast([endpointID unsignedShortVa - (BOOL)isEqualToEventPath:(MTREventPath *)eventPath { - if (!eventPath) - return NO; - - return [self isEqualToClusterPath:eventPath] && eventPath.event && [_event isEqualToNumber:eventPath.event]; + return [self isEqualToClusterPath:eventPath] && [_event isEqualToNumber:eventPath.event]; } - (BOOL)isEqual:(id)object @@ -2721,10 +2703,7 @@ ConcreteCommandPath path(static_cast([endpointID unsignedShort - (BOOL)isEqualToCommandPath:(MTRCommandPath *)commandPath { - if (!commandPath) - return NO; - - return [self isEqualToClusterPath:commandPath] && commandPath.command && [_command isEqualToNumber:commandPath.command]; + return [self isEqualToClusterPath:commandPath] && [_command isEqualToNumber:commandPath.command]; } - (BOOL)isEqual:(id)object diff --git a/src/darwin/Framework/CHIP/MTRDevice.mm b/src/darwin/Framework/CHIP/MTRDevice.mm index eb490bdbe0d37c..fff962dcc94188 100644 --- a/src/darwin/Framework/CHIP/MTRDevice.mm +++ b/src/darwin/Framework/CHIP/MTRDevice.mm @@ -336,11 +336,7 @@ - (id)copyWithZone:(NSZone *)zone - (BOOL)isEqualToClusterData:(MTRDeviceClusterData *)otherClusterData { - if (!otherClusterData) - return NO; - - return (otherClusterData.dataVersion && [_dataVersion isEqual:otherClusterData.dataVersion]) - && (otherClusterData.attributes && [_attributes isEqual:otherClusterData.attributes]); + return [_dataVersion isEqual:otherClusterData.dataVersion] && [_attributes isEqual:otherClusterData.attributes]; } - (BOOL)isEqual:(id)object