Skip to content

Commit b5746a4

Browse files
JulianKastJulianKast
authored
Merge pull request #1494 from smartdevicelink/feature/fix_rpcs_mismatch
Fix RPCs Mismatches
2 parents 0edd9a4 + 238075d commit b5746a4

17 files changed

Lines changed: 253 additions & 112 deletions

‎android/sdl_android/src/androidTest/assets/json/SubscribeVehicleData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"dataType":"VEHICLEDATA_EMERGENCYEVENT",
135135
"resultCode":"DISALLOWED"
136136
},
137-
"clusterModeStatus":{
137+
"clusterModes":{
138138
"dataType":"VEHICLEDATA_CLUSTERMODESTATUS",
139139
"resultCode":"SUCCESS"
140140
},

‎android/sdl_android/src/androidTest/assets/json/UnsubscribeVehicleData.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
"dataType":"VEHICLEDATA_EMERGENCYEVENT",
135135
"resultCode":"DISALLOWED"
136136
},
137-
"clusterModeStatus":{
137+
"clusterModes":{
138138
"dataType":"VEHICLEDATA_CLUSTERMODESTATUS",
139139
"resultCode":"SUCCESS"
140140
},

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/RPCGenericTests.java‎

Lines changed: 25 additions & 72 deletions
Large diffs are not rendered by default.

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/ClimateControlCapabilitiesTests.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ public void setUp(){
3535
msg.setModuleName(TestValues.GENERAL_STRING);
3636
msg.setFanSpeedAvailable(TestValues.GENERAL_BOOLEAN);
3737
msg.setDesiredTemperatureAvailable(TestValues.GENERAL_BOOLEAN);
38+
msg.setCurrentTemperatureAvailable(TestValues.GENERAL_BOOLEAN);
3839
msg.setAcEnableAvailable(TestValues.GENERAL_BOOLEAN);
3940
msg.setAcMaxEnableAvailable(TestValues.GENERAL_BOOLEAN);
4041
msg.setCirculateAirEnableAvailable(TestValues.GENERAL_BOOLEAN);
@@ -60,6 +61,7 @@ public void testRpcValues () {
6061
String moduleName = msg.getModuleName();
6162
boolean fanSpeedAvailable = msg.getFanSpeedAvailable();
6263
boolean desiredTemperatureAvailable = msg.getDesiredTemperatureAvailable();
64+
boolean currentTemperatureAvailable = msg.getCurrentTemperatureAvailable();
6365
boolean acEnableAvailable = msg.getAcEnableAvailable();
6466
boolean acMaxEnableAvailable = msg.getAcMaxEnableAvailable();
6567
boolean circulateAirEnableAvailable = msg.getCirculateAirEnableAvailable();
@@ -80,6 +82,7 @@ public void testRpcValues () {
8082
assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, moduleName);
8183
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, fanSpeedAvailable);
8284
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, desiredTemperatureAvailable);
85+
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, currentTemperatureAvailable);
8386
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, acEnableAvailable);
8487
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, acMaxEnableAvailable);
8588
assertEquals(TestValues.MATCH, TestValues.GENERAL_BOOLEAN, circulateAirEnableAvailable);
@@ -112,6 +115,7 @@ public void testRpcValues () {
112115
assertNull(TestValues.NULL, msg.getModuleName());
113116
assertNull(TestValues.NULL, msg.getFanSpeedAvailable());
114117
assertNull(TestValues.NULL, msg.getDesiredTemperatureAvailable());
118+
assertNull(TestValues.NULL, msg.getCurrentTemperatureAvailable());
115119
assertNull(TestValues.NULL, msg.getAcEnableAvailable());
116120
assertNull(TestValues.NULL, msg.getAcMaxEnableAvailable());
117121
assertNull(TestValues.NULL, msg.getAutoModeEnableAvailable());
@@ -135,6 +139,7 @@ public void testJson(){
135139
reference.put(ClimateControlCapabilities.KEY_MODULE_NAME, TestValues.GENERAL_STRING);
136140
reference.put(ClimateControlCapabilities.KEY_FAN_SPEED_AVAILABLE, TestValues.GENERAL_BOOLEAN);
137141
reference.put(ClimateControlCapabilities.KEY_DESIRED_TEMPERATURE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
142+
reference.put(ClimateControlCapabilities.KEY_CURRENT_TEMPERATURE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
138143
reference.put(ClimateControlCapabilities.KEY_AC_ENABLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
139144
reference.put(ClimateControlCapabilities.KEY_AC_MAX_ENABLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);
140145
reference.put(ClimateControlCapabilities.KEY_CIRCULATE_AIR_ENABLE_AVAILABLE, TestValues.GENERAL_BOOLEAN);

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/datatypes/SeatLocationCapabilityTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void testRpcValues() {
3535
int row = msg.getRows();
3636
int col = msg.getCols();
3737
int level = msg.getLevels();
38-
List<SeatLocation> seats = msg.getSeatLocations();
38+
List<SeatLocation> seats = msg.getSeats();
3939

4040
//valid tests
4141
assertEquals(TestValues.MATCH, row, TestValues.GENERAL_INT);
@@ -51,7 +51,7 @@ public void testRpcValues() {
5151
assertNull(TestValues.NULL, msg.getCols());
5252
assertNull(TestValues.NULL, msg.getRows());
5353
assertNull(TestValues.NULL, msg.getLevels());
54-
assertNull(TestValues.NULL, msg.getSeatLocations());
54+
assertNull(TestValues.NULL, msg.getSeats());
5555
}
5656

5757
public void testJson() {

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/SubscribeVehicleDataResponseTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ protected RPCMessage createMessage() {
6060
msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
6161
msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
6262
msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
63-
msg.setClusterModeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
63+
msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
6464
msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
6565
msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
6666
msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
@@ -117,7 +117,7 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
117117
result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
118118
result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
119119
result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
120-
result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
120+
result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
121121
result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
122122
result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
123123
result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
@@ -150,7 +150,7 @@ public void testRpcValues () {
150150
VehicleDataResult testECallInfo = ( (SubscribeVehicleDataResponse) msg ).getECallInfo();
151151
VehicleDataResult testAirbagStatus = ( (SubscribeVehicleDataResponse) msg ).getAirbagStatus();
152152
VehicleDataResult testEmergencyEvent = ( (SubscribeVehicleDataResponse) msg ).getEmergencyEvent();
153-
VehicleDataResult testClusterMode = ( (SubscribeVehicleDataResponse) msg ).getClusterModeStatus();
153+
VehicleDataResult testClusterMode = ( (SubscribeVehicleDataResponse) msg ).getClusterModes();
154154
VehicleDataResult testMyKey = ( (SubscribeVehicleDataResponse) msg ).getMyKey();
155155
VehicleDataResult testSpeed = ( (SubscribeVehicleDataResponse) msg ).getSpeed();
156156
VehicleDataResult testRpm = ( (SubscribeVehicleDataResponse) msg ).getRpm();
@@ -237,7 +237,7 @@ public void testRpcValues () {
237237
assertNull(TestValues.NULL, msg.getSteeringWheelAngle());
238238
assertNull(TestValues.NULL, msg.getECallInfo());
239239
assertNull(TestValues.NULL, msg.getEmergencyEvent());
240-
assertNull(TestValues.NULL, msg.getClusterModeStatus());
240+
assertNull(TestValues.NULL, msg.getClusterModes());
241241
assertNull(TestValues.NULL, msg.getMyKey());
242242
assertNull(TestValues.NULL, msg.getFuelRange());
243243
assertNull(TestValues.NULL, msg.getTurnSignal());
@@ -362,9 +362,9 @@ public void testJsonConstructor () {
362362
VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
363363
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
364364

365-
JSONObject clusterModeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODE_STATUS);
366-
VehicleDataResult referenceClusterModeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatus));
367-
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModeStatus, cmd.getClusterModeStatus()));
365+
JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
366+
VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
367+
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
368368

369369
JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, SubscribeVehicleDataResponse.KEY_MY_KEY);
370370
VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeVehicleDataResponseTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ protected RPCMessage createMessage() {
6262
msg.setECallInfo(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()));
6363
msg.setAirbagStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()));
6464
msg.setEmergencyEvent(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()));
65-
msg.setClusterModeStatus(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
65+
msg.setClusterModes(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()));
6666
msg.setMyKey(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()));
6767
msg.setFuelRange(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()));
6868
msg.setTurnSignal(TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()));
@@ -119,7 +119,7 @@ protected JSONObject getExpectedParameters(int sdlVersion) {
119119
result.put(SubscribeVehicleDataResponse.KEY_E_CALL_INFO, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_ECALLINFO.ordinal()).serializeJSON());
120120
result.put(SubscribeVehicleDataResponse.KEY_AIRBAG_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_AIRBAGSTATUS.ordinal()).serializeJSON());
121121
result.put(SubscribeVehicleDataResponse.KEY_EMERGENCY_EVENT, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_EMERGENCYEVENT.ordinal()).serializeJSON());
122-
result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODE_STATUS, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
122+
result.put(SubscribeVehicleDataResponse.KEY_CLUSTER_MODES, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_CLUSTERMODESTATUS.ordinal()).serializeJSON());
123123
result.put(SubscribeVehicleDataResponse.KEY_MY_KEY, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_MYKEY.ordinal()).serializeJSON());
124124
result.put(SubscribeVehicleDataResponse.KEY_FUEL_RANGE, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_FUELRANGE.ordinal()).serializeJSON());
125125
result.put(SubscribeVehicleDataResponse.KEY_TURN_SIGNAL, TestValues.GENERAL_VEHICLEDATARESULT_LIST.get(VehicleDataType.VEHICLEDATA_TURNSIGNAL.ordinal()).serializeJSON());
@@ -153,7 +153,7 @@ public void testRpcValues () {
153153
VehicleDataResult testECallInfo = ( (UnsubscribeVehicleDataResponse) msg ).getECallInfo();
154154
VehicleDataResult testAirbagStatus = ( (UnsubscribeVehicleDataResponse) msg ).getAirbagStatus();
155155
VehicleDataResult testEmergencyEvent = ( (UnsubscribeVehicleDataResponse) msg ).getEmergencyEvent();
156-
VehicleDataResult testClusterMode = ( (UnsubscribeVehicleDataResponse) msg ).getClusterModeStatus();
156+
VehicleDataResult testClusterMode = ( (UnsubscribeVehicleDataResponse) msg ).getClusterModes();
157157
VehicleDataResult testMyKey = ( (UnsubscribeVehicleDataResponse) msg ).getMyKey();
158158
VehicleDataResult testSpeed = ( (UnsubscribeVehicleDataResponse) msg ).getSpeed();
159159
VehicleDataResult testRpm = ( (UnsubscribeVehicleDataResponse) msg ).getRpm();
@@ -240,7 +240,7 @@ public void testRpcValues () {
240240
assertNull(TestValues.NULL, msg.getSteeringWheelAngle());
241241
assertNull(TestValues.NULL, msg.getECallInfo());
242242
assertNull(TestValues.NULL, msg.getEmergencyEvent());
243-
assertNull(TestValues.NULL, msg.getClusterModeStatus());
243+
assertNull(TestValues.NULL, msg.getClusterModes());
244244
assertNull(TestValues.NULL, msg.getMyKey());
245245
assertNull(TestValues.NULL, msg.getFuelRange());
246246
assertNull(TestValues.NULL, msg.getTurnSignal());
@@ -366,9 +366,9 @@ public void testJsonConstructor () {
366366
VehicleDataResult referenceEmergencyEvent = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(emergencyEvent));
367367
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceEmergencyEvent, cmd.getEmergencyEvent()));
368368

369-
JSONObject clusterModeStatus = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODE_STATUS);
370-
VehicleDataResult referenceClusterModeStatus = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModeStatus));
371-
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModeStatus, cmd.getClusterModeStatus()));
369+
JSONObject clusterModes = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_CLUSTER_MODES);
370+
VehicleDataResult referenceClusterModes = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(clusterModes));
371+
assertTrue(TestValues.TRUE, Validator.validateVehicleDataResult(referenceClusterModes, cmd.getClusterModes()));
372372

373373
JSONObject myKey = JsonUtils.readJsonObjectFromJsonObject(parameters, UnsubscribeVehicleDataResponse.KEY_MY_KEY);
374374
VehicleDataResult referenceMyKey = new VehicleDataResult(JsonRPCMarshaller.deserializeJSONObject(myKey));

‎android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/responses/UnsubscribeWayPointsResponseTests.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.smartdevicelink.marshal.JsonRPCMarshaller;
44
import com.smartdevicelink.protocol.enums.FunctionID;
55
import com.smartdevicelink.proxy.RPCMessage;
6+
import com.smartdevicelink.proxy.rpc.LocationDetails;
67
import com.smartdevicelink.proxy.rpc.UnsubscribeWayPointsResponse;
78
import com.smartdevicelink.test.BaseRpcTests;
89
import com.smartdevicelink.test.JsonUtils;
@@ -14,6 +15,7 @@
1415
import org.junit.Test;
1516

1617
import java.util.Hashtable;
18+
import java.util.List;
1719

1820
import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
1921
import static junit.framework.TestCase.assertEquals;
@@ -51,8 +53,13 @@ protected JSONObject getExpectedParameters(int sdlVersion){
5153
public void testRpcValues () {
5254
// Invalid/Null Tests
5355
UnsubscribeWayPointsResponse msg = new UnsubscribeWayPointsResponse();
56+
msg.setWayPoints(TestValues.GENERAL_LOCATIONDETAILS_LIST);
5457
assertNotNull(TestValues.NOT_NULL, msg);
5558
testNullBase(msg);
59+
60+
// test getter
61+
List<LocationDetails> wayPoints = msg.getWayPoints();
62+
assertEquals(TestValues.GENERAL_LOCATIONDETAILS_LIST, wayPoints);
5663
}
5764

5865
/**

‎base/src/main/java/com/smartdevicelink/proxy/rpc/ClimateControlCapabilities.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public class ClimateControlCapabilities extends RPCStruct{
4848
public static final String KEY_MODULE_NAME= "moduleName";
4949
public static final String KEY_FAN_SPEED_AVAILABLE= "fanSpeedAvailable";
5050
public static final String KEY_DESIRED_TEMPERATURE_AVAILABLE= "desiredTemperatureAvailable";
51+
public static final String KEY_CURRENT_TEMPERATURE_AVAILABLE= "currentTemperatureAvailable";
5152
public static final String KEY_AC_ENABLE_AVAILABLE= "acEnableAvailable";
5253
public static final String KEY_AC_MAX_ENABLE_AVAILABLE= "acMaxEnableAvailable";
5354
public static final String KEY_CIRCULATE_AIR_ENABLE_AVAILABLE= "circulateAirEnableAvailable";
@@ -144,6 +145,28 @@ public Boolean getDesiredTemperatureAvailable() {
144145
return getBoolean(KEY_DESIRED_TEMPERATURE_AVAILABLE);
145146
}
146147

148+
/**
149+
* Sets the currentTemperatureAvailable portion of the ClimateControlCapabilities class
150+
*
151+
* @param currentTemperatureAvailable
152+
* Availability of the reading of current temperature.
153+
* True: Available, False: Not Available, Not present: Not Available.
154+
*/
155+
public ClimateControlCapabilities setCurrentTemperatureAvailable(Boolean currentTemperatureAvailable) {
156+
setValue(KEY_CURRENT_TEMPERATURE_AVAILABLE, currentTemperatureAvailable);
157+
return this;
158+
}
159+
160+
/**
161+
* Gets the currentTemperatureAvailable portion of the ClimateControlCapabilities class
162+
*
163+
* @return Boolean - Availability of the reading of current temperature.
164+
* True: Available, False: Not Available, Not present: Not Available.
165+
*/
166+
public Boolean getCurrentTemperatureAvailable() {
167+
return getBoolean(KEY_CURRENT_TEMPERATURE_AVAILABLE);
168+
}
169+
147170
/**
148171
* Sets the acEnableAvailable portion of the ClimateControlCapabilities class
149172
*

‎base/src/main/java/com/smartdevicelink/proxy/rpc/HMICapabilities.java‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,24 @@ public boolean isNavigationAvailable(){
5858
}
5959
return (Boolean)available;
6060
}
61-
61+
62+
/**
63+
* @deprecated use {@link #setNavigationAvailable(Boolean available)} instead.
64+
*/
65+
@Deprecated
6266
public HMICapabilities setNavigationAvilable( Boolean available) {
63-
setValue(KEY_NAVIGATION, available);
64-
return this;
67+
return setNavigationAvailable(available);
6568
}
69+
70+
/**
71+
* Sets the navigationAvailable.
72+
*
73+
* @param available Availability of driver Navigation capability. True: Available, False: Not Available
74+
*/
75+
public HMICapabilities setNavigationAvailable(Boolean available) {
76+
setValue(KEY_NAVIGATION, available);
77+
return this;
78+
}
6679

6780
public boolean isPhoneCallAvailable(){
6881
Object available = getValue(KEY_PHONE_CALL);
@@ -71,12 +84,25 @@ public boolean isPhoneCallAvailable(){
7184
}
7285
return (Boolean)available;
7386
}
74-
87+
88+
/**
89+
* @deprecated use {@link #setPhoneCallAvailable(Boolean available)} instead.
90+
*/
91+
@Deprecated
7592
public HMICapabilities setPhoneCallAvilable( Boolean available) {
76-
setValue(KEY_PHONE_CALL, available);
77-
return this;
93+
return setPhoneCallAvailable(available);
7894
}
7995

96+
/**
97+
* Sets the PhoneCallAvailable.
98+
*
99+
* @param available Availability of PhoneCall capability. True: Available, False: Not Available
100+
*/
101+
public HMICapabilities setPhoneCallAvailable( Boolean available) {
102+
setValue(KEY_PHONE_CALL, available);
103+
return this;
104+
}
105+
80106
public boolean isVideoStreamingAvailable(){
81107
Object available = getValue(KEY_VIDEO_STREAMING);
82108
if(available == null){
@@ -118,10 +144,10 @@ public HMICapabilities setAppServicesAvailable( Boolean available) {
118144

119145
public boolean isDisplaysCapabilityAvailable(){
120146
Object available = getValue(KEY_DISPLAYS);
121-
if(available == null){
147+
if (available == null) {
122148
return false;
123149
}
124-
return (Boolean)available;
150+
return (Boolean) available;
125151
}
126152

127153
public HMICapabilities setDisplaysCapabilityAvailable( Boolean available) {

0 commit comments

Comments
 (0)