From 48e2e9dea72ebbcc4995bede127b2ecfefd6c00e Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Mon, 11 Apr 2022 17:00:59 +0200 Subject: [PATCH] Adapt to changes in Spring Framework 6.0 HttpStatus. Fixes #2134. --- .../data/elasticsearch/client/ClientLogger.java | 6 ++++-- .../elasticsearch/client/reactive/RawActionResponse.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java b/src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java index 7dcc11e4d..34e99edf8 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/ClientLogger.java @@ -20,6 +20,7 @@ import java.util.function.Supplier; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.lang.Nullable; import org.springframework.util.ObjectUtils; @@ -30,6 +31,7 @@ import org.springframework.util.ObjectUtils; * @author Mark Paluch * @author Christoph Strobl * @author Peter-Josef Meisch + * @author Oliver Drotbohm * @since 3.2 */ public abstract class ClientLogger { @@ -125,7 +127,7 @@ public abstract class ClientLogger { * @param logId the correlation id, see {@link #newLogId()}. * @param statusCode the HTTP status code. */ - public static void logRawResponse(String logId, @Nullable HttpStatus statusCode) { + public static void logRawResponse(String logId, @Nullable HttpStatusCode statusCode) { if (isEnabled()) { WIRE_LOGGER.trace(String.format("[%s] Received raw response: %s", logId, statusCode)); @@ -153,7 +155,7 @@ public abstract class ClientLogger { * @param statusCode the HTTP status code. * @param body body content. */ - public static void logResponse(String logId, HttpStatus statusCode, String body) { + public static void logResponse(String logId, HttpStatusCode statusCode, String body) { if (isEnabled()) { WIRE_LOGGER.trace(String.format("[%s] Received response: %s%nResponse body: %s", logId, statusCode, body)); diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java index e24ba8f5b..c8c54a2c6 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/RawActionResponse.java @@ -21,7 +21,7 @@ import java.io.IOException; import org.elasticsearch.action.ActionResponse; import org.elasticsearch.common.io.stream.StreamOutput; -import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.client.reactive.ClientHttpResponse; import org.springframework.web.reactive.function.BodyExtractor; import org.springframework.web.reactive.function.client.ClientResponse; @@ -32,6 +32,7 @@ import org.springframework.web.reactive.function.client.ClientResponse; * @author Christoph Strobl * @author Peter-Josef Meisch * @author Mark Paluch + * @author Oliver Drotbohm * @since 3.2 */ class RawActionResponse extends ActionResponse { @@ -46,7 +47,7 @@ class RawActionResponse extends ActionResponse { return new RawActionResponse(response); } - public HttpStatus statusCode() { + public HttpStatusCode statusCode() { return delegate.statusCode(); }