Changes for handling null inputs in some of the RPC Classes

Author: Dahiya, Anil (A.)

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/AddSubMenu.java

@@ -65,6 +65,8 @@ public Integer getMenuID() {
     public void setMenuID( Integer menuID ) {
         if (menuID != null) {
             parameters.put(AddSubMenu.menuID, menuID );
+        } else {
+            parameters.remove(AddSubMenu.menuID);
         }
     }
 	/**
@@ -99,6 +101,8 @@ public Integer getPosition() {
     public void setPosition( Integer position ) {
         if (position != null) {
             parameters.put(AddSubMenu.position, position );
+        } else {
+            parameters.remove(AddSubMenu.position);
         }
     }
 	/**
@@ -118,6 +122,8 @@ public String getMenuName() {
     public void setMenuName( String menuName ) {
         if (menuName != null) {
             parameters.put(AddSubMenu.menuName, menuName );
+        } else {
+            parameters.remove(AddSubMenu.menuName);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ButtonCapabilities.java

@@ -86,6 +86,8 @@ public ButtonName getName() {
     public void setName( ButtonName name ) {
         if (name != null) {
             store.put(ButtonCapabilities.name, name );
+        } else {
+        	store.remove(ButtonCapabilities.name);
         }
     }
     /**
@@ -102,6 +104,8 @@ public Boolean getShortPressAvailable() {
     public void setShortPressAvailable( Boolean shortPressAvailable ) {
         if (shortPressAvailable != null) {
             store.put(ButtonCapabilities.shortPressAvailable, shortPressAvailable );
+        } else {
+        	store.remove(ButtonCapabilities.shortPressAvailable);
         }
     }
     /**
@@ -118,6 +122,8 @@ public Boolean getLongPressAvailable() {
     public void setLongPressAvailable( Boolean longPressAvailable ) {
         if (longPressAvailable != null) {
             store.put(ButtonCapabilities.longPressAvailable, longPressAvailable );
+        } else {
+        	store.remove(ButtonCapabilities.longPressAvailable);
         }
     }
     /**
@@ -134,6 +140,8 @@ public Boolean getUpDownAvailable() {
     public void setUpDownAvailable( Boolean upDownAvailable ) {
         if (upDownAvailable != null) {
             store.put(ButtonCapabilities.upDownAvailable, upDownAvailable );
+        } else {
+        	store.remove(ButtonCapabilities.upDownAvailable);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/Choice.java

@@ -83,6 +83,8 @@ public Integer getChoiceID() {
     public void setChoiceID(Integer choiceID) {
         if (choiceID != null) {
             store.put(Choice.choiceID, choiceID);
+        } else {
+        	store.remove(Choice.choiceID);
         }
     }
     /**
@@ -103,6 +105,8 @@ public String getMenuName() {
     public void setMenuName(String menuName) {
         if (menuName != null) {
             store.put(Choice.menuName, menuName);
+        } else {
+        	store.remove(Choice.menuName);
         }
     }
     /**
@@ -130,6 +134,8 @@ public List<String> getVrCommands() {
     public void setVrCommands(List<String> vrCommands) {
         if (vrCommands != null) {
             store.put(Choice.vrCommands, vrCommands);
+        } else {
+        	store.remove(Choice.vrCommands);
         }
     }
     /**

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/CreateInteractionChoiceSet.java

@@ -59,6 +59,8 @@ public Integer getInteractionChoiceSetID() {
     public void setInteractionChoiceSetID( Integer interactionChoiceSetID ) {
         if (interactionChoiceSetID != null) {
             parameters.put(CreateInteractionChoiceSet.interactionChoiceSetID, interactionChoiceSetID );
+        } else {
+        	parameters.remove(CreateInteractionChoiceSet.interactionChoiceSetID);
         }
     }
 	/**
@@ -97,6 +99,8 @@ public List<Choice> getChoiceSet() {
     public void setChoiceSet( List<Choice> choiceSet ) {
         if (choiceSet != null) {
             parameters.put(CreateInteractionChoiceSet.choiceSet, choiceSet );
+        } else {
+        	parameters.remove(CreateInteractionChoiceSet.choiceSet);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteCommand.java

@@ -59,6 +59,8 @@ public Integer getCmdID() {
     public void setCmdID( Integer cmdID ) {
         if (cmdID != null) {
             parameters.put(DeleteCommand.cmdID, cmdID );
+        } else {
+            parameters.remove(DeleteCommand.cmdID);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteInteractionChoiceSet.java

@@ -55,6 +55,8 @@ public Integer getInteractionChoiceSetID() {
     public void setInteractionChoiceSetID( Integer interactionChoiceSetID ) {
         if (interactionChoiceSetID != null) {
             parameters.put(DeleteInteractionChoiceSet.interactionChoiceSetID, interactionChoiceSetID );
+        } else {
+            parameters.remove(DeleteInteractionChoiceSet.interactionChoiceSetID);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DeleteSubMenu.java

@@ -49,6 +49,8 @@ public Integer getMenuID() {
     public void setMenuID( Integer menuID ) {
         if (menuID != null) {
             parameters.put(DeleteSubMenu.menuID, menuID );
+        } else {
+            parameters.remove(DeleteSubMenu.menuID);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/DisplayCapabilities.java

@@ -94,6 +94,8 @@ public DisplayType getDisplayType() {
     public void setDisplayType( DisplayType displayType ) {
         if (displayType != null) {
             store.put(DisplayCapabilities.displayType, displayType );
+        } else {
+        	store.remove(DisplayCapabilities.displayType);
         }
     }
     /**
@@ -127,6 +129,8 @@ public List<TextField> getTextFields() {
     public void setTextFields( List<TextField> textFields ) {
         if (textFields != null) {
             store.put(DisplayCapabilities.textFields, textFields );
+        } else {
+        	store.remove(DisplayCapabilities.textFields);
         }
     }
 
@@ -213,6 +217,8 @@ public List<MediaClockFormat> getMediaClockFormats() {
     public void setMediaClockFormats( List<MediaClockFormat> mediaClockFormats ) {
         if (mediaClockFormats != null) {
             store.put(DisplayCapabilities.mediaClockFormats, mediaClockFormats );
+        } else {
+        	store.remove(DisplayCapabilities.mediaClockFormats);
         }
     }
 

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/MenuParams.java

@@ -84,6 +84,8 @@ public Integer getParentID() {
     public void setParentID( Integer parentID ) {
         if (parentID != null) {
             store.put(MenuParams.parentID, parentID );
+        } else {
+        	store.remove(MenuParams.parentID);
         }
     }
     /**
@@ -114,6 +116,8 @@ public Integer getPosition() {
     public void setPosition( Integer position ) {
         if (position != null) {
             store.put(MenuParams.position, position );
+        } else {
+        	store.remove(MenuParams.position);
         }
     }
     /**
@@ -140,6 +144,8 @@ public String getMenuName() {
     public void setMenuName( String menuName ) {
         if (menuName != null) {
             store.put(MenuParams.menuName, menuName );
+        } else {
+        	store.remove(MenuParams.menuName);
         }
     }
 }

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java

@@ -81,6 +81,8 @@ public AppInterfaceUnregisteredReason getReason() {
     public void setReason( AppInterfaceUnregisteredReason reason ) {
         if (reason != null) {
             parameters.put(OnAppInterfaceUnregistered.reason, reason );
+        } else {
+            parameters.remove(OnAppInterfaceUnregistered.reason);
         }
     }
 }