Skip to content

Commit 0f9e9b9

Browse files
committed
Use log4j2.
1 parent ac43d09 commit 0f9e9b9

File tree

3 files changed

+23
-21
lines changed

3 files changed

+23
-21
lines changed

build.gradle

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ dependencies {
6565
implementation "org.glassfish.jersey.core:jersey-client:3.0.4"
6666
implementation "org.glassfish.jersey.media:jersey-media-json-jackson:3.0.4"
6767
implementation "org.glassfish.jersey.inject:jersey-hk2:3.0.4"
68-
implementation "org.slf4j:slf4j-api:1.7.30"
68+
implementation "org.apache.logging.log4j:log4j-api:2.13.3"
69+
implementation "org.apache.logging.log4j:log4j-core:2.13.3"
6970
implementation "org.junit.jupiter:junit-jupiter:5.7.0"
7071
implementation "io.swagger.core.v3:swagger-annotations:2.0.0"
7172
implementation "org.glassfish.jersey.connectors:jersey-apache-connector:3.0.4"

src/main/java/org/typesense/api/ApiCall.java

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
11
package org.typesense.api;
22

3-
import java.net.SocketTimeoutException;
4-
import java.net.UnknownHostException;
5-
import java.time.Duration;
6-
import java.time.LocalDateTime;
7-
83
import com.fasterxml.jackson.annotation.JsonInclude;
94
import com.fasterxml.jackson.databind.ObjectMapper;
105
import jakarta.ws.rs.client.Client;
@@ -13,22 +8,28 @@
138
import jakarta.ws.rs.client.WebTarget;
149
import jakarta.ws.rs.core.MediaType;
1510
import jakarta.ws.rs.core.Response;
11+
import org.apache.logging.log4j.LogManager;
12+
import org.apache.logging.log4j.Logger;
13+
import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
1614
import org.glassfish.jersey.client.ClientConfig;
17-
1815
import org.glassfish.jersey.client.ClientProperties;
1916
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider;
2017
import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider;
21-
import org.slf4j.Logger;
22-
import org.slf4j.LoggerFactory;
23-
import org.typesense.model.ErrorResponse;
24-
import org.typesense.interceptor.LoggingInterceptor;
2518
import org.typesense.api.exceptions.*;
19+
import org.typesense.interceptor.LoggingInterceptor;
20+
import org.typesense.model.ErrorResponse;
2621
import org.typesense.resources.Node;
2722
import org.typesense.resources.RequestHandler;
28-
import org.glassfish.jersey.apache.connector.ApacheConnectorProvider;
2923

3024
import javax.net.ssl.SSLException;
31-
import java.util.*;
25+
import java.net.SocketTimeoutException;
26+
import java.net.UnknownHostException;
27+
import java.time.Duration;
28+
import java.time.LocalDateTime;
29+
import java.util.ArrayList;
30+
import java.util.HashMap;
31+
import java.util.List;
32+
import java.util.Map;
3233

3334

3435
public class ApiCall {
@@ -39,7 +40,7 @@ public class ApiCall {
3940
private static int nodeIndex = 0;
4041

4142
private static final String API_KEY_HEADER = "X-TYPESENSE-API-KEY";
42-
private static final Logger logger = LoggerFactory.getLogger(ApiCall.class);
43+
private static final Logger logger = LogManager.getLogger(ApiCall.class);
4344
private final Client client;
4445
private final String apiKey;
4546
private final Duration retryInterval;
@@ -129,7 +130,7 @@ else if (status_code == 503)
129130

130131
<T, Q> T get(String endpoint, Q queryParameters, Class<T> resourceClass) throws Exception {
131132

132-
/**
133+
/*
133134
* Lambda function which implements the RequestHandler interface
134135
* which is passed as a parameter to makeRequest function
135136
* and returns T as the response entity.
@@ -283,7 +284,7 @@ <T> T delete(String endpoint) throws Exception {
283284

284285
<T> T makeRequest(String endpoint, RequestHandler requestHandler, Class<T> resourceClass) throws Exception {
285286
int num_tries = 0;
286-
Logger logger = LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
287+
Logger logger = LogManager.getLogger(ApiCall.class);
287288
Response response;
288289
Exception lastException = new TypesenseError("Unknown client error", 400);
289290

src/main/java/org/typesense/interceptor/LoggingInterceptor.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import jakarta.ws.rs.client.ClientRequestContext;
6+
import jakarta.ws.rs.client.ClientResponseContext;
7+
import org.apache.logging.log4j.LogManager;
8+
import org.apache.logging.log4j.Logger;
59
import org.glassfish.jersey.client.spi.PostInvocationInterceptor;
610
import org.glassfish.jersey.client.spi.PreInvocationInterceptor;
7-
import org.slf4j.Logger;
8-
import org.slf4j.LoggerFactory;
911

10-
import jakarta.ws.rs.client.ClientRequestContext;
11-
import jakarta.ws.rs.client.ClientResponseContext;
1212
import java.io.BufferedReader;
1313
import java.io.InputStream;
1414
import java.io.InputStreamReader;
1515
import java.util.stream.Collectors;
1616

1717
public class LoggingInterceptor implements PreInvocationInterceptor, PostInvocationInterceptor {
1818

19-
private static final Logger logger = LoggerFactory.getLogger(LoggingInterceptor.class);
19+
private static final Logger logger = LogManager.getLogger(LoggingInterceptor.class);
2020
private static final ObjectMapper objectMapper = new ObjectMapper();
2121

2222
@Override

0 commit comments

Comments
 (0)