http: Better exception messages

Author: srnyx

http/src/main/java/gg/eventalerts/sdk/http/endpoint/EAEndpoint.java

@@ -175,7 +175,7 @@ public EAAction<O> retrieveOne(@NotNull String... pathSegments) {
     }
 
     @NotNull
-    protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNull String objectField, @Nullable Map<String, Object> queryParams, @Nullable String... pathSegments) throws IOException {
+    public String buildUrl(@NotNull String endpointPath, @Nullable Map<String, Object> queryParams, @Nullable String... pathSegments) {
         // Build query parameters
         final StringBuilder queryString = new StringBuilder();
         if (queryParams != null && !queryParams.isEmpty()) {
@@ -216,8 +216,14 @@ protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNul
         final StringBuilder path = new StringBuilder();
         if (pathSegments != null) for (final String segment : pathSegments) path.append("/").append(segment);
 
+        // Build and return full URL
+        return http.url + endpointPath + path + queryString;
+    }
+
+    @NotNull
+    protected ConnectionDetails openConnection(@NotNull String url, @NotNull String objectField) throws IOException {
         // Open connection
-        final HttpURLConnection connection = (HttpURLConnection) URI.create(http.url + endpointPath + path + queryString).toURL().openConnection();
+        final HttpURLConnection connection = (HttpURLConnection) URI.create(url).toURL().openConnection();
         connection.setRequestMethod("GET");
         for (final Map.Entry<String, String> header : http.headers.entrySet()) connection.setRequestProperty(header.getKey(), header.getValue());
 
@@ -227,7 +233,7 @@ protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNul
         final JsonObject json = GSONProvider.GSON.fromJson(body, JsonObject.class);
         if (json == null) {
             if (statusCode >= 400) throw new EAHttpResponseException(statusCode, connection.getResponseMessage(), body);
-            throw new EAHttpRequestException("GET " + endpointPath, new IllegalStateException("Failed to parse JSON response"));
+            throw new EAHttpRequestException("GET " + url, new IllegalStateException("Failed to parse JSON response"));
         }
 
         // Error
@@ -291,13 +297,13 @@ private PaginatedResponse<O> executePage(@Nullable Map<String, Object> queryPara
         if (page != null) params.put("page", page);
         if (limit != null) params.put("limit", limit);
 
-        final String endpointPath = getPath();
+        final String url = buildUrl(getPath(), params);
         final String objectField = getPaginatedFieldName();
 
         HttpURLConnection connection = null;
         try {
             // Open connection and get details
-            final ConnectionDetails details = openConnection(endpointPath, objectField, params);
+            final ConnectionDetails details = openConnection(url, objectField);
             connection = details.connection;
 
             // Parse objects
@@ -313,21 +319,21 @@ private PaginatedResponse<O> executePage(@Nullable Map<String, Object> queryPara
         } catch (final RuntimeException e) {
             throw e;
         } catch (final Exception e) {
-            throw new EAHttpRequestException("GET " + endpointPath, e);
+            throw new EAHttpRequestException("GET " + url, e);
         } finally {
             if (connection != null) connection.disconnect();
         }
     }
 
     @NotNull
     private EAItemData<O> executeOne(@Nullable String... pathSegments) {
-        final String endpointPath = getPath();
+        final String url = buildUrl(getPath(), null, pathSegments);
         final String objectField = getSingleFieldName();
 
         HttpURLConnection connection = null;
         try {
             // Open connection and get details
-            final ConnectionDetails details = openConnection(endpointPath, objectField, null, pathSegments);
+            final ConnectionDetails details = openConnection(url, objectField);
             connection = details.connection;
 
             // Parse object
@@ -339,7 +345,7 @@ private EAItemData<O> executeOne(@Nullable String... pathSegments) {
         } catch (final RuntimeException e) {
             throw e;
         } catch (final Exception e) {
-            throw new EAHttpRequestException("GET " + endpointPath, e);
+            throw new EAHttpRequestException("GET " + url, e);
         } finally {
             if (connection != null) connection.disconnect();
         }

http/src/test/java/gg/eventalerts/http/endpoint/EAEndpointRetrieveTest.java

@@ -10,7 +10,6 @@
 import gg.eventalerts.sdk.object.EAEvent;
 import org.bson.types.ObjectId;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -106,7 +105,7 @@ void retrieveOneOnErrorMapSeesTransportFailure() {
         final EAHTTP http = new EAHTTP.Builder("EventAlertsSDK/1.0").url(baseUrl).build();
         final EAEvents events = new EAEvents(http) {
             @Override @NotNull
-            protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNull String objectField, @Nullable Map<String, Object> queryParams, @Nullable String... pathSegments) throws IOException {
+            protected ConnectionDetails openConnection(@NotNull String url, @NotNull String objectField) throws IOException {
                 throw new IOException("boom");
             }
         };
@@ -125,7 +124,7 @@ protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNul
         assertNotNull(event);
         assertEquals("Recovered Event", event.title);
         assertInstanceOf(EAHttpRequestException.class, captured.get());
-        assertTrue(captured.get().getMessage().contains("GET events"));
+        assertTrue(captured.get().getMessage().contains("GET " + events.buildUrl(events.getPath(), null, "broken")));
     }
 
     @Test
@@ -151,7 +150,7 @@ void retrieveDoesNotSwallowFatalErrors() {
         final EAHTTP http = new EAHTTP.Builder("EventAlertsSDK/1.0").url(baseUrl).build();
         final EAEvents events = new EAEvents(http) {
             @Override @NotNull
-            protected ConnectionDetails openConnection(@NotNull String endpointPath, @NotNull String objectField, @Nullable Map<String, Object> queryParams, @Nullable String... pathSegments) {
+            protected ConnectionDetails openConnection(@NotNull String url, @NotNull String objectField) {
                 throw new AssertionError("fatal");
             }
         };