Sync from monorepo 6769111f347e

Author: FusionAuth Automation

src/main/java/io/fusionauth/domain/message/sms/SMSMessage.java

@@ -16,6 +16,7 @@
 package io.fusionauth.domain.message.sms;
 
 import java.util.Objects;
+import java.util.UUID;
 
 import com.inversoft.json.JacksonConstructor;
 import com.inversoft.json.ToString;
@@ -26,10 +27,14 @@
  * @author Michael Sleevi
  */
 public class SMSMessage implements Message {
+  public String code;
+
   public String phoneNumber;
 
   public String textMessage;
 
+  public UUID userId;
+
   @JacksonConstructor
   public SMSMessage() {
   }
@@ -43,8 +48,10 @@ public boolean equals(Object o) {
       return false;
     }
     SMSMessage that = (SMSMessage) o;
-    return textMessage.equals(that.textMessage) &&
-           phoneNumber.equals(that.phoneNumber);
+    return Objects.equals(code, that.code) &&
+           Objects.equals(textMessage, that.textMessage) &&
+           Objects.equals(phoneNumber, that.phoneNumber) &&
+           Objects.equals(userId, that.userId);
   }
 
   @Override
@@ -54,7 +61,7 @@ public MessageType getType() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(textMessage, phoneNumber);
+    return Objects.hash(code, textMessage, phoneNumber, userId);
   }
 
   @Override

src/main/java/io/fusionauth/domain/message/voice/VoiceMessage.java

@@ -17,6 +17,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.UUID;
 
 import com.inversoft.json.JacksonConstructor;
 import com.inversoft.json.ToString;
@@ -27,12 +28,16 @@
  * @author Daniel King
  */
 public class VoiceMessage implements Message {
+  public String code;
+
   public Locale locale;
 
   public String message;
 
   public String phoneNumber;
 
+  public UUID userId;
+
   @JacksonConstructor
   public VoiceMessage() {
   }
@@ -46,9 +51,11 @@ public boolean equals(Object o) {
       return false;
     }
     VoiceMessage that = (VoiceMessage) o;
-    return Objects.equals(locale, that.locale) &&
-           message.equals(that.message) &&
-           phoneNumber.equals(that.phoneNumber);
+    return Objects.equals(code, that.code) &&
+           Objects.equals(locale, that.locale) &&
+           Objects.equals(message, that.message) &&
+           Objects.equals(phoneNumber, that.phoneNumber) &&
+           Objects.equals(userId, that.userId);
   }
 
   @Override
@@ -58,7 +65,7 @@ public MessageType getType() {
 
   @Override
   public int hashCode() {
-    return Objects.hash(locale, message, phoneNumber);
+    return Objects.hash(code, locale, message, phoneNumber, userId);
   }
 
   @Override