Use setOrRemove category on all SDLRPCNotificationsfeature/nsmutabledict_category

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

17 files changed, 121 insertions, 369 deletions

diff --git a/sdl_ios/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m b/sdl_ios/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
index ccdccd412..449c39062 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnAppInterfaceUnregistered.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setReason:(SDLAppInterfaceUnregisteredReason*) reason {
-    if (reason != nil) {
-        [parameters setObject:reason forKey:NAMES_reason];
-    } else {
-        [parameters removeObjectForKey:NAMES_reason];
-    }
+- (void)setReason:(SDLAppInterfaceUnregisteredReason *)reason {
+    [parameters setOrRemoveObject:reason forKey:NAMES_reason];
 }
 
 -(SDLAppInterfaceUnregisteredReason*) reason {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnButtonEvent.m b/sdl_ios/SmartDeviceLink/SDLOnButtonEvent.m
index 3647e7241..5e9a633cb 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnButtonEvent.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnButtonEvent.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setButtonName:(SDLButtonName*) buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
-    } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
-    }
+- (void)setButtonName:(SDLButtonName *)buttonName {
+    [parameters setOrRemoveObject:buttonName forKey:NAMES_buttonName];
 }
 
 -(SDLButtonName*) buttonName {
@@ -35,12 +31,8 @@
     }
 }
 
--(void) setButtonEventMode:(SDLButtonEventMode*) buttonEventMode {
-    if (buttonEventMode != nil) {
-        [parameters setObject:buttonEventMode forKey:NAMES_buttonEventMode];
-    } else {
-        [parameters removeObjectForKey:NAMES_buttonEventMode];
-    }
+- (void)setButtonEventMode:(SDLButtonEventMode *)buttonEventMode {
+    [parameters setOrRemoveObject:buttonEventMode forKey:NAMES_buttonEventMode];
 }
 
 -(SDLButtonEventMode*) buttonEventMode {
@@ -52,12 +44,8 @@
     }
 }
 
--(void) setCustomButtonID:(NSNumber*) customButtonID {
-    if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
-    } else {
-        [parameters removeObjectForKey:NAMES_customButtonID];
-    }
+- (void)setCustomButtonID:(NSNumber *)customButtonID {
+    [parameters setOrRemoveObject:customButtonID forKey:NAMES_customButtonID];
 }
 
 -(NSNumber*) customButtonID {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnButtonPress.m b/sdl_ios/SmartDeviceLink/SDLOnButtonPress.m
index 66edee196..856627924 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnButtonPress.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnButtonPress.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setButtonName:(SDLButtonName*) buttonName {
-    if (buttonName != nil) {
-        [parameters setObject:buttonName forKey:NAMES_buttonName];
-    } else {
-        [parameters removeObjectForKey:NAMES_buttonName];
-    }
+- (void)setButtonName:(SDLButtonName *)buttonName {
+    [parameters setOrRemoveObject:buttonName forKey:NAMES_buttonName];
 }
 
 -(SDLButtonName*) buttonName {
@@ -35,12 +31,8 @@
     }
 }
 
--(void) setButtonPressMode:(SDLButtonPressMode*) buttonPressMode {
-    if (buttonPressMode != nil) {
-        [parameters setObject:buttonPressMode forKey:NAMES_buttonPressMode];
-    } else {
-        [parameters removeObjectForKey:NAMES_buttonPressMode];
-    }
+- (void)setButtonPressMode:(SDLButtonPressMode *)buttonPressMode {
+    [parameters setOrRemoveObject:buttonPressMode forKey:NAMES_buttonPressMode];
 }
 
 -(SDLButtonPressMode*) buttonPressMode {
@@ -52,12 +44,8 @@
     }
 }
 
--(void) setCustomButtonID:(NSNumber*) customButtonID {
-    if (customButtonID != nil) {
-        [parameters setObject:customButtonID forKey:NAMES_customButtonID];
-    } else {
-        [parameters removeObjectForKey:NAMES_customButtonID];
-    }
+- (void)setCustomButtonID:(NSNumber *)customButtonID {
+    [parameters setOrRemoveObject:customButtonID forKey:NAMES_customButtonID];
 }
 
 -(NSNumber*) customButtonID {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnCommand.m b/sdl_ios/SmartDeviceLink/SDLOnCommand.m
index 406811714..19d2ad135 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnCommand.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnCommand.m
@@ -18,24 +18,16 @@
     return self;
 }
 
--(void) setCmdID:(NSNumber*) cmdID {
-    if (cmdID != nil) {
-        [parameters setObject:cmdID forKey:NAMES_cmdID];
-    } else {
-        [parameters removeObjectForKey:NAMES_cmdID];
-    }
+- (void)setCmdID:(NSNumber *)cmdID {
+    [parameters setOrRemoveObject:cmdID forKey:NAMES_cmdID];
 }
 
 -(NSNumber*) cmdID {
     return [parameters objectForKey:NAMES_cmdID];
 }
 
--(void) setTriggerSource:(SDLTriggerSource*) triggerSource {
-    if (triggerSource != nil) {
-        [parameters setObject:triggerSource forKey:NAMES_triggerSource];
-    } else {
-        [parameters removeObjectForKey:NAMES_triggerSource];
-    }
+- (void)setTriggerSource:(SDLTriggerSource *)triggerSource {
+    [parameters setOrRemoveObject:triggerSource forKey:NAMES_triggerSource];
 }
 
 -(SDLTriggerSource*) triggerSource {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnDriverDistraction.m b/sdl_ios/SmartDeviceLink/SDLOnDriverDistraction.m
index 6c8761647..bb5708f0e 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnDriverDistraction.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnDriverDistraction.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setState:(SDLDriverDistractionState*) state {
-    if (state != nil) {
-        [parameters setObject:state forKey:NAMES_state];
-    } else {
-        [parameters removeObjectForKey:NAMES_state];
-    }
+- (void)setState:(SDLDriverDistractionState *)state {
+    [parameters setOrRemoveObject:state forKey:NAMES_state];
 }
 
 -(SDLDriverDistractionState*) state {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnEncodedSyncPData.m b/sdl_ios/SmartDeviceLink/SDLOnEncodedSyncPData.m
index 3b8caf8d5..bfcba3030 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnEncodedSyncPData.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnEncodedSyncPData.m
@@ -18,36 +18,24 @@
     return self;
 }
 
--(void) setData:(NSMutableArray*) data {
-    if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
-    } else {
-        [parameters removeObjectForKey:NAMES_data];
-    }
+- (void)setData:(NSMutableArray *)data {
+    [parameters setOrRemoveObject:data forKey:NAMES_data];
 }
 
 -(NSMutableArray*) data {
     return [parameters objectForKey:NAMES_data];
 }
 
--(void) setURL:(NSString*) URL {
-    if (URL != nil) {
-        [parameters setObject:URL forKey:NAMES_URL];
-    } else {
-        [parameters removeObjectForKey:NAMES_URL];
-    }
+- (void)setURL:(NSString *)URL {
+    [parameters setOrRemoveObject:URL forKey:NAMES_URL];
 }
 
 -(NSString*) URL {
     return [parameters objectForKey:NAMES_URL];
 }
 
--(void) setTimeout:(NSNumber*) Timeout {
-    if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:NAMES_Timeout];
-    } else {
-        [parameters removeObjectForKey:NAMES_Timeout];
-    }
+- (void)setTimeout:(NSNumber *)Timeout {
+    [parameters setOrRemoveObject:Timeout forKey:NAMES_Timeout];
 }
 
 -(NSNumber*) Timeout {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnHMIStatus.m b/sdl_ios/SmartDeviceLink/SDLOnHMIStatus.m
index 4c3e9bd3e..89a94fd32 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnHMIStatus.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnHMIStatus.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setHmiLevel:(SDLHMILevel*) hmiLevel {
-    if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:NAMES_hmiLevel];
-    } else {
-        [parameters removeObjectForKey:NAMES_hmiLevel];
-    }
+- (void)setHmiLevel:(SDLHMILevel *)hmiLevel {
+    [parameters setOrRemoveObject:hmiLevel forKey:NAMES_hmiLevel];
 }
 
 -(SDLHMILevel*) hmiLevel {
@@ -35,12 +31,8 @@
     }
 }
 
--(void) setAudioStreamingState:(SDLAudioStreamingState*) audioStreamingState {
-    if (audioStreamingState != nil) {
-        [parameters setObject:audioStreamingState forKey:NAMES_audioStreamingState];
-    } else {
-        [parameters removeObjectForKey:NAMES_audioStreamingState];
-    }
+- (void)setAudioStreamingState:(SDLAudioStreamingState *)audioStreamingState {
+    [parameters setOrRemoveObject:audioStreamingState forKey:NAMES_audioStreamingState];
 }
 
 -(SDLAudioStreamingState*) audioStreamingState {
@@ -52,12 +44,8 @@
     }
 }
 
--(void) setSystemContext:(SDLSystemContext*) systemContext {
-    if (systemContext != nil) {
-        [parameters setObject:systemContext forKey:NAMES_systemContext];
-    } else {
-        [parameters removeObjectForKey:NAMES_systemContext];
-    }
+- (void)setSystemContext:(SDLSystemContext *)systemContext {
+    [parameters setOrRemoveObject:systemContext forKey:NAMES_systemContext];
 }
 
 -(SDLSystemContext*) systemContext {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnHashChange.m b/sdl_ios/SmartDeviceLink/SDLOnHashChange.m
index f253ab0bf..1c52ec61f 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnHashChange.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnHashChange.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setHashID:(NSString*) hashID {
-    if (hashID != nil) {
-        [parameters setObject:hashID forKey:NAMES_hashID];
-    } else {
-        [parameters removeObjectForKey:NAMES_hashID];
-    }
+- (void)setHashID:(NSString *)hashID {
+    [parameters setOrRemoveObject:hashID forKey:NAMES_hashID];
 }
 
 -(NSString*) hashID {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnKeyboardInput.m b/sdl_ios/SmartDeviceLink/SDLOnKeyboardInput.m
index e670bcae8..254fa6704 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnKeyboardInput.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnKeyboardInput.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setEvent:(SDLKeyboardEvent*) event {
-    if (event != nil) {
-        [parameters setObject:event forKey:NAMES_event];
-    } else {
-        [parameters removeObjectForKey:NAMES_event];
-    }
+- (void)setEvent:(SDLKeyboardEvent *)event {
+    [parameters setOrRemoveObject:event forKey:NAMES_event];
 }
 
 -(SDLKeyboardEvent*) event {
@@ -35,12 +31,8 @@
     }
 }
 
--(void) setData:(NSString*) data {
-    if (data != nil) {
-        [parameters setObject:data forKey:NAMES_data];
-    } else {
-        [parameters removeObjectForKey:NAMES_data];
-    }
+- (void)setData:(NSString *)data {
+    [parameters setOrRemoveObject:data forKey:NAMES_data];
 }
 
 -(NSString*) data {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnLanguageChange.m b/sdl_ios/SmartDeviceLink/SDLOnLanguageChange.m
index 774717b09..66eef3b2b 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnLanguageChange.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnLanguageChange.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setLanguage:(SDLLanguage*) language {
-    if (language != nil) {
-        [parameters setObject:language forKey:NAMES_language];
-    } else {
-        [parameters removeObjectForKey:NAMES_language];
-    }
+- (void)setLanguage:(SDLLanguage *)language {
+    [parameters setOrRemoveObject:language forKey:NAMES_language];
 }
 
 -(SDLLanguage*) language {
@@ -35,12 +31,8 @@
     }
 }
 
--(void) setHmiDisplayLanguage:(SDLLanguage*) hmiDisplayLanguage {
-    if (hmiDisplayLanguage != nil) {
-        [parameters setObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
-    } else {
-        [parameters removeObjectForKey:NAMES_hmiDisplayLanguage];
-    }
+- (void)setHmiDisplayLanguage:(SDLLanguage *)hmiDisplayLanguage {
+    [parameters setOrRemoveObject:hmiDisplayLanguage forKey:NAMES_hmiDisplayLanguage];
 }
 
 -(SDLLanguage*) hmiDisplayLanguage {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnLockScreenStatus.m b/sdl_ios/SmartDeviceLink/SDLOnLockScreenStatus.m
index 36c81df1d..445d43076 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnLockScreenStatus.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnLockScreenStatus.m
@@ -21,12 +21,8 @@
     return self;
 }
 
-- (void)setLockScreenStatus:(SDLLockScreenStatus*)lockScreenStatus {
-    if (lockScreenStatus != nil) {
-        [parameters setObject:lockScreenStatus forKey:@"OnLockScreenStatus"];
-    } else {
-        [parameters removeObjectForKey:@"OnLockScreenStatus"];
-    }
+- (void)setLockScreenStatus:(SDLLockScreenStatus *)lockScreenStatus {
+    [parameters setOrRemoveObject:lockScreenStatus forKey:@"OnLockScreenStatus"];
 }
 
 - (SDLLockScreenStatus *)lockScreenStatus {
@@ -39,11 +35,7 @@
 }
 
 - (void)setHmiLevel:(SDLHMILevel *)hmiLevel {
-    if (hmiLevel != nil) {
-        [parameters setObject:hmiLevel forKey:@"hmilevel"];
-    } else {
-        [parameters removeObjectForKey:@"hmilevel"];
-    }
+    [parameters setOrRemoveObject:hmiLevel forKey:@"hmilevel"];
 }
 
 - (SDLHMILevel *)hmiLevel {
@@ -56,11 +48,7 @@
 }
 
 - (void)setUserSelected:(NSNumber *)userSelected {
-    if (userSelected != nil) {
-        [parameters setObject:userSelected forKey:@"userselected"];
-    } else {
-        [parameters removeObjectForKey:@"userselected"];
-    }
+    [parameters setOrRemoveObject:userSelected forKey:@"userselected"];
 }
 
 - (NSNumber *)userSelected {
@@ -68,11 +56,7 @@
 }
 
 - (void)setDriverDistractionStatus:(NSNumber *)driverDistractionStatus {
-    if (driverDistractionStatus != nil) {
-        [parameters setObject:driverDistractionStatus forKey:@"driverdistractionstatus"];
-    } else {
-        [parameters removeObjectForKey:@"driverdistractionstatus"];
-    }
+    [parameters setOrRemoveObject:driverDistractionStatus forKey:@"driverdistractionstatus"];
 }
 
 - (NSNumber *)driverDistractionStatus {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnPermissionsChange.m b/sdl_ios/SmartDeviceLink/SDLOnPermissionsChange.m
index e82951d9c..ea8978ae1 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnPermissionsChange.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnPermissionsChange.m
@@ -19,12 +19,8 @@
     return self;
 }
 
--(void) setPermissionItem:(NSMutableArray*) permissionItem {
-    if (permissionItem != nil) {
-        [parameters setObject:permissionItem forKey:NAMES_permissionItem];
-    } else {
-        [parameters removeObjectForKey:NAMES_permissionItem];
-    }
+- (void)setPermissionItem:(NSMutableArray *)permissionItem {
+    [parameters setOrRemoveObject:permissionItem forKey:NAMES_permissionItem];
 }
 
 -(NSMutableArray*) permissionItem {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnSyncPData.m b/sdl_ios/SmartDeviceLink/SDLOnSyncPData.m
index 049c70553..c5d128edc 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnSyncPData.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnSyncPData.m
@@ -18,24 +18,16 @@
     return self;
 }
 
--(void) setURL:(NSString*) URL {
-    if (URL != nil) {
-        [parameters setObject:URL forKey:NAMES_URL];
-    } else {
-        [parameters removeObjectForKey:NAMES_URL];
-    }
+- (void)setURL:(NSString *)URL {
+    [parameters setOrRemoveObject:URL forKey:NAMES_URL];
 }
 
 -(NSString*) URL {
     return [parameters objectForKey:NAMES_URL];
 }
 
--(void) setTimeout:(NSNumber*) Timeout {
-    if (Timeout != nil) {
-        [parameters setObject:Timeout forKey:NAMES_Timeout];
-    } else {
-        [parameters removeObjectForKey:NAMES_Timeout];
-    }
+- (void)setTimeout:(NSNumber *)Timeout {
+    [parameters setOrRemoveObject:Timeout forKey:NAMES_Timeout];
 }
 
 -(NSNumber*) Timeout {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnSystemRequest.m b/sdl_ios/SmartDeviceLink/SDLOnSystemRequest.m
index ed3be85e9..30352848e 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnSystemRequest.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnSystemRequest.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setRequestType:(SDLRequestType*) requestType {
-    if (requestType != nil) {
-        [parameters setObject:requestType forKey:NAMES_requestType];
-    } else {
-        [parameters removeObjectForKey:NAMES_requestType];
-    }
+- (void)setRequestType:(SDLRequestType *)requestType {
+    [parameters setOrRemoveObject:requestType forKey:NAMES_requestType];
 }
 
 -(SDLRequestType*) requestType {
@@ -35,36 +31,24 @@
     }
 }
 
--(void) setUrl:(NSString*) url {
-    if (url != nil) {
-        [parameters setObject:url forKey:NAMES_url];
-    } else {
-        [parameters removeObjectForKey:NAMES_url];
-    }
+- (void)setUrl:(NSString *)url {
+    [parameters setOrRemoveObject:url forKey:NAMES_url];
 }
 
 -(NSString*) url {
     return [parameters objectForKey:NAMES_url];
 }
 
--(void) setTimeout:(NSNumber*) timeout {
-    if (timeout != nil) {
-        [parameters setObject:timeout forKey:NAMES_timeout];
-    } else {
-        [parameters removeObjectForKey:NAMES_timeout];
-    }
+- (void)setTimeout:(NSNumber *)timeout {
+    [parameters setOrRemoveObject:timeout forKey:NAMES_timeout];
 }
 
 -(NSNumber*) timeout {
     return [parameters objectForKey:NAMES_timeout];
 }
 
--(void) setFileType:(SDLFileType*) fileType {
-    if (fileType != nil) {
-        [parameters setObject:fileType forKey:NAMES_fileType];
-    } else {
-        [parameters removeObjectForKey:NAMES_fileType];
-    }
+- (void)setFileType:(SDLFileType *)fileType {
+    [parameters setOrRemoveObject:fileType forKey:NAMES_fileType];
 }
 
 -(SDLFileType*) fileType {
@@ -76,24 +60,16 @@
     }
 }
 
--(void) setOffset:(NSNumber*) offset {
-    if (offset != nil) {
-        [parameters setObject:offset forKey:NAMES_offset];
-    } else {
-        [parameters removeObjectForKey:NAMES_offset];
-    }
+- (void)setOffset:(NSNumber *)offset {
+    [parameters setOrRemoveObject:offset forKey:NAMES_offset];
 }
 
 -(NSNumber*) offset {
     return [parameters objectForKey:NAMES_offset];
 }
 
--(void) setLength:(NSNumber*) length {
-    if (length != nil) {
-        [parameters setObject:length forKey:NAMES_length];
-    } else {
-        [parameters removeObjectForKey:NAMES_length];
-    }
+- (void)setLength:(NSNumber *)length {
+    [parameters setOrRemoveObject:length forKey:NAMES_length];
 }
 
 -(NSNumber*) length {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnTBTClientState.m b/sdl_ios/SmartDeviceLink/SDLOnTBTClientState.m
index 1402ca9b2..28b5f8dbe 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnTBTClientState.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnTBTClientState.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setState:(SDLTBTState*) state {
-    if (state != nil) {
-        [parameters setObject:state forKey:NAMES_state];
-    } else {
-        [parameters removeObjectForKey:NAMES_state];
-    }
+- (void)setState:(SDLTBTState *)state {
+    [parameters setOrRemoveObject:state forKey:NAMES_state];
 }
 
 -(SDLTBTState*) state {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnTouchEvent.m b/sdl_ios/SmartDeviceLink/SDLOnTouchEvent.m
index 18d9d4e42..9134a326d 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnTouchEvent.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnTouchEvent.m
@@ -19,12 +19,8 @@
     return self;
 }
 
--(void) setType:(SDLTouchType*) type {
-    if (type != nil) {
-        [parameters setObject:type forKey:NAMES_type];
-    } else {
-        [parameters removeObjectForKey:NAMES_type];
-    }
+- (void)setType:(SDLTouchType *)type {
+    [parameters setOrRemoveObject:type forKey:NAMES_type];
 }
 
 -(SDLTouchType*) type {
@@ -36,12 +32,8 @@
     }
 }
 
--(void) setEvent:(NSMutableArray*) event {
-    if (event != nil) {
-        [parameters setObject:event forKey:NAMES_event];
-    } else {
-        [parameters removeObjectForKey:NAMES_event];
-    }
+- (void)setEvent:(NSMutableArray *)event {
+    [parameters setOrRemoveObject:event forKey:NAMES_event];
 }
 
 -(NSMutableArray*) event {
diff --git a/sdl_ios/SmartDeviceLink/SDLOnVehicleData.m b/sdl_ios/SmartDeviceLink/SDLOnVehicleData.m
index 77b439e03..d86963c31 100644
--- a/sdl_ios/SmartDeviceLink/SDLOnVehicleData.m
+++ b/sdl_ios/SmartDeviceLink/SDLOnVehicleData.m
@@ -18,12 +18,8 @@
     return self;
 }
 
--(void) setGps:(SDLGPSData*) gps {
-    if (gps != nil) {
-        [parameters setObject:gps forKey:NAMES_gps];
-    } else {
-        [parameters removeObjectForKey:NAMES_gps];
-    }
+- (void)setGps:(SDLGPSData *)gps {
+    [parameters setOrRemoveObject:gps forKey:NAMES_gps];
 }
 
 -(SDLGPSData*) gps {
@@ -35,48 +31,32 @@
     }
 }
 
--(void) setSpeed:(NSNumber*) speed {
-    if (speed != nil) {
-        [parameters setObject:speed forKey:NAMES_speed];
-    } else {
-        [parameters removeObjectForKey:NAMES_speed];
-    }
+- (void)setSpeed:(NSNumber *)speed {
+    [parameters setOrRemoveObject:speed forKey:NAMES_speed];
 }
 
 -(NSNumber*) speed {
     return [parameters objectForKey:NAMES_speed];
 }
 
--(void) setRpm:(NSNumber*) rpm {
-    if (rpm != nil) {
-        [parameters setObject:rpm forKey:NAMES_rpm];
-    } else {
-        [parameters removeObjectForKey:NAMES_rpm];
-    }
+- (void)setRpm:(NSNumber *)rpm {
+    [parameters setOrRemoveObject:rpm forKey:NAMES_rpm];
 }
 
 -(NSNumber*) rpm {
     return [parameters objectForKey:NAMES_rpm];
 }
 
--(void) setFuelLevel:(NSNumber*) fuelLevel {
-    if (fuelLevel != nil) {
-        [parameters setObject:fuelLevel forKey:NAMES_fuelLevel];
-    } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel];
-    }
+- (void)setFuelLevel:(NSNumber *)fuelLevel {
+    [parameters setOrRemoveObject:fuelLevel forKey:NAMES_fuelLevel];
 }
 
 -(NSNumber*) fuelLevel {
     return [parameters objectForKey:NAMES_fuelLevel];
 }
 
--(void) setFuelLevel_State:(SDLComponentVolumeStatus*) fuelLevel_State {
-    if (fuelLevel_State != nil) {
-        [parameters setObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
-    } else {
-        [parameters removeObjectForKey:NAMES_fuelLevel_State];
-    }
+- (void)setFuelLevel_State:(SDLComponentVolumeStatus *)fuelLevel_State {
+    [parameters setOrRemoveObject:fuelLevel_State forKey:NAMES_fuelLevel_State];
 }
 
 -(SDLComponentVolumeStatus*) fuelLevel_State {
@@ -88,48 +68,32 @@
     }
 }
 
--(void) setInstantFuelConsumption:(NSNumber*) instantFuelConsumption {
-    if (instantFuelConsumption != nil) {
-        [parameters setObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
-    } else {
-        [parameters removeObjectForKey:NAMES_instantFuelConsumption];
-    }
+- (void)setInstantFuelConsumption:(NSNumber *)instantFuelConsumption {
+    [parameters setOrRemoveObject:instantFuelConsumption forKey:NAMES_instantFuelConsumption];
 }
 
 -(NSNumber*) instantFuelConsumption {
     return [parameters objectForKey:NAMES_instantFuelConsumption];
 }
 
--(void) setExternalTemperature:(NSNumber*) externalTemperature {
-    if (externalTemperature != nil) {
-        [parameters setObject:externalTemperature forKey:NAMES_externalTemperature];
-    } else {
-        [parameters removeObjectForKey:NAMES_externalTemperature];
-    }
+- (void)setExternalTemperature:(NSNumber *)externalTemperature {
+    [parameters setOrRemoveObject:externalTemperature forKey:NAMES_externalTemperature];
 }
 
 -(NSNumber*) externalTemperature {
     return [parameters objectForKey:NAMES_externalTemperature];
 }
 
--(void) setVin:(NSString*) vin {
-    if (vin != nil) {
-        [parameters setObject:vin forKey:NAMES_vin];
-    } else {
-        [parameters removeObjectForKey:NAMES_vin];
-    }
+- (void)setVin:(NSString *)vin {
+    [parameters setOrRemoveObject:vin forKey:NAMES_vin];
 }
 
 -(NSString*) vin {
     return [parameters objectForKey:NAMES_vin];
 }
 
--(void) setPrndl:(SDLPRNDL*) prndl {
-    if (prndl != nil) {
-        [parameters setObject:prndl forKey:NAMES_prndl];
-    } else {
-        [parameters removeObjectForKey:NAMES_prndl];
-    }
+- (void)setPrndl:(SDLPRNDL *)prndl {
+    [parameters setOrRemoveObject:prndl forKey:NAMES_prndl];
 }
 
 -(SDLPRNDL*) prndl {
@@ -141,12 +105,8 @@
     }
 }
 
--(void) setTirePressure:(SDLTireStatus*) tirePressure {
-    if (tirePressure != nil) {
-        [parameters setObject:tirePressure forKey:NAMES_tirePressure];
-    } else {
-        [parameters removeObjectForKey:NAMES_tirePressure];
-    }
+- (void)setTirePressure:(SDLTireStatus *)tirePressure {
+    [parameters setOrRemoveObject:tirePressure forKey:NAMES_tirePressure];
 }
 
 -(SDLTireStatus*) tirePressure {
@@ -158,24 +118,16 @@
     }
 }
 
--(void) setOdometer:(NSNumber*) odometer {
-    if (odometer != nil) {
-        [parameters setObject:odometer forKey:NAMES_odometer];
-    } else {
-        [parameters removeObjectForKey:NAMES_odometer];
-    }
+- (void)setOdometer:(NSNumber *)odometer {
+    [parameters setOrRemoveObject:odometer forKey:NAMES_odometer];
 }
 
 -(NSNumber*) odometer {
     return [parameters objectForKey:NAMES_odometer];
 }
 
--(void) setBeltStatus:(SDLBeltStatus*) beltStatus {
-    if (beltStatus != nil) {
-        [parameters setObject:beltStatus forKey:NAMES_beltStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_beltStatus];
-    }
+- (void)setBeltStatus:(SDLBeltStatus *)beltStatus {
+    [parameters setOrRemoveObject:beltStatus forKey:NAMES_beltStatus];
 }
 
 -(SDLBeltStatus*) beltStatus {
@@ -187,12 +139,8 @@
     }
 }
 
--(void) setBodyInformation:(SDLBodyInformation*) bodyInformation {
-    if (bodyInformation != nil) {
-        [parameters setObject:bodyInformation forKey:NAMES_bodyInformation];
-    } else {
-        [parameters removeObjectForKey:NAMES_bodyInformation];
-    }
+- (void)setBodyInformation:(SDLBodyInformation *)bodyInformation {
+    [parameters setOrRemoveObject:bodyInformation forKey:NAMES_bodyInformation];
 }
 
 -(SDLBodyInformation*) bodyInformation {
@@ -204,12 +152,8 @@
     }
 }
 
--(void) setDeviceStatus:(SDLDeviceStatus*) deviceStatus {
-    if (deviceStatus != nil) {
-        [parameters setObject:deviceStatus forKey:NAMES_deviceStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_deviceStatus];
-    }
+- (void)setDeviceStatus:(SDLDeviceStatus *)deviceStatus {
+    [parameters setOrRemoveObject:deviceStatus forKey:NAMES_deviceStatus];
 }
 
 -(SDLDeviceStatus*) deviceStatus {
@@ -221,12 +165,8 @@
     }
 }
 
--(void) setDriverBraking:(SDLVehicleDataEventStatus*) driverBraking {
-    if (driverBraking != nil) {
-        [parameters setObject:driverBraking forKey:NAMES_driverBraking];
-    } else {
-        [parameters removeObjectForKey:NAMES_driverBraking];
-    }
+- (void)setDriverBraking:(SDLVehicleDataEventStatus *)driverBraking {
+    [parameters setOrRemoveObject:driverBraking forKey:NAMES_driverBraking];
 }
 
 -(SDLVehicleDataEventStatus*) driverBraking {
@@ -238,12 +178,8 @@
     }
 }
 
--(void) setWiperStatus:(SDLWiperStatus*) wiperStatus {
-    if (wiperStatus != nil) {
-        [parameters setObject:wiperStatus forKey:NAMES_wiperStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_wiperStatus];
-    }
+- (void)setWiperStatus:(SDLWiperStatus *)wiperStatus {
+    [parameters setOrRemoveObject:wiperStatus forKey:NAMES_wiperStatus];
 }
 
 -(SDLWiperStatus*) wiperStatus {
@@ -255,12 +191,8 @@
     }
 }
 
--(void) setHeadLampStatus:(SDLHeadLampStatus*) headLampStatus {
-    if (headLampStatus != nil) {
-        [parameters setObject:headLampStatus forKey:NAMES_headLampStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_headLampStatus];
-    }
+- (void)setHeadLampStatus:(SDLHeadLampStatus *)headLampStatus {
+    [parameters setOrRemoveObject:headLampStatus forKey:NAMES_headLampStatus];
 }
 
 -(SDLHeadLampStatus*) headLampStatus {
@@ -272,48 +204,32 @@
     }
 }
 
--(void) setEngineTorque:(NSNumber*) engineTorque {
-    if (engineTorque != nil) {
-        [parameters setObject:engineTorque forKey:NAMES_engineTorque];
-    } else {
-        [parameters removeObjectForKey:NAMES_engineTorque];
-    }
+- (void)setEngineTorque:(NSNumber *)engineTorque {
+    [parameters setOrRemoveObject:engineTorque forKey:NAMES_engineTorque];
 }
 
 -(NSNumber*) engineTorque {
     return [parameters objectForKey:NAMES_engineTorque];
 }
 
--(void) setAccPedalPosition:(NSNumber*) accPedalPosition {
-    if (accPedalPosition != nil) {
-        [parameters setObject:accPedalPosition forKey:NAMES_accPedalPosition];
-    } else {
-        [parameters removeObjectForKey:NAMES_accPedalPosition];
-    }
+- (void)setAccPedalPosition:(NSNumber *)accPedalPosition {
+    [parameters setOrRemoveObject:accPedalPosition forKey:NAMES_accPedalPosition];
 }
 
 -(NSNumber*) accPedalPosition {
     return [parameters objectForKey:NAMES_accPedalPosition];
 }
 
--(void) setSteeringWheelAngle:(NSNumber*) steeringWheelAngle {
-    if (steeringWheelAngle != nil) {
-        [parameters setObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
-    } else {
-        [parameters removeObjectForKey:NAMES_steeringWheelAngle];
-    }
+- (void)setSteeringWheelAngle:(NSNumber *)steeringWheelAngle {
+    [parameters setOrRemoveObject:steeringWheelAngle forKey:NAMES_steeringWheelAngle];
 }
 
 -(NSNumber*) steeringWheelAngle {
     return [parameters objectForKey:NAMES_steeringWheelAngle];
 }
 
--(void) setECallInfo:(SDLECallInfo*) eCallInfo {
-    if (eCallInfo != nil) {
-        [parameters setObject:eCallInfo forKey:NAMES_eCallInfo];
-    } else {
-        [parameters removeObjectForKey:NAMES_eCallInfo];
-    }
+- (void)setECallInfo:(SDLECallInfo *)eCallInfo {
+    [parameters setOrRemoveObject:eCallInfo forKey:NAMES_eCallInfo];
 }
 
 -(SDLECallInfo*) eCallInfo {
@@ -325,12 +241,8 @@
     }
 }
 
--(void) setAirbagStatus:(SDLAirbagStatus*) airbagStatus {
-    if (airbagStatus != nil) {
-        [parameters setObject:airbagStatus forKey:NAMES_airbagStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_airbagStatus];
-    }
+- (void)setAirbagStatus:(SDLAirbagStatus *)airbagStatus {
+    [parameters setOrRemoveObject:airbagStatus forKey:NAMES_airbagStatus];
 }
 
 -(SDLAirbagStatus*) airbagStatus {
@@ -342,12 +254,8 @@
     }
 }
 
--(void) setEmergencyEvent:(SDLEmergencyEvent*) emergencyEvent {
-    if (emergencyEvent != nil) {
-        [parameters setObject:emergencyEvent forKey:NAMES_emergencyEvent];
-    } else {
-        [parameters removeObjectForKey:NAMES_emergencyEvent];
-    }
+- (void)setEmergencyEvent:(SDLEmergencyEvent *)emergencyEvent {
+    [parameters setOrRemoveObject:emergencyEvent forKey:NAMES_emergencyEvent];
 }
 
 -(SDLEmergencyEvent*) emergencyEvent {
@@ -359,12 +267,8 @@
     }
 }
 
--(void) setClusterModeStatus:(SDLClusterModeStatus*) clusterModeStatus {
-    if (clusterModeStatus != nil) {
-        [parameters setObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
-    } else {
-        [parameters removeObjectForKey:NAMES_clusterModeStatus];
-    }
+- (void)setClusterModeStatus:(SDLClusterModeStatus *)clusterModeStatus {
+    [parameters setOrRemoveObject:clusterModeStatus forKey:NAMES_clusterModeStatus];
 }
 
 -(SDLClusterModeStatus*) clusterModeStatus {
@@ -376,12 +280,8 @@
     }
 }
 
--(void) setMyKey:(SDLMyKey*) myKey {
-    if (myKey != nil) {
-        [parameters setObject:myKey forKey:NAMES_myKey];
-    } else {
-        [parameters removeObjectForKey:NAMES_myKey];
-    }
+- (void)setMyKey:(SDLMyKey *)myKey {
+    [parameters setOrRemoveObject:myKey forKey:NAMES_myKey];
 }
 
 -(SDLMyKey*) myKey {