From 3a26ab34603c4617d2fabd4cc5b7e26a0b04cb94 Mon Sep 17 00:00:00 2001 From: Johnathan Gilday Date: Fri, 20 Dec 2019 12:23:13 -0500 Subject: [PATCH] :art: Gradle 6 - Format code --- .../com/baeldung/gradle/RxHelloWorld.java | 16 ++++++---- .../baeldung/gradle/RxHelloWorldUnitTest.java | 11 +++---- .../fibonacci/impl/RecursiveFibonacci.java | 20 ++++++------ .../impl/RecursiveFibonacciUnitTest.java | 8 ++--- .../fibonacci/FibonacciSequenceGenerator.java | 10 +++--- .../FibonacciSequenceGeneratorFixture.java | 32 +++++++++---------- 6 files changed, 46 insertions(+), 51 deletions(-) diff --git a/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java b/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java index efb0ca3197..1c4e71541d 100644 --- a/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java +++ b/gradle-6/dependency-constraints/src/main/java/com/baeldung/gradle/RxHelloWorld.java @@ -2,17 +2,19 @@ package com.baeldung.gradle; import com.google.common.collect.ImmutableList; import io.reactivex.Observable; + import java.util.List; /** Demonstrates a library type that returns an RxJava type. */ public class RxHelloWorld { - /** @return an {@link Observable} that emits events "hello" and "world" before completing. */ - public static Observable hello() { - // Guava ImmutableList class is an implementation detail. - List values = ImmutableList.of("hello", "world"); - return Observable.fromIterable(values); - } + /** @return an {@link Observable} that emits events "hello" and "world" before completing. */ + public static Observable hello() { + // Guava ImmutableList class is an implementation detail. + List values = ImmutableList.of("hello", "world"); + return Observable.fromIterable(values); + } - private RxHelloWorld() {} + private RxHelloWorld() { + } } diff --git a/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java b/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java index bc64148c64..232c7d7e02 100644 --- a/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java +++ b/gradle-6/dependency-constraints/src/test/java/com/baeldung/gradle/RxHelloWorldUnitTest.java @@ -1,14 +1,13 @@ package com.baeldung.gradle; -import static com.baeldung.gradle.RxHelloWorld.hello; - import org.junit.jupiter.api.Test; +import static com.baeldung.gradle.RxHelloWorld.hello; + /** Unit test for {@link RxHelloWorld}. */ final class RxHelloWorldUnitTest { - @Test - void it_emits_hello_world_values() { - hello().test().assertValues("hello", "world").assertComplete(); - } + @Test void it_emits_hello_world_values() { + hello().test().assertValues("hello", "world").assertComplete(); + } } diff --git a/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java b/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java index 97eccde054..764f4ad12c 100644 --- a/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java +++ b/gradle-6/fibonacci-recursive/src/main/java/com/baeldung/fibonacci/impl/RecursiveFibonacci.java @@ -4,17 +4,15 @@ import com.baeldung.fibonacci.FibonacciSequenceGenerator; import com.google.auto.service.AutoService; /** Recursive implementation of the {@link FibonacciSequenceGenerator}. */ -@AutoService(FibonacciSequenceGenerator.class) -public final class RecursiveFibonacci implements FibonacciSequenceGenerator { +@AutoService(FibonacciSequenceGenerator.class) public final class RecursiveFibonacci implements FibonacciSequenceGenerator { - @Override - public int generate(int nth) { - if (nth < 0) { - throw new IllegalArgumentException("sequence number must be 0 or greater"); + @Override public int generate(int nth) { + if (nth < 0) { + throw new IllegalArgumentException("sequence number must be 0 or greater"); + } + if (nth <= 1) { + return nth; + } + return generate(nth - 1) + generate(nth - 2); } - if (nth <= 1) { - return nth; - } - return generate(nth - 1) + generate(nth - 2); - } } diff --git a/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java b/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java index 1e46e75106..0703c97848 100644 --- a/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java +++ b/gradle-6/fibonacci-recursive/src/test/java/com/baeldung/fibonacci/impl/RecursiveFibonacciUnitTest.java @@ -8,9 +8,7 @@ import com.baeldung.fibonacci.FibonacciSequenceGeneratorFixture; * the fibonacci-spi project. */ final class RecursiveFibonacciUnitTest implements FibonacciSequenceGeneratorFixture { - - @Override - public FibonacciSequenceGenerator provide() { - return new RecursiveFibonacci(); - } + @Override public FibonacciSequenceGenerator provide() { + return new RecursiveFibonacci(); + } } diff --git a/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java b/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java index 1e9de21257..e152b7b515 100644 --- a/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java +++ b/gradle-6/fibonacci-spi/src/main/java/com/baeldung/fibonacci/FibonacciSequenceGenerator.java @@ -3,9 +3,9 @@ package com.baeldung.fibonacci; /** Describes an SPI for a Fibonacci sequence generator function. */ public interface FibonacciSequenceGenerator { - /** - * @param nth the index of the number in the fibonacci sequence - * @return the nth number in the fibonacci sequence - */ - int generate(int nth); + /** + * @param nth the index of the number in the fibonacci sequence + * @return the nth number in the fibonacci sequence + */ + int generate(int nth); } diff --git a/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java b/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java index 0b7988f640..e5bfe8117b 100644 --- a/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java +++ b/gradle-6/fibonacci-spi/src/testFixtures/java/com/baeldung/fibonacci/FibonacciSequenceGeneratorFixture.java @@ -1,31 +1,29 @@ package com.baeldung.fibonacci; +import org.junit.jupiter.api.Test; + import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - /** * Reusable test fixture for {@link FibonacciSequenceGenerator} implementations. Tests will be * skipped if no such implementation exists. */ public interface FibonacciSequenceGeneratorFixture { - /** @return the implementation of {@link FibonacciSequenceGenerator} to test. Must not be null */ - FibonacciSequenceGenerator provide(); + /** @return the implementation of {@link FibonacciSequenceGenerator} to test. Must not be null */ + FibonacciSequenceGenerator provide(); - @Test - default void when_sequence_index_is_negative_then_throws() { - final FibonacciSequenceGenerator generator = provide(); - assertThrows(IllegalArgumentException.class, () -> generator.generate(-1)); - } - - @Test - default void when_given_index_then_generates_fibonacci_number() { - final FibonacciSequenceGenerator generator = provide(); - final int[] sequence = {0, 1, 1, 2, 3, 5, 8}; - for (int i = 0; i < sequence.length; i++) { - assertEquals(sequence[i], generator.generate(i)); + @Test default void when_sequence_index_is_negative_then_throws() { + final FibonacciSequenceGenerator generator = provide(); + assertThrows(IllegalArgumentException.class, () -> generator.generate(-1)); + } + + @Test default void when_given_index_then_generates_fibonacci_number() { + final FibonacciSequenceGenerator generator = provide(); + final int[] sequence = { 0, 1, 1, 2, 3, 5, 8 }; + for (int i = 0; i < sequence.length; i++) { + assertEquals(sequence[i], generator.generate(i)); + } } - } }