From 3d8f8ed398352b51d48a483121cc2244288157e8 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 11 Jul 2021 00:49:11 +0000 Subject: [PATCH 01/21] other: update sbt-scalafmt from 2.4.2 to 2.4.3 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 965537e..81d3c8c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.0") From 901d7667dd3a2d38840d239eb001bd7dbb51324b Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 15 Aug 2021 00:43:23 +0000 Subject: [PATCH 02/21] other: update sbt-sonatype from 3.9.7 to 3.9.9 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 965537e..db9ddec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.3.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") From 5aadcc78918efbf6a6b09a131e8c35e635e075d7 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 29 Aug 2021 00:46:36 +0000 Subject: [PATCH 03/21] other: update sbt-java-formatter from 0.6.0 to 0.6.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d7c58e4..a731486 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.9") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.0") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") \ No newline at end of file From c4ca7f717d5c6539766ead70cc751d56282f4a52 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 29 Aug 2021 00:46:44 +0000 Subject: [PATCH 04/21] other: update sbt-sonatype from 3.9.9 to 3.9.10 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index d7c58e4..f276926 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.3.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.9") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") From 83e0d10c39c7ebd51b7326c4d2f8187d644554a5 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Tue, 31 Aug 2021 10:29:08 +0200 Subject: [PATCH 05/21] updated the javadoc badge in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f6d12eb..9734d49 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ![Build & Test](https://github.com/pnerg/java-scala-util/workflows/Build%20&%20Test/badge.svg) [![codecov.io](http://codecov.io/github/pnerg/java-scala-util/coverage.svg?branch=master)](http://codecov.io/github/pnerg/java-scala-util?branch=master) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/org.dmonix.functional/java-scala-utils/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/org.dmonix.functional/java-scala-utils) -[![Javadoc](http://javadoc-badge.appspot.com/org.dmonix.functional/java-scala-utils.svg?label=javadoc)](http://javadoc-badge.appspot.com/org.dmonix.functional/java-scala-utils) +[![javadoc](https://javadoc.io/badge2/org.dmonix.functional/java-scala-utils/javadoc.svg?label=javadoc)](https://javadoc.io/doc/org.dmonix.functional/java-scala-utils) One might ask the question why bother to map some of the features in Scala to Java. From ce16f151e6113195e07b0cb5f8b81d1869a341b7 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Tue, 9 Nov 2021 09:11:05 +0000 Subject: [PATCH 06/21] other: update sbt-jacoco from 3.3.0 to 3.4.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 90d39db..f515ebc 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ -addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.3.0") +addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") From df75812596d21c7a374400dc9a7ece6304830674 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Tue, 9 Nov 2021 09:11:20 +0000 Subject: [PATCH 07/21] other: update junit-interface from 0.11 to 0.13.2 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3207c39..55c09d7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies extends AutoPlugin { */ //val junit = "junit" % "junit" % "4.11" val junit = "junit" % "junit" % "4.13.2" - val `junit-interface` = "com.novocode" % "junit-interface" % "0.11" + val `junit-interface` = "com.github.sbt" % "junit-interface" % "0.13.2" } } From 0f4f338cd37902135b9ac36cafe1bbfe71ec7858 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Tue, 9 Nov 2021 09:11:24 +0000 Subject: [PATCH 08/21] other: update sbt-native-packager from 1.8.1 to 1.9.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 90d39db..354f8ec 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.0") \ No newline at end of file From 64340e7b4b0739458dd764c5c0c3275085a69158 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 21 Nov 2021 00:40:43 +0000 Subject: [PATCH 09/21] other: update sbt-native-packager from 1.9.0 to 1.9.7 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f1ae704..ed76864 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.0") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.7") \ No newline at end of file From edce7953bc95611e21874b65a8d298557356b5a2 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 21 Nov 2021 00:40:53 +0000 Subject: [PATCH 10/21] other: update sbt-java-formatter from 0.6.1 to 0.7.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f1ae704..4619b25 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.0") \ No newline at end of file From 1703ca17b21b138726d6d4022d0b77ecec3f2fba Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 21 Nov 2021 00:41:01 +0000 Subject: [PATCH 11/21] other: update sbt-scalafmt from 2.4.3 to 2.4.4 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index f1ae704..e45d248 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.6.1") From c12f5d6e72d3b43b1be6d1652b0860ebf573485d Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 26 Dec 2021 00:45:33 +0000 Subject: [PATCH 12/21] other: update sbt-scalafmt from 2.4.4 to 2.4.6 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 1cb8ce0..09e8fcf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.4") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") From 80ba3d39d7295f4707696a007559faf5f1996a37 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 2 Jan 2022 00:44:22 +0000 Subject: [PATCH 13/21] other: update junit-interface from 0.13.2 to 0.13.3 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 55c09d7..c2f784c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies extends AutoPlugin { */ //val junit = "junit" % "junit" % "4.11" val junit = "junit" % "junit" % "4.13.2" - val `junit-interface` = "com.github.sbt" % "junit-interface" % "0.13.2" + val `junit-interface` = "com.github.sbt" % "junit-interface" % "0.13.3" } } From 6956420ff273599c6aeff81be573a4835f9c635c Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 25 Dec 2022 01:10:56 +0000 Subject: [PATCH 14/21] other: update sbt-java-formatter from 0.7.0 to 0.8.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 09e8fcf..2223014 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,6 +6,6 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") -addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") +addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.7") \ No newline at end of file From 656ae6237059dcc1b94c39784df0ab913e8426ec Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 25 Dec 2022 01:11:12 +0000 Subject: [PATCH 15/21] Reformat with sbt-java-formatter 0.8.0 Executed command: sbt javafmtAll --- src/main/java/javascalautils/Failure.java | 4 ++-- src/main/java/javascalautils/Left.java | 4 ++-- src/main/java/javascalautils/LeftProjection.java | 4 ++-- src/main/java/javascalautils/None.java | 6 +++--- src/main/java/javascalautils/Right.java | 4 ++-- src/main/java/javascalautils/RightProjection.java | 4 ++-- src/main/java/javascalautils/Some.java | 7 +++---- src/main/java/javascalautils/Success.java | 4 ++-- .../java/javascalautils/ThrowableFunction0.java | 3 +-- .../javascalautils/concurrent/ExecutorImpl.java | 4 ++-- .../java/javascalautils/concurrent/Executors.java | 3 +-- .../java/javascalautils/concurrent/Future.java | 5 ++--- .../javascalautils/concurrent/FutureImpl.java | 15 +++++++-------- .../javascalautils/concurrent/PromiseImpl.java | 7 +++---- .../javascalautils/concurrent/ReflectionUtil.java | 4 ++-- src/test/java/javascalautils/BaseAssert.java | 7 +++---- .../java/javascalautils/TestEitherCompanion.java | 4 ++-- .../TestLeftProjection_WithLeft.java | 3 +-- .../TestLeftProjection_WithRight.java | 3 +-- src/test/java/javascalautils/TestNone.java | 3 +-- src/test/java/javascalautils/TestOption.java | 3 +-- .../java/javascalautils/TestOptionCompanion.java | 4 ++-- .../TestRightProjection_WithLeft.java | 3 +-- .../TestRightProjection_WithRight.java | 3 +-- .../javascalautils/TestSingleItemContainer.java | 3 +-- src/test/java/javascalautils/TestSome.java | 3 +-- src/test/java/javascalautils/TestSuccess.java | 3 +-- .../java/javascalautils/TestTryCompanion.java | 4 ++-- .../concurrent/TestExecutorImpl.java | 7 +++---- .../javascalautils/concurrent/TestExecutors.java | 5 +++-- .../javascalautils/concurrent/TestFuture.java | 15 +++++++-------- .../concurrent/TestFutureCompanion.java | 9 ++++----- .../javascalautils/concurrent/TestFutureImpl.java | 11 +++++------ .../concurrent/TestNamedThreadFactory.java | 5 ++--- .../concurrent/TestPromiseCompanion.java | 4 ++-- .../concurrent/TestPromiseImpl.java | 5 ++--- 36 files changed, 82 insertions(+), 103 deletions(-) diff --git a/src/main/java/javascalautils/Failure.java b/src/main/java/javascalautils/Failure.java index 8e9c304..9135e7c 100644 --- a/src/main/java/javascalautils/Failure.java +++ b/src/main/java/javascalautils/Failure.java @@ -13,12 +13,12 @@ */ package javascalautils; +import static javascalautils.TryCompanion.Success; + import java.io.Serializable; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.TryCompanion.Success; - /** * Represents the failure implementation of {@link Try}.
* Acts as a carrier for the result/throwable of a unsuccessful computation.
diff --git a/src/main/java/javascalautils/Left.java b/src/main/java/javascalautils/Left.java index 3eb0553..fa82163 100644 --- a/src/main/java/javascalautils/Left.java +++ b/src/main/java/javascalautils/Left.java @@ -13,11 +13,11 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Right; + import java.io.Serializable; import java.util.function.Function; -import static javascalautils.EitherCompanion.Right; - /** * Represents the {@link Left} side of an {@link Either}. * diff --git a/src/main/java/javascalautils/LeftProjection.java b/src/main/java/javascalautils/LeftProjection.java index 27af404..0cca614 100644 --- a/src/main/java/javascalautils/LeftProjection.java +++ b/src/main/java/javascalautils/LeftProjection.java @@ -13,13 +13,13 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Left; + import java.io.Serializable; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.EitherCompanion.Left; - /** * This is a left-biased wrapper for an instance of {@link Either}. * diff --git a/src/main/java/javascalautils/None.java b/src/main/java/javascalautils/None.java index 6f46a84..4803398 100644 --- a/src/main/java/javascalautils/None.java +++ b/src/main/java/javascalautils/None.java @@ -13,14 +13,14 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Left; +import static javascalautils.EitherCompanion.Right; + import java.io.Serializable; import java.util.NoSuchElementException; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.EitherCompanion.Left; -import static javascalautils.EitherCompanion.Right; - /** * Represents an empty {@link Option}.
* The {@link None} is a replacement for null values representing a non-existing value. diff --git a/src/main/java/javascalautils/Right.java b/src/main/java/javascalautils/Right.java index 05ec3fd..53536c1 100644 --- a/src/main/java/javascalautils/Right.java +++ b/src/main/java/javascalautils/Right.java @@ -13,11 +13,11 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Left; + import java.io.Serializable; import java.util.function.Function; -import static javascalautils.EitherCompanion.Left; - /** * Represents the {@link Right} side of an {@link Either}. * diff --git a/src/main/java/javascalautils/RightProjection.java b/src/main/java/javascalautils/RightProjection.java index 416441c..38b50ab 100644 --- a/src/main/java/javascalautils/RightProjection.java +++ b/src/main/java/javascalautils/RightProjection.java @@ -13,13 +13,13 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Right; + import java.io.Serializable; import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.EitherCompanion.Right; - /** * This is a right-biased wrapper for an instance of {@link Either}. * diff --git a/src/main/java/javascalautils/Some.java b/src/main/java/javascalautils/Some.java index 1ee118b..9254e48 100644 --- a/src/main/java/javascalautils/Some.java +++ b/src/main/java/javascalautils/Some.java @@ -13,14 +13,13 @@ */ package javascalautils; +import static javascalautils.EitherCompanion.Left; +import static javascalautils.EitherCompanion.Right; + import java.io.Serializable; -import java.util.function.Function; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.EitherCompanion.Left; -import static javascalautils.EitherCompanion.Right; - /** * Represents an {@link Option} holding a value.
* The instance of {@link Some} is guaranteed to keep a non-null value object.
diff --git a/src/main/java/javascalautils/Success.java b/src/main/java/javascalautils/Success.java index bf980ab..9996c05 100644 --- a/src/main/java/javascalautils/Success.java +++ b/src/main/java/javascalautils/Success.java @@ -13,13 +13,13 @@ */ package javascalautils; +import static javascalautils.TryCompanion.Try; + import java.io.Serializable; import java.util.NoSuchElementException; import java.util.function.Predicate; import java.util.function.Supplier; -import static javascalautils.TryCompanion.Try; - /** * Represents the successful implementation of {@link Try}.
* Acts as a carrier for the result of a successful computation.
diff --git a/src/main/java/javascalautils/ThrowableFunction0.java b/src/main/java/javascalautils/ThrowableFunction0.java index 78535a2..74428de 100644 --- a/src/main/java/javascalautils/ThrowableFunction0.java +++ b/src/main/java/javascalautils/ThrowableFunction0.java @@ -13,9 +13,8 @@ */ package javascalautils; -import javascalautils.concurrent.Future; - import java.util.function.Function; +import javascalautils.concurrent.Future; /** * A function that takes no arguments and returns a value of type T.
diff --git a/src/main/java/javascalautils/concurrent/ExecutorImpl.java b/src/main/java/javascalautils/concurrent/ExecutorImpl.java index b52d098..be65988 100644 --- a/src/main/java/javascalautils/concurrent/ExecutorImpl.java +++ b/src/main/java/javascalautils/concurrent/ExecutorImpl.java @@ -13,6 +13,8 @@ */ package javascalautils.concurrent; +import static javascalautils.concurrent.PromiseCompanion.Promise; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.Callable; @@ -20,8 +22,6 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.TimeUnit; -import static javascalautils.concurrent.PromiseCompanion.Promise; - /** * Implements the executor interface.
* Internally uses a Java concurrent executor to provide the thread execution mechanism. diff --git a/src/main/java/javascalautils/concurrent/Executors.java b/src/main/java/javascalautils/concurrent/Executors.java index d5c1731..b6f2a83 100644 --- a/src/main/java/javascalautils/concurrent/Executors.java +++ b/src/main/java/javascalautils/concurrent/Executors.java @@ -13,9 +13,8 @@ */ package javascalautils.concurrent; -import javascalautils.Try; - import java.util.concurrent.ThreadFactory; +import javascalautils.Try; /** * Factory for creating {@link Executor} instances. diff --git a/src/main/java/javascalautils/concurrent/Future.java b/src/main/java/javascalautils/concurrent/Future.java index 17bf998..2e34faa 100644 --- a/src/main/java/javascalautils/concurrent/Future.java +++ b/src/main/java/javascalautils/concurrent/Future.java @@ -13,7 +13,7 @@ */ package javascalautils.concurrent; -import javascalautils.*; +import static javascalautils.TryCompanion.*; import java.time.Duration; import java.util.concurrent.TimeUnit; @@ -22,8 +22,7 @@ import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Stream; - -import static javascalautils.TryCompanion.*; +import javascalautils.*; /** * A Future that will hold the result of an asynchronous computation.
diff --git a/src/main/java/javascalautils/concurrent/FutureImpl.java b/src/main/java/javascalautils/concurrent/FutureImpl.java index bf2d16f..3bc8fd6 100644 --- a/src/main/java/javascalautils/concurrent/FutureImpl.java +++ b/src/main/java/javascalautils/concurrent/FutureImpl.java @@ -13,10 +13,9 @@ */ package javascalautils.concurrent; -import javascalautils.Option; -import javascalautils.ThrowableFunction1; -import javascalautils.Try; -import javascalautils.Validator; +import static javascalautils.Option.None; +import static javascalautils.OptionCompanion.Some; +import static javascalautils.TryCompanion.*; import java.util.List; import java.util.NoSuchElementException; @@ -27,10 +26,10 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Predicate; - -import static javascalautils.Option.None; -import static javascalautils.OptionCompanion.Some; -import static javascalautils.TryCompanion.*; +import javascalautils.Option; +import javascalautils.ThrowableFunction1; +import javascalautils.Try; +import javascalautils.Validator; /** * The future implementation. diff --git a/src/main/java/javascalautils/concurrent/PromiseImpl.java b/src/main/java/javascalautils/concurrent/PromiseImpl.java index e0c60f4..fa0f259 100644 --- a/src/main/java/javascalautils/concurrent/PromiseImpl.java +++ b/src/main/java/javascalautils/concurrent/PromiseImpl.java @@ -13,13 +13,12 @@ */ package javascalautils.concurrent; -import javascalautils.Try; -import javascalautils.Validator; +import static javascalautils.TryCompanion.*; import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; - -import static javascalautils.TryCompanion.*; +import javascalautils.Try; +import javascalautils.Validator; /** * The Promise implementation.
diff --git a/src/main/java/javascalautils/concurrent/ReflectionUtil.java b/src/main/java/javascalautils/concurrent/ReflectionUtil.java index 12a523e..bc0c244 100644 --- a/src/main/java/javascalautils/concurrent/ReflectionUtil.java +++ b/src/main/java/javascalautils/concurrent/ReflectionUtil.java @@ -13,12 +13,12 @@ */ package javascalautils.concurrent; +import static javascalautils.TryCompanion.Try; + import javascalautils.Failure; import javascalautils.Success; import javascalautils.Try; -import static javascalautils.TryCompanion.Try; - /** * Class with utilities for reflective operations.
* This class is not intended for public usage, it's a library internal helper.
diff --git a/src/test/java/javascalautils/BaseAssert.java b/src/test/java/javascalautils/BaseAssert.java index 2c1678e..80a4d7f 100644 --- a/src/test/java/javascalautils/BaseAssert.java +++ b/src/test/java/javascalautils/BaseAssert.java @@ -13,15 +13,14 @@ */ package javascalautils; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; - import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Modifier; import java.util.Collection; import java.util.Locale; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; /** * Base test class. diff --git a/src/test/java/javascalautils/TestEitherCompanion.java b/src/test/java/javascalautils/TestEitherCompanion.java index 4b45e81..9a6dc58 100644 --- a/src/test/java/javascalautils/TestEitherCompanion.java +++ b/src/test/java/javascalautils/TestEitherCompanion.java @@ -13,11 +13,11 @@ */ package javascalautils; -import org.junit.Test; - import static javascalautils.EitherCompanion.Left; import static javascalautils.EitherCompanion.Right; +import org.junit.Test; + /** * Test the class {@link EitherCompanion} * diff --git a/src/test/java/javascalautils/TestLeftProjection_WithLeft.java b/src/test/java/javascalautils/TestLeftProjection_WithLeft.java index 4a8e328..908e265 100644 --- a/src/test/java/javascalautils/TestLeftProjection_WithLeft.java +++ b/src/test/java/javascalautils/TestLeftProjection_WithLeft.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.Iterator; +import org.junit.Test; /** * Test the class {@link LeftProjection} diff --git a/src/test/java/javascalautils/TestLeftProjection_WithRight.java b/src/test/java/javascalautils/TestLeftProjection_WithRight.java index ef2a03d..47702fe 100644 --- a/src/test/java/javascalautils/TestLeftProjection_WithRight.java +++ b/src/test/java/javascalautils/TestLeftProjection_WithRight.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.NoSuchElementException; +import org.junit.Test; /** * Test the class {@link LeftProjection} diff --git a/src/test/java/javascalautils/TestNone.java b/src/test/java/javascalautils/TestNone.java index 0b56940..9970673 100644 --- a/src/test/java/javascalautils/TestNone.java +++ b/src/test/java/javascalautils/TestNone.java @@ -13,10 +13,9 @@ */ package javascalautils; -import org.junit.Test; - import java.util.ArrayList; import java.util.NoSuchElementException; +import org.junit.Test; /** * Test the class {@link None}. diff --git a/src/test/java/javascalautils/TestOption.java b/src/test/java/javascalautils/TestOption.java index 3fe8294..6f76c2f 100644 --- a/src/test/java/javascalautils/TestOption.java +++ b/src/test/java/javascalautils/TestOption.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.Optional; +import org.junit.Test; /** * Test the class {@link Option}. diff --git a/src/test/java/javascalautils/TestOptionCompanion.java b/src/test/java/javascalautils/TestOptionCompanion.java index 154db55..0744dfe 100644 --- a/src/test/java/javascalautils/TestOptionCompanion.java +++ b/src/test/java/javascalautils/TestOptionCompanion.java @@ -13,12 +13,12 @@ */ package javascalautils; -import org.junit.Test; - import static javascalautils.OptionCompanion.None; import static javascalautils.OptionCompanion.Option; import static javascalautils.OptionCompanion.Some; +import org.junit.Test; + /** * Test the class {@link OptionCompanion}. * diff --git a/src/test/java/javascalautils/TestRightProjection_WithLeft.java b/src/test/java/javascalautils/TestRightProjection_WithLeft.java index 0e9dcfe..6f506b6 100644 --- a/src/test/java/javascalautils/TestRightProjection_WithLeft.java +++ b/src/test/java/javascalautils/TestRightProjection_WithLeft.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.NoSuchElementException; +import org.junit.Test; /** * Test the class {@link RightProjection} diff --git a/src/test/java/javascalautils/TestRightProjection_WithRight.java b/src/test/java/javascalautils/TestRightProjection_WithRight.java index d613cfd..62433c9 100644 --- a/src/test/java/javascalautils/TestRightProjection_WithRight.java +++ b/src/test/java/javascalautils/TestRightProjection_WithRight.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.Iterator; +import org.junit.Test; /** * Test the class {@link RightProjection} diff --git a/src/test/java/javascalautils/TestSingleItemContainer.java b/src/test/java/javascalautils/TestSingleItemContainer.java index ab0909f..af0d912 100644 --- a/src/test/java/javascalautils/TestSingleItemContainer.java +++ b/src/test/java/javascalautils/TestSingleItemContainer.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.Iterator; +import org.junit.Test; /** * Test the class {@link SingleItemContainer} diff --git a/src/test/java/javascalautils/TestSome.java b/src/test/java/javascalautils/TestSome.java index 6ea8077..c5e3180 100644 --- a/src/test/java/javascalautils/TestSome.java +++ b/src/test/java/javascalautils/TestSome.java @@ -13,10 +13,9 @@ */ package javascalautils; -import org.junit.Test; - import java.util.ArrayList; import java.util.Iterator; +import org.junit.Test; /** * Test the class {@link Some} diff --git a/src/test/java/javascalautils/TestSuccess.java b/src/test/java/javascalautils/TestSuccess.java index 6db7dbb..8a2e2d2 100644 --- a/src/test/java/javascalautils/TestSuccess.java +++ b/src/test/java/javascalautils/TestSuccess.java @@ -13,9 +13,8 @@ */ package javascalautils; -import org.junit.Test; - import java.util.stream.Stream; +import org.junit.Test; /** * Test the class {@link Success} diff --git a/src/test/java/javascalautils/TestTryCompanion.java b/src/test/java/javascalautils/TestTryCompanion.java index 3109b4e..7fbe32e 100644 --- a/src/test/java/javascalautils/TestTryCompanion.java +++ b/src/test/java/javascalautils/TestTryCompanion.java @@ -13,12 +13,12 @@ */ package javascalautils; -import org.junit.Test; - import static javascalautils.TryCompanion.Failure; import static javascalautils.TryCompanion.Success; import static javascalautils.TryCompanion.Try; +import org.junit.Test; + /** * Test the class {@link TryCompanion} * diff --git a/src/test/java/javascalautils/concurrent/TestExecutorImpl.java b/src/test/java/javascalautils/concurrent/TestExecutorImpl.java index c840674..d99b024 100644 --- a/src/test/java/javascalautils/concurrent/TestExecutorImpl.java +++ b/src/test/java/javascalautils/concurrent/TestExecutorImpl.java @@ -13,15 +13,14 @@ */ package javascalautils.concurrent; +import java.util.List; +import java.util.concurrent.RejectedExecutionException; +import java.util.concurrent.TimeUnit; import javascalautils.BaseAssert; import javascalautils.DummyException; import org.junit.After; import org.junit.Test; -import java.util.List; -import java.util.concurrent.RejectedExecutionException; -import java.util.concurrent.TimeUnit; - /** * Test the class {@link ExecutorImpl}. * diff --git a/src/test/java/javascalautils/concurrent/TestExecutors.java b/src/test/java/javascalautils/concurrent/TestExecutors.java index c2b74d3..924664a 100644 --- a/src/test/java/javascalautils/concurrent/TestExecutors.java +++ b/src/test/java/javascalautils/concurrent/TestExecutors.java @@ -13,13 +13,14 @@ */ package javascalautils.concurrent; +import static javascalautils.TryCompanion.Try; + +import java.util.concurrent.TimeUnit; import javascalautils.BaseAssert; import javascalautils.Try; import javascalautils.TryAsserts; import org.junit.Test; -import java.util.concurrent.TimeUnit; -import static javascalautils.TryCompanion.Try; /** * Test the class {@link Executors}. * diff --git a/src/test/java/javascalautils/concurrent/TestFuture.java b/src/test/java/javascalautils/concurrent/TestFuture.java index 13dffda..718cfce 100644 --- a/src/test/java/javascalautils/concurrent/TestFuture.java +++ b/src/test/java/javascalautils/concurrent/TestFuture.java @@ -13,19 +13,18 @@ */ package javascalautils.concurrent; -import javascalautils.BaseAssert; -import javascalautils.DummyException; -import javascalautils.Failure; -import javascalautils.Success; -import org.junit.Test; +import static java.util.concurrent.TimeUnit.SECONDS; +import static javascalautils.concurrent.Future.apply; import java.time.Duration; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import java.util.stream.Stream; - -import static java.util.concurrent.TimeUnit.SECONDS; -import static javascalautils.concurrent.Future.apply; +import javascalautils.BaseAssert; +import javascalautils.DummyException; +import javascalautils.Failure; +import javascalautils.Success; +import org.junit.Test; /** * Test the class {@link Future}. diff --git a/src/test/java/javascalautils/concurrent/TestFutureCompanion.java b/src/test/java/javascalautils/concurrent/TestFutureCompanion.java index 4c4f18d..77473e2 100644 --- a/src/test/java/javascalautils/concurrent/TestFutureCompanion.java +++ b/src/test/java/javascalautils/concurrent/TestFutureCompanion.java @@ -13,16 +13,15 @@ */ package javascalautils.concurrent; -import javascalautils.BaseAssert; -import javascalautils.Unit; -import org.junit.Test; +import static javascalautils.concurrent.FutureCompanion.Future; import java.time.Duration; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeoutException; - -import static javascalautils.concurrent.FutureCompanion.Future; +import javascalautils.BaseAssert; +import javascalautils.Unit; +import org.junit.Test; /** * Test the class {@link FutureCompanion} diff --git a/src/test/java/javascalautils/concurrent/TestFutureImpl.java b/src/test/java/javascalautils/concurrent/TestFutureImpl.java index 78817d4..61bfaaa 100644 --- a/src/test/java/javascalautils/concurrent/TestFutureImpl.java +++ b/src/test/java/javascalautils/concurrent/TestFutureImpl.java @@ -13,6 +13,11 @@ */ package javascalautils.concurrent; +import java.util.NoSuchElementException; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; import javascalautils.BaseAssert; import javascalautils.DummyException; import javascalautils.Failure; @@ -21,12 +26,6 @@ import org.junit.Before; import org.junit.Test; -import java.util.NoSuchElementException; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; - /** * Test the class {@link FutureImpl}. * diff --git a/src/test/java/javascalautils/concurrent/TestNamedThreadFactory.java b/src/test/java/javascalautils/concurrent/TestNamedThreadFactory.java index a2b07b1..d135516 100644 --- a/src/test/java/javascalautils/concurrent/TestNamedThreadFactory.java +++ b/src/test/java/javascalautils/concurrent/TestNamedThreadFactory.java @@ -13,11 +13,10 @@ */ package javascalautils.concurrent; -import javascalautils.BaseAssert; -import org.junit.Test; - import java.io.IOException; import java.util.concurrent.ThreadFactory; +import javascalautils.BaseAssert; +import org.junit.Test; /** * Test the class {@link NamedSequenceThreadFactory}. diff --git a/src/test/java/javascalautils/concurrent/TestPromiseCompanion.java b/src/test/java/javascalautils/concurrent/TestPromiseCompanion.java index 814bfc6..50b54b5 100644 --- a/src/test/java/javascalautils/concurrent/TestPromiseCompanion.java +++ b/src/test/java/javascalautils/concurrent/TestPromiseCompanion.java @@ -13,11 +13,11 @@ */ package javascalautils.concurrent; +import static javascalautils.concurrent.PromiseCompanion.Promise; + import javascalautils.BaseAssert; import org.junit.Test; -import static javascalautils.concurrent.PromiseCompanion.Promise; - /** * Test the class {@link PromiseCompanion} * diff --git a/src/test/java/javascalautils/concurrent/TestPromiseImpl.java b/src/test/java/javascalautils/concurrent/TestPromiseImpl.java index 2d10d52..632d30a 100644 --- a/src/test/java/javascalautils/concurrent/TestPromiseImpl.java +++ b/src/test/java/javascalautils/concurrent/TestPromiseImpl.java @@ -13,13 +13,12 @@ */ package javascalautils.concurrent; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import javascalautils.BaseAssert; import javascalautils.Success; import org.junit.Test; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - /** * Test the class {@link PromiseImpl} * From 246e5d64672cb4088f3e9838a4aac45687be65c8 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 25 Dec 2022 01:11:12 +0000 Subject: [PATCH 16/21] Add 'Reformat with sbt-java-formatter 0.8.0' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000..cf78b4c --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with sbt-java-formatter 0.8.0 +656ae6237059dcc1b94c39784df0ab913e8426ec From ec2f911778803188a06e7b8ae87dd922901796e9 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 25 Dec 2022 01:11:19 +0000 Subject: [PATCH 17/21] other: update sbt-scalafmt from 2.4.6 to 2.5.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 09e8fcf..6dd7632 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,7 +4,7 @@ addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") From cba828b9ebdd86f89fe21e4c7ca7d116c560b45a Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 29 Jan 2023 01:14:54 +0000 Subject: [PATCH 18/21] other: update sbt-sonatype from 3.9.10 to 3.9.17 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 09e8fcf..2fb4c4c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.10") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") From 8e3ebbb423727d65416f3524d58d6e7eb9d2657c Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 19 Feb 2023 01:14:12 +0000 Subject: [PATCH 19/21] other: update sbt-native-packager from 1.9.7 to 1.9.15 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 09e8fcf..e76602c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.7.0") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.7") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.15") \ No newline at end of file From 756b0a57a8ad9014274a4c160cff287c3c6f067e Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 26 Feb 2023 01:19:22 +0000 Subject: [PATCH 20/21] other: update sbt-native-packager from 1.9.15 to 1.9.16 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bd51378..d6ee968 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,4 +8,4 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.15") \ No newline at end of file +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") \ No newline at end of file From 98b5cab8ddfc343e604bfc879e3dfd1a6059e047 Mon Sep 17 00:00:00 2001 From: Peter Nerg Date: Sun, 21 May 2023 01:08:53 +0000 Subject: [PATCH 21/21] other: update sbt-sonatype from 3.9.17 to 3.9.21 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index bd51378..de51dda 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,7 +2,7 @@ addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0") addSbtPlugin("io.crashbox" % "sbt-gpg" % "0.2.1") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.17") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0")