sdl-0253 "New vehicle data StabilityControlsStatus": apply review comments: fix the previous commit leftovers.

10 files changed, 76 insertions, 13 deletions

diff --git a/SmartDeviceLink/SDLGetVehicleData.h b/SmartDeviceLink/SDLGetVehicleData.h
index f0e30b2ec..296e61876 100644
--- a/SmartDeviceLink/SDLGetVehicleData.h
+++ b/SmartDeviceLink/SDLGetVehicleData.h
@@ -186,157 +186,219 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * A boolean value. If true, requests GPS data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *gps;
 
 /**
  * A boolean value. If true, requests Speed data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *speed;
 
 /**
  * A boolean value. If true, requests RPM data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *rpm;
 
 /**
  * A boolean value. If true, requests Fuel Level data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel;
 
 /**
  * A boolean value. If true, requests Fuel Level State data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelLevel_State;
 
 /**
  * A boolean value. If true, requests Fuel Range data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *fuelRange;
 
 /**
  * A boolean value. If true, requests Instant Fuel Consumption data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *instantFuelConsumption;
 
 /**
  * A boolean value. If true, requests External Temperature data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *externalTemperature;
 
 /**
  * A boolean value. If true, requests the Vehicle Identification Number.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *vin;
 
 /**
  * A boolean value. If true, requests PRNDL data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *prndl;
 
 /**
  * A boolean value. If true, requests Tire Pressure data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *tirePressure;
 
 /**
  * A boolean value. If true, requests Odometer data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *odometer;
 
 /**
  * A boolean value. If true, requests Belt Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *beltStatus;
 
 /**
  * A boolean value. If true, requests Body Information data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *bodyInformation;
 
 /**
  * A boolean value. If true, requests Device Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *deviceStatus;
 
 /**
  * A boolean value. If true, requests Driver Braking data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *driverBraking;
 
 /**
  * A boolean value. If true, requests Wiper Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *wiperStatus;
 
 /**
  * A boolean value. If true, requests Head Lamp Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *headLampStatus;
 
 /**
  * A boolean value. If true, requests Engine Oil Life data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineOilLife;
 
 /**
  * A boolean value. If true, requests Engine Torque data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *engineTorque;
 
 /**
  * A boolean value. If true, requests Acc Pedal Position data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *accPedalPosition;
 
 /**
  * A boolean value. If true, requests Steering Wheel Angle data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *steeringWheelAngle;
 
 /**
  * A boolean value. If true, requests Emergency Call Info data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *eCallInfo;
 
 /**
  * A boolean value. If true, requests Air Bag Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *airbagStatus;
 
 /**
  * A boolean value. If true, requests Emergency Event (if it occurred) data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *emergencyEvent;
 
 /**
  * A boolean value. If true, requests Cluster Mode Status data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *clusterModeStatus;
 
 /**
  * A boolean value. If true, requests MyKey data.
+ *
+ * Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *myKey;
 
 /**
  A boolean value. If true, requests Electronic Parking Brake status data.
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *electronicParkBrakeStatus;
 
 /**
  A boolean value. If true, requests Turn Signal data.
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *turnSignal;
 
 /**
  A boolean value. If true, requests the Cloud App Vehicle ID.
+
+ Optional.
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *cloudAppVehicleID;
 
 /**
  * See StabilityControlsStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
 @property (strong, nonatomic, nullable) NSNumber<SDLBool> *stabilityControlsStatus;
diff --git a/SmartDeviceLink/SDLStabilityControlsStatus.m b/SmartDeviceLink/SDLStabilityControlsStatus.m
index 26fb636d9..0748fe3f7 100644
--- a/SmartDeviceLink/SDLStabilityControlsStatus.m
+++ b/SmartDeviceLink/SDLStabilityControlsStatus.m
@@ -30,10 +30,10 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import "SDLStabilityControlsStatus.h"
 #import "NSMutableDictionary+Store.h"
-#import "SDLVehicleDataStatus.h"
 #import "SDLRPCParameterNames.h"
+#import "SDLStabilityControlsStatus.h"
+#import "SDLVehicleDataStatus.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -67,4 +67,4 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
\ No newline at end of file
+NS_ASSUME_NONNULL_END
diff --git a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
index e1551c6bd..a0dd79c71 100644
--- a/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
+++ b/SmartDeviceLink/SDLUnsubscribeVehicleDataResponse.h
@@ -247,6 +247,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * See StabilityControlsStatus
  *
+ * Optional.
+ *
  * @since SDL 6.2.0
  */
 @property (strong, nonatomic, nullable) SDLVehicleDataResult *stabilityControlsStatus;
diff --git a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
index e15396703..7b43ace69 100644
--- a/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/NotificationSpecs/SDLOnVehicleDataSpec.m
@@ -149,7 +149,7 @@ describe(@"Getter/Setter Tests", ^ {
                                            SDLRPCParameterNameTurnSignal:SDLTurnSignalOff,
                                            SDLRPCParameterNameVIN:@"222222222722",
                                            SDLRPCParameterNameWiperStatus:SDLWiperStatusStalled,
-                                           @"stabilityControlsStatus":stabilityControlsStatus
+                                           SDLRPCParameterNameStabilityControlsStatus:stabilityControlsStatus
                                          },
                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameOnVehicleData}};
 #pragma clang diagnostic push
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
index fec71b119..83b7f40ab 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLGetVehicleDataSpec.m
@@ -4,13 +4,12 @@
 
 
 #import <Foundation/Foundation.h>
-
-#import <Quick/Quick.h>
 #import <Nimble/Nimble.h>
+#import <Quick/Quick.h>
 
 #import "SDLGetVehicleData.h"
-#import "SDLRPCParameterNames.h"
 #import "SDLRPCFunctionNames.h"
+#import "SDLRPCParameterNames.h"
 
 QuickSpecBegin(SDLGetVehicleDataSpec)
 
@@ -113,7 +112,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameTirePressure:@YES,
                                                                    SDLRPCParameterNameTurnSignal:@NO,
                                                                    SDLRPCParameterNameWiperStatus:@YES,
-                                                                   @"stabilityControlsStatus":@YES
+                                                                   SDLRPCParameterNameStabilityControlsStatus:@YES
                                                                  },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}};
 #pragma clang diagnostic push
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
index 67887971d..0c6dd91d8 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLSubscribeVehicleDataSpec.m
@@ -113,7 +113,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                            SDLRPCParameterNameTirePressure:@YES,
                                                            SDLRPCParameterNameTurnSignal:@NO,
                                                            SDLRPCParameterNameWiperStatus:@NO,
-                                                           @"stabilityControlsStatus":@YES},
+                                                           SDLRPCParameterNameStabilityControlsStatus:@YES},
                                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}};
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
diff --git a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
index f74108080..0bddf7c01 100644
--- a/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/RequestSpecs/SDLUnsubscribeVehicleDataSpec.m
@@ -113,7 +113,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                            SDLRPCParameterNameTirePressure:@YES,
                                                            SDLRPCParameterNameTurnSignal:@YES,
                                                            SDLRPCParameterNameWiperStatus:@YES,
-                                                           @"stabilityControlsStatus":@YES
+                                                           SDLRPCParameterNameStabilityControlsStatus:@YES
                                                          },
                                                      SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}};
 #pragma clang diagnostic push
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
index 8798fd314..87a965d02 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLGetVehicleDataResponseSpec.m
@@ -151,7 +151,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                      SDLRPCParameterNameTurnSignal:SDLTurnSignalOff,
                                                      SDLRPCParameterNameVIN:vin,
                                                      SDLRPCParameterNameWiperStatus:SDLWiperStatusAutomaticHigh,
-                                                     @"stabilityControlsStatus":stabilityControlsStatus
+                                                     SDLRPCParameterNameStabilityControlsStatus:stabilityControlsStatus
                                                  },
                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameGetVehicleData}};
 #pragma clang diagnostic push
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
index c439139d8..11e329e5e 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLSubscribeVehicleDataResponseSpec.m
@@ -120,7 +120,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameTirePressure:vehicleDataResult,
                                                                    SDLRPCParameterNameTurnSignal:vehicleDataResult,
                                                                    SDLRPCParameterNameWiperStatus:vehicleDataResult,
-                                                                   @"stabilityControlsStatus":vehicleDataResult
+                                                                   SDLRPCParameterNameStabilityControlsStatus:vehicleDataResult
                                                                  },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameSubscribeVehicleData}};
 #pragma clang diagnostic push
diff --git a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
index 96fb7b91b..d915c0f4c 100644
--- a/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/ResponseSpecs/SDLUnsubscribeVehicleDataResponseSpec.m
@@ -117,7 +117,7 @@ describe(@"Getter/Setter Tests", ^ {
                                                                    SDLRPCParameterNameElectronicParkBrakeStatus:vehicleDataResult,
                                                                    SDLRPCParameterNameTurnSignal:vehicleDataResult,
                                                                    SDLRPCParameterNameCloudAppVehicleID:vehicleDataResult,
-                                                                   @"stabilityControlsStatus":vehicleDataResult
+                                                                   SDLRPCParameterNameStabilityControlsStatus:vehicleDataResult
                                                                    },
                                                              SDLRPCParameterNameOperationName:SDLRPCFunctionNameUnsubscribeVehicleData}} mutableCopy];
 #pragma clang diagnostic push