From fad7aa6a66e40ec48213bc9a13fa8a01da155103 Mon Sep 17 00:00:00 2001 From: Maciej Andrearczyk Date: Tue, 1 Oct 2019 19:05:07 +0200 Subject: [PATCH] BAEL-3285 - code reformatted --- .../simultaneous}/Client.java | 15 ++++++--------- .../simultaneous}/Item.java | 2 +- .../simultaneous}/User.java | 2 +- .../simultaneous}/UserWithItem.java | 2 +- .../simultaneous}/ClientIntegrationTest.java | 11 ++++------- 5 files changed, 13 insertions(+), 19 deletions(-) rename spring-5-reactive-client/src/main/java/com/baeldung/reactive/{simultaneouswebclient => webclient/simultaneous}/Client.java (87%) rename spring-5-reactive-client/src/main/java/com/baeldung/reactive/{simultaneouswebclient => webclient/simultaneous}/Item.java (84%) rename spring-5-reactive-client/src/main/java/com/baeldung/reactive/{simultaneouswebclient => webclient/simultaneous}/User.java (84%) rename spring-5-reactive-client/src/main/java/com/baeldung/reactive/{simultaneouswebclient => webclient/simultaneous}/UserWithItem.java (84%) rename spring-5-reactive-client/src/test/java/com/baeldung/reactive/{simultaneouswebclient => webclient/simultaneous}/ClientIntegrationTest.java (87%) diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Client.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java similarity index 87% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Client.java rename to spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java index 4fbb904564..3c6623cb02 100644 --- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Client.java +++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Client.java @@ -1,4 +1,4 @@ -package com.baeldung.reactive.simultaneouswebclient; +package com.baeldung.reactive.webclient.simultaneous; import org.springframework.web.reactive.function.client.WebClient; import reactor.core.publisher.Mono; @@ -16,24 +16,21 @@ public class Client { } public Mono getUser(int id) { - return webClient - .get() + return webClient.get() .uri("/user/{id}", id) .retrieve() .bodyToMono(User.class); } public Mono getItem(int id) { - return webClient - .get() + return webClient.get() .uri("/item/{id}", id) .retrieve() .bodyToMono(Item.class); } public Mono getOtherUser(int id) { - return webClient - .get() + return webClient.get() .uri("/otheruser/{id}", id) .retrieve() .bodyToMono(User.class); @@ -45,7 +42,7 @@ public class Client { .runOn(Schedulers.elastic()) .flatMap(this::getUser) .collectSortedList((u1, u2) -> u2.id() - u1.id()) - .block(); + .block(); } public List fetchUserAndOtherUser(int id) { @@ -61,6 +58,6 @@ public class Client { Mono item = getItem(itemId).subscribeOn(Schedulers.elastic()); return Mono.zip(user, item, UserWithItem::new) - .block(); + .block(); } } diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Item.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java similarity index 84% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Item.java rename to spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java index 5584e1896d..5b8260743b 100644 --- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/Item.java +++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/Item.java @@ -1,4 +1,4 @@ -package com.baeldung.reactive.simultaneouswebclient; +package com.baeldung.reactive.webclient.simultaneous; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/User.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java similarity index 84% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/User.java rename to spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java index e080538227..0e1cc2cd76 100644 --- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/User.java +++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/User.java @@ -1,4 +1,4 @@ -package com.baeldung.reactive.simultaneouswebclient; +package com.baeldung.reactive.webclient.simultaneous; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/UserWithItem.java b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java similarity index 84% rename from spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/UserWithItem.java rename to spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java index d19a324e55..96dcfe994e 100644 --- a/spring-5-reactive-client/src/main/java/com/baeldung/reactive/simultaneouswebclient/UserWithItem.java +++ b/spring-5-reactive-client/src/main/java/com/baeldung/reactive/webclient/simultaneous/UserWithItem.java @@ -1,4 +1,4 @@ -package com.baeldung.reactive.simultaneouswebclient; +package com.baeldung.reactive.webclient.simultaneous; public class UserWithItem { private User user; diff --git a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/simultaneouswebclient/ClientIntegrationTest.java b/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java similarity index 87% rename from spring-5-reactive-client/src/test/java/com/baeldung/reactive/simultaneouswebclient/ClientIntegrationTest.java rename to spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java index e5b707d384..99efd34f9f 100644 --- a/spring-5-reactive-client/src/test/java/com/baeldung/reactive/simultaneouswebclient/ClientIntegrationTest.java +++ b/spring-5-reactive-client/src/test/java/com/baeldung/reactive/webclient/simultaneous/ClientIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.reactive.simultaneouswebclient; +package com.baeldung.reactive.webclient.simultaneous; import org.junit.Test; import org.junit.Before; @@ -8,7 +8,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.WireMockServer; -import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -43,17 +42,15 @@ public class ClientIntegrationTest { int singleRequestTime = 1000; for (int i = 1; i <= requestsNumber; i++) { - stubFor( - get(urlEqualTo("/user/" + i)).willReturn(aResponse() - .withFixedDelay(singleRequestTime) + stubFor(get(urlEqualTo("/user/" + i)).willReturn(aResponse().withFixedDelay(singleRequestTime) .withStatus(200) .withHeader("Content-Type", "application/json") .withBody(String.format("{ \"id\": %d }", i)))); } List userIds = IntStream.rangeClosed(1, requestsNumber) - .boxed() - .collect(Collectors.toList()); + .boxed() + .collect(Collectors.toList()); Client client = new Client("http://localhost:8089");