Skip to content

GH-2464: WebFlux: Get rid of Mono.block() #2465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 11, 2018
Merged

GH-2464: WebFlux: Get rid of Mono.block() #2465

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f5144
GH-2464: WebFlux: Get rid of Mono.block()
artembilan Jun 1, 2018
62ca020
* Fix Checkstyle for the Reactive Spring Security testing utils stati…
artembilan Jun 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions ...src/main/java/org/springframework/integration/webflux/inbound/WebFluxInboundEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ private Mono<Void> doHandle(ServerWebExchange exchange) {
.doOnSubscribe(s -> this.activeCount.incrementAndGet())
.switchIfEmpty(Mono.just(exchange.getRequest().getQueryParams()))
.map(body -> new HttpEntity<>(body, exchange.getRequest().getHeaders()))
.map(entity -> buildMessage(entity, exchange))
.flatMap(entity -> buildMessage(entity, exchange))
.flatMap(requestMessage -> {
if (this.expectReply) {
return sendAndReceiveMessageReactive(requestMessage)
Expand Down Expand Up @@ -235,7 +235,7 @@ else if (MediaType.MULTIPART_FORM_DATA.isCompatibleWith(contentType)) {
}

@SuppressWarnings("unchecked")
private Message<?> buildMessage(HttpEntity<?> httpEntity, ServerWebExchange exchange) {
private Mono<Message<?>> buildMessage(HttpEntity<?> httpEntity, ServerWebExchange exchange) {
ServerHttpRequest request = exchange.getRequest();
HttpHeaders requestHeaders = request.getHeaders();
Map<String, Object> exchangeAttributes = exchange.getAttributes();
Expand Down Expand Up @@ -289,12 +289,12 @@ private Message<?> buildMessage(HttpEntity<?> httpEntity, ServerWebExchange exch
payload = requestParams;
}

AbstractIntegrationMessageBuilder<?> messageBuilder;
AbstractIntegrationMessageBuilder<Object> messageBuilder;

if (payload instanceof Message<?>) {
messageBuilder =
getMessageBuilderFactory()
.fromMessage((Message<?>) payload)
.fromMessage((Message<Object>) payload)
.copyHeadersIfAbsent(headers);
}
else {
Expand All @@ -304,11 +304,17 @@ private Message<?> buildMessage(HttpEntity<?> httpEntity, ServerWebExchange exch
.copyHeaders(headers);
}

return messageBuilder
messageBuilder
.setHeader(org.springframework.integration.http.HttpHeaders.REQUEST_URL, request.getURI().toString())
.setHeader(org.springframework.integration.http.HttpHeaders.REQUEST_METHOD, request.getMethod().toString())
.setHeader(org.springframework.integration.http.HttpHeaders.USER_PRINCIPAL, exchange.getPrincipal().block())
.build();
.setHeader(org.springframework.integration.http.HttpHeaders.REQUEST_METHOD,
request.getMethod().toString());

return exchange.getPrincipal()
.map(principal ->
messageBuilder
.setHeader(org.springframework.integration.http.HttpHeaders.USER_PRINCIPAL, principal))
.defaultIfEmpty(messageBuilder)
.map(AbstractIntegrationMessageBuilder::build);
}

private Mono<Void> populateResponse(ServerWebExchange exchange, Message<?> replyMessage) {
Expand Down
57 changes: 47 additions & 10 deletions ...on-webflux/src/test/java/org/springframework/integration/webflux/dsl/WebFluxDslTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,16 @@
package org.springframework.integration.webflux.dsl;

import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertThat;
import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.httpBasic;
import static org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.springSecurity;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.Credentials.basicAuthenticationCredentials;
import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;

import java.security.Principal;
import java.util.Collections;

import javax.annotation.Resource;
Expand All @@ -48,6 +51,7 @@
import org.springframework.integration.config.EnableIntegration;
import org.springframework.integration.dsl.IntegrationFlow;
import org.springframework.integration.dsl.IntegrationFlows;
import org.springframework.integration.http.HttpHeaders;
import org.springframework.integration.http.dsl.Http;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.integration.webflux.outbound.WebFluxRequestExecutingMessageHandler;
Expand All @@ -60,10 +64,18 @@
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
import org.springframework.security.config.web.server.ServerHttpSecurity;
import org.springframework.security.core.userdetails.MapReactiveUserDetailsService;
import org.springframework.security.core.userdetails.ReactiveUserDetailsService;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.factory.PasswordEncoderFactories;
import org.springframework.security.provisioning.InMemoryUserDetailsManager;
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
import org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers;
import org.springframework.security.web.server.SecurityWebFilterChain;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.web.WebAppConfiguration;
Expand Down Expand Up @@ -116,11 +128,14 @@ public class WebFluxDslTests {
public void setup() {
this.mockMvc =
MockMvcBuilders.webAppContextSetup(this.wac)
.apply(springSecurity())
.apply(SecurityMockMvcConfigurers.springSecurity())
.build();

this.webTestClient =
WebTestClient.bindToApplicationContext(this.wac)
.apply(SecurityMockServerConfigurers.springSecurity())
.configureClient()
.filter(basicAuthentication())
.build();
}

Expand Down Expand Up @@ -198,6 +213,7 @@ public void testHttpReactiveProxyFlow() throws Exception {
@SuppressWarnings("unchecked")
public void testHttpReactivePost() {
this.webTestClient.post().uri("/reactivePost")
.attributes(basicAuthenticationCredentials("guest", "guest"))
.body(Mono.just("foo\nbar\nbaz"), String.class)
.exchange()
.expectStatus().isAccepted();
Expand All @@ -206,6 +222,8 @@ public void testHttpReactivePost() {
assertNotNull(store);
assertThat(store.getPayload(), instanceOf(Flux.class));

assertThat(store.getHeaders().get(HttpHeaders.USER_PRINCIPAL, Principal.class).getName(), is("guest"));

StepVerifier
.create((Publisher<String>) store.getPayload())
.expectNext("foo", "bar", "baz")
Expand All @@ -217,6 +235,7 @@ public void testHttpReactivePost() {
public void testSse() {
Flux<String> responseBody =
this.webTestClient.get().uri("/sse")
.attributes(basicAuthenticationCredentials("guest", "guest"))
.exchange()
.returnResult(String.class)
.getResponseBody();
Expand All @@ -230,22 +249,40 @@ public void testSse() {
@Configuration
@EnableWebFlux
@EnableWebSecurity
@EnableWebFluxSecurity
@EnableIntegration
public static class ContextConfiguration extends WebSecurityConfigurerAdapter {

@Bean
public UserDetails userDetails() {
return User.withUsername("guest")
.passwordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()::encode)
.password("guest")
.roles("ADMIN")
.build();
}

@Override
@Bean
public UserDetailsService userDetailsService() {
InMemoryUserDetailsManager manager = new InMemoryUserDetailsManager();
return new InMemoryUserDetailsManager(userDetails());
}

manager.createUser(
User.withUsername("guest")
.passwordEncoder(PasswordEncoderFactories.createDelegatingPasswordEncoder()::encode)
.password("guest")
.roles("ADMIN")
.build());
@Bean
public ReactiveUserDetailsService reactiveUserDetailsService() {
return new MapReactiveUserDetailsService(userDetails());
}

return manager;

@Bean
public SecurityWebFilterChain reactiveSpringSecurityFilterChain(ServerHttpSecurity http) {
return http.authorizeExchange()
.anyExchange().hasRole("ADMIN")
.and()
.httpBasic()
.and()
.csrf().disable()
.build();
}

@Override
Expand Down
4 changes: 3 additions & 1 deletion src/checkstyle/checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*,
org.springframework.test.web.servlet.result.MockMvcResultMatchers.*,
org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.*,
org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*" />
org.springframework.security.test.web.servlet.setup.SecurityMockMvcConfigurers.*,
org.springframework.web.reactive.function.client.ExchangeFilterFunctions.*,
org.springframework.web.reactive.function.client.ExchangeFilterFunctions.Credentials.*" />
</module>
<module name="IllegalImport" />
<module name="RedundantImport" />
Expand Down