Merge pull request #3 from sashirestela/developer

sashirestela · web-flow · commit 5fc6e379f8aa · 2023-10-16T14:58:09.000-05:00
Support for Generic sender and Default methods
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>io.github.sashirestela</groupId>
   <artifactId>cleverclient</artifactId>
-  <version>0.2.0</version>
+  <version>0.3.0</version>
   <packaging>jar</packaging>
 
   <name>cleverclient</name>
diff --git a/src/main/java/io/github/sashirestela/cleverclient/CleverClient.java b/src/main/java/io/github/sashirestela/cleverclient/CleverClient.java
@@ -2,34 +2,36 @@
 
 import java.net.http.HttpClient;
 import java.util.List;
+import java.util.Optional;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import io.github.sashirestela.cleverclient.http.HttpProcessor;
 import io.github.sashirestela.cleverclient.http.InvocationFilter;
 import lombok.Builder;
+import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.NonNull;
 
 @NoArgsConstructor
+@Getter
 public class CleverClient {
   private static Logger logger = LoggerFactory.getLogger(CleverClient.class);
 
-  @NonNull
-  private HttpClient httpClient;
-
   @NonNull
   private String urlBase;
 
   private List<String> headers;
+  private HttpClient httpClient;
+
   private HttpProcessor httpProcessor;
 
   @Builder
-  public CleverClient(HttpClient httpClient, String urlBase, List<String> headers) {
-    this.httpClient = httpClient;
+  public CleverClient(String urlBase, List<String> headers, HttpClient httpClient) {
     this.urlBase = urlBase;
-    this.headers = headers;
+    this.headers = Optional.ofNullable(headers).orElse(List.of());
+    this.httpClient = Optional.ofNullable(httpClient).orElse(HttpClient.newHttpClient());
     this.httpProcessor = new HttpProcessor(this.httpClient, this.urlBase, this.headers);
     logger.debug("CleverClient has been created.");
   }
diff --git a/src/main/java/io/github/sashirestela/cleverclient/http/HttpConnector.java b/src/main/java/io/github/sashirestela/cleverclient/http/HttpConnector.java
@@ -31,13 +31,25 @@ public class HttpConnector {
   public Object sendRequest() {
     var bodyPublisher = createBodyPublisher(bodyObject, isMultipart);
     var responseClass = returnType.getBaseClass();
-    var httpRequest = HttpRequest.newBuilder()
-        .uri(URI.create(url))
-        .headers(headersArray)
-        .method(httpMethod, bodyPublisher)
-        .build();
+    HttpRequest httpRequest = null;
+    if (headersArray.length > 0) {
+      httpRequest = HttpRequest.newBuilder()
+          .uri(URI.create(url))
+          .headers(headersArray)
+          .method(httpMethod, bodyPublisher)
+          .build();
+    } else {
+      httpRequest = HttpRequest.newBuilder()
+          .uri(URI.create(url))
+          .method(httpMethod, bodyPublisher)
+          .build();
+    }
     var httpSender = HttpSenderFactory.get().createSender(returnType);
-    return httpSender.sendRequest(httpClient, httpRequest, responseClass);
+    if (returnType.isGeneric()) {
+      return httpSender.sendRequest(httpClient, httpRequest, responseClass, returnType.getGenericClass());
+    } else {
+      return httpSender.sendRequest(httpClient, httpRequest, responseClass, null);
+    }
   }
 
   private BodyPublisher createBodyPublisher(Object bodyObject, boolean isMultipart) {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/http/HttpInvocationHandler.java b/src/main/java/io/github/sashirestela/cleverclient/http/HttpInvocationHandler.java
@@ -1,5 +1,7 @@
 package io.github.sashirestela.cleverclient.http;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 
@@ -24,9 +26,21 @@ public Object invoke(Object proxy, Method method, Object[] arguments) throws Thr
       filter.apply(method, arguments);
       logger.debug("Applied Filter : {}", filter.getClass().getSimpleName());
     }
-    var responseObject = processor.resolve(method, arguments);
-    logger.debug("Received Response");
-
-    return responseObject;
+    if (method.isDefault()) {
+      return MethodHandles.lookup()
+          .findSpecial(
+              method.getDeclaringClass(),
+              method.getName(),
+              MethodType.methodType(
+                  method.getReturnType(),
+                  method.getParameterTypes()),
+              method.getDeclaringClass())
+          .bindTo(proxy)
+          .invokeWithArguments(arguments);
+    } else {
+      var responseObject = processor.resolve(method, arguments);
+      logger.debug("Received Response");
+      return responseObject;
+    }
   }
 }
diff --git a/src/main/java/io/github/sashirestela/cleverclient/http/HttpProcessor.java b/src/main/java/io/github/sashirestela/cleverclient/http/HttpProcessor.java
@@ -30,7 +30,7 @@ public class HttpProcessor {
   public HttpProcessor(HttpClient httpClient, String urlBase, List<String> headers) {
     this.httpClient = httpClient;
     this.urlBase = urlBase;
-    this.headers = headers;
+    this.headers = Optional.ofNullable(headers).orElse(List.of());
   }
 
   /**
diff --git a/src/main/java/io/github/sashirestela/cleverclient/http/ReturnType.java b/src/main/java/io/github/sashirestela/cleverclient/http/ReturnType.java
@@ -8,18 +8,23 @@ public class ReturnType {
   private static final String LIST = "java.util.List";
   private static final String STRING = "java.lang.String";
 
+  private static final String REGEX = "[<>]";
+  private static final String JAVA_PCK = "java";
+
   private String fullClassName;
   private String[] returnTypeArray;
   private int size;
+  private int firstIndex;
   private int lastIndex;
   private int prevLastIndex;
 
   public ReturnType(String fullClassName) {
     this.fullClassName = fullClassName;
-    returnTypeArray = fullClassName.split("[<>]", 0);
+    returnTypeArray = fullClassName.split(REGEX, 0);
     size = returnTypeArray.length;
+    firstIndex = 0;
     lastIndex = size - 1;
-    prevLastIndex = size > 1 ? lastIndex - 1 : -1;
+    prevLastIndex = lastIndex - 1;
   }
 
   public ReturnType(Method method) {
@@ -31,53 +36,78 @@ public String getFullClassName() {
   }
 
   public Class<?> getBaseClass() {
-    Class<?> baseClass = null;
+    return getClass(lastIndex);
+  }
+
+  public Class<?> getGenericClass() {
+    return getClass(prevLastIndex);
+  }
+
+  private Class<?> getClass(int index) {
+    Class<?> clazz = null;
     try {
-      baseClass = Class.forName(returnTypeArray[lastIndex]);
+      clazz = Class.forName(returnTypeArray[index]);
     } catch (ClassNotFoundException e) {
       // This shouldn't happen
     }
-    return baseClass;
+    return clazz;
   }
 
   public Category category() {
     if (isAsync()) {
-      if (isStream()) {
-        return Category.ASYNC_STREAM;
-      } else if (isList()) {
-        return Category.ASYNC_LIST;
-      } else if (isObject()) {
-        return Category.ASYNC_OBJECT;
-      } else if (isPlainText()) {
-        return Category.ASYNC_PLAIN_TEXT;
-      } else {
-        return null;
-      }
+      return asyncCategory();
     } else {
-      if (isStream()) {
-        return Category.SYNC_STREAM;
-      } else if (isList()) {
-        return Category.SYNC_LIST;
-      } else if (isObject()) {
-        return Category.SYNC_OBJECT;
-      } else if (isPlainText()) {
-        return Category.SYNC_PLAIN_TEXT;
-      } else {
-        return null;
-      }
+      return syncCategory();
+    }
+  }
+
+  private Category asyncCategory() {
+    if (isStream()) {
+      return Category.ASYNC_STREAM;
+    } else if (isList()) {
+      return Category.ASYNC_LIST;
+    } else if (isGeneric()) {
+      return Category.ASYNC_GENERIC;
+    } else if (isObject()) {
+      return Category.ASYNC_OBJECT;
+    } else if (isPlainText()) {
+      return Category.ASYNC_PLAIN_TEXT;
+    } else {
+      return null;
+    }
+  }
+
+  private Category syncCategory() {
+    if (isStream()) {
+      return Category.SYNC_STREAM;
+    } else if (isList()) {
+      return Category.SYNC_LIST;
+    } else if (isGeneric()) {
+      return Category.SYNC_GENERIC;
+    } else if (isObject()) {
+      return Category.SYNC_OBJECT;
+    } else if (isPlainText()) {
+      return Category.SYNC_PLAIN_TEXT;
+    } else {
+      return null;
     }
   }
 
   public boolean isAsync() {
-    return size > 1 && ASYNC.equals(returnTypeArray[0]);
+    return size > 1 && ASYNC.equals(returnTypeArray[firstIndex]);
   }
 
   public boolean isStream() {
-    return size != 1 && STREAM.equals(returnTypeArray[prevLastIndex]);
+    return size > 1 && STREAM.equals(returnTypeArray[prevLastIndex]);
   }
 
   public boolean isList() {
-    return size != 1 && LIST.equals(returnTypeArray[prevLastIndex]);
+    return size > 1 && LIST.equals(returnTypeArray[prevLastIndex]);
+  }
+
+  public boolean isGeneric() {
+    return ((isAsync() && size > 2) || (!isAsync() && size > 1))
+        && !returnTypeArray[prevLastIndex].startsWith(JAVA_PCK);
   }
 
   public boolean isObject() {
@@ -95,10 +125,12 @@ private boolean isString() {
   public enum Category {
     ASYNC_STREAM,
     ASYNC_LIST,
+    ASYNC_GENERIC,
     ASYNC_OBJECT,
     ASYNC_PLAIN_TEXT,
     SYNC_STREAM,
     SYNC_LIST,
+    SYNC_GENERIC,
     SYNC_OBJECT,
     SYNC_PLAIN_TEXT;
   }
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncGenericSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncGenericSender.java
@@ -0,0 +1,27 @@
+package io.github.sashirestela.cleverclient.sender;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse.BodyHandlers;
+
+import io.github.sashirestela.cleverclient.util.JsonUtil;
+
+public class HttpAsyncGenericSender extends HttpSender {
+
+  @Override
+  public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass) {
+
+    var httpResponseFuture = httpClient.sendAsync(httpRequest, BodyHandlers.ofString());
+
+    return httpResponseFuture.thenApply(response -> {
+
+      throwExceptionIfErrorIsPresent(response, false);
+
+      logger.debug("Response : {}", response.body());
+
+      return JsonUtil.jsonToParametricObject(response.body(), genericClass, responseClass);
+    });
+  }
+
+}
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncListSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncListSender.java
@@ -9,7 +9,9 @@
 public class HttpAsyncListSender extends HttpSender {
 
   @Override
-  public <T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass) {
+  public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass) {
+
     var httpResponseFuture = httpClient.sendAsync(httpRequest, BodyHandlers.ofString());
 
     return httpResponseFuture.thenApply(response -> {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncObjectSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncObjectSender.java
@@ -9,7 +9,9 @@
 public class HttpAsyncObjectSender extends HttpSender {
 
   @Override
-  public <T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass) {
+  public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass) {
+
     var httpResponseFuture = httpClient.sendAsync(httpRequest, BodyHandlers.ofString());
 
     return httpResponseFuture.thenApply(response -> {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncPlainTextSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncPlainTextSender.java
@@ -8,7 +8,9 @@ public class HttpAsyncPlainTextSender extends HttpSender {
 
   @Override
   @SuppressWarnings("unchecked")
-  public <T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass) {
+  public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass) {
+
     var httpResponseFuture = httpClient.sendAsync(httpRequest, BodyHandlers.ofString());
 
     return httpResponseFuture.thenApply(response -> {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncStreamSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpAsyncStreamSender.java
@@ -10,7 +10,9 @@
 public class HttpAsyncStreamSender extends HttpSender {
 
   @Override
-  public <T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass) {
+  public <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass) {
+
     var httpResponseFuture = httpClient.sendAsync(httpRequest, BodyHandlers.ofLines());
 
     return httpResponseFuture.thenApply(response -> {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSender.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSender.java
@@ -15,7 +15,8 @@
 public abstract class HttpSender {
   protected static Logger logger = LoggerFactory.getLogger(HttpSender.class);
 
-  public abstract <T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass);
+  public abstract <S, T> Object sendRequest(HttpClient httpClient, HttpRequest httpRequest, Class<T> responseClass,
+      Class<S> genericClass);
 
   @SuppressWarnings("unchecked")
   protected void throwExceptionIfErrorIsPresent(HttpResponse<?> response, boolean isStream) {
diff --git a/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSenderFactory.java b/src/main/java/io/github/sashirestela/cleverclient/sender/HttpSenderFactory.java
@@ -21,6 +21,7 @@ private HttpSenderFactory() {
     sendersMap = new EnumMap<>(Category.class);
     sendersMap.put(Category.ASYNC_STREAM, HttpAsyncStreamSender::new);
     sendersMap.put(Category.ASYNC_LIST, HttpAsyncListSender::new);
+    sendersMap.put(Category.ASYNC_GENERIC, HttpAsyncGenericSender::new);
     sendersMap.put(Category.ASYNC_OBJECT, HttpAsyncObjectSender::new);
     sendersMap.put(Category.ASYNC_PLAIN_TEXT, HttpAsyncPlainTextSender::new);
   }
diff --git a/src/main/java/io/github/sashirestela/cleverclient/util/ReflectUtil.java b/src/main/java/io/github/sashirestela/cleverclient/util/ReflectUtil.java
diff --git a/src/test/java/io/github/sashirestela/cleverclient/CleverClientTest.java b/src/test/java/io/github/sashirestela/cleverclient/CleverClientTest.java
diff --git a/src/test/java/io/github/sashirestela/cleverclient/http/HttpProcessorTest.java b/src/test/java/io/github/sashirestela/cleverclient/http/HttpProcessorTest.java
diff --git a/src/test/java/io/github/sashirestela/cleverclient/http/ITest.java b/src/test/java/io/github/sashirestela/cleverclient/http/ITest.java
diff --git a/src/test/java/io/github/sashirestela/cleverclient/http/ReturnTypeTest.java b/src/test/java/io/github/sashirestela/cleverclient/http/ReturnTypeTest.java
diff --git a/src/test/java/io/github/sashirestela/cleverclient/support/CleverClientSSETest.java b/src/test/java/io/github/sashirestela/cleverclient/support/CleverClientSSETest.java

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ public class HttpProcessor {`
`30`	`30`	`public HttpProcessor(HttpClient httpClient, String urlBase, List<String> headers) {`
`31`	`31`	`this.httpClient = httpClient;`
`32`	`32`	`this.urlBase = urlBase;`
`33`		`- this.headers = headers;`
	`33`	`+ this.headers = Optional.ofNullable(headers).orElse(List.of());`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`/**`