Merge pull request #1547 from smartdevicelink/bugfix/issue_1545

Match Deprecations to RPC Spec

Author: JulianKast

android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/enums/GlobalPropertyTests.java

@@ -32,7 +32,7 @@ public void testValidEnums() {
         GlobalProperty enumMenuIcon = GlobalProperty.valueForString(example);
         example = "KEYBOARDPROPERTIES";
         GlobalProperty enumKeyboardProperties = GlobalProperty.valueForString(example);
-        example = "USERLOCATION";
+        example = "USER_LOCATION";
         GlobalProperty enumUserLocation = GlobalProperty.valueForString(example);
 
         assertNotNull("HELPPROMPT returned null", enumHelpPrompt);
@@ -42,7 +42,7 @@ public void testValidEnums() {
         assertNotNull("MENUNAME returned null", enumMenuName);
         assertNotNull("MENUICON returned null", enumMenuIcon);
         assertNotNull("KEYBOARDPROPERTIES returned null", enumKeyboardProperties);
-        assertNotNull("USERLOCATION returned null", enumUserLocation);
+        assertNotNull("USER_LOCATION returned null", enumUserLocation);
     }
 
     /**
@@ -86,6 +86,7 @@ public void testListEnum() {
         enumTestList.add(GlobalProperty.MENUICON);
         enumTestList.add(GlobalProperty.KEYBOARDPROPERTIES);
         enumTestList.add(GlobalProperty.USERLOCATION);
+        enumTestList.add(GlobalProperty.USER_LOCATION);
 
         assertTrue("Enum value list does not match enum class list",
                 enumValueList.containsAll(enumTestList) && enumTestList.containsAll(enumValueList));

base/src/main/java/com/smartdevicelink/managers/screen/TextAndGraphicUpdateOperation.java

@@ -161,6 +161,7 @@ public void onResponse(int correlationId, RPCResponse response) {
 
     }
 
+    @SuppressWarnings("deprecation")
     private void sendSetDisplayLayoutWithTemplateConfiguration(TemplateConfiguration configuration, final CompletionListener listener) {
         final SetDisplayLayout setLayout = new SetDisplayLayout().setDisplayLayout(configuration.getTemplate()).setDayColorScheme(configuration.getDayColorScheme()).setNightColorScheme(configuration.getNightColorScheme());
         setLayout.setOnRPCResponseListener(new OnRPCResponseListener() {
@@ -527,6 +528,7 @@ Show assembleLayout(Show show) {
         return show;
     }
 
+    @SuppressWarnings("deprecation")
     private void updateCurrentScreenDataFromSetDisplayLayout(SetDisplayLayout setDisplayLayout) {
         currentScreenData.setTemplateConfiguration(new TemplateConfiguration().setTemplate(setDisplayLayout.getDisplayLayout()).setDayColorScheme(setDisplayLayout.getDayColorScheme()).setNightColorScheme(setDisplayLayout.getNightColorScheme()));
         if (currentScreenDataUpdateListener != null) {

base/src/main/java/com/smartdevicelink/proxy/rpc/SeatControlData.java

@@ -43,6 +43,7 @@
  * Seat control data corresponds to "SEAT" ModuleType.
  */
 public class SeatControlData extends RPCStruct {
+    @Deprecated
     public static final String KEY_ID = "id";
     public static final String KEY_HEATING_ENABLED = "heatingEnabled";
     public static final String KEY_COOLING_ENABLED = "coolingEnabled";
@@ -81,6 +82,7 @@ public SeatControlData(Hashtable<String, Object> hash) {
      *
      * @param id type of SupportedSeat.
      */
+    @Deprecated
     public SeatControlData(@NonNull SupportedSeat id) {
         this();
         setId(id);
@@ -91,6 +93,7 @@ public SeatControlData(@NonNull SupportedSeat id) {
      *
      * @param id
      */
+    @Deprecated
     public SeatControlData setId(@NonNull SupportedSeat id) {
         setValue(KEY_ID, id);
         return this;
@@ -101,6 +104,7 @@ public SeatControlData setId(@NonNull SupportedSeat id) {
      *
      * @return SupportedSeat.
      */
+    @Deprecated
     public SupportedSeat getId() {
         return (SupportedSeat) getObject(SupportedSeat.class, KEY_ID);
     }

base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayout.java

@@ -93,7 +93,9 @@
  * <p>   REJECTED</p>
  *
  * @since SmartDeviceLink 2.0
+ * @deprecated in SmartDeviceLink 6.0
  */
+@Deprecated
 public class SetDisplayLayout extends RPCRequest {
     public static final String KEY_DISPLAY_LAYOUT = "displayLayout";
     public static final String KEY_DAY_COLOR_SCHEME = "dayColorScheme";

base/src/main/java/com/smartdevicelink/proxy/rpc/SetDisplayLayoutResponse.java

@@ -45,7 +45,9 @@
  * Set Display Layout Response is sent, when SetDisplayLayout has been called
  *
  * @since SmartDeviceLink 2.0
+ * @deprecated in SmartDeviceLink 6.0
  */
+@Deprecated
 public class SetDisplayLayoutResponse extends RPCResponse {
     public static final String KEY_BUTTON_CAPABILITIES = "buttonCapabilities";
     public static final String KEY_DISPLAY_CAPABILITIES = "displayCapabilities";

base/src/main/java/com/smartdevicelink/proxy/rpc/enums/DisplayType.java

@@ -35,8 +35,9 @@
  * The type of the display.
  *
  * @since SmartDeviceLink 1.0
+ * @deprecated in SmartDeviceLink 5.0
  */
-
+@Deprecated
 public enum DisplayType {
     /**
      * Center Information Display.

base/src/main/java/com/smartdevicelink/proxy/rpc/enums/GlobalProperty.java

@@ -71,10 +71,13 @@ public enum GlobalProperty {
 
     KEYBOARDPROPERTIES,
 
+    @Deprecated
+    USERLOCATION,
+
     /**
      * The user seat location of setGlobalProperties
      */
-    USERLOCATION;
+    USER_LOCATION;
 
     /**
      * Convert String to GlobalProperty