1717
1818import java .util .function .Supplier ;
1919
20- import org .slf4j . Logger ;
21- import org .slf4j . LoggerFactory ;
20+ import org .apache . commons . logging . Log ;
21+ import org .apache . commons . logging . LogFactory ;
2222import org .springframework .http .HttpStatus ;
2323import org .springframework .lang .Nullable ;
2424import org .springframework .util .ObjectUtils ;
2525
2626/**
2727 * Logging Utility to log client requests and responses. Logs client requests and responses to Elasticsearch to a
28- * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on {@link org.slf4j.event.Level#TRACE}
29- * level.
28+ * dedicated logger: {@code org.springframework.data.elasticsearch.client.WIRE} on trace level.
3029 *
3130 * @author Mark Paluch
3231 * @author Christoph Strobl
3534public abstract class ClientLogger {
3635
3736 private static final String lineSeparator = System .getProperty ("line.separator" );
38- private static final Logger WIRE_LOGGER = LoggerFactory
39- .getLogger ("org.springframework.data.elasticsearch.client.WIRE" );
37+ private static final Log WIRE_LOGGER = LogFactory .getLog ("org.springframework.data.elasticsearch.client.WIRE" );
4038
4139 private ClientLogger () {}
4240
@@ -52,24 +50,23 @@ public static boolean isEnabled() {
5250 /**
5351 * Log an outgoing HTTP request.
5452 *
55- * @param logId the correlation Id , see {@link #newLogId()}.
53+ * @param logId the correlation id , see {@link #newLogId()}.
5654 * @param method HTTP method
5755 * @param endpoint URI
5856 * @param parameters optional parameters.
5957 */
6058 public static void logRequest (String logId , String method , String endpoint , Object parameters ) {
6159
6260 if (isEnabled ()) {
63-
64- WIRE_LOGGER .trace ("[{}] Sending request {} {} with parameters: {}" , logId , method .toUpperCase (), endpoint ,
65- parameters );
61+ WIRE_LOGGER .trace (String .format ("[%s] Sending request %s %s with parameters: %s" , logId , method .toUpperCase (),
62+ endpoint , parameters ));
6663 }
6764 }
6865
6966 /**
7067 * Log an outgoing HTTP request with a request body.
7168 *
72- * @param logId the correlation Id , see {@link #newLogId()}.
69+ * @param logId the correlation id , see {@link #newLogId()}.
7370 * @param method HTTP method
7471 * @param endpoint URI
7572 * @param parameters optional parameters.
@@ -79,43 +76,43 @@ public static void logRequest(String logId, String method, String endpoint, Obje
7976 Supplier <Object > body ) {
8077
8178 if (isEnabled ()) {
82-
83- WIRE_LOGGER .trace ("[{}] Sending request {} {} with parameters: {}{}Request body: {}" , logId , method .toUpperCase (),
84- endpoint , parameters , lineSeparator , body .get ());
79+ WIRE_LOGGER .trace (String .format ("[%s] Sending request %s %s with parameters: %s%sRequest body: %s" , logId ,
80+ method .toUpperCase (), endpoint , parameters , lineSeparator , body .get ()));
8581 }
8682 }
8783
8884 /**
8985 * Log a raw HTTP response without logging the body.
9086 *
91- * @param logId the correlation Id , see {@link #newLogId()}.
87+ * @param logId the correlation id , see {@link #newLogId()}.
9288 * @param statusCode the HTTP status code.
9389 */
9490 public static void logRawResponse (String logId , @ Nullable HttpStatus statusCode ) {
9591
9692 if (isEnabled ()) {
97- WIRE_LOGGER .trace ("[{} ] Received raw response: {} "logId , statusCode );
93+ WIRE_LOGGER .trace (String . format ( "[%s ] Received raw response: %s "logId , statusCode ) );
9894 }
9995 }
10096
10197 /**
10298 * Log a raw HTTP response along with the body.
10399 *
104- * @param logId the correlation Id , see {@link #newLogId()}.
100+ * @param logId the correlation id , see {@link #newLogId()}.
105101 * @param statusCode the HTTP status code.
106102 * @param body body content.
107103 */
108104 public static void logResponse (String logId , HttpStatus statusCode , String body ) {
109105
110106 if (isEnabled ()) {
111- WIRE_LOGGER .trace ("[{}] Received response: {}{}Response body: {}" , logId , statusCode , lineSeparator , body );
107+ WIRE_LOGGER .trace (
108+ String .format ("[%s] Received response: %s%sResponse body: %s" , logId , statusCode , lineSeparator , body ));
112109 }
113110 }
114111
115112 /**
116- * Creates a new, unique correlation Id to improve tracing across log events.
113+ * Creates a new, unique correlation id to improve tracing across log events.
117114 *
118- * @return a new, unique correlation Id .
115+ * @return a new, unique correlation id .
119116 */
120117 public static String newLogId () {
121118
0 commit comments