Skip to content

Commit

Permalink
[MODORDERS-1227]. Simplify RestClient logging
Browse files Browse the repository at this point in the history
  • Loading branch information
BKadirkhodjaev committed Jan 9, 2025
1 parent c62b334 commit ccfba14
Showing 1 changed file with 9 additions and 27 deletions.
36 changes: 9 additions & 27 deletions src/main/java/org/folio/rest/core/RestClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,7 @@ public <T> Future<T> post(RequestEntry requestEntry, T entity, Class<T> response
}

public <T> Future<T> post(String endpoint, T entity, Class<T> responseType, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending 'POST {}", endpoint);
}
log.debug("Sending 'POST {}", endpoint);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
return getVertxWebClient(requestContext.getContext()).postAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
.putHeaders(caseInsensitiveHeader)
Expand All @@ -64,9 +62,7 @@ public <T> Future<T> post(String endpoint, T entity, Class<T> responseType, Requ
}

public <T> Future<Void> postEmptyResponse(String endpoint, T entity, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending 'POST {}", () -> endpoint);
}
log.debug("Sending 'POST {}", () -> endpoint);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
return getVertxWebClient(requestContext.getContext())
.postAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
Expand All @@ -89,9 +85,7 @@ public <T> Future<Void> put(RequestEntry requestEntry, T dataObject, RequestCont
}
public <T> Future<Void> put(String endpoint, T dataObject, RequestContext requestContext) {
var recordData = JsonObject.mapFrom(dataObject);
if (log.isDebugEnabled()) {
log.debug("Sending 'PUT {}'", endpoint);
}
log.debug("Sending 'PUT {}'", endpoint);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
return getVertxWebClient(requestContext.getContext())
.putAbs(buildAbsEndpoint(caseInsensitiveHeader, endpoint))
Expand All @@ -108,9 +102,7 @@ public <T>Future<Void> patch(RequestEntry requestEntry, T dataObject, RequestCon
}

public <T>Future<Void> patch(String endpoint, T dataObject, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending 'PATCH {}'", endpoint);
}
log.debug("Sending 'PATCH {}'", endpoint);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
Promise<Void> promise = Promise.promise();
return getVertxWebClient(requestContext.getContext())
Expand All @@ -129,9 +121,7 @@ public Future<Void> delete(RequestEntry requestEntry, boolean skipError404, Requ
}

public Future<Void> delete(String endpointById, boolean skipError404, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending {} {}", HttpMethod.DELETE, endpointById);
}
log.debug("Sending {} {}", HttpMethod.DELETE, endpointById);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
Promise<Void> promise = Promise.promise();
getVertxWebClient(requestContext.getContext())
Expand Down Expand Up @@ -181,9 +171,7 @@ public <T> Future<T> get(RequestEntry requestEntry, Class<T> responseType, Reque
}

public <T> Future<T> get(String endpoint, boolean skipError404, Class<T> responseType, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Calling GET {}", endpoint);
}
log.debug("Calling GET {}", endpoint);
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
Promise<T> promise = Promise.promise();
getVertxWebClient(requestContext.getContext())
Expand All @@ -201,9 +189,7 @@ public <T> Future<T> get(String endpoint, boolean skipError404, Class<T> respons


public Future<JsonObject> getAsJsonObject(String endpoint, boolean skipError404, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Calling GET {}", endpoint);
}
log.debug("Calling GET {}", endpoint);
Promise<JsonObject> promise = Promise.promise();
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
var webClient = getVertxWebClient(requestContext.getContext());
Expand Down Expand Up @@ -254,9 +240,7 @@ private String buildAbsEndpoint(MultiMap okapiHeaders, String endpoint) {
}

public Future<String> postJsonObjectAndGetId(RequestEntry requestEntry, JsonObject entity, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending 'POST {}", requestEntry.buildEndpoint());
}
log.debug("Sending 'POST {}", requestEntry.buildEndpoint());
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
return getVertxWebClient(requestContext.getContext())
.postAbs(buildAbsEndpoint(caseInsensitiveHeader, requestEntry.buildEndpoint()))
Expand All @@ -268,9 +252,7 @@ public Future<String> postJsonObjectAndGetId(RequestEntry requestEntry, JsonObje
}

public Future<JsonObject> postJsonObject(RequestEntry requestEntry, JsonObject jsonObject, RequestContext requestContext) {
if (log.isDebugEnabled()) {
log.debug("Sending 'POST {}", requestEntry.buildEndpoint());
}
log.debug("Sending 'POST {}", requestEntry.buildEndpoint());
var endpoint = requestEntry.buildEndpoint();
var caseInsensitiveHeader = convertToCaseInsensitiveMap(requestContext.getHeaders());
return getVertxWebClient(requestContext.getContext()).postAbs(buildAbsEndpoint(caseInsensitiveHeader, requestEntry.buildEndpoint()))
Expand Down

0 comments on commit ccfba14

Please sign in to comment.