From a1a5585a3000743f5bdb8f401d5005877246ad18 Mon Sep 17 00:00:00 2001 From: Somnath Musib <7885767+musibs@users.noreply.github.com> Date: Sat, 16 Apr 2022 07:29:53 +0530 Subject: [PATCH] PR Review changes --- .../create}/CharacterCreator.java | 3 +-- .../create}/CharacterGenerator.java | 4 +-- .../create}/CharacterUnitTest.java | 26 ++++++++++++------- 3 files changed, 18 insertions(+), 15 deletions(-) rename reactor-core/src/main/java/com/baeldung/reactor/{creation => generate/create}/CharacterCreator.java (88%) rename reactor-core/src/main/java/com/baeldung/reactor/{creation => generate/create}/CharacterGenerator.java (88%) rename reactor-core/src/test/java/com/baeldung/reactor/{creation => generate/create}/CharacterUnitTest.java (76%) diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java similarity index 88% rename from reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java rename to reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java index 382615b01c..122e512e78 100644 --- a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterCreator.java +++ b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterCreator.java @@ -1,4 +1,4 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import java.util.List; import java.util.function.Consumer; @@ -6,7 +6,6 @@ import java.util.function.Consumer; import reactor.core.publisher.Flux; public class CharacterCreator { - public Consumer> consumer; public Flux createCharacterSequence() { diff --git a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java similarity index 88% rename from reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java rename to reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java index a22ea02bba..7951483dd9 100644 --- a/reactor-core/src/main/java/com/baeldung/reactor/creation/CharacterGenerator.java +++ b/reactor-core/src/main/java/com/baeldung/reactor/generate/create/CharacterGenerator.java @@ -1,11 +1,9 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import reactor.core.publisher.Flux; public class CharacterGenerator { - public Flux generateCharacters() { - return Flux.generate(() -> 97, (state, sink) -> { char value = (char) state.intValue(); sink.next(value); diff --git a/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java similarity index 76% rename from reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java rename to reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java index 2609f1f403..e58ce40b82 100644 --- a/reactor-core/src/test/java/com/baeldung/reactor/creation/CharacterUnitTest.java +++ b/reactor-core/src/test/java/com/baeldung/reactor/generate/create/CharacterUnitTest.java @@ -1,4 +1,4 @@ -package com.baeldung.reactor.creation; +package com.baeldung.reactor.generate.create; import static org.assertj.core.api.Assertions.assertThat; @@ -11,7 +11,6 @@ import reactor.core.publisher.Flux; import reactor.test.StepVerifier; public class CharacterUnitTest { - @Test public void whenGeneratingCharacters_thenCharactersAreProduced() { CharacterGenerator characterGenerator = new CharacterGenerator(); @@ -26,24 +25,31 @@ public class CharacterUnitTest { @Test public void whenCreatingCharactersWithMultipleThreads_thenSequenceIsProducedAsynchronously() throws InterruptedException { CharacterGenerator characterGenerator = new CharacterGenerator(); - List sequence1 = characterGenerator.generateCharacters().take(3).collectList().block(); - List sequence2 = characterGenerator.generateCharacters().take(2).collectList().block(); + List sequence1 = characterGenerator.generateCharacters() + .take(3) + .collectList() + .block(); + List sequence2 = characterGenerator.generateCharacters() + .take(2) + .collectList() + .block(); CharacterCreator characterCreator = new CharacterCreator(); - Thread producingThread1 = new Thread( + + Thread producerThread1 = new Thread( () -> characterCreator.consumer.accept(sequence1) ); - Thread producingThread2 = new Thread( + Thread producerThread2 = new Thread( () -> characterCreator.consumer.accept(sequence2) ); List consolidated = new ArrayList<>(); characterCreator.createCharacterSequence().subscribe(consolidated::add); - producingThread1.start(); - producingThread2.start(); - producingThread1.join(); - producingThread2.join(); + producerThread1.start(); + producerThread2.start(); + producerThread1.join(); + producerThread2.join(); assertThat(consolidated).containsExactlyInAnyOrder('a', 'b', 'c', 'a', 'b'); }