Skip to content

S
spring-boot-admin
Commit d3518a32 by Johannes Edmeier
Options

Do legacy conversion for application/json responses

As Spring Boot 1.4.x and older doesn't use the vendor content-type for the actuator endpoints, we also need to consider application/json responses for the legacy conversion fixes #749
parent f751359c
Showing with 128 additions and 2 deletions
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/services/StatusUpdater.java
......@@ -93,6 +93,7 @@ public class StatusUpdater {
return response.bodyToMono(Void.class).then(Mono.just(this.getStatusInfoFromStatus(response, emptyMap())));
}
@SuppressWarnings("unchecked")
protected StatusInfo getStatusInfoFromStatus(ClientResponse response, Map<String, ?> body) {
if (response.statusCode().is2xxSuccessful()) {
return StatusInfo.ofUp();
......@@ -100,7 +101,11 @@ public class StatusUpdater {
Map<String, Object> details = new LinkedHashMap<>();
details.put("status", response.statusCode().value());
details.put("error", response.statusCode().getReasonPhrase());
details.putAll(body);
if (body.get("details") instanceof Map) {
details.putAll((Map<? extends String, ?>) body.get("details"));
} else {
details.putAll(body);
}
return StatusInfo.ofDown(details);
}
......
spring-boot-admin-server/src/main/java/de/codecentric/boot/admin/server/web/client/InstanceExchangeFilterFunctions.java
......@@ -41,6 +41,7 @@ import org.springframework.web.util.UriComponentsBuilder;
import static de.codecentric.boot.admin.server.utils.MediaType.ACTUATOR_V1_MEDIATYPE;
import static de.codecentric.boot.admin.server.utils.MediaType.ACTUATOR_V2_MEDIATYPE;
import static java.util.Collections.singletonList;
import static org.springframework.http.MediaType.APPLICATION_JSON;
public final class InstanceExchangeFilterFunctions {
private static final Logger log = LoggerFactory.getLogger(InstanceExchangeFilterFunctions.class);
......@@ -128,7 +129,11 @@ public final class InstanceExchangeFilterFunctions {
Mono<ClientResponse> clientResponse = next.exchange(request);
if (request.attribute(ATTRIBUTE_ENDPOINT).map(converter::canConvert).orElse(false)) {
return clientResponse.flatMap(response -> {
if (response.headers().contentType().map(ACTUATOR_V1_MEDIATYPE::isCompatibleWith).orElse(false)) {
if (response.headers()
.contentType()
.map(t -> ACTUATOR_V1_MEDIATYPE.isCompatibleWith(t) ||
APPLICATION_JSON.isCompatibleWith(t))
.orElse(false)) {
return convertClientResponse(converter::convert, ACTUATOR_V2_MEDIATYPE).apply(response);
}
return Mono.just(response);
......
spring-boot-admin-server/src/test/java/de/codecentric/boot/admin/server/web/client/InstanceExchangeFilterFunctionsTest.java 0 → 100644
/*
* Copyright 2014-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package de.codecentric.boot.admin.server.web.client;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import org.junit.Test;
import org.springframework.boot.actuate.endpoint.http.ActuatorMediaType;
import org.springframework.core.io.buffer.DataBuffer;
import org.springframework.core.io.buffer.DefaultDataBufferFactory;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.web.reactive.function.BodyExtractors;
import org.springframework.web.reactive.function.client.ClientRequest;
import org.springframework.web.reactive.function.client.ClientResponse;
import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
import static de.codecentric.boot.admin.server.web.client.InstanceExchangeFilterFunctions.ATTRIBUTE_ENDPOINT;
import static io.netty.handler.codec.http.HttpHeaders.Values.APPLICATION_JSON;
import static org.springframework.http.HttpHeaders.CONTENT_TYPE;
public class InstanceExchangeFilterFunctionsTest {
private static final DefaultDataBufferFactory BUFFER_FACTORY = new DefaultDataBufferFactory();
private static final DataBuffer ORIGINAL = BUFFER_FACTORY.wrap("ORIGINAL".getBytes(StandardCharsets.UTF_8));
private static final DataBuffer CONVERTED = BUFFER_FACTORY.wrap("CONVERTED".getBytes(StandardCharsets.UTF_8));
@Test
public void should_convert_v1_actuator() {
ExchangeFilterFunction filter = InstanceExchangeFilterFunctions.convertLegacyEndpoint(
new TestLegacyEndpointConverter());
ClientRequest request = ClientRequest.create(HttpMethod.GET, URI.create("/test"))
.attribute(ATTRIBUTE_ENDPOINT, "test")
.build();
ClientResponse response = ClientResponse.create(HttpStatus.OK)
.header(CONTENT_TYPE, ActuatorMediaType.V1_JSON)
.body(Flux.just(ORIGINAL))
.build();
Mono<ClientResponse> convertedResponse = filter.filter(request, r -> Mono.just(response));
StepVerifier.create(convertedResponse)
.assertNext(r -> StepVerifier.create(r.body(BodyExtractors.toDataBuffers()))
.expectNext(CONVERTED)
.verifyComplete())
.verifyComplete();
}
@Test
public void should_convert_json() {
ExchangeFilterFunction filter = InstanceExchangeFilterFunctions.convertLegacyEndpoint(
new TestLegacyEndpointConverter());
ClientRequest request = ClientRequest.create(HttpMethod.GET, URI.create("/test"))
.attribute(ATTRIBUTE_ENDPOINT, "test")
.build();
ClientResponse response = ClientResponse.create(HttpStatus.OK)
.header(CONTENT_TYPE, APPLICATION_JSON)
.body(Flux.just(ORIGINAL))
.build();
Mono<ClientResponse> convertedResponse = filter.filter(request, r -> Mono.just(response));
StepVerifier.create(convertedResponse)
.assertNext(r -> StepVerifier.create(r.body(BodyExtractors.toDataBuffers()))
.expectNext(CONVERTED)
.verifyComplete())
.verifyComplete();
}
@Test
public void should_not_convert_v2_actuator() {
ExchangeFilterFunction filter = InstanceExchangeFilterFunctions.convertLegacyEndpoint(
new TestLegacyEndpointConverter());
ClientRequest request = ClientRequest.create(HttpMethod.GET, URI.create("/test"))
.attribute(ATTRIBUTE_ENDPOINT, "test")
.build();
ClientResponse response = ClientResponse.create(HttpStatus.OK)
.header(CONTENT_TYPE, ActuatorMediaType.V2_JSON)
.body(Flux.just(ORIGINAL))
.build();
Mono<ClientResponse> convertedResponse = filter.filter(request, r -> Mono.just(response));
StepVerifier.create(convertedResponse)
.assertNext(r -> StepVerifier.create(r.body(BodyExtractors.toDataBuffers()))
.expectNext(ORIGINAL)
.verifyComplete())
.verifyComplete();
}
static class TestLegacyEndpointConverter extends LegacyEndpointConverter {
TestLegacyEndpointConverter() {
super("test", from -> Flux.just(CONVERTED));
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment