fix deprecation issues

Author: BrandonArp

src/main/java/com/arpnetworking/clusteraggregator/client/AggClientConnection.java

@@ -28,7 +28,7 @@
 import com.arpnetworking.tsdcore.statistics.Statistic;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.pekko.actor.AbstractActor;
 import org.apache.pekko.actor.ActorRef;
@@ -153,7 +153,7 @@ private void processMessages() {
         while (messageOptional.isPresent()) {
             final AggregationMessage message = messageOptional.get();
             current = current.drop(message.getLength());
-            final GeneratedMessageV3 gm = message.getMessage();
+            final GeneratedMessage gm = message.getMessage();
             if (gm instanceof Messages.HostIdentification) {
                 final Messages.HostIdentification hostIdent = (Messages.HostIdentification) gm;
                 _hostName = Optional.ofNullable(hostIdent.getHostName());

src/main/java/com/arpnetworking/clusteraggregator/client/HttpSourceActor.java

@@ -36,7 +36,7 @@
 import com.google.common.util.concurrent.AtomicDouble;
 import com.google.inject.Inject;
 import com.google.inject.name.Named;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import org.apache.http.HttpHeaders;
 import org.apache.pekko.Done;
@@ -145,8 +145,8 @@ private void handleAggregation(
 
         final AggregationMode aggregationMode = aggregationRequest.getAggregationMode();
         for (final AggregationMessage aggregationMessage : aggregationRequest.getAggregationMessages()) {
-            final GeneratedMessageV3 generatedMessageV3 = aggregationMessage.getMessage();
-            if (generatedMessageV3 instanceof Messages.StatisticSetRecord) {
+            final GeneratedMessage generatedMessage = aggregationMessage.getMessage();
+            if (generatedMessage instanceof Messages.StatisticSetRecord) {
                 final Messages.StatisticSetRecord statisticSetRecord =
                         (Messages.StatisticSetRecord) aggregationMessage.getMessage();
 

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 com.google.protobuf.InvalidProtocolBufferException;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.pekko.util.ByteIterator;
@@ -42,7 +42,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);
     }
 
@@ -139,7 +139,7 @@ public ByteString serialize() {
         return AggregationMessage.serialize(_message);
     }
 
-    private static ByteString serialize(final GeneratedMessageV3 message) {
+    private static ByteString serialize(final GeneratedMessage message) {
         final ByteStringBuilder b = ByteString.createBuilder();
         if (message instanceof Messages.HostIdentification) {
             b.putByte((byte) 0x01);
@@ -166,24 +166,24 @@ private static ByteString serialize(final GeneratedMessageV3 message) {
         return sizePrefix.result().concat(b.result());
     }
 
-    public GeneratedMessageV3 getMessage() {
+    public GeneratedMessage getMessage() {
         return _message;
     }
 
     public int getLength() {
         return _length;
     }
 
-    private AggregationMessage(final GeneratedMessageV3 message) {
+    private AggregationMessage(final GeneratedMessage message) {
         this(message, serialize(message).length());
     }
 
-    private AggregationMessage(final GeneratedMessageV3 message, final int length) {
+    private AggregationMessage(final GeneratedMessage message, final int length) {
         _length = length;
         _message = message;
     }
 
-    private final GeneratedMessageV3 _message;
+    private final GeneratedMessage _message;
     private final int _length;
 
     private static final int BYTE_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 org.apache.pekko.util.ByteString;
 import org.apache.pekko.util.ByteStringBuilder;
 import org.junit.Assert;
@@ -34,7 +34,7 @@ public class AggregationMessageTest {
 
     @Test
     public void testHostIdentification() {
-        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());
@@ -65,7 +65,7 @@ public void testHostIdentification() {
 
     @Test(expected = IllegalArgumentException.class)
     public void testSerializedUnsupportedMessage() {
-        final GeneratedMessageV3 message = Messages.SparseHistogramEntry.newBuilder()
+        final GeneratedMessage message = Messages.SparseHistogramEntry.newBuilder()
                 .build();
         AggregationMessage.create(message).serialize();
     }