Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Deprecate RPC superclass initializers #1262

Merged
merged 3 commits into from May 17, 2019
Merged

Deprecate RPC superclass initializers #1262

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fc6179
Deprecate RPC superclass initializers
joeljfischer May 14, 2019
8464d35
Fix the unit tests
joeljfischer May 14, 2019
58987c3
Fix review issues
joeljfischer May 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 11 additions & 8 deletions SmartDeviceLink/SDLAddCommand.m
View file
Open in desktop
Expand Up @@ -14,11 +14,14 @@

@implementation SDLAddCommand

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) {
}
return self;
}
#pragma clang diagnostic pop

- (instancetype)initWithHandler:(nullable SDLRPCCommandNotificationHandler)handler {
self = [self init];
Expand Down Expand Up @@ -103,36 +106,36 @@ - (instancetype)initWithId:(UInt32)commandId vrCommands:(nullable NSArray<NSStri
#pragma mark - Getters / Setters

- (void)setCmdID:(NSNumber<SDLInt> *)cmdID {
[parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId];
[self.parameters sdl_setObject:cmdID forName:SDLRPCParameterNameCommandId];
}

- (NSNumber<SDLInt> *)cmdID {
NSError *error = nil;
return [parameters sdl_objectForName:SDLRPCParameterNameCommandId ofClass:NSNumber.class error:&error];
return [self.parameters sdl_objectForName:SDLRPCParameterNameCommandId ofClass:NSNumber.class error:&error];
}

- (void)setMenuParams:(nullable SDLMenuParams *)menuParams {
[parameters sdl_setObject:menuParams forName:SDLRPCParameterNameMenuParams];
[self.parameters sdl_setObject:menuParams forName:SDLRPCParameterNameMenuParams];
}

- (nullable SDLMenuParams *)menuParams {
return [parameters sdl_objectForName:SDLRPCParameterNameMenuParams ofClass:SDLMenuParams.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuParams ofClass:SDLMenuParams.class error:nil];
}

- (void)setVrCommands:(nullable NSArray<NSString *> *)vrCommands {
[parameters sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
[self.parameters sdl_setObject:vrCommands forName:SDLRPCParameterNameVRCommands];
}

- (nullable NSArray<NSString *> *)vrCommands {
return [parameters sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
return [self.parameters sdl_objectsForName:SDLRPCParameterNameVRCommands ofClass:NSString.class error:nil];
}

- (void)setCmdIcon:(nullable SDLImage *)cmdIcon {
[parameters sdl_setObject:cmdIcon forName:SDLRPCParameterNameCommandIcon];
[self.parameters sdl_setObject:cmdIcon forName:SDLRPCParameterNameCommandIcon];
}

- (nullable SDLImage *)cmdIcon {
return [parameters sdl_objectForName:SDLRPCParameterNameCommandIcon ofClass:SDLImage.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameCommandIcon ofClass:SDLImage.class error:nil];
}

-(id)copyWithZone:(nullable NSZone *)zone {
Expand Down
3 changes: 3 additions & 0 deletions SmartDeviceLink/SDLAddCommandResponse.m
View file
Open in desktop
Expand Up @@ -10,11 +10,14 @@

@implementation SDLAddCommandResponse

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddCommand]) {
}
return self;
}
#pragma clang diagnostic pop

@end

Expand Down
19 changes: 11 additions & 8 deletions SmartDeviceLink/SDLAddSubMenu.m
View file
Open in desktop
Expand Up @@ -11,11 +11,14 @@

@implementation SDLAddSubMenu

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) {
}
return self;
}
#pragma clang diagnostic pop

- (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName menuIcon:(nullable SDLImage *)icon position:(UInt8)position {
self = [self initWithId:menuId menuName:menuName];
Expand Down Expand Up @@ -44,37 +47,37 @@ - (instancetype)initWithId:(UInt32)menuId menuName:(NSString *)menuName {
}

- (void)setMenuID:(NSNumber<SDLInt> *)menuID {
[parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId];
[self.parameters sdl_setObject:menuID forName:SDLRPCParameterNameMenuId];
}

- (NSNumber<SDLInt> *)menuID {
NSError *error = nil;
return [parameters sdl_objectForName:SDLRPCParameterNameMenuId ofClass:NSNumber.class error:&error];
return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuId ofClass:NSNumber.class error:&error];
}

- (void)setPosition:(nullable NSNumber<SDLInt> *)position {
[parameters sdl_setObject:position forName:SDLRPCParameterNamePosition];
[self.parameters sdl_setObject:position forName:SDLRPCParameterNamePosition];
}

- (nullable NSNumber<SDLInt> *)position {
return [parameters sdl_objectForName:SDLRPCParameterNamePosition ofClass:NSNumber.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNamePosition ofClass:NSNumber.class error:nil];
}

- (void)setMenuName:(NSString *)menuName {
[parameters sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
[self.parameters sdl_setObject:menuName forName:SDLRPCParameterNameMenuName];
}

- (NSString *)menuName {
NSError *error = nil;
return [parameters sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuName ofClass:NSString.class error:&error];
}

- (void)setMenuIcon:(nullable SDLImage *)menuIcon {
[parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon];
[self.parameters sdl_setObject:menuIcon forName:SDLRPCParameterNameMenuIcon];
}

- (nullable SDLImage *)menuIcon {
return [parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:[SDLImage class] error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameMenuIcon ofClass:[SDLImage class] error:nil];
}

@end
Expand Down
3 changes: 3 additions & 0 deletions SmartDeviceLink/SDLAddSubMenuResponse.m
View file
Open in desktop
Expand Up @@ -10,11 +10,14 @@

@implementation SDLAddSubMenuResponse

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAddSubMenu]) {
}
return self;
}
#pragma clang diagnostic pop

@end

Expand Down
32 changes: 16 additions & 16 deletions SmartDeviceLink/SDLAirbagStatus.m
View file
Open in desktop
Expand Up @@ -10,74 +10,74 @@
@implementation SDLAirbagStatus

- (void)setDriverAirbagDeployed:(SDLVehicleDataEventStatus)driverAirbagDeployed {
[store sdl_setObject:driverAirbagDeployed forName:SDLRPCParameterNameDriverAirbagDeployed];
[self.store sdl_setObject:driverAirbagDeployed forName:SDLRPCParameterNameDriverAirbagDeployed];
}

- (SDLVehicleDataEventStatus)driverAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNameDriverAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNameDriverAirbagDeployed error:&error];
}

- (void)setDriverSideAirbagDeployed:(SDLVehicleDataEventStatus)driverSideAirbagDeployed {
[store sdl_setObject:driverSideAirbagDeployed forName:SDLRPCParameterNameDriverSideAirbagDeployed];
[self.store sdl_setObject:driverSideAirbagDeployed forName:SDLRPCParameterNameDriverSideAirbagDeployed];
}

- (SDLVehicleDataEventStatus)driverSideAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNameDriverSideAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNameDriverSideAirbagDeployed error:&error];
}

- (void)setDriverCurtainAirbagDeployed:(SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
[store sdl_setObject:driverCurtainAirbagDeployed forName:SDLRPCParameterNameDriverCurtainAirbagDeployed];
[self.store sdl_setObject:driverCurtainAirbagDeployed forName:SDLRPCParameterNameDriverCurtainAirbagDeployed];
}

- (SDLVehicleDataEventStatus)driverCurtainAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNameDriverCurtainAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNameDriverCurtainAirbagDeployed error:&error];
}

- (void)setPassengerAirbagDeployed:(SDLVehicleDataEventStatus)passengerAirbagDeployed {
[store sdl_setObject:passengerAirbagDeployed forName:SDLRPCParameterNamePassengerAirbagDeployed];}
[self.store sdl_setObject:passengerAirbagDeployed forName:SDLRPCParameterNamePassengerAirbagDeployed];}

- (SDLVehicleDataEventStatus)passengerAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNamePassengerAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNamePassengerAirbagDeployed error:&error];
}

- (void)setPassengerCurtainAirbagDeployed:(SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
[store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLRPCParameterNamePassengerCurtainAirbagDeployed];
[self.store sdl_setObject:passengerCurtainAirbagDeployed forName:SDLRPCParameterNamePassengerCurtainAirbagDeployed];
}

- (SDLVehicleDataEventStatus)passengerCurtainAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNamePassengerCurtainAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNamePassengerCurtainAirbagDeployed error:&error];
}

- (void)setDriverKneeAirbagDeployed:(SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
[store sdl_setObject:driverKneeAirbagDeployed forName:SDLRPCParameterNameDriverKneeAirbagDeployed];
[self.store sdl_setObject:driverKneeAirbagDeployed forName:SDLRPCParameterNameDriverKneeAirbagDeployed];
}

- (SDLVehicleDataEventStatus)driverKneeAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNameDriverKneeAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNameDriverKneeAirbagDeployed error:&error];
}

- (void)setPassengerSideAirbagDeployed:(SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
[store sdl_setObject:passengerSideAirbagDeployed forName:SDLRPCParameterNamePassengerSideAirbagDeployed];
[self.store sdl_setObject:passengerSideAirbagDeployed forName:SDLRPCParameterNamePassengerSideAirbagDeployed];
}

- (SDLVehicleDataEventStatus)passengerSideAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNamePassengerSideAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNamePassengerSideAirbagDeployed error:&error];
}

- (void)setPassengerKneeAirbagDeployed:(SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
[store sdl_setObject:passengerKneeAirbagDeployed forName:SDLRPCParameterNamePassengerKneeAirbagDeployed];
[self.store sdl_setObject:passengerKneeAirbagDeployed forName:SDLRPCParameterNamePassengerKneeAirbagDeployed];
}

- (SDLVehicleDataEventStatus)passengerKneeAirbagDeployed {
NSError *error = nil;
return [store sdl_enumForName:SDLRPCParameterNamePassengerKneeAirbagDeployed error:&error];
return [self.store sdl_enumForName:SDLRPCParameterNamePassengerKneeAirbagDeployed error:&error];
}

@end
Expand Down
35 changes: 19 additions & 16 deletions SmartDeviceLink/SDLAlert.m
View file
Open in desktop
Expand Up @@ -14,11 +14,14 @@

@implementation SDLAlert

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlert]) {
}
return self;
}
#pragma clang diagnostic pop

- (instancetype)initWithAlertText1:(nullable NSString *)alertText1 alertText2:(nullable NSString *)alertText2 alertText3:(nullable NSString *)alertText3 {
return [self initWithAlertText1:alertText1 alertText2:alertText2 alertText3:alertText3 duration:SDLDefaultDuration];
Expand Down Expand Up @@ -75,67 +78,67 @@ - (instancetype)initWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks a
}

- (void)setAlertText1:(nullable NSString *)alertText1 {
[parameters sdl_setObject:alertText1 forName:SDLRPCParameterNameAlertText1];
[self.parameters sdl_setObject:alertText1 forName:SDLRPCParameterNameAlertText1];
}

- (nullable NSString *)alertText1 {
return [parameters sdl_objectForName:SDLRPCParameterNameAlertText1 ofClass:NSString.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText1 ofClass:NSString.class error:nil];
}

- (void)setAlertText2:(nullable NSString *)alertText2 {
[parameters sdl_setObject:alertText2 forName:SDLRPCParameterNameAlertText2];
[self.parameters sdl_setObject:alertText2 forName:SDLRPCParameterNameAlertText2];
}

- (nullable NSString *)alertText2 {
return [parameters sdl_objectForName:SDLRPCParameterNameAlertText2 ofClass:NSString.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText2 ofClass:NSString.class error:nil];
}

- (void)setAlertText3:(nullable NSString *)alertText3 {
[parameters sdl_setObject:alertText3 forName:SDLRPCParameterNameAlertText3];
[self.parameters sdl_setObject:alertText3 forName:SDLRPCParameterNameAlertText3];
}

- (nullable NSString *)alertText3 {
return [parameters sdl_objectForName:SDLRPCParameterNameAlertText3 ofClass:NSString.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameAlertText3 ofClass:NSString.class error:nil];
}

- (void)setTtsChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks {
[parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
[self.parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
}

- (nullable NSArray<SDLTTSChunk *> *)ttsChunks {
return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
return [self.parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
}

- (void)setDuration:(nullable NSNumber<SDLInt> *)duration {
[parameters sdl_setObject:duration forName:SDLRPCParameterNameDuration];
[self.parameters sdl_setObject:duration forName:SDLRPCParameterNameDuration];
}

- (nullable NSNumber<SDLInt> *)duration {
return [parameters sdl_objectForName:SDLRPCParameterNameDuration ofClass:NSNumber.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameDuration ofClass:NSNumber.class error:nil];
}

- (void)setPlayTone:(nullable NSNumber<SDLBool> *)playTone {
[parameters sdl_setObject:playTone forName:SDLRPCParameterNamePlayTone];
[self.parameters sdl_setObject:playTone forName:SDLRPCParameterNamePlayTone];
}

- (nullable NSNumber<SDLBool> *)playTone {
return [parameters sdl_objectForName:SDLRPCParameterNamePlayTone ofClass:NSNumber.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNamePlayTone ofClass:NSNumber.class error:nil];
}

- (void)setProgressIndicator:(nullable NSNumber<SDLBool> *)progressIndicator {
[parameters sdl_setObject:progressIndicator forName:SDLRPCParameterNameProgressIndicator];
[self.parameters sdl_setObject:progressIndicator forName:SDLRPCParameterNameProgressIndicator];
}

- (nullable NSNumber<SDLBool> *)progressIndicator {
return [parameters sdl_objectForName:SDLRPCParameterNameProgressIndicator ofClass:NSNumber.class error:nil];
return [self.parameters sdl_objectForName:SDLRPCParameterNameProgressIndicator ofClass:NSNumber.class error:nil];
}

- (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons {
[parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
[self.parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
}

- (nullable NSArray<SDLSoftButton *> *)softButtons {
return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
return [self.parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
}

@end
Expand Down
11 changes: 7 additions & 4 deletions SmartDeviceLink/SDLAlertManeuver.m
View file
Open in desktop
Expand Up @@ -14,11 +14,14 @@

@implementation SDLAlertManeuver

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) {
}
return self;
}
#pragma clang diagnostic pop


- (instancetype)initWithTTS:(nullable NSString *)ttsText softButtons:(nullable NSArray<SDLSoftButton *> *)softButtons {
Expand All @@ -39,19 +42,19 @@ - (instancetype)initWithTTSChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks s
}

- (void)setTtsChunks:(nullable NSArray<SDLTTSChunk *> *)ttsChunks {
[parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
[self.parameters sdl_setObject:ttsChunks forName:SDLRPCParameterNameTTSChunks];
}

- (nullable NSArray<SDLTTSChunk *> *)ttsChunks {
return [parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
return [self.parameters sdl_objectsForName:SDLRPCParameterNameTTSChunks ofClass:SDLTTSChunk.class error:nil];
}

- (void)setSoftButtons:(nullable NSArray<SDLSoftButton *> *)softButtons {
[parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
[self.parameters sdl_setObject:softButtons forName:SDLRPCParameterNameSoftButtons];
}

- (nullable NSArray<SDLSoftButton *> *)softButtons {
return [parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
return [self.parameters sdl_objectsForName:SDLRPCParameterNameSoftButtons ofClass:SDLSoftButton.class error:nil];
}

@end
Expand Down
3 changes: 3 additions & 0 deletions SmartDeviceLink/SDLAlertManeuverResponse.m
View file
Open in desktop
Expand Up @@ -11,11 +11,14 @@

@implementation SDLAlertManeuverResponse

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
- (instancetype)init {
if (self = [super initWithName:SDLRPCFunctionNameAlertManeuver]) {
}
return self;
}
#pragma clang diagnostic pop

@end

Expand Down