Spring/spring-hateoas
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

#1153 - WebFluxLinkBuilder now considers the requests context path.

Browse Source 
The base URI we create now consists of the requests root URI plus the context path concatenated. On actual UriComponentsBuilder creation we then simply append the path discovered from the method mapping.
This commit is contained in:
Oliver Drotbohm
2019-12-09 12:06:33 +01:00
parent 12ca3d4fbf
commit 285af0c7e4
2 changed files with 103 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilder.java
View File

@@ -32,6 +32,8 @@ import org.springframework.hateoas.server.core.DummyInvocationUtils;
import org.springframework.hateoas.server.core.TemplateVariableAwareLinkBuilderSupport;
import org.springframework.hateoas.server.core.WebHandler;
import org.springframework.hateoas.server.core.WebHandler.PreparedWebHandler;
import org.springframework.http.server.PathContainer;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.web.server.ServerWebExchange;
@@ -231,9 +233,15 @@ public class WebFluxLinkBuilder extends TemplateVariableAwareLinkBuilderSupport<
*/
private static UriComponentsBuilder getBuilder(@Nullable ServerWebExchange exchange) {
return exchange == null //
? UriComponentsBuilder.fromPath("/") //
: UriComponentsBuilder.fromHttpRequest(exchange.getRequest());
if (exchange == null) {
return UriComponentsBuilder.fromPath("/");
}
ServerHttpRequest request = exchange.getRequest();
PathContainer contextPath = request.getPath().contextPath();
return UriComponentsBuilder.fromHttpRequest(request) //
.replacePath(contextPath.toString());
}
private static Mono<WebFluxLinkBuilder> linkToInternal(Object invocation) {
@@ -242,14 +250,15 @@ public class WebFluxLinkBuilder extends TemplateVariableAwareLinkBuilderSupport<
Mono.subscriberContext().map(context -> getBuilder(context.getOrDefault(EXCHANGE_CONTEXT_ATTRIBUTE, null))));
}
private static Mono<WebFluxLinkBuilder> linkToInternal(Object invocation, Mono<UriComponentsBuilder> exchange) {
private static Mono<WebFluxLinkBuilder> linkToInternal(Object invocation, Mono<UriComponentsBuilder> builder) {
PreparedWebHandler<WebFluxLinkBuilder> handler = WebHandler.linkTo(invocation, WebFluxLinkBuilder::new);
return exchange.map(WebFluxLinkBuilder::getBuilderCreator).map(handler::conclude);
return builder.map(WebFluxLinkBuilder::getBuilderCreator) //
.map(handler::conclude);
}
private static Function<String, UriComponentsBuilder> getBuilderCreator(UriComponentsBuilder exchange) {
return path -> exchange.replacePath(path == null ? "/" : path);
private static Function<String, UriComponentsBuilder> getBuilderCreator(UriComponentsBuilder builder) {
return path -> builder.path(path);
}
}

193
src/test/java/org/springframework/hateoas/server/reactive/WebFluxLinkBuilderTest.java
View File

@@ -24,15 +24,17 @@ import reactor.core.publisher.Mono;
import reactor.test.StepVerifier;
import reactor.util.context.Context;
import java.net.URI;
import java.util.function.Consumer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.hateoas.IanaLinkRelations;
import org.springframework.http.HttpHeaders;
import org.springframework.http.server.reactive.ServerHttpRequest;
import org.springframework.hateoas.Link;
import org.springframework.hateoas.server.reactive.WebFluxLinkBuilder.WebFluxLink;
import org.springframework.lang.Nullable;
import org.springframework.mock.http.server.reactive.MockServerHttpRequest;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -48,7 +50,6 @@ import org.springframework.web.server.ServerWebExchange;
class WebFluxLinkBuilderTest {
@Mock ServerWebExchange exchange;
@Mock ServerHttpRequest request;
/**
* @see #728
@@ -56,19 +57,13 @@ class WebFluxLinkBuilderTest {
@Test
void linkAtSameLevelAsExplicitServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api").build();
WebFluxLink link = linkTo(methodOn(TestController.class).root()).withSelfRel();
linkTo(methodOn(TestController.class).root(), this.exchange).withSelfRel().toMono() //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api");
});
}
/**
@@ -77,19 +72,13 @@ class WebFluxLinkBuilderTest {
@Test
void linkAtSameLevelAsContextProvidedServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api").build();
WebFluxLink link = linkTo(methodOn(TestController.class).root()).withSelfRel();
linkTo(methodOn(TestController.class).root()).withSelfRel().toMono() //
.subscriberContext(Context.of(EXCHANGE_CONTEXT_ATTRIBUTE, this.exchange)) //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api");
});
}
/**
@@ -98,21 +87,13 @@ class WebFluxLinkBuilderTest {
@Test
void shallowLinkFromDeepExplicitServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api/employees"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
linkTo(methodOn(TestController.class).root(), this.exchange).withSelfRel().toMono() //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api");
return true;
}).verifyComplete();
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api/employees").build();
WebFluxLink link = linkTo(methodOn(TestController.class).root()).withSelfRel();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api");
});
}
/**
@@ -121,20 +102,14 @@ class WebFluxLinkBuilderTest {
@Test
void shallowLinkFromDeepContextProvidedServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api/employees"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api/employees").build();
linkTo(methodOn(TestController.class).root()).withSelfRel().toMono() //
.subscriberContext(Context.of(EXCHANGE_CONTEXT_ATTRIBUTE, this.exchange)) //
.as(StepVerifier::create).expectNextMatches(link -> {
WebFluxLink link = linkTo(methodOn(TestController.class).root()).withSelfRel();
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api");
});
}
/**
@@ -143,19 +118,13 @@ class WebFluxLinkBuilderTest {
@Test
void deepLinkFromShallowExplicitServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api").build();
WebFluxLink link = linkTo(methodOn(TestController.class).deep()).withSelfRel();
linkTo(methodOn(TestController.class).deep(), this.exchange).withSelfRel().toMono() //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api/employees");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api/employees");
});
}
/**
@@ -164,20 +133,13 @@ class WebFluxLinkBuilderTest {
@Test
void deepLinkFromShallowContextProvidedServerExchangeShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/api"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/api").build();
WebFluxLink link = linkTo(methodOn(TestController.class).deep()).withSelfRel();
linkTo(methodOn(TestController.class).deep()).withSelfRel().toMono() //
.subscriberContext(Context.of(EXCHANGE_CONTEXT_ATTRIBUTE, this.exchange)) //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/api/employees");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080/api/employees");
});
}
/**
@@ -186,20 +148,13 @@ class WebFluxLinkBuilderTest {
@Test
void linkToRouteWithNoMappingShouldWork() {
when(this.exchange.getRequest()).thenReturn(this.request);
when(this.request.getURI()).thenReturn(URI.create("http://localhost:8080/"));
when(this.request.getHeaders()).thenReturn(new HttpHeaders());
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080").build();
WebFluxLink link = linkTo(methodOn(TestController2.class).root()).withSelfRel();
linkTo(methodOn(TestController2.class).root()).withSelfRel().toMono() //
.subscriberContext(Context.of(EXCHANGE_CONTEXT_ATTRIBUTE, this.exchange)) //
.as(StepVerifier::create).expectNextMatches(link -> {
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("http://localhost:8080/");
return true;
}).verifyComplete();
verify(request, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("http://localhost:8080");
});
}
/**
@@ -208,33 +163,59 @@ class WebFluxLinkBuilderTest {
@Test
void linkToRouteWithNoExchangeInTheContextShouldFallbackToRelativeUris() {
linkTo(methodOn(TestController2.class).root()).withSelfRel().toMono() //
.as(StepVerifier::create).expectNextMatches(link -> {
WebFluxLink link = linkTo(methodOn(TestController2.class).root()).withSelfRel();
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("/");
return true;
}).verifyComplete();
verify(null, link, result -> {
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("/");
});
}
/**
* @see #728
*/
@Test
@SuppressWarnings("null")
void linkToRouteWithExplictExchangeBeingNullShouldFallbackToRelativeUris() {
linkTo(methodOn(TestController2.class).root(), null).withSelfRel().toMono() //
.as(StepVerifier::create).expectNextMatches(link -> {
WebFluxLink link = linkTo(methodOn(TestController2.class).root(), null).withSelfRel();
assertThat(link.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(link.getHref()).isEqualTo("/");
verify(null, link, result -> {
return true;
assertThat(result.getRel()).isEqualTo(IanaLinkRelations.SELF);
assertThat(result.getHref()).isEqualTo("/");
});
}
}).verifyComplete();
@Test
void considersContextPath() {
MockServerHttpRequest request = MockServerHttpRequest.get("http://localhost:8080/context/api") //
.contextPath("/context") //
.build();
WebFluxLink link = linkTo(methodOn(TestController.class).deep()).withSelfRel();
verify(request, link, result -> {
assertThat(result.getHref()).endsWith("/context/api/employees");
});
}
private void verify(@Nullable MockServerHttpRequest request, WebFluxLink link, Consumer<Link> verifications) {
Mono<Link> mono = link.toMono();
if (request != null) {
when(this.exchange.getRequest()).thenReturn(request);
mono = mono.subscriberContext(Context.of(EXCHANGE_CONTEXT_ATTRIBUTE, this.exchange));
}
mono.as(StepVerifier::create).expectNextMatches(signal -> {
verifications.accept(signal);
return true;
}).verifyComplete();
}
@RestController