update protobuf messages

Author: BrandonArp

src/main/java/com/arpnetworking/tsdcore/model/AggregationMessage.java

@@ -16,7 +16,7 @@
 package com.arpnetworking.tsdcore.model;
 
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import io.vertx.core.buffer.Buffer;
 import org.apache.pekko.util.ByteString;
 import org.apache.pekko.util.ByteStringBuilder;
@@ -37,7 +37,7 @@ public final class AggregationMessage {
      * @param message The message.
      * @return New ${link AggregationMessage} instance.
      */
-    public static AggregationMessage create(final GeneratedMessageV3 message) {
+    public static AggregationMessage create(final GeneratedMessage message) {
         return new AggregationMessage(message);
     }
 
@@ -103,19 +103,19 @@ public ByteString serializeToByteString() {
         return sizePrefix.result().concat(bs);
     }
 
-    public GeneratedMessageV3 getMessage() {
+    public GeneratedMessage getMessage() {
         return _message;
     }
 
     public int getLength() {
         return _message.getSerializedSize() + HEADER_SIZE_IN_BYTES;
     }
 
-    private AggregationMessage(final GeneratedMessageV3 message) {
+    private AggregationMessage(final GeneratedMessage message) {
         _message = message;
     }
 
-    private final GeneratedMessageV3 _message;
+    private final GeneratedMessage _message;
 
     private static final int INTEGER_SIZE_IN_BYTES = Integer.SIZE / 8;
     private static final int HEADER_SIZE_IN_BYTES = INTEGER_SIZE_IN_BYTES + 1;

src/test/java/com/arpnetworking/tsdcore/model/AggregationMessageTest.java

@@ -16,7 +16,7 @@
 package com.arpnetworking.tsdcore.model;
 
 import com.arpnetworking.metrics.aggregation.protocol.Messages;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import com.google.protobuf.UnknownFieldSet;
 import io.vertx.core.buffer.Buffer;
 import org.apache.pekko.util.ByteString;
@@ -35,7 +35,7 @@ public class AggregationMessageTest {
 
     @Test
     public void testToBufferHostIdentification() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());
@@ -60,14 +60,14 @@ public void testToBufferHostIdentification() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testToBufferSerializedUnsupportedMessage() {
-        final GeneratedMessageV3 mockMessage = Mockito.mock(GeneratedMessageV3.class);
+        final GeneratedMessage mockMessage = Mockito.mock(GeneratedMessage.class);
         Mockito.doReturn(UnknownFieldSet.getDefaultInstance()).when(mockMessage).getUnknownFields();
         AggregationMessage.create(mockMessage).serializeToBuffer();
     }
 
     @Test
     public void testToByteStringHostIdentification() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());
@@ -92,14 +92,14 @@ public void testToByteStringHostIdentification() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testToByteStringSerializedUnsupportedMessage() {
-        final GeneratedMessageV3 mockMessage = Mockito.mock(GeneratedMessageV3.class);
+        final GeneratedMessage mockMessage = Mockito.mock(GeneratedMessage.class);
         Mockito.doReturn(UnknownFieldSet.getDefaultInstance()).when(mockMessage).getUnknownFields();
         AggregationMessage.create(mockMessage).serializeToByteString();
     }
 
     @Test
     public void testPekkoVsVertx() {
-        final GeneratedMessageV3 protobufMessage = Messages.HostIdentification.getDefaultInstance();
+        final GeneratedMessage protobufMessage = Messages.HostIdentification.getDefaultInstance();
         final AggregationMessage message = AggregationMessage.create(protobufMessage);
         Assert.assertNotNull(message);
         Assert.assertSame(protobufMessage, message.getMessage());