fix: Add logging to DynamicEndpoint

Vonage · Jan 9, 2025 · 82b66e2 · 82b66e2
1 parent 42b9afb
commit 82b66e2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/src/main/java/com/vonage/client/DynamicEndpoint.java b/src/main/java/com/vonage/client/DynamicEndpoint.java
@@ -30,6 +30,8 @@
 import java.util.*;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * Enables convenient declaration of endpoints without directly implementing {@link AbstractMethod}.
@@ -42,6 +44,8 @@
  */
 @SuppressWarnings("unchecked")
 public class DynamicEndpoint<T, R> extends AbstractMethod<T, R> {
+	protected final Logger logger = Logger.getLogger(getClass().getName());
+
 	protected Set<Class<? extends AuthMethod>> authMethods;
 	protected String contentType, accept;
 	protected HttpMethod requestMethod;
@@ -242,6 +246,7 @@ else if (requestBody instanceof byte[]) {
 	@Override
 	protected final R parseResponse(HttpResponse response) throws IOException {
 		int statusCode = response.getStatusLine().getStatusCode();
+		logger.fine(() -> "Response status: " + statusCode);
 		try {
 			if (statusCode >= 200 && statusCode < 300) {
 				return parseResponseSuccess(response);
@@ -255,6 +260,7 @@ else if (statusCode >= 300 && statusCode < 400) {
 		}
 		catch (InvocationTargetException ex) {
 			Throwable wrapped = ex.getTargetException();
+			logger.log(Level.SEVERE, "Internal SDK error", ex);
 			if (wrapped instanceof RuntimeException) {
 				throw (RuntimeException) wrapped;
 			}
@@ -263,6 +269,7 @@ else if (statusCode >= 300 && statusCode < 400) {
 			}
 		}
 		catch (ReflectiveOperationException ex) {
+			logger.log(Level.SEVERE, "Internal SDK error", ex);
 			throw new VonageUnexpectedException(ex);
 		}
 		finally {
@@ -276,6 +283,7 @@ protected R parseResponseFromString(String response) {
 
 	private R parseResponseRedirect(HttpResponse response) throws ReflectiveOperationException, IOException {
 		final String location = response.getFirstHeader("Location").getValue();
+		logger.fine(() -> "Redirect: " + location);
 
 		if (java.net.URI.class.equals(responseType)) {
 			return (R) URI.create(location);
@@ -290,13 +298,17 @@ else if (String.class.equals(responseType)) {
 
 	private R parseResponseSuccess(HttpResponse response) throws IOException, ReflectiveOperationException {
 		if (Void.class.equals(responseType)) {
+			logger.fine(() -> "No response body.");
 			return null;
 		}
 		else if (byte[].class.equals(responseType)) {
-			return (R) EntityUtils.toByteArray(response.getEntity());
+			byte[] result = EntityUtils.toByteArray(response.getEntity());
+			logger.fine(() -> "Binary response body of length " + result.length);
+			return (R) result;
 		}
 		else {
 			String deser = EntityUtils.toString(response.getEntity());
+			logger.fine(() -> deser);
 
 			if (responseType.equals(String.class)) {
 				return (R) deser;
@@ -316,7 +328,9 @@ else if (Collection.class.isAssignableFrom(responseType) || isJsonableArrayRespo
 			else {
 				R customParsedResponse = parseResponseFromString(deser);
 				if (customParsedResponse == null) {
-					throw new IllegalStateException("Unhandled return type: " + responseType);
+					String errorMsg = "Unhandled return type: " + responseType;
+					logger.warning(errorMsg);
+					throw new IllegalStateException(errorMsg);
 				}
 				else {
 					return customParsedResponse;
@@ -345,7 +359,9 @@ private R parseResponseFailure(HttpResponse response) throws IOException, Reflec
 						if (!constructor.isAccessible()) {
 							constructor.setAccessible(true);
 						}
-						throw (RuntimeException) constructor.newInstance(exMessage);
+						RuntimeException ex = (RuntimeException) constructor.newInstance(exMessage);
+						logger.log(Level.SEVERE, "Internal SDK error", ex);
+						throw ex;
 					}
 				}
 			}

diff --git a/src/test/java/com/vonage/client/AbstractMethodTest.java b/src/test/java/com/vonage/client/AbstractMethodTest.java
@@ -47,14 +47,8 @@
 import java.util.logging.LogManager;
 import java.util.stream.Collectors;
 
-@Execution(ExecutionMode.SAME_THREAD)
 public class AbstractMethodTest {
 
-    static {
-        LogManager.getLogManager().getLogger(AbstractMethod.class.getName())
-                .setLevel(java.util.logging.Level.FINE);
-    }
-
     private static class ConcreteMethod extends AbstractMethod<String, String> {
         public ConcreteMethod(HttpWrapper httpWrapper) {
             super(httpWrapper);
@@ -116,6 +110,12 @@ public void close() {
     private AuthMethod mockAuthMethod;
     private final CloseableHttpResponse basicResponse = new CloseableBasicHttpResponse();
 
+    @BeforeAll
+    public static void setUpBeforeClass() {
+        LogManager.getLogManager().getLogger(AbstractMethod.class.getName())
+                .setLevel(java.util.logging.Level.FINE);
+    }
+
     @BeforeEach
     public void setUp() throws Exception {
         mockWrapper = mock(HttpWrapper.class);