diff --git a/.mvn/maven-wrapper.properties b/.mvn/maven-wrapper.properties deleted file mode 100644 index d58dfb7..0000000 --- a/.mvn/maven-wrapper.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -wrapperVersion=3.3.2 -distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties index 8dea6c2..c595b00 100644 --- a/.mvn/wrapper/maven-wrapper.properties +++ b/.mvn/wrapper/maven-wrapper.properties @@ -1,3 +1,3 @@ wrapperVersion=3.3.4 distributionType=only-script -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.14/apache-maven-3.9.14-bin.zip diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 0000000..a8cc890 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,39 @@ +# Security Policy + +## Supported Versions + +The following versions of `base.build` are currently supported with security updates: + +| Version | Supported | +|---------|--------------------| +| 0.21.x | :white_check_mark: | +| < 0.21 | :x: | + +## Reporting a Vulnerability + +This is a Workday sponsored project hosted on GitHub. + +To report a security vulnerability, please **do not** open a public GitHub issue. Instead: + +1. Navigate to the [Security Advisories](https://https://github.com/workday/base.build/security/advisories) page for + this repository and click **Report a vulnerability**. + +2. Alternatively, contact the project maintainers directly by emailing the developers. + +### What to Include + +Please include as much of the following information as possible to help us understand and reproduce the issue: + +- The type of vulnerability (e.g. dependency with known CVE, insecure API usage, credential leak) +- The affected module(s) and version(s) +- Step-by-step instructions to reproduce the issue +- Any proof-of-concept code or test cases +- The potential impact and severity assessment + +### Response Timeline + +| Stage | Target | +|------------------------|------------------| +| Acknowledgement | 2 business days | +| Severity assessment | 5 business days | +| Fix or mitigation plan | 15 business days | diff --git a/base-archiving/pom.xml b/base-archiving/pom.xml index 4a62109..41c5e4e 100644 --- a/base-archiving/pom.xml +++ b/base-archiving/pom.xml @@ -44,14 +44,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-archiving/src/main/java/build/base/archiving/AbstractTarBuilder.java b/base-archiving/src/main/java/build/base/archiving/AbstractTarBuilder.java index a857f36..04adba7 100644 --- a/base-archiving/src/main/java/build/base/archiving/AbstractTarBuilder.java +++ b/base-archiving/src/main/java/build/base/archiving/AbstractTarBuilder.java @@ -21,6 +21,9 @@ */ import build.base.foundation.Closeables; +import org.kamranzafar.jtar.TarEntry; +import org.kamranzafar.jtar.TarHeader; +import org.kamranzafar.jtar.TarOutputStream; import java.io.BufferedInputStream; import java.io.IOException; @@ -29,10 +32,6 @@ import java.nio.file.Path; import java.util.ArrayDeque; -import org.kamranzafar.jtar.TarEntry; -import org.kamranzafar.jtar.TarHeader; -import org.kamranzafar.jtar.TarOutputStream; - /** * An abstract {@link ArchiveBuilder} of Tape Archives (.tar files). * diff --git a/base-archiving/src/test/java/build/base/archiving/JarBuilderTests.java b/base-archiving/src/test/java/build/base/archiving/JarBuilderTests.java index 987ef0a..161e0ca 100644 --- a/base-archiving/src/test/java/build/base/archiving/JarBuilderTests.java +++ b/base-archiving/src/test/java/build/base/archiving/JarBuilderTests.java @@ -1,6 +1,8 @@ package build.base.archiving; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; import java.io.IOException; @@ -10,9 +12,7 @@ import java.util.jar.Attributes; import java.util.jar.JarFile; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link JarBuilder}. diff --git a/base-archiving/src/test/java/build/base/archiving/TarBuilderTests.java b/base-archiving/src/test/java/build/base/archiving/TarBuilderTests.java index 2274c8e..3908f76 100644 --- a/base-archiving/src/test/java/build/base/archiving/TarBuilderTests.java +++ b/base-archiving/src/test/java/build/base/archiving/TarBuilderTests.java @@ -1,6 +1,8 @@ package build.base.archiving; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; import java.io.File; import java.io.IOException; @@ -8,9 +10,7 @@ import java.nio.file.Path; import java.nio.file.Paths; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.io.TempDir; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link TarBuilder}s. diff --git a/base-assertion/pom.xml b/base-assertion/pom.xml index a3a63a6..51599a1 100644 --- a/base-assertion/pom.xml +++ b/base-assertion/pom.xml @@ -50,7 +50,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/base-assertion/src/main/java/build/base/assertion/CompletableFutureAssertion.java b/base-assertion/src/main/java/build/base/assertion/CompletableFutureAssertion.java index e41627f..5b1db16 100644 --- a/base-assertion/src/main/java/build/base/assertion/CompletableFutureAssertion.java +++ b/base-assertion/src/main/java/build/base/assertion/CompletableFutureAssertion.java @@ -22,13 +22,10 @@ import build.base.foundation.Capture; import build.base.option.Timeout; -import static org.assertj.core.api.Assertions.catchThrowable; -import static org.assertj.core.error.ShouldNotHaveThrown.shouldNotHaveThrown; -import static org.assertj.core.error.future.ShouldBeCancelled.shouldBeCancelled; -import static org.assertj.core.error.future.ShouldBeCompleted.shouldBeCompleted; -import static org.assertj.core.error.future.ShouldBeCompletedExceptionally.shouldHaveCompletedExceptionally; -import static org.assertj.core.error.future.ShouldNotBeCancelled.shouldNotBeCancelled; -import static org.assertj.core.error.future.ShouldNotBeCompleted.shouldNotBeCompleted; +import org.assertj.core.api.AbstractAssert; +import org.assertj.core.api.AbstractThrowableAssert; +import org.assertj.core.api.Assertions; +import org.assertj.core.api.ObjectAssert; import java.time.Duration; import java.util.Optional; @@ -38,10 +35,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.assertj.core.api.AbstractAssert; -import org.assertj.core.api.AbstractThrowableAssert; -import org.assertj.core.api.Assertions; -import org.assertj.core.api.ObjectAssert; +import static org.assertj.core.api.Assertions.catchThrowable; +import static org.assertj.core.error.ShouldNotHaveThrown.shouldNotHaveThrown; +import static org.assertj.core.error.future.ShouldBeCancelled.shouldBeCancelled; +import static org.assertj.core.error.future.ShouldBeCompleted.shouldBeCompleted; +import static org.assertj.core.error.future.ShouldBeCompletedExceptionally.shouldHaveCompletedExceptionally; +import static org.assertj.core.error.future.ShouldNotBeCancelled.shouldNotBeCancelled; +import static org.assertj.core.error.future.ShouldNotBeCompleted.shouldNotBeCompleted; /** * An {@code assertj} Assertion Class for {@link CompletableFuture}s. diff --git a/base-assertion/src/main/java/build/base/assertion/IteratorAssert.java b/base-assertion/src/main/java/build/base/assertion/IteratorAssert.java index a88fe2f..8b02f9c 100644 --- a/base-assertion/src/main/java/build/base/assertion/IteratorAssert.java +++ b/base-assertion/src/main/java/build/base/assertion/IteratorAssert.java @@ -22,6 +22,7 @@ import build.base.foundation.iterator.matching.IteratorPatternMatcher; import build.base.foundation.iterator.matching.IteratorPatternMatchers; +import org.assertj.core.api.Assertions; import java.util.ArrayList; import java.util.Iterator; @@ -30,8 +31,6 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.assertj.core.api.Assertions; - /** * An {@code assertj}-like Assertion Class for {@link IteratorPatternMatcher}s evaluated against * an immediately-available source of elements. diff --git a/base-assertion/src/main/java/build/base/assertion/IteratorPatternMatcherSequenceAssertion.java b/base-assertion/src/main/java/build/base/assertion/IteratorPatternMatcherSequenceAssertion.java index 5013830..dd4f0b1 100644 --- a/base-assertion/src/main/java/build/base/assertion/IteratorPatternMatcherSequenceAssertion.java +++ b/base-assertion/src/main/java/build/base/assertion/IteratorPatternMatcherSequenceAssertion.java @@ -21,11 +21,10 @@ */ import build.base.foundation.iterator.matching.Sequence; +import org.assertj.core.api.Assertions; import java.util.Objects; -import org.assertj.core.api.Assertions; - /** * An {@code assertj}-like assertion step wrapping a {@link Sequence}, allowing the fluent * definition of ordering constraints and terminal evaluation. diff --git a/base-assertion/src/main/java/build/base/assertion/RetryableAssertion.java b/base-assertion/src/main/java/build/base/assertion/RetryableAssertion.java index ce0154c..43e61ad 100644 --- a/base-assertion/src/main/java/build/base/assertion/RetryableAssertion.java +++ b/base-assertion/src/main/java/build/base/assertion/RetryableAssertion.java @@ -28,13 +28,12 @@ import build.base.retryable.PermanentFailureException; import build.base.retryable.Retryable; import build.base.retryable.RetryablePredicate; - -import java.util.Objects; - import org.assertj.core.api.AbstractThrowableAssert; import org.assertj.core.api.Assertions; import org.assertj.core.api.ObjectAssert; +import java.util.Objects; + /** * An {@code assertj}-like Assertion Class for {@link Retryable}s. * diff --git a/base-assertion/src/test/java/build/base/assertion/CompletableFutureAssertionTests.java b/base-assertion/src/test/java/build/base/assertion/CompletableFutureAssertionTests.java index 59f3d5c..7be5391 100644 --- a/base-assertion/src/test/java/build/base/assertion/CompletableFutureAssertionTests.java +++ b/base-assertion/src/test/java/build/base/assertion/CompletableFutureAssertionTests.java @@ -1,9 +1,9 @@ package build.base.assertion; -import java.util.concurrent.CompletableFuture; - import org.junit.jupiter.api.Test; +import java.util.concurrent.CompletableFuture; + /** * Tests for {@link CompletableFutureAssertionTests}. * diff --git a/base-assertion/src/test/java/build/base/assertion/EventuallyTests.java b/base-assertion/src/test/java/build/base/assertion/EventuallyTests.java index 3c7de2e..acbcc54 100644 --- a/base-assertion/src/test/java/build/base/assertion/EventuallyTests.java +++ b/base-assertion/src/test/java/build/base/assertion/EventuallyTests.java @@ -5,9 +5,7 @@ import build.base.retryable.PermanentFailureException; import build.base.retryable.PermanentlyFailingRetryable; import build.base.retryable.Retryable; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Fail.fail; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.time.Instant; @@ -15,7 +13,9 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Fail.fail; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link Eventually}. diff --git a/base-assertion/src/test/java/build/base/assertion/IteratorAssertTests.java b/base-assertion/src/test/java/build/base/assertion/IteratorAssertTests.java index 3ff3afa..85cec84 100644 --- a/base-assertion/src/test/java/build/base/assertion/IteratorAssertTests.java +++ b/base-assertion/src/test/java/build/base/assertion/IteratorAssertTests.java @@ -1,12 +1,11 @@ package build.base.assertion; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Tests for {@link IteratorAssert}. diff --git a/base-assertion/src/test/java/build/base/assertion/IteratorPatternMatcherRetryableAssertionTests.java b/base-assertion/src/test/java/build/base/assertion/IteratorPatternMatcherRetryableAssertionTests.java index 98f2818..641294e 100644 --- a/base-assertion/src/test/java/build/base/assertion/IteratorPatternMatcherRetryableAssertionTests.java +++ b/base-assertion/src/test/java/build/base/assertion/IteratorPatternMatcherRetryableAssertionTests.java @@ -2,15 +2,14 @@ import build.base.option.Timeout; import build.base.retryable.Retryable; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; import java.time.Duration; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Tests for {@link IteratorPatternMatcherRetryableAssertion}. diff --git a/base-commandline/pom.xml b/base-commandline/pom.xml index b270ced..d1fde7e 100644 --- a/base-commandline/pom.xml +++ b/base-commandline/pom.xml @@ -25,21 +25,20 @@ build.base - base-table + base-foundation ${revision} - - org.junit.jupiter - junit-jupiter - ${junit.version} - test + build.base + base-table + ${revision} + org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-commandline/src/test/java/build/base/commandline/CommandLineParserTests.java b/base-commandline/src/test/java/build/base/commandline/CommandLineParserTests.java index 74aab44..23b7ded 100644 --- a/base-commandline/src/test/java/build/base/commandline/CommandLineParserTests.java +++ b/base-commandline/src/test/java/build/base/commandline/CommandLineParserTests.java @@ -3,13 +3,13 @@ import build.base.configuration.AbstractValueOption; import build.base.configuration.Configuration; import build.base.configuration.Option; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.Objects; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for the {@link CommandLineParser} and the {@link CommandLine} interface/annotations. diff --git a/base-configuration/pom.xml b/base-configuration/pom.xml index 2f5eb10..4f955dc 100644 --- a/base-configuration/pom.xml +++ b/base-configuration/pom.xml @@ -26,14 +26,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -60,6 +53,7 @@ maven-dependency-plugin + dependency-properties properties diff --git a/base-configuration/src/main/java/build/base/configuration/Configuration.java b/base-configuration/src/main/java/build/base/configuration/Configuration.java index e93e802..f2b16e5 100644 --- a/base-configuration/src/main/java/build/base/configuration/Configuration.java +++ b/base-configuration/src/main/java/build/base/configuration/Configuration.java @@ -20,14 +20,14 @@ * #L% */ -import static build.base.configuration.Option.getDefaultOption; - import java.lang.reflect.Array; import java.util.Optional; import java.util.function.Consumer; import java.util.function.Supplier; import java.util.stream.Stream; +import static build.base.configuration.Option.getDefaultOption; + /** * An immutable {@link java.util.Map}-like structure for managing zero or more configuration * {@link Option}s, discriminating (keying) them by the concrete {@link Class} of the said {@link Option}s. @@ -247,7 +247,7 @@ default void ifPresent(final Class classOfOption, * @return a {@link Stream} of {@link Option}s implementing the specified type */ @SuppressWarnings("unchecked") - default Stream stream(Class requiredClass) { + default Stream stream(final Class requiredClass) { return stream() .filter(requiredClass::isInstance) diff --git a/base-configuration/src/test/java/build/base/configuration/ConfigurationTests.java b/base-configuration/src/test/java/build/base/configuration/ConfigurationTests.java index 6d59bf9..5c4f3c7 100644 --- a/base-configuration/src/test/java/build/base/configuration/ConfigurationTests.java +++ b/base-configuration/src/test/java/build/base/configuration/ConfigurationTests.java @@ -1,11 +1,7 @@ package build.base.configuration; import build.base.foundation.Capture; -import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; @@ -14,7 +10,11 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /** * Tests for {@link Configuration}s. diff --git a/base-configuration/src/test/java/build/base/configuration/OptionTests.java b/base-configuration/src/test/java/build/base/configuration/OptionTests.java index 8a3803f..68cdb02 100644 --- a/base-configuration/src/test/java/build/base/configuration/OptionTests.java +++ b/base-configuration/src/test/java/build/base/configuration/OptionTests.java @@ -1,10 +1,10 @@ package build.base.configuration; +import org.junit.jupiter.api.Test; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; -import org.junit.jupiter.api.Test; - /** * Tests for {@link Option}s. * diff --git a/base-expression/pom.xml b/base-expression/pom.xml index b08e7c8..031b1e9 100644 --- a/base-expression/pom.xml +++ b/base-expression/pom.xml @@ -44,14 +44,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -78,11 +71,20 @@ maven-dependency-plugin + dependency-properties properties + + + + org.glassfish:jakarta.el + + org.mockito:mockito-core + + diff --git a/base-expression/src/test/java/build/base/expression/ProcessorTests.java b/base-expression/src/test/java/build/base/expression/ProcessorTests.java index 6f56f8f..dd0fad6 100644 --- a/base-expression/src/test/java/build/base/expression/ProcessorTests.java +++ b/base-expression/src/test/java/build/base/expression/ProcessorTests.java @@ -3,12 +3,12 @@ import build.base.configuration.AbstractValueOption; import build.base.configuration.ValueOption; import jakarta.el.ELException; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.HashMap; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests that {@link Processor}s evaluate and replace expressions. diff --git a/base-expression/src/test/java/build/base/expression/VariableTests.java b/base-expression/src/test/java/build/base/expression/VariableTests.java index 5d73d16..6066446 100644 --- a/base-expression/src/test/java/build/base/expression/VariableTests.java +++ b/base-expression/src/test/java/build/base/expression/VariableTests.java @@ -1,9 +1,9 @@ package build.base.expression; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests that {@link Variable}s are created properly and that their properties can be accessed. * diff --git a/base-flow/pom.xml b/base-flow/pom.xml index ebc3249..f324b18 100644 --- a/base-flow/pom.xml +++ b/base-flow/pom.xml @@ -26,14 +26,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -60,6 +53,7 @@ maven-dependency-plugin + dependency-properties properties diff --git a/base-flow/src/test/java/build/base/flow/CompletingSubscriberTests.java b/base-flow/src/test/java/build/base/flow/CompletingSubscriberTests.java index 90f4f18..b1210ec 100644 --- a/base-flow/src/test/java/build/base/flow/CompletingSubscriberTests.java +++ b/base-flow/src/test/java/build/base/flow/CompletingSubscriberTests.java @@ -1,12 +1,12 @@ package build.base.flow; import build.base.foundation.predicate.Predicates; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.concurrent.CompletableFuture; import java.util.function.Predicate; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link CompletingSubscriber}s. diff --git a/base-flow/src/test/java/build/base/flow/FilteringSubscriberTests.java b/base-flow/src/test/java/build/base/flow/FilteringSubscriberTests.java index 3504c4f..f37aaf8 100644 --- a/base-flow/src/test/java/build/base/flow/FilteringSubscriberTests.java +++ b/base-flow/src/test/java/build/base/flow/FilteringSubscriberTests.java @@ -1,10 +1,10 @@ package build.base.flow; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link FilteringSubscriber}s. * diff --git a/base-flow/src/test/java/build/base/flow/MappingSubscriberTests.java b/base-flow/src/test/java/build/base/flow/MappingSubscriberTests.java index e9409fa..194ef60 100644 --- a/base-flow/src/test/java/build/base/flow/MappingSubscriberTests.java +++ b/base-flow/src/test/java/build/base/flow/MappingSubscriberTests.java @@ -1,10 +1,10 @@ package build.base.flow; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link MappingSubscriber}s. * diff --git a/base-flow/src/test/java/build/base/flow/SubscriberRegistryTests.java b/base-flow/src/test/java/build/base/flow/SubscriberRegistryTests.java index 874b54f..0873ff6 100644 --- a/base-flow/src/test/java/build/base/flow/SubscriberRegistryTests.java +++ b/base-flow/src/test/java/build/base/flow/SubscriberRegistryTests.java @@ -1,5 +1,9 @@ package build.base.flow; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; +import org.mockito.Mockito; + import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.ArgumentMatchers.any; @@ -8,10 +12,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -import org.junit.jupiter.api.Test; -import org.mockito.ArgumentCaptor; -import org.mockito.Mockito; - /** * Tests for {@link SubscriberRegistry}s. * diff --git a/base-foundation/pom.xml b/base-foundation/pom.xml index a3da53b..4a2f6a1 100644 --- a/base-foundation/pom.xml +++ b/base-foundation/pom.xml @@ -20,7 +20,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/base-foundation/src/main/java/build/base/foundation/iterator/TransformingIterable.java b/base-foundation/src/main/java/build/base/foundation/iterator/TransformingIterable.java index af3dd9e..b5d8ff0 100644 --- a/base-foundation/src/main/java/build/base/foundation/iterator/TransformingIterable.java +++ b/base-foundation/src/main/java/build/base/foundation/iterator/TransformingIterable.java @@ -45,7 +45,7 @@ public interface TransformingIterable * @param the type of elements returned by the {@link Iterator} * @return a {@link TransformingIterable} */ - default TransformingIterable map(Function function) { + default TransformingIterable map(final Function function) { return of(() -> Iterators.map(iterator(), function)); } @@ -56,7 +56,7 @@ default TransformingIterable map(Function function) { * @param predicate the {@link Predicate} * @return a {@link TransformingIterable} */ - default TransformingIterable filter(Predicate predicate) { + default TransformingIterable filter(final Predicate predicate) { return of(() -> Iterators.filter(iterator(), predicate)); } @@ -94,7 +94,7 @@ default TransformingIterable filter(final Function extractor, final * @param value the value to be used in an equality check with the extractor * @return a {@link TransformingIterable} */ - default TransformingIterable filter(final Function extractor, R value) { + default TransformingIterable filter(final Function extractor, final R value) { return filter(t -> Objects.equals(extractor.apply(t), value)); } diff --git a/base-foundation/src/main/java/build/base/foundation/iterator/matching/Element.java b/base-foundation/src/main/java/build/base/foundation/iterator/matching/Element.java index ce9e29d..10e6637 100644 --- a/base-foundation/src/main/java/build/base/foundation/iterator/matching/Element.java +++ b/base-foundation/src/main/java/build/base/foundation/iterator/matching/Element.java @@ -22,7 +22,6 @@ import build.base.foundation.Capture; import build.base.foundation.iterator.ResettableIterator; -import static build.base.foundation.predicate.Predicates.always; import java.util.ArrayList; import java.util.Iterator; @@ -31,6 +30,8 @@ import java.util.function.Function; import java.util.function.Predicate; +import static build.base.foundation.predicate.Predicates.always; + /** * A {@link Matcher} to evaluate an element using a {@link Predicate}. * diff --git a/base-foundation/src/main/java/build/base/foundation/iterator/matching/SkipWhile.java b/base-foundation/src/main/java/build/base/foundation/iterator/matching/SkipWhile.java index 2f6765c..ac62d46 100644 --- a/base-foundation/src/main/java/build/base/foundation/iterator/matching/SkipWhile.java +++ b/base-foundation/src/main/java/build/base/foundation/iterator/matching/SkipWhile.java @@ -21,11 +21,12 @@ */ import build.base.foundation.iterator.ResettableIterator; -import static build.base.foundation.predicate.Predicates.always; import java.util.Iterator; import java.util.function.Predicate; +import static build.base.foundation.predicate.Predicates.always; + /** * A {@link Matcher} to skip over an number of elements in an {@link Iterator} while a * {@link Predicate} is satisfied. diff --git a/base-foundation/src/main/java/build/base/foundation/iterator/matching/Term.java b/base-foundation/src/main/java/build/base/foundation/iterator/matching/Term.java index db49ee3..430f2f7 100644 --- a/base-foundation/src/main/java/build/base/foundation/iterator/matching/Term.java +++ b/base-foundation/src/main/java/build/base/foundation/iterator/matching/Term.java @@ -21,7 +21,6 @@ */ import build.base.foundation.predicate.Predicates; -import static build.base.foundation.predicate.Predicates.descriptive; import java.util.Arrays; import java.util.Iterator; @@ -29,6 +28,8 @@ import java.util.function.Predicate; import java.util.stream.Stream; +import static build.base.foundation.predicate.Predicates.descriptive; + /** * Represents a {@link Condition} for evaluating zero or more values provided by {@link Iterator}, and/or the * current state of an {@link Iterator}. diff --git a/base-foundation/src/test/java/build/base/foundation/AbstractHasherMapTests.java b/base-foundation/src/test/java/build/base/foundation/AbstractHasherMapTests.java index a4a8b2a..0fe3ec5 100644 --- a/base-foundation/src/test/java/build/base/foundation/AbstractHasherMapTests.java +++ b/base-foundation/src/test/java/build/base/foundation/AbstractHasherMapTests.java @@ -328,4 +328,4 @@ void shouldStream() { assertThat(map.keySet().stream().mapToInt(Integer::intValue).sum()) .isEqualTo(sum); } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/AbstractWeakHasherMapTests.java b/base-foundation/src/test/java/build/base/foundation/AbstractWeakHasherMapTests.java index 897e49e..ce6c989 100644 --- a/base-foundation/src/test/java/build/base/foundation/AbstractWeakHasherMapTests.java +++ b/base-foundation/src/test/java/build/base/foundation/AbstractWeakHasherMapTests.java @@ -94,4 +94,4 @@ void shouldIterateOverDeadKeysValues() { assertThat(iter.next()).isNotNull(); } } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/ArraysTests.java b/base-foundation/src/test/java/build/base/foundation/ArraysTests.java index e8ca599..1ca87ee 100644 --- a/base-foundation/src/test/java/build/base/foundation/ArraysTests.java +++ b/base-foundation/src/test/java/build/base/foundation/ArraysTests.java @@ -1,9 +1,9 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link Arrays}. * diff --git a/base-foundation/src/test/java/build/base/foundation/AtomicEnumTests.java b/base-foundation/src/test/java/build/base/foundation/AtomicEnumTests.java index 5d85ba9..b5d881c 100644 --- a/base-foundation/src/test/java/build/base/foundation/AtomicEnumTests.java +++ b/base-foundation/src/test/java/build/base/foundation/AtomicEnumTests.java @@ -1,12 +1,12 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; import java.util.function.Function; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link AtomicEnum}. diff --git a/base-foundation/src/test/java/build/base/foundation/CaptureTests.java b/base-foundation/src/test/java/build/base/foundation/CaptureTests.java index ca1c5ec..e37b132 100644 --- a/base-foundation/src/test/java/build/base/foundation/CaptureTests.java +++ b/base-foundation/src/test/java/build/base/foundation/CaptureTests.java @@ -1,12 +1,12 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import org.junit.jupiter.api.Test; import java.util.NoSuchElementException; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * Unit tests for {@link Capture}. diff --git a/base-foundation/src/test/java/build/base/foundation/CompletableFuturesTests.java b/base-foundation/src/test/java/build/base/foundation/CompletableFuturesTests.java index 805a769..b6c4b8f 100644 --- a/base-foundation/src/test/java/build/base/foundation/CompletableFuturesTests.java +++ b/base-foundation/src/test/java/build/base/foundation/CompletableFuturesTests.java @@ -1,7 +1,8 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import java.util.concurrent.CancellationException; import java.util.concurrent.CompletableFuture; @@ -9,9 +10,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for the {@link CompletableFutures} class. diff --git a/base-foundation/src/test/java/build/base/foundation/ConcurrentWeakHashMapTests.java b/base-foundation/src/test/java/build/base/foundation/ConcurrentWeakHashMapTests.java index 6772f27..7984e30 100644 --- a/base-foundation/src/test/java/build/base/foundation/ConcurrentWeakHashMapTests.java +++ b/base-foundation/src/test/java/build/base/foundation/ConcurrentWeakHashMapTests.java @@ -15,4 +15,4 @@ public class ConcurrentWeakHashMapTests protected Map makeMap() { return new ConcurrentWeakHashMap<>(); } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/ExceptionalTests.java b/base-foundation/src/test/java/build/base/foundation/ExceptionalTests.java index a245d7d..8fc2655 100644 --- a/base-foundation/src/test/java/build/base/foundation/ExceptionalTests.java +++ b/base-foundation/src/test/java/build/base/foundation/ExceptionalTests.java @@ -787,4 +787,4 @@ void shouldSeeCausingExceptionInExceptional() { .isEqualTo("Not supported mate"); } } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/IntegerBasedEnumIndexTests.java b/base-foundation/src/test/java/build/base/foundation/IntegerBasedEnumIndexTests.java index ab0f55c..efbb069 100644 --- a/base-foundation/src/test/java/build/base/foundation/IntegerBasedEnumIndexTests.java +++ b/base-foundation/src/test/java/build/base/foundation/IntegerBasedEnumIndexTests.java @@ -1,9 +1,9 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link IntegerBasedEnumIndex}es. * diff --git a/base-foundation/src/test/java/build/base/foundation/IntrospectionTests.java b/base-foundation/src/test/java/build/base/foundation/IntrospectionTests.java index 39aeecf..5db2b9f 100644 --- a/base-foundation/src/test/java/build/base/foundation/IntrospectionTests.java +++ b/base-foundation/src/test/java/build/base/foundation/IntrospectionTests.java @@ -3,9 +3,10 @@ import build.base.foundation.example.AbstractPerson; import build.base.foundation.example.ConcretePerson; import build.base.foundation.tuple.Tuple; -import static build.base.foundation.Introspection.getParameterType; -import static build.base.foundation.Introspection.parameterTypes; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import java.lang.annotation.Annotation; import java.lang.annotation.ElementType; @@ -23,10 +24,9 @@ import java.util.Optional; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; +import static build.base.foundation.Introspection.getParameterType; +import static build.base.foundation.Introspection.parameterTypes; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Introspection}. diff --git a/base-foundation/src/test/java/build/base/foundation/PreconditionsTests.java b/base-foundation/src/test/java/build/base/foundation/PreconditionsTests.java index 086b895..45cd794 100644 --- a/base-foundation/src/test/java/build/base/foundation/PreconditionsTests.java +++ b/base-foundation/src/test/java/build/base/foundation/PreconditionsTests.java @@ -1,11 +1,11 @@ package build.base.foundation; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import org.junit.jupiter.api.Test; import java.util.Objects; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for {@link Preconditions}. diff --git a/base-foundation/src/test/java/build/base/foundation/PredicatesTests.java b/base-foundation/src/test/java/build/base/foundation/PredicatesTests.java index 03fc248..53a8023 100644 --- a/base-foundation/src/test/java/build/base/foundation/PredicatesTests.java +++ b/base-foundation/src/test/java/build/base/foundation/PredicatesTests.java @@ -1,6 +1,8 @@ package build.base.foundation; import build.base.foundation.predicate.Predicates; +import org.junit.jupiter.api.Test; + import static build.base.foundation.predicate.Predicates.allOf; import static build.base.foundation.predicate.Predicates.always; import static build.base.foundation.predicate.Predicates.anyOf; @@ -8,8 +10,6 @@ import static build.base.foundation.predicate.Predicates.not; import static org.assertj.core.api.Assertions.assertThat; -import org.junit.jupiter.api.Test; - /** * Tests for {@link Predicates}. * diff --git a/base-foundation/src/test/java/build/base/foundation/PrimesTests.java b/base-foundation/src/test/java/build/base/foundation/PrimesTests.java index 3df2e03..7a54f52 100644 --- a/base-foundation/src/test/java/build/base/foundation/PrimesTests.java +++ b/base-foundation/src/test/java/build/base/foundation/PrimesTests.java @@ -1,12 +1,12 @@ package build.base.foundation; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.Iterator; import java.util.NoSuchElementException; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link Primes}. diff --git a/base-foundation/src/test/java/build/base/foundation/RequiresSortTests.java b/base-foundation/src/test/java/build/base/foundation/RequiresSortTests.java index f2e5335..5aacc2b 100644 --- a/base-foundation/src/test/java/build/base/foundation/RequiresSortTests.java +++ b/base-foundation/src/test/java/build/base/foundation/RequiresSortTests.java @@ -1,12 +1,12 @@ package build.base.foundation; import build.base.foundation.stream.Streams; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.LinkedHashSet; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests to sort by {@link Requires}. diff --git a/base-foundation/src/test/java/build/base/foundation/TopologicalSortTests.java b/base-foundation/src/test/java/build/base/foundation/TopologicalSortTests.java index bca00a9..e97ead1 100644 --- a/base-foundation/src/test/java/build/base/foundation/TopologicalSortTests.java +++ b/base-foundation/src/test/java/build/base/foundation/TopologicalSortTests.java @@ -1,9 +1,9 @@ package build.base.foundation; import build.base.foundation.stream.Streams; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.RepeatedTest; +import org.junit.jupiter.api.Test; import java.util.ArrayList; import java.util.Arrays; @@ -11,9 +11,9 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.RepeatedTest; -import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for Topological Sort. diff --git a/base-foundation/src/test/java/build/base/foundation/iterator/AbortableIteratorTests.java b/base-foundation/src/test/java/build/base/foundation/iterator/AbortableIteratorTests.java index 7a9ff36..a40ee43 100644 --- a/base-foundation/src/test/java/build/base/foundation/iterator/AbortableIteratorTests.java +++ b/base-foundation/src/test/java/build/base/foundation/iterator/AbortableIteratorTests.java @@ -242,4 +242,4 @@ void shouldHandleSingleElementThatMatches() { assertThatThrownBy(result::next) .isInstanceOf(NoSuchElementException.class); } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/iterator/DistinctIteratorTests.java b/base-foundation/src/test/java/build/base/foundation/iterator/DistinctIteratorTests.java index 09ebd20..77b37f3 100644 --- a/base-foundation/src/test/java/build/base/foundation/iterator/DistinctIteratorTests.java +++ b/base-foundation/src/test/java/build/base/foundation/iterator/DistinctIteratorTests.java @@ -278,4 +278,4 @@ void shouldHandleComplexDuplicatePatterns() { assertThat(result.hasNext()) .isFalse(); } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/iterator/IteratorsTests.java b/base-foundation/src/test/java/build/base/foundation/iterator/IteratorsTests.java index 5bf1969..e15afc7 100644 --- a/base-foundation/src/test/java/build/base/foundation/iterator/IteratorsTests.java +++ b/base-foundation/src/test/java/build/base/foundation/iterator/IteratorsTests.java @@ -201,4 +201,4 @@ void shouldHandleMultipleHasNextCalls() { assertThat(result.hasNext()) .isFalse(); } -} \ No newline at end of file +} diff --git a/base-foundation/src/test/java/build/base/foundation/iterator/matching/IteratorPatternMatcherTests.java b/base-foundation/src/test/java/build/base/foundation/iterator/matching/IteratorPatternMatcherTests.java index aadcf3e..eb8cd16 100644 --- a/base-foundation/src/test/java/build/base/foundation/iterator/matching/IteratorPatternMatcherTests.java +++ b/base-foundation/src/test/java/build/base/foundation/iterator/matching/IteratorPatternMatcherTests.java @@ -1,15 +1,15 @@ package build.base.foundation.iterator.matching; import build.base.foundation.Capture; -import static build.base.foundation.predicate.Predicates.descriptive; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static build.base.foundation.predicate.Predicates.descriptive; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link IteratorPatternMatcher}s. diff --git a/base-foundation/src/test/java/build/base/foundation/stream/StreamableTests.java b/base-foundation/src/test/java/build/base/foundation/stream/StreamableTests.java index 2edd560..b5c26d3 100644 --- a/base-foundation/src/test/java/build/base/foundation/stream/StreamableTests.java +++ b/base-foundation/src/test/java/build/base/foundation/stream/StreamableTests.java @@ -1,11 +1,11 @@ package build.base.foundation.stream; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.List; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Streamable}. diff --git a/base-foundation/src/test/java/build/base/foundation/stream/StreamsTests.java b/base-foundation/src/test/java/build/base/foundation/stream/StreamsTests.java index 8d95d33..c487f18 100644 --- a/base-foundation/src/test/java/build/base/foundation/stream/StreamsTests.java +++ b/base-foundation/src/test/java/build/base/foundation/stream/StreamsTests.java @@ -1,12 +1,12 @@ package build.base.foundation.stream; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.Arrays; import java.util.Collections; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Streams}. diff --git a/base-foundation/src/test/java/build/base/foundation/unit/MemorySizeTests.java b/base-foundation/src/test/java/build/base/foundation/unit/MemorySizeTests.java index a180a26..eca266c 100644 --- a/base-foundation/src/test/java/build/base/foundation/unit/MemorySizeTests.java +++ b/base-foundation/src/test/java/build/base/foundation/unit/MemorySizeTests.java @@ -1,12 +1,12 @@ package build.base.foundation.unit; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.fail; +import org.junit.jupiter.api.Test; import java.util.ArrayList; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; /** * Tests for {@link MemorySize}. diff --git a/base-io/pom.xml b/base-io/pom.xml index 7d80a72..8e3be70 100644 --- a/base-io/pom.xml +++ b/base-io/pom.xml @@ -38,14 +38,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-io/src/test/java/build/base/io/LookaheadReaderTests.java b/base-io/src/test/java/build/base/io/LookaheadReaderTests.java index 16869db..0b19bce 100644 --- a/base-io/src/test/java/build/base/io/LookaheadReaderTests.java +++ b/base-io/src/test/java/build/base/io/LookaheadReaderTests.java @@ -1,14 +1,14 @@ package build.base.io; import build.base.foundation.Strings; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link LookaheadReader}s. diff --git a/base-io/src/test/java/build/base/io/PathSetTests.java b/base-io/src/test/java/build/base/io/PathSetTests.java index 690d62f..58140b8 100644 --- a/base-io/src/test/java/build/base/io/PathSetTests.java +++ b/base-io/src/test/java/build/base/io/PathSetTests.java @@ -1,13 +1,13 @@ package build.base.io; import build.base.foundation.predicate.Predicates; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.nio.file.Path; import java.nio.file.Paths; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link PathSet}s. diff --git a/base-io/src/test/java/build/base/io/PipeTests.java b/base-io/src/test/java/build/base/io/PipeTests.java index 59bd9aa..fc8ebaa 100644 --- a/base-io/src/test/java/build/base/io/PipeTests.java +++ b/base-io/src/test/java/build/base/io/PipeTests.java @@ -3,7 +3,7 @@ import build.base.assertion.Eventually; import build.base.assertion.IteratorAssert; import build.base.flow.RecordingSubscriber; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.OutputStreamWriter; @@ -12,7 +12,7 @@ import java.io.StringWriter; import java.io.Writer; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Pipe}s diff --git a/base-logging/pom.xml b/base-logging/pom.xml index 506cdf5..9040870 100644 --- a/base-logging/pom.xml +++ b/base-logging/pom.xml @@ -27,14 +27,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-logging/src/test/java/build/base/logging/LoggerTests.java b/base-logging/src/test/java/build/base/logging/LoggerTests.java index 634ecdb..37d26e2 100644 --- a/base-logging/src/test/java/build/base/logging/LoggerTests.java +++ b/base-logging/src/test/java/build/base/logging/LoggerTests.java @@ -2,12 +2,12 @@ import build.base.flow.LogRecordPublisher; import build.base.flow.RecordingSubscriber; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.logging.Level; import java.util.logging.LogRecord; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Logger}s. diff --git a/base-marshalling/pom.xml b/base-marshalling/pom.xml index 5be446b..f9f76c8 100644 --- a/base-marshalling/pom.xml +++ b/base-marshalling/pom.xml @@ -26,14 +26,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-marshalling/src/main/java/build/base/marshalling/Marshalling.java b/base-marshalling/src/main/java/build/base/marshalling/Marshalling.java index 3c31cd7..fc01e5f 100644 --- a/base-marshalling/src/main/java/build/base/marshalling/Marshalling.java +++ b/base-marshalling/src/main/java/build/base/marshalling/Marshalling.java @@ -48,7 +48,7 @@ public interface Marshalling { * @param lookup the {@link MethodHandles.Lookup} for the {@link Class} * @param the type of marshallable {@link Class} */ - static void register(Class registrationClass, MethodHandles.Lookup lookup) { + static void register(final Class registrationClass, final MethodHandles.Lookup lookup) { GLOBAL_SCHEMA_FACTORY.register(registrationClass, lookup); } @@ -61,7 +61,7 @@ static void register(Class registrationClass, MethodHandles.Lookup lookup * @param marshallableClass the marshallable {@link Class} to register * @param the type of marshallable {@link Class} */ - static void register(Class marshallableClass) { + static void register(final Class marshallableClass) { GLOBAL_SCHEMA_FACTORY.register(marshallableClass); } diff --git a/base-marshalling/src/test/java/build/base/marshalling/MarshallingTests.java b/base-marshalling/src/test/java/build/base/marshalling/MarshallingTests.java index 615cae4..954a099 100644 --- a/base-marshalling/src/test/java/build/base/marshalling/MarshallingTests.java +++ b/base-marshalling/src/test/java/build/base/marshalling/MarshallingTests.java @@ -9,10 +9,10 @@ import build.base.marshalling.example.StaticallyRegisteredPoint; import build.base.marshalling.example.Wrapper; import build.base.marshalling.tutorial.Address; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link Marshalling}. * diff --git a/base-marshalling/src/test/java/build/base/marshalling/OutTests.java b/base-marshalling/src/test/java/build/base/marshalling/OutTests.java index d93d94a..40bd2ce 100644 --- a/base-marshalling/src/test/java/build/base/marshalling/OutTests.java +++ b/base-marshalling/src/test/java/build/base/marshalling/OutTests.java @@ -1,12 +1,12 @@ package build.base.marshalling; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatExceptionOfType; +import org.junit.jupiter.api.Test; import java.util.NoSuchElementException; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatExceptionOfType; /** * Unit tests for {@link Out}s. diff --git a/base-marshalling/src/test/java/build/base/marshalling/TutorialTests.java b/base-marshalling/src/test/java/build/base/marshalling/TutorialTests.java index 3e7c69a..0250a49 100644 --- a/base-marshalling/src/test/java/build/base/marshalling/TutorialTests.java +++ b/base-marshalling/src/test/java/build/base/marshalling/TutorialTests.java @@ -17,12 +17,12 @@ import build.base.marshalling.tutorial.ResidentialAddress; import build.base.marshalling.tutorial.SelfRegisteredPerson; import build.base.marshalling.tutorial.ValidatedAddress; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; +import org.junit.jupiter.api.Test; import java.util.Optional; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; /** * Marshalling tests for the tutorial examples. diff --git a/base-marshalling/src/test/java/build/base/marshalling/tutorial/ResidentialAddress.java b/base-marshalling/src/test/java/build/base/marshalling/tutorial/ResidentialAddress.java index 4af8e5f..3606c8a 100644 --- a/base-marshalling/src/test/java/build/base/marshalling/tutorial/ResidentialAddress.java +++ b/base-marshalling/src/test/java/build/base/marshalling/tutorial/ResidentialAddress.java @@ -20,7 +20,6 @@ * #L% */ -import build.base.foundation.Capture; import build.base.marshalling.Marshal; import build.base.marshalling.Marshalling; import build.base.marshalling.Out; diff --git a/base-mereology/pom.xml b/base-mereology/pom.xml index e99afd5..b9fd3dd 100644 --- a/base-mereology/pom.xml +++ b/base-mereology/pom.xml @@ -32,14 +32,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -73,11 +66,18 @@ maven-dependency-plugin + dependency-properties properties + + + + org.mockito:mockito-core + + diff --git a/base-naming/pom.xml b/base-naming/pom.xml index ef01133..134a8c9 100644 --- a/base-naming/pom.xml +++ b/base-naming/pom.xml @@ -26,14 +26,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-naming/src/test/java/build/base/naming/UniqueNameGeneratorTests.java b/base-naming/src/test/java/build/base/naming/UniqueNameGeneratorTests.java index f8e8f25..8dbda74 100644 --- a/base-naming/src/test/java/build/base/naming/UniqueNameGeneratorTests.java +++ b/base-naming/src/test/java/build/base/naming/UniqueNameGeneratorTests.java @@ -1,10 +1,10 @@ package build.base.naming; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.HashSet; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for the {@link UniqueNameGenerator}s. diff --git a/base-network/pom.xml b/base-network/pom.xml index a5d3fb3..d2c455a 100644 --- a/base-network/pom.xml +++ b/base-network/pom.xml @@ -56,14 +56,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-network/src/main/java/build/base/network/Network.java b/base-network/src/main/java/build/base/network/Network.java index 6c92ec0..aabb280 100644 --- a/base-network/src/main/java/build/base/network/Network.java +++ b/base-network/src/main/java/build/base/network/Network.java @@ -22,12 +22,12 @@ import build.base.configuration.Configuration; import build.base.configuration.Option; -import build.base.option.Timeout; import build.base.foundation.Strings; import build.base.foundation.predicate.Predicates; import build.base.network.option.KeepAlive; import build.base.network.option.SocketTimeout; import build.base.network.option.TCPNoDelay; +import build.base.option.Timeout; import build.base.retryable.BlockingRetry; import build.base.retryable.EphemeralFailureException; import build.base.retryable.Retryable; diff --git a/base-network/src/test/java/build/base/network/ClientServerTests.java b/base-network/src/test/java/build/base/network/ClientServerTests.java index 33dcde7..7e5ea71 100644 --- a/base-network/src/test/java/build/base/network/ClientServerTests.java +++ b/base-network/src/test/java/build/base/network/ClientServerTests.java @@ -3,15 +3,15 @@ import build.base.assertion.Eventually; import build.base.foundation.Closeables; import build.base.io.SerializableCallable; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import java.net.InetAddress; import java.net.URI; import java.util.concurrent.CompletableFuture; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for the {@link Client} and {@link Server}. diff --git a/base-network/src/test/java/build/base/network/EphemeralPortSupplierTests.java b/base-network/src/test/java/build/base/network/EphemeralPortSupplierTests.java index 7358878..2948ffe 100644 --- a/base-network/src/test/java/build/base/network/EphemeralPortSupplierTests.java +++ b/base-network/src/test/java/build/base/network/EphemeralPortSupplierTests.java @@ -1,6 +1,6 @@ package build.base.network; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.DatagramSocket; @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for the {@link EphemeralPortSupplier}. diff --git a/base-network/src/test/java/build/base/network/NetworkTests.java b/base-network/src/test/java/build/base/network/NetworkTests.java index 039fdb1..39179ea 100644 --- a/base-network/src/test/java/build/base/network/NetworkTests.java +++ b/base-network/src/test/java/build/base/network/NetworkTests.java @@ -6,6 +6,7 @@ import build.base.option.Timeout; import build.base.retryable.PermanentFailureException; import build.base.retryable.option.RetryFrequency; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.net.InetAddress; @@ -15,8 +16,6 @@ import java.time.Duration; import java.util.concurrent.CompletableFuture; -import org.junit.jupiter.api.Test; - /** * Tests for {@link Network} utilities. * diff --git a/base-option/pom.xml b/base-option/pom.xml index f9d560d..8f261e6 100644 --- a/base-option/pom.xml +++ b/base-option/pom.xml @@ -32,7 +32,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/base-option/src/test/java/build/base/option/JDKVersionTests.java b/base-option/src/test/java/build/base/option/JDKVersionTests.java index f43f38e..c03d19c 100644 --- a/base-option/src/test/java/build/base/option/JDKVersionTests.java +++ b/base-option/src/test/java/build/base/option/JDKVersionTests.java @@ -1,15 +1,15 @@ package build.base.option; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.util.stream.Stream; - import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; + /** * Tests for {@link JDKVersion}. * diff --git a/base-parsing/pom.xml b/base-parsing/pom.xml index 46d985b..f549366 100644 --- a/base-parsing/pom.xml +++ b/base-parsing/pom.xml @@ -32,14 +32,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-parsing/src/test/java/build/base/parsing/ScannerTests.java b/base-parsing/src/test/java/build/base/parsing/ScannerTests.java index 2ccdc94..7e81d8f 100644 --- a/base-parsing/src/test/java/build/base/parsing/ScannerTests.java +++ b/base-parsing/src/test/java/build/base/parsing/ScannerTests.java @@ -1,10 +1,10 @@ package build.base.parsing; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.regex.Pattern; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Scanner}. diff --git a/base-query/pom.xml b/base-query/pom.xml index 0d5f800..8856ee5 100644 --- a/base-query/pom.xml +++ b/base-query/pom.xml @@ -26,14 +26,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -60,11 +53,18 @@ maven-dependency-plugin + dependency-properties properties + + + + org.mockito:mockito-core + + diff --git a/base-query/src/main/java/build/base/query/Condition.java b/base-query/src/main/java/build/base/query/Condition.java index 8a95af8..b732717 100644 --- a/base-query/src/main/java/build/base/query/Condition.java +++ b/base-query/src/main/java/build/base/query/Condition.java @@ -64,7 +64,7 @@ public interface Condition { * @param predicate the {@link Predicate} that must fail to match * @return a {@link Terminal} that can be used to obtain the results */ - default Terminal doesNotMatch(Predicate predicate) { + default Terminal doesNotMatch(final Predicate predicate) { return matches(predicate.negate()); } } diff --git a/base-retryable/pom.xml b/base-retryable/pom.xml index 56b4cac..81e7e88 100644 --- a/base-retryable/pom.xml +++ b/base-retryable/pom.xml @@ -38,14 +38,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test @@ -72,6 +65,7 @@ maven-dependency-plugin + dependency-properties properties diff --git a/base-retryable/src/test/java/build/base/retryable/BlockingRetryTests.java b/base-retryable/src/test/java/build/base/retryable/BlockingRetryTests.java index 9303634..0bb2455 100644 --- a/base-retryable/src/test/java/build/base/retryable/BlockingRetryTests.java +++ b/base-retryable/src/test/java/build/base/retryable/BlockingRetryTests.java @@ -4,6 +4,12 @@ import build.base.retryable.option.MaximumDelay; import build.base.retryable.option.MinimumDelay; import build.base.retryable.option.RetryFrequency; +import org.junit.jupiter.api.Test; + +import java.time.Duration; +import java.time.Instant; +import java.util.Stack; + import static build.base.retryable.ConditionallyRetryable.retrying; import static java.time.Duration.ofMillis; import static org.assertj.core.api.Assertions.assertThat; @@ -16,12 +22,6 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.time.Duration; -import java.time.Instant; -import java.util.Stack; - -import org.junit.jupiter.api.Test; - /** * Tests for {@link BlockingRetry}. * diff --git a/base-retryable/src/test/java/build/base/retryable/ConditionallyRetryableTests.java b/base-retryable/src/test/java/build/base/retryable/ConditionallyRetryableTests.java index c9e502d..ce0dd5d 100644 --- a/base-retryable/src/test/java/build/base/retryable/ConditionallyRetryableTests.java +++ b/base-retryable/src/test/java/build/base/retryable/ConditionallyRetryableTests.java @@ -1,12 +1,12 @@ package build.base.retryable; -import static build.base.retryable.ConditionallyRetryable.retrying; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; +import org.junit.jupiter.api.Test; import java.util.function.Supplier; -import org.junit.jupiter.api.Test; +import static build.base.retryable.ConditionallyRetryable.retrying; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Tests for {@link ConditionallyRetryable}. diff --git a/base-retryable/src/test/java/build/base/retryable/RetryableTests.java b/base-retryable/src/test/java/build/base/retryable/RetryableTests.java index ce82787..ead1910 100644 --- a/base-retryable/src/test/java/build/base/retryable/RetryableTests.java +++ b/base-retryable/src/test/java/build/base/retryable/RetryableTests.java @@ -1,10 +1,10 @@ package build.base.retryable; -import static org.assertj.core.api.Assertions.assertThat; +import org.junit.jupiter.api.Test; import java.util.function.Supplier; -import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link Retryable}s. diff --git a/base-table/pom.xml b/base-table/pom.xml index aade4f6..09e8025 100644 --- a/base-table/pom.xml +++ b/base-table/pom.xml @@ -19,21 +19,20 @@ build.base - base-configuration + base-foundation ${revision} - - org.junit.jupiter - junit-jupiter - ${junit.version} - test + build.base + base-configuration + ${revision} + org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-table/src/test/java/build/base/table/CellAlignmentTests.java b/base-table/src/test/java/build/base/table/CellAlignmentTests.java index ae27264..b6d4beb 100644 --- a/base-table/src/test/java/build/base/table/CellAlignmentTests.java +++ b/base-table/src/test/java/build/base/table/CellAlignmentTests.java @@ -1,10 +1,10 @@ package build.base.table; import build.base.table.option.CellAlignment; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link CellAlignment}. * diff --git a/base-table/src/test/java/build/base/table/TableTests.java b/base-table/src/test/java/build/base/table/TableTests.java index 85afc10..64b466c 100644 --- a/base-table/src/test/java/build/base/table/TableTests.java +++ b/base-table/src/test/java/build/base/table/TableTests.java @@ -3,10 +3,10 @@ import build.base.foundation.Strings; import build.base.table.option.CellSeparator; import build.base.table.option.RowComparator; -import static org.assertj.core.api.Assertions.assertThat; - import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + /** * Tests for {@link Table}. * diff --git a/base-telemetry-ansi/pom.xml b/base-telemetry-ansi/pom.xml index ddbd05c..cc0eb46 100644 --- a/base-telemetry-ansi/pom.xml +++ b/base-telemetry-ansi/pom.xml @@ -29,10 +29,16 @@ ${revision} + + build.base + base-telemetry + ${revision} + + org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/base-telemetry-foundation/pom.xml b/base-telemetry-foundation/pom.xml index 16ee22f..e3e3ef3 100644 --- a/base-telemetry-foundation/pom.xml +++ b/base-telemetry-foundation/pom.xml @@ -30,11 +30,5 @@ - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - diff --git a/base-telemetry-foundation/src/main/java/build/base/telemetry/foundation/MessagerBasedTelemetryRecorder.java b/base-telemetry-foundation/src/main/java/build/base/telemetry/foundation/MessagerBasedTelemetryRecorder.java index 0d2df6e..1296c22 100644 --- a/base-telemetry-foundation/src/main/java/build/base/telemetry/foundation/MessagerBasedTelemetryRecorder.java +++ b/base-telemetry-foundation/src/main/java/build/base/telemetry/foundation/MessagerBasedTelemetryRecorder.java @@ -9,9 +9,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,12 +34,12 @@ import build.base.telemetry.TelemetryRecorderFactory; import build.base.telemetry.Warning; +import java.net.URI; +import java.util.Objects; import javax.annotation.processing.Messager; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; import javax.tools.Diagnostic; -import java.net.URI; -import java.util.Objects; /** * A {@link Messager} based {@link TelemetryRecorder}. diff --git a/base-telemetry/pom.xml b/base-telemetry/pom.xml index 16694b5..b1801bd 100644 --- a/base-telemetry/pom.xml +++ b/base-telemetry/pom.xml @@ -20,7 +20,7 @@ org.junit.jupiter - junit-jupiter + junit-jupiter-api ${junit.version} test diff --git a/base-telemetry/src/main/java/build/base/telemetry/TelemetryRecorder.java b/base-telemetry/src/main/java/build/base/telemetry/TelemetryRecorder.java index fa09bd2..8e7600c 100644 --- a/base-telemetry/src/main/java/build/base/telemetry/TelemetryRecorder.java +++ b/base-telemetry/src/main/java/build/base/telemetry/TelemetryRecorder.java @@ -187,7 +187,7 @@ default Notification notify(final Location locations, final String format, final * @param args the arguments * @return the created {@link Warning} {@link Telemetry} */ - default Warning warn(Stream location, String format, Object... args) { + default Warning warn(final Stream location, final String format, final Object... args) { return warn(location, null, format, args); } @@ -262,7 +262,7 @@ default Warning warn(final String format, final Object... args) { * @param args the arguments * @return the created {@link Error} {@link Telemetry} */ - default Error error(Stream locations, String format, Object... args) { + default Error error(final Stream locations, final String format, final Object... args) { return error(locations, null, format, args); } diff --git a/base-transport-json/pom.xml b/base-transport-json/pom.xml index 69a33ae..15021c0 100644 --- a/base-transport-json/pom.xml +++ b/base-transport-json/pom.xml @@ -29,6 +29,12 @@ ${revision} + + build.base + base-foundation + ${revision} + + com.fasterxml.jackson.core jackson-core @@ -38,14 +44,7 @@ org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params + junit-jupiter-api ${junit.version} test diff --git a/base-transport-json/src/main/java/build/base/transport/json/Codec.java b/base-transport-json/src/main/java/build/base/transport/json/Codec.java index ffd5937..3c1c956 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/Codec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/Codec.java @@ -22,12 +22,11 @@ import build.base.marshalling.Marshaller; import build.base.marshalling.Parameter; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; +import java.io.IOException; + /** * A JSON Codec for a specific type of value. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/JsonTransport.java b/base-transport-json/src/main/java/build/base/transport/json/JsonTransport.java index cc80566..0637bb2 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/JsonTransport.java +++ b/base-transport-json/src/main/java/build/base/transport/json/JsonTransport.java @@ -55,6 +55,9 @@ import build.base.transport.json.codec.StringCodec; import build.base.transport.json.codec.TimestampCodec; import build.base.transport.json.codec.ZonedDateTimeCodec; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; import java.io.IOException; import java.lang.reflect.Modifier; @@ -65,10 +68,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; - /** * A JSON-based {@link Transport} for {@link Marshalled} {@link Object}s. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/BigDecimalCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/BigDecimalCodec.java index c2da9b8..c010b14 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/BigDecimalCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/BigDecimalCodec.java @@ -24,14 +24,13 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; -import java.math.BigDecimal; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; +import java.math.BigDecimal; + /** * A {@link Codec} for {@link BigDecimal} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/BigIntegerCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/BigIntegerCodec.java index 5b80304..789321b 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/BigIntegerCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/BigIntegerCodec.java @@ -24,14 +24,13 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; -import java.math.BigInteger; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; +import java.math.BigInteger; + /** * A {@link Codec} for {@link BigInteger} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/BooleanCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/BooleanCodec.java index d7401a9..d8b9ff0 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/BooleanCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/BooleanCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Boolean} and {@code boolean} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/ByteCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/ByteCodec.java index 188fbfb..1296f6a 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/ByteCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/ByteCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Byte} and {@code byte} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/CharacterCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/CharacterCodec.java index a59235c..bf505a6 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/CharacterCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/CharacterCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Character} and {@code char} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/DoubleCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/DoubleCodec.java index 201c7c3..3474df9 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/DoubleCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/DoubleCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Double} and {@code double} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/FloatCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/FloatCodec.java index 47283d8..aae74e6 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/FloatCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/FloatCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Float} and {@code float} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/IntegerCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/IntegerCodec.java index c857181..918799d 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/IntegerCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/IntegerCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Integer} and {@code int} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/LongCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/LongCodec.java index 6c59315..d33d827 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/LongCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/LongCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link Long} and {@code long} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/OptionalCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/OptionalCodec.java index af27a79..8d52f9a 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/OptionalCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/OptionalCodec.java @@ -25,14 +25,13 @@ import build.base.marshalling.Parameter; import build.base.transport.json.ConditionalCodec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; -import java.util.Optional; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; +import java.util.Optional; + /** * A {@link ConditionalCodec} of {@link Optional} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/StreamableCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/StreamableCodec.java index 2bf1897..e8e26f9 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/StreamableCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/StreamableCodec.java @@ -26,14 +26,13 @@ import build.base.marshalling.Parameter; import build.base.transport.json.ConditionalCodec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; -import java.util.LinkedList; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; +import java.util.LinkedList; + /** * A {@link ConditionalCodec} of {@link Streamable} values. * diff --git a/base-transport-json/src/main/java/build/base/transport/json/codec/StringCodec.java b/base-transport-json/src/main/java/build/base/transport/json/codec/StringCodec.java index f6b85e8..7a829a5 100644 --- a/base-transport-json/src/main/java/build/base/transport/json/codec/StringCodec.java +++ b/base-transport-json/src/main/java/build/base/transport/json/codec/StringCodec.java @@ -24,13 +24,12 @@ import build.base.marshalling.Parameter; import build.base.transport.json.Codec; import build.base.transport.json.JsonTransport; - -import java.io.IOException; - import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import java.io.IOException; + /** * A {@link Codec} for {@link String} values. * diff --git a/base-transport-json/src/test/java/build/base/transport/json/JsonTransportTests.java b/base-transport-json/src/test/java/build/base/transport/json/JsonTransportTests.java index eeb3198..3c72fb6 100644 --- a/base-transport-json/src/test/java/build/base/transport/json/JsonTransportTests.java +++ b/base-transport-json/src/test/java/build/base/transport/json/JsonTransportTests.java @@ -19,9 +19,8 @@ import build.base.transport.json.example.StreamsAndOptionals; import build.base.transport.json.example.TemporalPerson; import build.base.transport.json.example.Uber; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; +import com.fasterxml.jackson.core.JsonFactory; +import org.junit.jupiter.api.Test; import java.io.IOException; import java.io.StringReader; @@ -32,9 +31,9 @@ import java.util.Optional; import java.util.stream.Stream; -import org.junit.jupiter.api.Test; - -import com.fasterxml.jackson.core.JsonFactory; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; /** * Tests for {@link JsonTransport}. diff --git a/base-transport/pom.xml b/base-transport/pom.xml index c28bd08..73f1d9a 100644 --- a/base-transport/pom.xml +++ b/base-transport/pom.xml @@ -23,26 +23,12 @@ ${revision} - - org.junit.jupiter - junit-jupiter - ${junit.version} - test - - - - org.junit.jupiter - junit-jupiter-params - ${junit.version} - test + build.base + base-foundation + ${revision} - - org.assertj - assertj-core - ${assertj.version} - test - + diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index a23ecf9..f1f5907 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -10,6 +10,11 @@ + + + + + @@ -17,6 +22,7 @@ + @@ -45,28 +51,6 @@ - + diff --git a/config/intellij/CodeStyle.xml b/config/intellij/CodeStyle.xml index 64c63fd..eed5d50 100644 --- a/config/intellij/CodeStyle.xml +++ b/config/intellij/CodeStyle.xml @@ -81,4 +81,4 @@ + + org.apache.maven.plugins + maven-dependency-plugin + ${maven-dependency-plugin.version} + + + analyze-dependencies + verify + + analyze-only + + + true + + + + + org.codehaus.mojo license-maven-plugin @@ -309,6 +350,15 @@ + + org.apache.maven.plugins + maven-surefire-plugin + ${maven-surefire-plugin.version} + + false + + +