[pinpoint-apm#9932] Removed thrift dependency of Agent module

Author: emeroad

profiler-thrift/src/main/java/com/navercorp/pinpoint/profiler/thrift/sender/RequestMessage.java

@@ -16,19 +16,17 @@
 
 package com.navercorp.pinpoint.profiler.thrift.sender;
 
-import com.navercorp.pinpoint.rpc.ResponseMessage;
-
 import java.util.function.BiConsumer;
 
 /**
  * @author Woonduk Kang(emeroad)
  */
-public interface RequestMessage<M> {
+public interface RequestMessage<REQ, RES> {
 
-    M getMessage();
+    REQ getMessage();
 
     int getRetryCount();
 
-    BiConsumer<ResponseMessage, Throwable> getFutureListener();
+    BiConsumer<RES, Throwable> getFutureListener();
 
 }

profiler-thrift/src/main/java/com/navercorp/pinpoint/profiler/thrift/sender/RequestMessageFactory.java

@@ -17,8 +17,6 @@
 package com.navercorp.pinpoint.profiler.thrift.sender;
 
 
-import com.navercorp.pinpoint.rpc.ResponseMessage;
-
 import java.util.function.BiConsumer;
 
 /**
@@ -29,11 +27,11 @@ public final class RequestMessageFactory {
     private RequestMessageFactory() {
     }
 
-    public static <T> RequestMessage<T> request(T message, int retryCount) {
-        return new RetryRequestMessage<>(message, retryCount, null);
+    public static <T, R> RequestMessage<T, R> request(T message, int retryCount) {
+        return new RetryRequestMessage<>(message, retryCount);
     }
 
-    public static <T> RequestMessage<T> request(T message, int retryCount, BiConsumer<ResponseMessage, Throwable> futureListener) {
+    public static <T, R> RequestMessage<T, R> request(T message, int retryCount, BiConsumer<R, Throwable> futureListener) {
         return new RetryRequestMessage<>(message, retryCount, futureListener);
     }
 

profiler-thrift/src/main/java/com/navercorp/pinpoint/profiler/thrift/sender/RetryRequestMessage.java

@@ -16,28 +16,33 @@
 
 package com.navercorp.pinpoint.profiler.thrift.sender;
 
-import com.navercorp.pinpoint.rpc.ResponseMessage;
-
+import java.util.Objects;
 import java.util.function.BiConsumer;
 
 /**
  * @author Woonduk Kang(emeroad)
  */
-class RetryRequestMessage<T> implements RequestMessage<T> {
-    private final T message;
+class RetryRequestMessage<REQ, RES> implements RequestMessage<REQ, RES> {
+    private final REQ message;
     private final int retryCount;
-    private final BiConsumer<ResponseMessage, Throwable> futureListener;
+    private final BiConsumer<RES, Throwable> futureListener;
+
 
+    RetryRequestMessage(REQ message, int retryCount) {
+        this.message = Objects.requireNonNull(message, "message");
+        this.retryCount = retryCount;
+        this.futureListener = null;
+    }
 
-    RetryRequestMessage(T message, int retryCount, BiConsumer<ResponseMessage, Throwable> futureListener) {
-        this.message = message;
+    RetryRequestMessage(REQ message, int retryCount, BiConsumer<RES, Throwable> futureListener) {
+        this.message = Objects.requireNonNull(message, "message");
         this.retryCount = retryCount;
-        this.futureListener = futureListener;
+        this.futureListener = Objects.requireNonNull(futureListener, "futureListener");
     }
 
 
     @Override
-    public T getMessage() {
+    public REQ getMessage() {
         return message;
     }
 
@@ -47,7 +52,7 @@ public int getRetryCount() {
     }
 
     @Override
-    public BiConsumer<ResponseMessage, Throwable> getFutureListener() {
+    public BiConsumer<RES, Throwable> getFutureListener() {
         return futureListener;
     }
 }

profiler-thrift/src/main/java/com/navercorp/pinpoint/profiler/thrift/sender/TcpDataSender.java

@@ -175,13 +175,13 @@ public boolean request(T data) {
 
     @Override
     public boolean request(T data, int retryCount) {
-        final RequestMessage<?> message = RequestMessageFactory.request(data, retryCount);
+        final RequestMessage<T, ResponseMessage> message = RequestMessageFactory.request(data, retryCount);
         return executor.execute(message);
     }
 
     @Override
     public boolean request(T data, BiConsumer<ResponseMessage, Throwable> listener) {
-        final RequestMessage<T> message = RequestMessageFactory.request(data, 3, listener);
+        final RequestMessage<T, ResponseMessage> message = RequestMessageFactory.request(data, 3, listener);
         return executor.execute(message);
     }
 
@@ -211,8 +211,8 @@ public void stop() {
 
     protected void sendPacket(Object message) {
         try {
-            if (message instanceof RequestMessage<?>) {
-                final RequestMessage<T> requestMessage = (RequestMessage<T>) message;
+            if (message instanceof RequestMessage<?, ?>) {
+                final RequestMessage<T, ResponseMessage> requestMessage = (RequestMessage<T, ResponseMessage>) message;
                 if (doRequest(requestMessage)) {
                     return;
                 }
@@ -229,7 +229,7 @@ protected void sendPacket(Object message) {
         }
     }
 
-    private boolean doRequest(RequestMessage<T> requestMessage) {
+    private boolean doRequest(RequestMessage<T, ResponseMessage> requestMessage) {
         final T message = requestMessage.getMessage();
 
         final byte[] copy = messageSerializer.serializer(message);