add override methods for RPCNotificationsfeature/issue_116_RPC_Notification

23 files changed, 531 insertions, 0 deletions

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
index fdb3542f6..4af2dff9f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppInterfaceUnregistered.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -120,4 +121,26 @@ public class OnAppInterfaceUnregistered extends RPCNotification {
         setParameters(KEY_REASON, reason);

         return this;

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnAppInterfaceUnregistered, not the same

+        if (!(obj instanceof OnAppInterfaceUnregistered)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
index e968f9cdb..0a52a2e47 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAppServiceData.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -77,4 +78,25 @@ public class OnAppServiceData extends RPCNotification {
         return (AppServiceData) getObject(AppServiceData.class, KEY_SERVICE_DATA);
     }
 
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnAppServiceData, not the same
+        if (!(obj instanceof OnAppServiceData)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
index e1227d207..e986cb8ca 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnAudioPassThru.java
@@ -31,6 +31,9 @@
  */

 package com.smartdevicelink.proxy.rpc;

 

+import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

+

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

 

@@ -94,4 +97,26 @@ public class OnAudioPassThru extends RPCNotification {
     public byte[] getAPTData() {

         return getBulkData();

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnAudioPassThru, not the same

+        if (!(obj instanceof OnAudioPassThru)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
index 1c1d00653..a0e443b67 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonEvent.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -197,4 +198,26 @@ public class OnButtonEvent extends RPCNotification {
     public Integer getCustomButtonID() {

         return getInteger(KEY_CUSTOM_BUTTON_ID);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnButtonEvent, not the same

+        if (!(obj instanceof OnButtonEvent)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
index 05c47351e..d479877e4 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnButtonPress.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -214,4 +215,26 @@ public class OnButtonPress extends RPCNotification {
     public Integer getCustomButtonID() {

         return getInteger(KEY_CUSTOM_BUTTON_ID);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnButtonPress, not the same

+        if (!(obj instanceof OnButtonPress)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
index 83f311487..2c5cb5afb 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnCommand.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -155,4 +156,26 @@ public class OnCommand extends RPCNotification {
         setParameters(KEY_TRIGGER_SOURCE, triggerSource);

         return this;

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnCommand, not the same

+        if (!(obj instanceof OnCommand)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
index 59be54ed8..f595987fc 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnDriverDistraction.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -159,4 +160,26 @@ public class OnDriverDistraction extends RPCNotification {
     public String getLockscreenWarningMessage() {

         return (String) getObject(String.class, KEY_LOCKSCREEN_DISMISSIBLE_MSG);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnDriverDistraction, not the same

+        if (!(obj instanceof OnDriverDistraction)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
index b0dc4db4e..768a27d10 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHMIStatus.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -271,4 +272,26 @@ public class OnHMIStatus extends RPCNotification {
     public Integer getWindowID() {

         return getInteger(KEY_WINDOW_ID);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnHMIStatus, not the same

+        if (!(obj instanceof OnHMIStatus)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
index e095c2d3d..86d265a60 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnHashChange.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -105,4 +106,25 @@ public class OnHashChange extends RPCNotification {
         return this;

     }

 

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnHashChange, not the same

+        if (!(obj instanceof OnHashChange)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
index 6c487615f..da79ce895 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnInteriorVehicleData.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -86,4 +87,26 @@ public class OnInteriorVehicleData extends RPCNotification {
         setParameters(KEY_MODULE_DATA, moduleData);
         return this;
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnInteriorVehicleData, not the same
+        if (!(obj instanceof OnInteriorVehicleData)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
index 496b912be..7717ef461 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnKeyboardInput.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -131,4 +132,25 @@ public class OnKeyboardInput extends RPCNotification {
         return this.getFunctionName() + ": " + " data: " + this.getData() + " event:" + this.getEvent().toString();

     }

 

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnKeyboardInput, not the same

+        if (!(obj instanceof OnKeyboardInput)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
index 819d7d3a5..a1bcda291 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnLanguageChange.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -157,4 +158,26 @@ public class OnLanguageChange extends RPCNotification {
     public Language getHmiDisplayLanguage() {

         return (Language) getObject(Language.class, KEY_HMI_DISPLAY_LANGUAGE);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnLanguageChange, not the same

+        if (!(obj instanceof OnLanguageChange)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
index c1d18e3e9..d4b0ba59e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnPermissionsChange.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -148,4 +149,26 @@ public class OnPermissionsChange extends RPCNotification {
         setParameters(KEY_REQUIRE_ENCRYPTION, isRequired);

         return this;

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnPermissionsChange, not the same

+        if (!(obj instanceof OnPermissionsChange)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
index 0a2fd0c5d..06261f397 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnRCStatus.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -101,4 +102,26 @@ public class OnRCStatus extends RPCNotification {
         setParameters(KEY_ALLOWED, allowed);
         return this;
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnRCStatus, not the same
+        if (!(obj instanceof OnRCStatus)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSubtleAlertPressed.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSubtleAlertPressed.java
index 6715cd0c6..da97a40f3 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSubtleAlertPressed.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSubtleAlertPressed.java
@@ -31,6 +31,9 @@
  */
 package com.smartdevicelink.proxy.rpc;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
 
@@ -59,4 +62,26 @@ public class OnSubtleAlertPressed extends RPCNotification {
     public OnSubtleAlertPressed(Hashtable<String, Object> hash) {
         super(hash);
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnSubtleAlertPressed, not the same
+        if (!(obj instanceof OnSubtleAlertPressed)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
index 26f51a78d..76ab4b492 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemCapabilityUpdated.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -77,4 +78,25 @@ public class OnSystemCapabilityUpdated extends RPCNotification {
         return (SystemCapability) getObject(SystemCapability.class, KEY_SYSTEM_CAPABILITY);
     }
 
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnSystemCapabilityUpdated, not the same
+        if (!(obj instanceof OnSystemCapabilityUpdated)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
index c07c4e2e0..6e686f6d3 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnSystemRequest.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.marshal.JsonRPCMarshaller;

 import com.smartdevicelink.protocol.enums.FunctionID;

@@ -392,4 +393,26 @@ public class OnSystemRequest extends RPCNotification {
         setParameters(KEY_LENGTH, length);

         return this;

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnSystemRequest, not the same

+        if (!(obj instanceof OnSystemRequest)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
index 8c16f5232..3799bd1dd 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTBTClientState.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -118,4 +119,26 @@ public class OnTBTClientState extends RPCNotification {
         setParameters(KEY_STATE, state);

         return this;

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnTBTClientState, not the same

+        if (!(obj instanceof OnTBTClientState)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 } // end-class

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
index 07bfa0393..b3fd7770e 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnTouchEvent.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;

 

 import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

 

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

@@ -126,4 +127,26 @@ public class OnTouchEvent extends RPCNotification {
     public List<TouchEvent> getEvent() {

         return (List<TouchEvent>) getObject(TouchEvent.class, KEY_EVENT);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnTouchEvent, not the same

+        if (!(obj instanceof OnTouchEvent)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateFile.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateFile.java
index 9a7b32c5c..4d59c80fd 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateFile.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateFile.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -109,4 +110,26 @@ public class OnUpdateFile extends RPCNotification {
     public String getFileName() {
         return getString(KEY_FILE_NAME);
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnUpdateFile, not the same
+        if (!(obj instanceof OnUpdateFile)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java
index 0fafc37ef..4de1b102c 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnUpdateSubMenu.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -141,4 +142,26 @@ public class OnUpdateSubMenu extends RPCNotification {
     public Boolean getUpdateSubCells() {
         return getBoolean(KEY_UPDATE_SUB_CELLS);
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnUpdateSubMenu, not the same
+        if (!(obj instanceof OnUpdateSubMenu)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
index e8f5b57ca..875ca530f 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnVehicleData.java
@@ -31,6 +31,9 @@
  */

 package com.smartdevicelink.proxy.rpc;

 

+import androidx.annotation.NonNull;

+import androidx.annotation.Nullable;

+

 import com.smartdevicelink.protocol.enums.FunctionID;

 import com.smartdevicelink.proxy.RPCNotification;

 import com.smartdevicelink.proxy.rpc.enums.ComponentVolumeStatus;

@@ -849,4 +852,26 @@ public class OnVehicleData extends RPCNotification {
     public GearStatus getGearStatus() {

         return (GearStatus) getObject(GearStatus.class, KEY_GEAR_STATUS);

     }

+

+    @Override

+    public int hashCode() {

+        return super.hashCode();

+    }

+

+    @Override

+    public boolean equals(@Nullable Object obj) {

+        if (obj == null) return false;

+        // if this is the same memory address, it's the same

+        if (this == obj) return true;

+        // if this is not an instance of OnVehicleData, not the same

+        if (!(obj instanceof OnVehicleData)) return false;

+        // return comparison

+        return hashCode() == obj.hashCode();

+    }

+

+    @NonNull

+    @Override

+    protected Object clone() throws CloneNotSupportedException {

+        return super.clone();

+    }

 }

diff --git a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
index 5d54d4eeb..8579c4ff9 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/rpc/OnWayPointChange.java
@@ -32,6 +32,7 @@
 package com.smartdevicelink.proxy.rpc;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
@@ -64,4 +65,26 @@ public class OnWayPointChange extends RPCNotification {
         setParameters(KEY_WAY_POINTS, wayPoints);
         return this;
     }
+
+    @Override
+    public int hashCode() {
+        return super.hashCode();
+    }
+
+    @Override
+    public boolean equals(@Nullable Object obj) {
+        if (obj == null) return false;
+        // if this is the same memory address, it's the same
+        if (this == obj) return true;
+        // if this is not an instance of OnWayPointChange, not the same
+        if (!(obj instanceof OnWayPointChange)) return false;
+        // return comparison
+        return hashCode() == obj.hashCode();
+    }
+
+    @NonNull
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        return super.clone();
+    }
 }