Support for UUID based addressing

service/src/main/java/org/whispersystems/textsecuregcm/entities/AccountCreationResult.java

@@ -0,0 +1,21 @@
+package org.whispersystems.textsecuregcm.entities;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.util.UUID;
+
+public class AccountCreationResult {
+
+  @JsonProperty
+  private UUID uuid;
+
+  public AccountCreationResult() {}
+
+  public AccountCreationResult(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+  public UUID getUuid() {
+    return uuid;
+  }
+}

service/src/main/java/org/whispersystems/textsecuregcm/entities/ActiveUserTally.java

@@ -19,10 +19,11 @@ package org.whispersystems.textsecuregcm.entities;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Map;
 import java.util.HashMap;
+import java.util.UUID;
 
 public class ActiveUserTally {
   @JsonProperty
-  private String fromNumber;
+  private UUID fromUuid;
 
   @JsonProperty
   private Map<String, long[]> platforms;
@@ -32,14 +33,14 @@ public class ActiveUserTally {
 
   public ActiveUserTally() {}
 
-  public ActiveUserTally(String fromNumber, Map<String, long[]> platforms, Map<String, long[]> countries) {
-    this.fromNumber = fromNumber;
+  public ActiveUserTally(UUID fromUuid, Map<String, long[]> platforms, Map<String, long[]> countries) {
+    this.fromUuid   = fromUuid;
     this.platforms  = platforms;
     this.countries  = countries;
   }
 
-  public String getFromNumber() {
-    return this.fromNumber;
+  public UUID getFromUuid() {
+    return this.fromUuid;
   }
 
   public Map<String, long[]> getPlatforms() {
@@ -50,8 +51,8 @@ public class ActiveUserTally {
     return this.countries;
   }
 
-  public void setFromNumber(String fromNumber) {
-    this.fromNumber = fromNumber;
+  public void setFromUuid(UUID fromUuid) {
+    this.fromUuid = fromUuid;
   }
 
 }

service/src/main/java/org/whispersystems/textsecuregcm/entities/DirectoryReconciliationRequest.java

@@ -19,14 +19,15 @@ package org.whispersystems.textsecuregcm.entities;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.List;
+import java.util.UUID;
 
 public class DirectoryReconciliationRequest {
 
   @JsonProperty
-  private String fromNumber;
+  private UUID fromUuid;
 
   @JsonProperty
-  private String toNumber;
+  private UUID toUuid;
 
   @JsonProperty
   private List<String> numbers;
@@ -34,18 +35,18 @@ public class DirectoryReconciliationRequest {
   public DirectoryReconciliationRequest() {
   }
 
-  public DirectoryReconciliationRequest(String fromNumber, String toNumber, List<String> numbers) {
-    this.fromNumber = fromNumber;
-    this.toNumber   = toNumber;
-    this.numbers    = numbers;
+  public DirectoryReconciliationRequest(UUID fromUuid, UUID toUuid, List<String> numbers) {
+    this.fromUuid = fromUuid;
+    this.toUuid   = toUuid;
+    this.numbers  = numbers;
   }
 
-  public String getFromNumber() {
-    return fromNumber;
+  public UUID getFromUuid() {
+    return fromUuid;
   }
 
-  public String getToNumber() {
-    return toNumber;
+  public UUID getToUuid() {
+    return toUuid;
   }
 
   public List<String> getNumbers() {

service/src/main/java/org/whispersystems/textsecuregcm/entities/OutgoingMessageEntity.java

@@ -28,6 +28,9 @@ public class OutgoingMessageEntity {
   @JsonProperty
   private String source;
 
+  @JsonProperty
+  private UUID sourceUuid;
+
   @JsonProperty
   private int sourceDevice;
 
@@ -44,8 +47,8 @@ public class OutgoingMessageEntity {
 
   public OutgoingMessageEntity(long id, boolean cached,
                                UUID guid, int type, String relay, long timestamp,
-                               String source, int sourceDevice, byte[] message,
-                               byte[] content, long serverTimestamp)
+                               String source, UUID sourceUuid, int sourceDevice,
+                               byte[] message, byte[] content, long serverTimestamp)
   {
     this.id              = id;
     this.cached          = cached;
@@ -54,6 +57,7 @@ public class OutgoingMessageEntity {
     this.relay           = relay;
     this.timestamp       = timestamp;
     this.source          = source;
+    this.sourceUuid      = sourceUuid;
     this.sourceDevice    = sourceDevice;
     this.message         = message;
     this.content         = content;
@@ -80,6 +84,10 @@ public class OutgoingMessageEntity {
     return source;
   }
 
+  public UUID getSourceUuid() {
+    return sourceUuid;
+  }
+
   public int getSourceDevice() {
     return sourceDevice;
   }