feat: Add optional URL parameter to FetchResponse (box/box-codegen#617) (#89)

Author: box-sdk-build

.codegen.json

@@ -1 +1 @@
-{ "engineHash": "d435f50", "specHash": "544d370", "version": "0.1.1" }
+{ "engineHash": "f073ce3", "specHash": "544d370", "version": "0.1.1" }

src/main/java/com/box/sdkgen/networking/fetch/FetchManager.java

@@ -67,16 +67,22 @@ public static FetchResponse fetch(FetchOptions options) {
             response.headers().toMultimap().entrySet().stream()
                 .collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().get(0)));
 
+        String responseUrl =
+            response.networkResponse() != null
+                ? response.networkResponse().request().url().toString()
+                : response.request().url().toString();
         fetchResponse =
             Objects.equals(fetchOptions.getResponseFormat().getEnumValue(), ResponseFormat.BINARY)
                 ? new FetchResponse.FetchResponseBuilder(response.code(), headersMap)
                     .content(response.body().byteStream())
+                    .url(responseUrl)
                     .build()
                 : new FetchResponse.FetchResponseBuilder(response.code(), headersMap)
                     .data(
                         response.body() != null
                             ? jsonToSerializedData(response.body().string())
                             : null)
+                    .url(responseUrl)
                     .build();
 
         fetchResponse =

src/main/java/com/box/sdkgen/networking/fetchresponse/FetchResponse.java

@@ -6,6 +6,8 @@
 
 public class FetchResponse {
 
+  public String url;
+
   public final int status;
 
   public JsonNode data;
@@ -20,12 +22,17 @@ public FetchResponse(int status, Map<String, String> headers) {
   }
 
   protected FetchResponse(FetchResponseBuilder builder) {
+    this.url = builder.url;
     this.status = builder.status;
     this.data = builder.data;
     this.content = builder.content;
     this.headers = builder.headers;
   }
 
+  public String getUrl() {
+    return url;
+  }
+
   public int getStatus() {
     return status;
   }
@@ -44,6 +51,8 @@ public Map<String, String> getHeaders() {
 
   public static class FetchResponseBuilder {
 
+    protected String url;
+
     protected final int status;
 
     protected JsonNode data;
@@ -57,6 +66,11 @@ public FetchResponseBuilder(int status, Map<String, String> headers) {
       this.headers = headers;
     }
 
+    public FetchResponseBuilder url(String url) {
+      this.url = url;
+      return this;
+    }
+
     public FetchResponseBuilder data(JsonNode data) {
       this.data = data;
       return this;

src/test/java/com/box/sdkgen/test/client/InterceptorChangingResponse.java

@@ -16,6 +16,7 @@ public FetchOptions beforeRequest(FetchOptions options) {
   @Override
   public FetchResponse afterRequest(FetchResponse response) {
     return new FetchResponse.FetchResponseBuilder(response.getStatus(), response.getHeaders())
+        .url(response.getUrl())
         .data(jsonToSerializedData("{\"id\": \"123\", \"type\": \"user\"}"))
         .content(response.getContent())
         .build();

src/test/java/com/box/sdkgen/test/client/InterceptorThrowingError.java

@@ -14,6 +14,7 @@ public FetchOptions beforeRequest(FetchOptions options) {
   @Override
   public FetchResponse afterRequest(FetchResponse response) {
     return new FetchResponse.FetchResponseBuilder(400, response.getHeaders())
+        .url(response.getUrl())
         .data(response.getData())
         .content(response.getContent())
         .build();