Remove unused properties from OutgoingMessageEntity

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

@@ -6,21 +6,13 @@
 package org.whispersystems.textsecuregcm.entities;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
-
 import java.util.Arrays;
 import java.util.Objects;
 import java.util.UUID;
 
 public class OutgoingMessageEntity {
 
-  @JsonIgnore
-  private final long id;
-
-  @JsonIgnore
-  private final boolean cached;
-
   @JsonProperty
   private final UUID guid;
 
@@ -55,9 +47,7 @@ public class OutgoingMessageEntity {
   private final long serverTimestamp;
 
   @JsonCreator
-  public OutgoingMessageEntity(@JsonProperty("id") final long id,
-      @JsonProperty("cached") final boolean cached,
-      @JsonProperty("guid") final UUID guid,
+  public OutgoingMessageEntity(@JsonProperty("guid") final UUID guid,
       @JsonProperty("type") final int type,
       @JsonProperty("relay") final String relay,
       @JsonProperty("timestamp") final long timestamp,
@@ -69,8 +59,6 @@ public class OutgoingMessageEntity {
       @JsonProperty("content") final byte[] content,
       @JsonProperty("serverTimestamp") final long serverTimestamp)
   {
-    this.id              = id;
-    this.cached          = cached;
     this.guid            = guid;
     this.type            = type;
     this.relay           = relay;
@@ -124,16 +112,6 @@ public class OutgoingMessageEntity {
     return content;
   }
 
-  @JsonIgnore
-  public long getId() {
-    return id;
-  }
-
-  @JsonIgnore
-  public boolean isCached() {
-    return cached;
-  }
-
   public long getServerTimestamp() {
     return serverTimestamp;
   }
@@ -143,23 +121,22 @@ public class OutgoingMessageEntity {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
     final OutgoingMessageEntity that = (OutgoingMessageEntity)o;
-    return id == that.id &&
-            cached == that.cached &&
-            type == that.type &&
+    return type == that.type &&
             timestamp == that.timestamp &&
             sourceDevice == that.sourceDevice &&
             serverTimestamp == that.serverTimestamp &&
-            Objects.equals(guid, that.guid) &&
+            guid.equals(that.guid) &&
             Objects.equals(relay, that.relay) &&
             Objects.equals(source, that.source) &&
             Objects.equals(sourceUuid, that.sourceUuid) &&
+            destinationUuid.equals(that.destinationUuid) &&
             Arrays.equals(message, that.message) &&
             Arrays.equals(content, that.content);
   }
 
   @Override
   public int hashCode() {
-    int result = Objects.hash(id, cached, guid, type, relay, timestamp, source, sourceUuid, sourceDevice, serverTimestamp);
+    int result = Objects.hash(guid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, serverTimestamp);
     result = 31 * result + Arrays.hashCode(message);
     result = 31 * result + Arrays.hashCode(content);
     return result;

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesCache.java

@@ -167,7 +167,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
 
     for (final byte[] bytes : serialized) {
       try {
-        removedMessages.add(constructEntityFromEnvelope(0, MessageProtos.Envelope.parseFrom(bytes)));
+        removedMessages.add(constructEntityFromEnvelope(MessageProtos.Envelope.parseFrom(bytes)));
       } catch (final InvalidProtocolBufferException e) {
         logger.warn("Failed to parse envelope", e);
       }
@@ -208,7 +208,7 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
 
             final long id = Long.parseLong(new String(queueItems.get(i + 1), StandardCharsets.UTF_8));
 
-            messageEntities.add(constructEntityFromEnvelope(id, message));
+            messageEntities.add(constructEntityFromEnvelope(message));
           } catch (InvalidProtocolBufferException e) {
             logger.warn("Failed to parse envelope", e);
           }
@@ -376,8 +376,8 @@ public class MessagesCache extends RedisClusterPubSubAdapter<String, String> imp
   }
 
   @VisibleForTesting
-  static OutgoingMessageEntity constructEntityFromEnvelope(long id, MessageProtos.Envelope envelope) {
-    return new OutgoingMessageEntity(id, true,
+  static OutgoingMessageEntity constructEntityFromEnvelope(MessageProtos.Envelope envelope) {
+    return new OutgoingMessageEntity(
         envelope.hasServerGuid() ? UUID.fromString(envelope.getServerGuid()) : null,
         envelope.getType().getNumber(),
         envelope.getRelay(),

service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagesDynamoDb.java

@@ -228,7 +228,7 @@ public class MessagesDynamoDb extends AbstractDynamoDbStore {
     final UUID destinationUuid = AttributeValues.getUUID(message, KEY_DESTINATION_UUID, null);
     final byte[] messageBytes = AttributeValues.getByteArray(message, KEY_MESSAGE, null);
     final byte[] content = AttributeValues.getByteArray(message, KEY_CONTENT, null);
-    return new OutgoingMessageEntity(-1L, false, messageUuid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, messageBytes, content, sortKey.getServerTimestamp());
+    return new OutgoingMessageEntity(messageUuid, type, relay, timestamp, source, sourceUuid, sourceDevice, destinationUuid, messageBytes, content, sortKey.getServerTimestamp());
   }
 
   private void deleteRowsMatchingQuery(AttributeValue partitionKey, QueryRequest querySpec) {