complete quote service

Author: juan-medina

src/main/java/org/learning/by/example/reactive/microservices/services/QuoteServiceImpl.java

@@ -8,8 +8,6 @@
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
 
-import java.util.function.Function;
-
 public class QuoteServiceImpl implements QuoteService {
 
     private static final String ERROR_GETTING_QUOTE = "ERROR GETTING_QUOTE";
@@ -32,14 +30,14 @@ Mono<Quote[]> request() {
                 .flatMap(clientResponse -> clientResponse.bodyToMono(Quote[].class));
     }
 
-    Function<Mono<Quote[]>, Mono<Quote>> chooseFirst() {
-        return mono -> mono.flatMap(quotes -> Mono.just(quotes[0]))
+    Mono<Quote> chooseFirst(Mono<Quote[]> monoQuotes) {
+        return monoQuotes.flatMap(quotes -> Mono.just(quotes[0]))
                 .onErrorResume(throwable ->Mono.error(new GetQuoteException(ERROR_GETTING_QUOTE, throwable)));
     }
 
     @Override
     public Mono<Quote> get() {
-        return Mono.defer(this::request).publish(chooseFirst())
+        return this.request().publish(this::chooseFirst)
                 .onErrorResume(throwable ->Mono.error(new GetQuoteException(ERROR_GETTING_QUOTE, throwable)));
     }
 

src/test/java/org/learning/by/example/reactive/microservices/services/QuoteServiceImplTest.java

@@ -7,6 +7,7 @@
 import org.learning.by.example.reactive.microservices.exceptions.GetQuoteException;
 import org.learning.by.example.reactive.microservices.model.Quote;
 import org.learning.by.example.reactive.microservices.test.categories.UnitTest;
+import org.mockito.Mockito;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.SpyBean;
 import org.springframework.test.context.ActiveProfiles;
@@ -16,7 +17,6 @@
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
-import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.*;
 
 @RunWith(SpringRunner.class)
@@ -49,7 +49,7 @@ public void mockedRequest() {
 
         verify(quoteService, times(1)).get();
         verify(quoteService, times(1)).request();
-        verify(quoteService, times(1)).chooseFirst();
+        verify(quoteService, times(1)).chooseFirst(Mockito.any());
 
         reset(quoteService);
     }
@@ -68,7 +68,6 @@ private Mono<Quote[]> createMockedResponse(final Integer ID, final String title,
 
     @Test
     public void requestErrorShouldBeHandle() {
-
         doReturn(Mono.error(new RuntimeException(BAD_EXCEPTION))).when(quoteService).request();
 
         quoteService.get().subscribe(quote -> {
@@ -79,14 +78,14 @@ public void requestErrorShouldBeHandle() {
 
         verify(quoteService, times(1)).get();
         verify(quoteService, times(1)).request();
-        verify(quoteService, times(1)).chooseFirst();
+        verify(quoteService, times(1)).chooseFirst(Mockito.any());
 
         reset(quoteService);
     }
 
     @Test
     public void chooseFirstErrorShouldBeHandle() {
-        given(quoteService.chooseFirst()).willReturn(mono -> Mono.error(new RuntimeException(BAD_EXCEPTION)));
+        doReturn(Mono.error(new RuntimeException(BAD_EXCEPTION))).when(quoteService).chooseFirst(Mockito.any());
 
         quoteService.get().subscribe(quote -> {
             throw new UnsupportedOperationException(SHOULD_NOT_RETURN_OBJECT);
@@ -96,7 +95,7 @@ public void chooseFirstErrorShouldBeHandle() {
 
         verify(quoteService, times(1)).get();
         verify(quoteService, times(1)).request();
-        verify(quoteService, times(1)).chooseFirst();
+        verify(quoteService, times(1)).chooseFirst(Mockito.any());
 
         reset(quoteService);
     }