created InterceptingHttpClient

yvasyliev · Dec 26, 2023 · 629f449 · 629f449
1 parent bec7524
commit 629f449
Show file tree

Hide file tree

Showing 12 changed files with 96 additions and 38 deletions.
diff --git a/src/main/java/io/github/yvasyliev/deezer/DeezerContext.java b/src/main/java/io/github/yvasyliev/deezer/DeezerContext.java
@@ -4,8 +4,8 @@
 import com.fasterxml.jackson.databind.InjectableValues;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationConfig;
-import io.github.yvasyliev.deezer.http.DefaultHttpClient;
 import io.github.yvasyliev.deezer.http.HttpClient;
+import io.github.yvasyliev.deezer.http.InterceptingHttpClient;
 import io.github.yvasyliev.deezer.methods.validators.AbstractResponseValidator;
 import io.github.yvasyliev.deezer.methods.validators.ErrorValidator;
 import io.github.yvasyliev.deezer.methods.validators.ResponseValidator;
@@ -26,7 +26,7 @@ public class DeezerContext {
     public DeezerContext() {
         this(
                 DEEZER_API_HOST,
-                new DefaultHttpClient(),
+                new InterceptingHttpClient(),
                 new ObjectMapper(),
                 AbstractResponseValidator.createChain(new WrongCodeValidator(), new ErrorValidator())
         );

diff --git a/src/main/java/io/github/yvasyliev/deezer/Main.java b/src/main/java/io/github/yvasyliev/deezer/Main.java
@@ -8,12 +8,14 @@
 import io.github.yvasyliev.deezer.objects.Track;
 
 import java.io.IOException;
+import java.net.URL;
 import java.util.Map;
 
 public class Main {
     public static void main(String[] args) throws IOException {
         DeezerClient deezerClient = new DeezerClient();
         ObjectMapper objectMapper = deezerClient.getContext().getObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
+        System.out.println(objectMapper.convertValue("https://google.com", URL.class));
         PagingMethod<Track> artistTop = deezerClient.getArtistTop(27);
         Map<String, String> map = deezerClient.getContext().getObjectMapper().convertValue(artistTop, new TypeReference<Map<String, String>>() {
         });

diff --git a/src/main/java/io/github/yvasyliev/deezer/http/DefaultHttpClient.java b/src/main/java/io/github/yvasyliev/deezer/http/DefaultHttpClient.java
@@ -1,8 +1,6 @@
 package io.github.yvasyliev.deezer.http;
 
 import io.github.yvasyliev.deezer.helpers.IOHelper;
-import io.github.yvasyliev.deezer.helpers.QueryParams;
-import io.github.yvasyliev.deezer.helpers.URLHelper;
 import lombok.Cleanup;
 
 import java.io.IOException;
@@ -12,14 +10,15 @@
 
 public class DefaultHttpClient implements HttpClient {
     @Override
-    public HttpResponse get(String url, QueryParams queryParams) throws IOException {
-        @Cleanup("disconnect") HttpURLConnection connection = (HttpURLConnection) URLHelper.newUrl(url, queryParams).openConnection();
+    public HttpResponse send(HttpRequest request) throws IOException {
+        @Cleanup("disconnect") HttpURLConnection connection = (HttpURLConnection) request.getUrl().openConnection();
+        connection.setRequestMethod(request.getMethod().name());
         InputStream content = connection.getResponseCode() < HttpURLConnection.HTTP_BAD_REQUEST
                 ? connection.getInputStream()
                 : connection.getErrorStream();
         return new HttpResponse(
-                new String(IOHelper.readAllBytes(content), StandardCharsets.UTF_8),
-                connection.getResponseCode()
+                connection.getResponseCode(),
+                new String(IOHelper.readAllBytes(content), StandardCharsets.UTF_8)
         );
     }
 }
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/HttpClient.java b/src/main/java/io/github/yvasyliev/deezer/http/HttpClient.java
@@ -1,9 +1,7 @@
 package io.github.yvasyliev.deezer.http;
 
-import io.github.yvasyliev.deezer.helpers.QueryParams;
-
 import java.io.IOException;
 
 public interface HttpClient {
-    HttpResponse get(String url, QueryParams queryParams) throws IOException;
+    HttpResponse send(HttpRequest request) throws IOException;
 }
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/HttpMethod.java b/src/main/java/io/github/yvasyliev/deezer/http/HttpMethod.java
@@ -0,0 +1,5 @@
+package io.github.yvasyliev.deezer.http;
+
+public enum HttpMethod {
+    GET
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/HttpRequest.java b/src/main/java/io/github/yvasyliev/deezer/http/HttpRequest.java
@@ -0,0 +1,8 @@
+package io.github.yvasyliev.deezer.http;
+
+import java.net.URL;
+
+public interface HttpRequest {
+    HttpMethod getMethod();
+    URL getUrl();
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/HttpResponse.java b/src/main/java/io/github/yvasyliev/deezer/http/HttpResponse.java
@@ -8,10 +8,15 @@
 @Data
 @AllArgsConstructor
 public class HttpResponse {
-    private String content;
     private int statusCode;
+    private String content;
 
     public boolean isOk() {
         return statusCode == HttpURLConnection.HTTP_OK;
     }
+
+    @Override
+    public String toString() {
+        return statusCode + ": " + content;
+    }
 }
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/InterceptingHttpClient.java b/src/main/java/io/github/yvasyliev/deezer/http/InterceptingHttpClient.java
@@ -0,0 +1,35 @@
+package io.github.yvasyliev.deezer.http;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.IOException;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class InterceptingHttpClient implements HttpClient {
+    private HttpClient origHttpClient;
+    private Interceptor<HttpRequest> requestInterceptor;
+    private Interceptor<HttpResponse> responseInterceptor;
+
+    public InterceptingHttpClient() {
+        this(
+                new DefaultHttpClient(),
+                request -> {
+                    System.out.println(request);
+                    return request;
+                },
+                response -> {
+                    System.out.println(response);
+                    return response;
+                }
+        );
+    }
+
+    @Override
+    public HttpResponse send(HttpRequest request) throws IOException {
+        return responseInterceptor.intercept(origHttpClient.send(requestInterceptor.intercept(request)));
+    }
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/http/Interceptor.java b/src/main/java/io/github/yvasyliev/deezer/http/Interceptor.java
@@ -0,0 +1,8 @@
+package io.github.yvasyliev.deezer.http;
+
+import java.io.IOException;
+
+@FunctionalInterface
+public interface Interceptor<T> {
+    T intercept(T t) throws IOException;
+}
diff --git a/src/main/java/io/github/yvasyliev/deezer/methods/GetMethod.java b/src/main/java/io/github/yvasyliev/deezer/methods/GetMethod.java
@@ -3,11 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.type.TypeReference;
 import io.github.yvasyliev.deezer.DeezerContext;
-import io.github.yvasyliev.deezer.helpers.QueryParams;
-import io.github.yvasyliev.deezer.http.HttpClient;
-import io.github.yvasyliev.deezer.http.HttpResponse;
-
-import java.io.IOException;
+import io.github.yvasyliev.deezer.http.HttpMethod;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class GetMethod<T> extends Method<T> {
@@ -16,12 +12,7 @@ public GetMethod(DeezerContext context, String path, TypeReference<T> responseTy
     }
 
     @Override
-    protected HttpResponse fetch(HttpClient httpClient, String url, QueryParams queryParams) throws IOException {
-        return httpClient.get(url, queryParams);
-    }
-
-    @Override
-    public String toString() {
-        return "GET " + super.toString();
+    public HttpMethod getMethod() {
+        return HttpMethod.GET;
     }
 }
diff --git a/src/main/java/io/github/yvasyliev/deezer/methods/Method.java b/src/main/java/io/github/yvasyliev/deezer/methods/Method.java
@@ -10,16 +10,18 @@
 import io.github.yvasyliev.deezer.exceptions.DeezerResponseException;
 import io.github.yvasyliev.deezer.exceptions.UnsupportedHttpResponseException;
 import io.github.yvasyliev.deezer.helpers.QueryParams;
-import io.github.yvasyliev.deezer.http.HttpClient;
+import io.github.yvasyliev.deezer.http.HttpMethod;
+import io.github.yvasyliev.deezer.http.HttpRequest;
 import io.github.yvasyliev.deezer.http.HttpResponse;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 
 import java.io.IOException;
+import java.net.URL;
 
 @Data
 @AllArgsConstructor
-public abstract class Method<T> {
+public abstract class Method<T> implements HttpRequest {
     @JacksonInject
     @JsonIgnore
     private DeezerContext context;
@@ -32,28 +34,36 @@ public abstract class Method<T> {
     private TypeReference<T> responseType;
 
     public T execute() throws IOException {
-        ObjectMapper mapper = context.getObjectMapper();
-        QueryParams queryParams = mapper.convertValue(this, QueryParams.class);
-        HttpResponse response = fetch(context.getHttpClient(), context.getDeezerApiHost() + path, queryParams);
+        HttpResponse response = context.getHttpClient().send(this);
         if (!response.isOk()) {
             throw new UnsupportedHttpResponseException(response);
         }
+        ObjectMapper mapper = context.getObjectMapper();
         JsonNode jsonResponse = mapper.readTree(response.getContent());
         if (!context.getResponseValidator().validate(jsonResponse)) {
             throw new DeezerResponseException(jsonResponse);
         }
         return mapper.treeToValue(jsonResponse, getResponseType());
     }
 
-    protected abstract HttpResponse fetch(HttpClient httpClient, String url, QueryParams queryParams) throws IOException;
-
+    @JsonIgnore
     @Override
-    public String toString() {
+    public URL getUrl() {
+        ObjectMapper mapper = context.getObjectMapper();
         String endpoint = context.getDeezerApiHost() + path;
-        QueryParams queryParams = context.getObjectMapper().convertValue(this, QueryParams.class);
+        QueryParams queryParams = mapper.convertValue(this, QueryParams.class);
         if (!queryParams.isEmpty()) {
             endpoint += "?" + queryParams.toQuery();
         }
-        return endpoint;
+        return mapper.convertValue(endpoint, URL.class);
+    }
+
+    @JsonIgnore
+    @Override
+    public abstract HttpMethod getMethod();
+
+    @Override
+    public String toString() {
+        return getMethod() + " " + getUrl();
     }
 }
diff --git a/src/main/java/io/github/yvasyliev/deezer/methods/validators/AbstractResponseValidator.java b/src/main/java/io/github/yvasyliev/deezer/methods/validators/AbstractResponseValidator.java
@@ -1,12 +1,11 @@
 package io.github.yvasyliev.deezer.methods.validators;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import lombok.NonNull;
 
 public abstract class AbstractResponseValidator implements ResponseValidator {
     private AbstractResponseValidator nextValidator;
 
-    public static AbstractResponseValidator createChain(@NonNull AbstractResponseValidator firstValidator, AbstractResponseValidator... chain) {
+    public static AbstractResponseValidator createChain(AbstractResponseValidator firstValidator, AbstractResponseValidator... chain) {
         AbstractResponseValidator head = firstValidator;
         for (AbstractResponseValidator nextInChain : chain) {
             head.nextValidator = nextInChain;
@@ -15,8 +14,6 @@ public static AbstractResponseValidator createChain(@NonNull AbstractResponseVal
         return firstValidator;
     }
 
-    public abstract boolean validate(JsonNode rawResponse);
-
     protected boolean validateNext(JsonNode rawResponse) {
         return nextValidator == null || nextValidator.validate(rawResponse);
     }