From 09aad7ea38ab6b0333d883e0370109cd77c91200 Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Wed, 13 Dec 2023 15:48:21 -0600 Subject: [PATCH 1/6] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d838af..42af0ee 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -# co.unruly.control +# AJ's control + +This is a fork of the co.unruly.control repo. I will probably redesign/rename various functions, but otherwise you should refer to the parent repo (or the readme below) for more information. + +## co.unruly.control [![Build Status](https://travis-ci.org/unruly/control.svg?branch=master)](https://travis-ci.org/unruly/control) [![Release Version](https://img.shields.io/maven-central/v/co.unruly/control.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22co.unruly%22%20AND%20a%3A%22control%22) From e97d03cf38cecb6957f3cc9703d2efe3a35aca87 Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Thu, 14 Dec 2023 22:24:26 -0600 Subject: [PATCH 2/6] adding all files --- .gitignore | 2 + README.md | 26 +- build.gradle | 46 ++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 12 + .../unruly/control/ErrorThrowingLambdas.java | 81 +++++- .../unruly/control/HigherOrderFunctions.java | 82 +++++- src/main/java/co/unruly/control/Lazy.java | 7 + src/main/java/co/unruly/control/Lists.java | 18 +- .../java/co/unruly/control/Optionals.java | 35 ++- .../co/unruly/control/PartialApplication.java | 66 ++++- src/main/java/co/unruly/control/Piper.java | 30 ++- .../java/co/unruly/control/Predicates.java | 10 +- .../co/unruly/control/ThrowingLambdas.java | 108 +++++++- src/main/java/co/unruly/control/Unit.java | 28 +- .../co/unruly/control/casts/Equality.java | 14 + .../control/matchers/FailureMatcher.java | 12 +- .../control/matchers/ResultMatchers.java | 36 ++- .../control/matchers/SuccessMatcher.java | 15 +- .../unruly/control/pair/Comprehensions.java | 183 +++++++++++-- .../java/co/unruly/control/pair/Maps.java | 13 +- .../java/co/unruly/control/pair/Pair.java | 62 +++-- .../control/pair/PairListCollector.java | 14 +- .../control/pair/PairReducingCollector.java | 21 +- .../java/co/unruly/control/pair/Pairs.java | 129 +++++++-- .../java/co/unruly/control/pair/Quad.java | 110 ++++---- .../java/co/unruly/control/pair/Triple.java | 94 ++++--- .../co/unruly/control/result/Combiners.java | 39 ++- .../co/unruly/control/result/Introducers.java | 200 +++++++++++--- .../java/co/unruly/control/result/Match.java | 46 +++- .../unruly/control/result/MonadicAliases.java | 74 +++++- .../co/unruly/control/result/Recover.java | 64 ++++- .../co/unruly/control/result/Resolvers.java | 87 +++++- .../java/co/unruly/control/result/Result.java | 64 ++++- .../control/result/ResultCollector.java | 35 ++- .../unruly/control/result/Transformers.java | 152 +++++++++-- .../java/co/unruly/control/result/TypeOf.java | 66 ++++- .../control/validation/FailedValidation.java | 37 +-- .../control/validation/ForwardingList.java | 35 ++- .../unruly/control/validation/Validator.java | 10 +- .../unruly/control/validation/Validators.java | 173 ++++++++++-- .../unruly/control/ThrowingLambdasTest.java | 6 +- src/test/java/co/unruly/control/ZipTest.java | 15 +- .../java/co/unruly/control/pair/PairTest.java | 6 +- .../co/unruly/control/result/CastsTest.java | 6 +- .../co/unruly/control/result/MatchTest.java | 40 +-- .../co/unruly/control/result/PiperTest.java | 12 +- .../co/unruly/control/result/ResultsTest.java | 126 +++++---- .../co/unruly/control/result/TryTest.java | 9 +- .../control/validation/ValidatorTest.java | 114 ++++---- src/test/java/examples/ConciseEquals.java | 4 +- .../examples/ExceptionsInStreamsHandling.java | 15 +- src/test/java/examples/FlatMapVariance.java | 18 +- .../examples/FunctionalErrorHandling.java | 22 +- .../java/examples/NovelErrorHandling.java | 80 ++---- 58 files changed, 2444 insertions(+), 713 deletions(-) create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore index f83e8cf..6943b56 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ .idea target *.iml +/.gradle/ +/build/ diff --git a/README.md b/README.md index 42af0ee..04b1cda 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,4 @@ -# AJ's control - -This is a fork of the co.unruly.control repo. I will probably redesign/rename various functions, but otherwise you should refer to the parent repo (or the readme below) for more information. - -## co.unruly.control +# co.unruly.control [![Build Status](https://travis-ci.org/unruly/control.svg?branch=master)](https://travis-ci.org/unruly/control) [![Release Version](https://img.shields.io/maven-central/v/co.unruly/control.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22co.unruly%22%20AND%20a%3A%22control%22) @@ -189,8 +185,12 @@ and failure types, and both functions must return the same type. `Result.then` takes a function from a `Result` to a value, and then applies that function to the result. The following lines of code are (other than generics inference issues) equivalent: ```java -ifFailed(x -> "Hello World").apply(result); -result.then(ifFailed(x -> "Hello World")); +class example { + example() { + ifFailed(x -> "Hello World").apply(result); + result.then(ifFailed(x -> "Hello World")); + } +} ``` By structuring the API like this, instead of having a fixed set of methods available, we can @@ -228,10 +228,14 @@ Piper pipe = Piper.pipe(42); You can then chain functions on the pipe: ```java -Piper.pipe(42) // yields a Pipe containing 42 - .then(x -> x + 10) // yields a Pipe containing 52 - .then(x -> x * 2) // yields a Pipe containing 104 - .resolve() // returns 104 +class example { + example() { + Piper.pipe(42) // yields a Pipe containing 42 + .then(x -> x + 10) // yields a Pipe containing 52 + .then(x -> x * 2) // yields a Pipe containing 104 + .resolve(); // returns 104 + } +} ``` This allows us to rewrite our failing-to-compile example from above as: diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..29ab009 --- /dev/null +++ b/build.gradle @@ -0,0 +1,46 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +plugins { + id 'java-library' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = uri('https://repo.maven.apache.org/maven2/') + } +} + +dependencies { + api 'org.hamcrest:java-hamcrest:2.0.0.0' + api 'org.hamcrest:hamcrest-junit:2.0.0.0' + api 'org.jetbrains:annotations:RELEASE' + implementation 'org.jetbrains:annotations:16.0.2' + testImplementation 'junit:junit:4.13.1' + testImplementation 'org.mockito:mockito-core:5.4.0' +} + +group = 'co.unruly' +version = '0.8.14-SNAPSHOT' +description = 'control' + +java { + withSourcesJar() + withJavadocJar() + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' +} + +tasks.withType(Javadoc).configureEach { + options.encoding = 'UTF-8' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7f93135c49b765f8051ef9d0a6055ff8e46073d8 GIT binary patch literal 63721 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鯊%1Et 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⁢ zv5o9#E7!G0XmdzfsS{efPNi`1b44~SZ4Z8fuX!I}#8g+(wxzQwUT#Xb2(tbY1+EUhGKoT@KEU9Ktl>_0 z%bjDJg;#*gtJZv!-Zs`?^}v5eKmnbjqlvnSzE@_SP|LG_PJ6CYU+6zY6>92%E+ z=j@TZf-iW4(%U{lnYxQA;7Q!b;^brF8n0D>)`q5>|WDDXLrqYU_tKN2>=#@~OE7grMnNh?UOz-O~6 z6%rHy{#h9K0AT+lDC7q4{hw^|q6*Ry;;L%Q@)Ga}$60_q%D)rv(CtS$CQbpq9|y1e zRSrN4;$Jyl{m5bZw`$8TGvb}(LpY{-cQ)fcyJv7l3S52TLXVDsphtv&aPuDk1OzCA z4A^QtC(!11`IsNx_HnSy?>EKpHJWT^wmS~hc^p^zIIh@9f6U@I2 zC=Mve{j2^)mS#U$e{@Q?SO6%LDsXz@SY+=cK_QMmXBIU)j!$ajc-zLx3V60EXJ!qC zi<%2x8Q24YN+&8U@CIlN zrZkcT9yh%LrlGS9`G)KdP(@9Eo-AQz@8GEFWcb7U=a0H^ZVbLmz{+&M7W(nXJ4sN8 zJLR7eeK(K8`2-}j(T7JsO`L!+CvbueT%izanm-^A1Dn{`1Nw`9P?cq;7no+XfC`K(GO9?O^5zNIt4M+M8LM0=7Gz8UA@Z0N+lg+cX)NfazRu z5D)~HA^(u%w^cz+@2@_#S|u>GpB+j4KzQ^&Wcl9f z&hG#bCA(Yk0D&t&aJE^xME^&E-&xGHhXn%}psEIj641H+Nl-}boj;)Zt*t(4wZ5DN z@GXF$bL=&pBq-#vkTkh>7hl%K5|3 z{`Vn9b$iR-SoGENp}bn4;fR3>9sA%X2@1L3aE9yTra;Wb#_`xWwLSLdfu+PAu+o3| zGVnpzPr=ch{uuoHjtw7+_!L_2;knQ!DuDl0R`|%jr+}jFzXtrHIKc323?JO{l&;VF z*L1+}JU7%QJOg|5|Tc|D8fN zJORAg=_vsy{ak|o);@)Yh8Lkcg@$FG3k@ep36BRa^>~UmnRPziS>Z=`Jb2x*Q#`%A zU*i3&Vg?TluO@X0O;r2Jl6LKLUOVhSqg1*qOt^|8*c7 zo(298@+r$k_wQNGHv{|$tW(T8L+4_`FQ{kEW5Jgg{yf7ey4ss_(SNKfz(N9lx&a;< je(UuV8hP?p&}TPdm1I$XmG#(RzlD&B2izSj9sl%y5~4qc literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..3fa8f86 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..93e3f59 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..f6746b1 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,12 @@ +/* + * This file was generated by the Gradle 'init' task. + * + * This project uses @Incubating APIs which are subject to change. + */ + +pluginManagement { + // Include 'plugins build' to define convention plugins. +// includeBuild('build-logic') +} + +rootProject.name = 'control' diff --git a/src/main/java/co/unruly/control/ErrorThrowingLambdas.java b/src/main/java/co/unruly/control/ErrorThrowingLambdas.java index c3536ff..bb5dc9e 100644 --- a/src/main/java/co/unruly/control/ErrorThrowingLambdas.java +++ b/src/main/java/co/unruly/control/ErrorThrowingLambdas.java @@ -1,5 +1,8 @@ package co.unruly.control; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; @@ -9,11 +12,12 @@ * A collection of functional interfaces which throw, and convenience functions to wrap them * so any thrown Throwables are converted to RuntimeExceptions so they can be used where * non-throwing functional interfaces are required - * + *

* Catching errors in the general case is not recommended, but there are specific errors * which are contextually reasonable to catch. Therefore, this wider capability exists * separately and should be used judiciously. */ +@SuppressWarnings("unused") public interface ErrorThrowingLambdas { /** @@ -21,21 +25,48 @@ public interface ErrorThrowingLambdas { */ @FunctionalInterface interface ThrowingFunction { + /** + * @param input input variable + * @return output of type O + * @throws X the exception type + */ O apply(I input) throws X; + /** + * @param nextFunction the next function to pass our input into + * @param outcome type + * @return dF(x -> y) where x is given to next function, + * and either T is return or an exception is thrown + */ default ThrowingFunction andThen(Function nextFunction) { return x -> nextFunction.apply(apply(x)); } - default ThrowingFunction compose(Function nextFunction) { + /** + * @param nextFunction next function to + * @param input type + * @return a function that can throw a runtime exception + * when provided with an input X, it will pass X into nextFunction, and then + * call the throwing function on the result + */ + default ThrowingFunction + compose(Function nextFunction) { return x -> apply(nextFunction.apply(x)); } /** * Converts the provided function into a regular Function, where any thrown exceptions are * wrapped in a RuntimeException. + * @param f function that throws + * @param input type + * @param output type + * @param exception type + * @return a function that expects an input X. X will be applied to f, and the result is + * wrapped in a try-catch block */ - static Function throwingRuntime(ThrowingFunction f) { + @Contract(pure = true) + static @NotNull Function + throwingRuntime(ThrowingFunction f) { return x -> { try { return f.apply(x); @@ -51,13 +82,24 @@ static Function throwingRuntime(ThrowingFuncti */ @FunctionalInterface interface ThrowingConsumer { + /** + * @param item the item to accept + * @throws X exception type + */ void accept(T item) throws X; /** * Converts the provided consumer into a regular Consumer, where any thrown exceptions are * wrapped in a RuntimeException. + * @param p consumer that throws + * @param input type + * @param exception type + * @return a function that expects an input X. X is passed to p, and the + * result is wrapped in a try-catch block */ - static Consumer throwingRuntime(ThrowingConsumer p) { + @Contract(pure = true) + static @NotNull Consumer + throwingRuntime(ThrowingConsumer p) { return x -> { try { p.accept(x); @@ -73,13 +115,27 @@ static Consumer throwingRuntime(ThrowingConsumer { + /** + * @param first left value + * @param second right value + * @return the result of working with first and second + * @throws X exception type + */ R apply(A first, B second) throws X; /** * Converts the provided bifunction into a regular BiFunction, where any thrown exceptions * are wrapped in a RuntimeException + * @param f the bifunction that might throw + * @param left type + * @param right type + * @param result type + * @param exception type + * @return a bifunction that applies the two inputs to f, wraps the result in a try-catch */ - static BiFunction throwingRuntime(ThrowingBiFunction f) { + @Contract(pure = true) + static @NotNull BiFunction + throwingRuntime(ThrowingBiFunction f) { return (a, b) -> { try { return f.apply(a, b); @@ -95,13 +151,26 @@ static BiFunction throwingRuntime(Throwi */ @FunctionalInterface interface ThrowingPredicate { + /** + * @param item input value + * @return T/f outcome of testing item + * @throws X exception type + */ boolean test(T item) throws X; + /** * Converts the provided predicate into a regular Predicate, where any thrown exceptions * are wrapped in a RuntimeException + * @param p predicate function that throws + * @param input type + * @param exception type + * @return function that takes an input, tests it against p, and throws a contained try/catch + * exception depending on the result */ - static Predicate throwingRuntime(ThrowingPredicate p) { + @Contract(pure = true) + static @NotNull Predicate + throwingRuntime(ThrowingPredicate p) { return x -> { try { return p.test(x); diff --git a/src/main/java/co/unruly/control/HigherOrderFunctions.java b/src/main/java/co/unruly/control/HigherOrderFunctions.java index 4e5cefd..33912a6 100644 --- a/src/main/java/co/unruly/control/HigherOrderFunctions.java +++ b/src/main/java/co/unruly/control/HigherOrderFunctions.java @@ -1,6 +1,8 @@ package co.unruly.control; import co.unruly.control.pair.Pair; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.*; import java.util.function.BiFunction; @@ -14,19 +16,33 @@ import static java.util.stream.Collectors.toList; import static java.util.stream.Stream.iterate; +/** + * interfaces for working with higher level functions + */ +@SuppressWarnings("unused") public interface HigherOrderFunctions { /** * Takes a BiFunction, and reverses the order of the arguments + * @param f function to use + * @param left type + * @param right type + * @param result type + * @return dF where f(a, b) now becomes f(b, a) */ - static BiFunction flip(BiFunction f) { + @Contract(pure = true) + static @NotNull BiFunction flip(BiFunction f) { return (a, b) -> f.apply(b, a); } /** * Takes a list of functions (which take and return the same type) and composes * them into a single function, applying the provided functions in order + * @param functions an arbitrary number of T -> T functions + * @param function type + * @return a single function representing the composition of each composite function */ + @SafeVarargs static Function compose(Function... functions) { return compose(Stream.of(functions)); } @@ -34,46 +50,80 @@ static Function compose(Function... functions) { /** * Takes a Stream of functions (which take and return the same type) and composes * them into a single function, applying the provided functions in order + * @param functions functions to compose + * @param input type + * @return a single function that is the combination of each function */ - static Function compose(Stream> functions) { + static Function compose(@NotNull Stream> functions) { return functions.reduce(identity(), Function::andThen); } /** * Takes a list of predicates and composes them into a single predicate, which * passes when all passed-in predicates pass + * @param functions functions to compose + * @param input type + * @return predicate function that is the composition of all passed in predicates */ + @SafeVarargs static Predicate compose(Predicate... functions) { return Stream.of(functions).reduce(__ -> true, Predicate::and); } /** * Turns a Consumer into a Function which applies the consumer and returns the input + * @param action consumer to act + * @param input type + * @return dF (x -> x) where x is passed to action to execute */ - static Function peek(Consumer action) { + @Contract(pure = true) + static @NotNull Function peek(Consumer action) { return t -> { action.accept(t); return t; }; } - static Stream> withIndices(Stream items) { + /** + * @param items item stream + * @param stream type + * @return a stream of KV pairs where k is the index and T is the value + */ + static @NotNull Stream> + withIndices(Stream items) { return zip(iterate(0, x -> x + 1), items); } - static Stream> zip(Stream a, Stream b) { + /** + * @param a left stream + * @param b right stream + * @param left type + * @param right type + * @return zips the two streams into a pair + */ + static @NotNull Stream> + zip(Stream a, Stream b) { return zip(a, b, Pair::of); } /** * Zips two streams together using the zipper function, resulting in a single stream of * items from each stream combined using the provided function. - * + *

* The resultant stream will have the length of the shorter of the two input streams. - * - * Sourced from https://stackoverflow.com/questions/17640754/zipping-streams-using-jdk8-with-lambda-java-util-stream-streams-zip + *

+ * Sourced from + * here + * @param a left stream + * @param b right stream + * @param zipper zipping function + * @param left type + * @param right type + * @param result type + * @return a stream representing the merging of streams a and b */ - static Stream zip(Stream a, Stream b, BiFunction zipper) { + static @NotNull Stream + zip(Stream a, Stream b, BiFunction zipper) { Objects.requireNonNull(zipper); Spliterator aSpliterator = Objects.requireNonNull(a).spliterator(); Spliterator bSpliterator = Objects.requireNonNull(b).spliterator(); @@ -88,7 +138,7 @@ static Stream> zip(Stream a, Stream b) { Iterator aIterator = Spliterators.iterator(aSpliterator); Iterator bIterator = Spliterators.iterator(bSpliterator); - Iterator cIterator = new Iterator() { + Iterator cIterator = new Iterator<>() { @Override public boolean hasNext() { return aIterator.hasNext() && bIterator.hasNext(); @@ -108,13 +158,23 @@ public C next() { /** * Takes two lists, and returns a list of pairs forming the Cartesian product of those lists. + * @param as left list + * @param bs right list + * @param left type + * @param right type + * @return list of pairs in the form L[P(A, B)...] */ - static List> pairs(List as, List bs) { + static List> + pairs(@NotNull List as, List bs) { return as.stream().flatMap(a -> bs.stream().map(b -> Pair.of(a, b))).collect(toList()); } /** * Takes a value, and returns that same value, upcast to a suitable type. Inference is our friend here. + * @param fv value to upcast + * @param type to upcast to + * @param value type + * @return fv upcasted from T to R */ static R upcast(T fv) { return fv; diff --git a/src/main/java/co/unruly/control/Lazy.java b/src/main/java/co/unruly/control/Lazy.java index ae9580e..750ee26 100644 --- a/src/main/java/co/unruly/control/Lazy.java +++ b/src/main/java/co/unruly/control/Lazy.java @@ -8,15 +8,22 @@ * Will only calculate the value once. * @param the type of object we're lazily instantiating */ +@SuppressWarnings({"unused", "optional", "OptionalUsedAsFieldOrParameterType"}) public final class Lazy { private final Supplier source; private Optional value = Optional.empty(); + /** + * @param source . + */ public Lazy(Supplier source) { this.source = source; } + /** + * @return value, calculates it if it hasn't been calculated yet + */ public synchronized T get() { return value.orElseGet(this::calculateAndStore); } diff --git a/src/main/java/co/unruly/control/Lists.java b/src/main/java/co/unruly/control/Lists.java index 9773fa3..ffde24f 100644 --- a/src/main/java/co/unruly/control/Lists.java +++ b/src/main/java/co/unruly/control/Lists.java @@ -2,19 +2,29 @@ import co.unruly.control.pair.Pair; import co.unruly.control.result.Result; +import org.jetbrains.annotations.NotNull; import java.util.List; import static co.unruly.control.result.Resolvers.split; +/** + * interface to allow us to work with results and lists + */ public interface Lists { - static Result, List> successesOrFailures(List> results) { + /** + * @param results a list of result types + * @param success type + * @param fail type + * @return a result with success as a list of the successes or a list of failures as the failures + */ + static Result, List> successesOrFailures(@NotNull List> results) { Pair, List> successesAndFailures = results.stream().collect(split()); - if(successesAndFailures.right.isEmpty()) { - return Result.success(successesAndFailures.left); + if(successesAndFailures.right().isEmpty()) { + return Result.success(successesAndFailures.left()); } else { - return Result.failure(successesAndFailures.right); + return Result.failure(successesAndFailures.right()); } } } diff --git a/src/main/java/co/unruly/control/Optionals.java b/src/main/java/co/unruly/control/Optionals.java index 0daff78..1d41a5b 100644 --- a/src/main/java/co/unruly/control/Optionals.java +++ b/src/main/java/co/unruly/control/Optionals.java @@ -1,20 +1,29 @@ package co.unruly.control; +import org.jetbrains.annotations.NotNull; + import java.util.Optional; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; import java.util.stream.Stream; +/** + * Interface for working with optionals + */ +@SuppressWarnings({"unused", "optional", "OptionalUsedAsFieldOrParameterType"}) public interface Optionals { /** * Converts an Optional to a Stream. * If the Optional was present, you get a Stream of one item. * If it was absent, you get an empty stream. - * - * Flatmapping a Stream of Optionals over this method will return a Stream of the + *

+ * Flat mapping a Stream of Optionals over this method will return a Stream of the * contents of the present Optionals in the input stream. + * @param item optional item + * @param item type + * @return stream of T's or empty's */ static Stream stream(Optional item) { return either(item, Stream::of, Stream::empty); @@ -23,27 +32,39 @@ static Stream stream(Optional item) { /** * If the provided optional is present, applies the first function to the wrapped value and returns it. * Otherwise, returns the value supplied by the second function + * @param optional optional value + * @param onPresent action on present + * @param onAbsent action on absence + * @param optional type + * @param result type + * @return result type from either onPresent on onAbsent */ - static R either(Optional optional, Function onPresent, Supplier onAbsent) { + static R either(@NotNull Optional optional, Function onPresent, Supplier onAbsent) { return optional.map(onPresent).orElseGet(onAbsent); } /** * If the provided Optional is present, pass the wrapped value to the provided consumer - * + *

* This simply invokes Optional.ifPresent(), and exists for cases where side-effects are required * in both the present and absent cases on an Optional. The Optional API doesn't cover the latter case, * so this provides a mimicking calling convention to permit consistency. + * @param optional optional value + * @param consume consuming function + * @param value type */ - static void ifPresent(Optional optional, Consumer consume) { + static void ifPresent(@NotNull Optional optional, Consumer consume) { optional.ifPresent(consume); } /** * If the provided Optional is empty, invoke the provided Runnable + * @param optional optional value + * @param action absent action + * @param value type */ - static void ifAbsent(Optional optional, Runnable action) { - if(!optional.isPresent()) { + static void ifAbsent(@NotNull Optional optional, Runnable action) { + if(optional.isEmpty()) { action.run(); } } diff --git a/src/main/java/co/unruly/control/PartialApplication.java b/src/main/java/co/unruly/control/PartialApplication.java index b880760..de9cd03 100644 --- a/src/main/java/co/unruly/control/PartialApplication.java +++ b/src/main/java/co/unruly/control/PartialApplication.java @@ -1,6 +1,8 @@ package co.unruly.control; import co.unruly.control.pair.Triple.TriFunction; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.function.BiFunction; import java.util.function.Function; @@ -10,50 +12,94 @@ * A collection of functions to partially apply arguments to functions, to simplify usage * in streams, optionals etc. */ +@SuppressWarnings("unused") public interface PartialApplication { /** * Binds the provided argument to the function, and returns a Supplier with that argument applied. - * + *

* bind(f, a) is equivalent to () -> f.apply(a) + * @param f binding function + * @param input to bind to f + * @param input type + * @param output type + * @return supplier of O */ - static Supplier bind(Function f, I input) { + @Contract(pure = true) + static @NotNull Supplier + bind(Function f, I input) { return () -> f.apply(input); } /** * Binds the provided argument to the function, and returns a new Function with that argument already applied. - * + *

* bind(f, a) is equivalent to b -> f.apply(a, b) + * @param f binding function + * @param firstParam to bind + * @param left type + * @param right type + * @param result type + * @return function that asks for B, and gives R */ - static Function bind(BiFunction f, A firstParam) { + @Contract(pure = true) + static @NotNull Function + bind(BiFunction f, A firstParam) { return secondParam -> f.apply(firstParam, secondParam); } /** * Binds the provided arguments to the function, and returns a new Supplier with those arguments already applied. - * + *

* bind(f, a, b) is equivalent to () -> f.apply(a, b) + * @param f binding function + * @param firstParam to bind + * @param secondParam to bind + * @param left type + * @param right type + * @param result type + * @return supplier of R */ - static Supplier bind(BiFunction f, A firstParam, B secondParam) { + @Contract(pure = true) + static @NotNull Supplier + bind(BiFunction f, A firstParam, B secondParam) { return () -> f.apply(firstParam, secondParam); } /** * Binds the provided argument to the function, and returns a new BiFunction with that argument already applied. - * + *

* bind(f, a) is equivalent to (b, c) -> f.apply(a, b, c) + * @param f function to bind + * @param firstParam to bind + * @param firstParam type + * @param left type of closure + * @param right type of closure + * @param result type + * @return bifunction that, when executed, provides R */ - static BiFunction bind(TriFunction f, A firstParam) { + @Contract(pure = true) + static @NotNull BiFunction + bind(TriFunction f, A firstParam) { return (secondParam, thirdParam) -> f.apply(firstParam, secondParam, thirdParam); } /** * Binds the provided arguments to the function, and returns a new Function with those arguments already applied. - * + *

* bind(f, a, b) is equivalent to c -> f.apply(a, b, c) + * @param f binding function + * @param firstParam to bind + * @param secondParam to bind + * @param firstParam type + * @param secondParam type + * @param final type argument + * @param result type + * @return function that asks for third argument, returns R */ - static Function bind(TriFunction f, A firstParam, B secondParam) { + @Contract(pure = true) + static @NotNull Function + bind(TriFunction f, A firstParam, B secondParam) { return thirdParam -> f.apply(firstParam, secondParam, thirdParam); } } diff --git a/src/main/java/co/unruly/control/Piper.java b/src/main/java/co/unruly/control/Piper.java index e49f9fc..fd9f000 100644 --- a/src/main/java/co/unruly/control/Piper.java +++ b/src/main/java/co/unruly/control/Piper.java @@ -1,34 +1,46 @@ package co.unruly.control; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Consumer; import java.util.function.Function; /** * Wraps a value in a Piper, allowing chaining of operations and segueing into other applicable types * (such as Result) cleanly. - * + *

* This is most useful when not streaming over values, starting off with a value which is not a Result. * * @param the type of wrapped value */ +@SuppressWarnings("unused") public class Piper { private final T element; + /** + * @param element . + */ public Piper(T element) { this.element = element; } /** * Applies the function to the piped value, returning a new pipe containing that value. + * @param function piping function + * @param result type + * @return new pipe segment of R */ - public Piper then(Function function) { + public Piper then(@NotNull Function function) { return new Piper<>(function.apply(element)); } /** * Applies the consumer to the current value of the piped value, returning a pipe containing * that value. + * @param consumer consuming function + * @return pipe containing the value */ public Piper peek(Consumer consumer) { return then(HigherOrderFunctions.peek(consumer)); @@ -36,6 +48,7 @@ public Piper peek(Consumer consumer) { /** * Returns the final result of the piped value, with all the piped functions applied. + * @return T */ public T resolve() { return element; @@ -43,16 +56,23 @@ public T resolve() { /** * Returns the final result of the piped value, with all the piped functions applied. + * @param f piping function + * @param result type + * @return R */ - public R resolveWith(Function f) { + public R resolveWith(@NotNull Function f) { return f.apply(element); } /** * Creates a new Piper wrapping the provided element. + * @param element value + * @param value type + * @return a piper around T */ - public static Piper pipe(T element) { - return new Piper(element); + @Contract(value = "_ -> new", pure = true) + public static @NotNull Piper pipe(T element) { + return new Piper<>(element); } } diff --git a/src/main/java/co/unruly/control/Predicates.java b/src/main/java/co/unruly/control/Predicates.java index 32a96b4..4c81ff5 100644 --- a/src/main/java/co/unruly/control/Predicates.java +++ b/src/main/java/co/unruly/control/Predicates.java @@ -1,18 +1,26 @@ package co.unruly.control; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Predicate; /** * Created by tomj on 31/03/2017. */ +@SuppressWarnings("unused") public interface Predicates { /** * Negates a predicate: mostly useful when our predicate is a method reference or lambda where we can't * call negate() on it directly, or where the code reads better by having the negation at the beginning * rather than the end. + * @param test predicate function + * @param input type + * @return reverse of the predicate function (negation) */ - static Predicate not(Predicate test) { + @Contract(pure = true) + static @NotNull Predicate not(@NotNull Predicate test) { return test.negate(); } } diff --git a/src/main/java/co/unruly/control/ThrowingLambdas.java b/src/main/java/co/unruly/control/ThrowingLambdas.java index 71c1f3b..380a38d 100644 --- a/src/main/java/co/unruly/control/ThrowingLambdas.java +++ b/src/main/java/co/unruly/control/ThrowingLambdas.java @@ -1,5 +1,8 @@ package co.unruly.control; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.BiFunction; import java.util.function.Consumer; import java.util.function.Function; @@ -10,19 +13,38 @@ * so any thrown exceptions are converted to RuntimeExceptions so they can be used where * non-throwing functional interfaces are required */ +@SuppressWarnings("ALL") public interface ThrowingLambdas { /** * A Function which may throw a checked exception */ + @SuppressWarnings("unused") @FunctionalInterface interface ThrowingFunction { + /** + * @param input value + * @return O + * @throws X exception type + */ O apply(I input) throws X; + /** + * @param nextFunction to use in pipe chain + * @param output type + * @return dF(x -> y) where x is piped into outer throwing function + * and then passed to the next function and y is T or it throws + */ default ThrowingFunction andThen(Function nextFunction) { return x -> nextFunction.apply(apply(x)); } + /** + * @param nextFunction to use in pipe chain + * @param input type + * @return dF(x -> y) where x is piped into the next function + * and y is O or it throws + */ default ThrowingFunction compose(Function nextFunction) { return x -> apply(nextFunction.apply(x)); } @@ -30,8 +52,16 @@ default ThrowingFunction compose(Function nextFunction) { /** * Converts the provided function into a regular Function, where any thrown exceptions are * wrapped in a RuntimeException. + * @param f I/O function that may throw X + * @param input type + * @param output type + * @param exception type + * @return dF(x -> y) where f is passed x and wrapped in a try-catch that + * throws a runtime */ - static Function throwingRuntime(ThrowingFunction f) { + @Contract(pure = true) + static @NotNull Function + throwingRuntime(ThrowingFunction f) { return x -> { try { return f.apply(x); @@ -45,15 +75,27 @@ static Function throwingRuntime(ThrowingFuncti /** * A Consumer which may throw a checked exception */ + @SuppressWarnings("unused") @FunctionalInterface interface ThrowingConsumer { + /** + * @param item value + * @throws X exception type + */ void accept(T item) throws X; /** * Converts the provided consumer into a regular Consumer, where any thrown exceptions are * wrapped in a RuntimeException. + * @param p consumer that throws + * @param input type + * @param exception type + * @return dF(x -> y) where x is passed to p and p + * is wrapped in a try catch that throws a runtime exception */ - static Consumer throwingRuntime(ThrowingConsumer p) { + @Contract(pure = true) + static @NotNull Consumer + throwingRuntime(ThrowingConsumer p) { return x -> { try { p.accept(x); @@ -66,16 +108,36 @@ static Consumer throwingRuntime(ThrowingConsumer left type + * @param right type + * @param result type + * @param exception type */ + @SuppressWarnings("unused") @FunctionalInterface interface ThrowingBiFunction { + /** + * @param first . + * @param second . + * @return R + * @throws X exception type + */ R apply(A first, B second) throws X; /** * Converts the provided bifunction into a regular BiFunction, where any thrown exceptions * are wrapped in a RuntimeException + * @param f bifunction that may throw + * @param left type + * @param right type + * @param result type + * @param exception type + * @return dF((a, b) -> y) where a and b are passed to f + * and f is wrapped in a try-catch that throws a runtime exception */ - static BiFunction throwingRuntime(ThrowingBiFunction f) { + @Contract(pure = true) + static @NotNull BiFunction + throwingRuntime(ThrowingBiFunction f) { return (a, b) -> { try { return f.apply(a, b); @@ -88,16 +150,29 @@ static BiFunction throwingRuntime(Throwi /** * A Predicate which may throw a checked exception + * @param input type + * @param exception type */ @FunctionalInterface interface ThrowingPredicate { + /** + * @param item to test + * @return boolean result of test + * @throws X throw type + */ boolean test(T item) throws X; /** * Converts the provided predicate into a regular Predicate, where any thrown exceptions * are wrapped in a RuntimeException + * @param p predicate that may throw + * @param input type + * @param output type + * @return dF(x -> y) where p is wrapped in a try catch that throws a runtime */ - static Predicate throwingRuntime(ThrowingPredicate p) { + @Contract(pure = true) + static @NotNull Predicate + throwingRuntime(ThrowingPredicate p) { return x -> { try { return p.test(x); @@ -108,7 +183,17 @@ static Predicate throwingRuntime(ThrowingPredicate Predicate throwsWhen(ThrowingConsumer consumer) { + /** + * @param consumer that may throw + * @param input type + * @param exception type + * @return dF(x -> y) where x is passed to the consumer + * and the consumer may or may not throw + * and y is a boolean that represents if the consumer failed + */ + @Contract(pure = true) + static @NotNull Predicate + throwsWhen(ThrowingConsumer consumer) { return t -> { try { consumer.accept(t); @@ -119,7 +204,18 @@ static Predicate throwsWhen(ThrowingConsumer c }; } - static Predicate doesntThrow(ThrowingConsumer consumer) { + /** + * @param consumer which may throw + * @param input type + * @param exception type + * @return dF(x -> y) where the consumer may throw + * and is thus wrapped in a try-catch that returns + * true/false based on whether or not the consumer + * threw + */ + @Contract(pure = true) + static @NotNull Predicate + doesntThrow(ThrowingConsumer consumer) { return t -> { try { consumer.accept(t); diff --git a/src/main/java/co/unruly/control/Unit.java b/src/main/java/co/unruly/control/Unit.java index 44a4481..cda2f5c 100644 --- a/src/main/java/co/unruly/control/Unit.java +++ b/src/main/java/co/unruly/control/Unit.java @@ -1,5 +1,8 @@ package co.unruly.control; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Consumer; import java.util.function.Function; @@ -9,14 +12,22 @@ * This exists to offer a bridge between void and regular functions, providing * convenience methods to convert between them. */ +@SuppressWarnings("unused") public enum Unit { + /** + * enum value + */ UNIT; /** - * Converts a Consumer to a Function, which returns Unit.UNIT + * Converts a Consumer to a Function, which returns Unit. UNIT + * @param toVoid function to use as consumer + * @param input type + * @return UNIT */ - public static Function functify(Consumer toVoid) { + @Contract(pure = true) + public static @NotNull Function functify(Consumer toVoid) { return x -> { toVoid.accept(x); return Unit.UNIT; @@ -25,13 +36,20 @@ public static Function functify(Consumer toVoid) { /** * Converts a Function to a Consumer, throwing away the return value + * @param function to convert + * @param input type + * @return consumer that throws away the return */ - public static Consumer voidify(Function function) { + @Contract(pure = true) + public static @NotNull Consumer voidify(@NotNull Function function) { return function::apply; } /** - * A no-op function which takes any argument, does nothing, and returns Unit.UNIT + * A no-op function which takes any argument, does nothing, and returns Unit. UNIT + * @param __ nothin + * @param type + * @return UNIT */ public static Unit noOp(T __) { return UNIT; @@ -39,6 +57,8 @@ public static Unit noOp(T __) { /** * A no-op consumer which takes any argument and does nothing + * @param __ nothin + * @param type */ public static void noOpConsumer(T __) { // do nothing diff --git a/src/main/java/co/unruly/control/casts/Equality.java b/src/main/java/co/unruly/control/casts/Equality.java index 739fc2b..c526a3d 100644 --- a/src/main/java/co/unruly/control/casts/Equality.java +++ b/src/main/java/co/unruly/control/casts/Equality.java @@ -7,8 +7,22 @@ import static co.unruly.control.result.Resolvers.ifFailed; import static co.unruly.control.result.Transformers.onSuccess; +/** + * Equality testing interface + */ public interface Equality { + /** + * @param self the object checking + * @param other the object to be checked + * @param equalityChecker the predicate function + * @param the types of both + * @return whether both are equal in terms of + * 1) exact cast + * 2) the equality checker + * 3) do not result in failure + */ + @SuppressWarnings("unchecked") static boolean areEqual(T self, Object other, BiPredicate equalityChecker) { if(self==other) { return true; diff --git a/src/main/java/co/unruly/control/matchers/FailureMatcher.java b/src/main/java/co/unruly/control/matchers/FailureMatcher.java index 4f2cb5c..91c9b7b 100644 --- a/src/main/java/co/unruly/control/matchers/FailureMatcher.java +++ b/src/main/java/co/unruly/control/matchers/FailureMatcher.java @@ -4,17 +4,25 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; +import org.jetbrains.annotations.NotNull; +/** A helper class for failure matching + * @param success + * @param failure + */ public class FailureMatcher extends TypeSafeDiagnosingMatcher> { private final Matcher innerMatcher; + /** + * @param innerMatcher . + */ public FailureMatcher(Matcher innerMatcher) { this.innerMatcher = innerMatcher; } @Override - protected boolean matchesSafely(Result result, Description description) { + protected boolean matchesSafely(@NotNull Result result, Description description) { Boolean matches = result.either( success -> false, innerMatcher::matches @@ -28,7 +36,7 @@ protected boolean matchesSafely(Result result, Description description) { } @Override - public void describeTo(Description description) { + public void describeTo(@NotNull Description description) { description.appendText("A Failure containing "); innerMatcher.describeTo(description); } diff --git a/src/main/java/co/unruly/control/matchers/ResultMatchers.java b/src/main/java/co/unruly/control/matchers/ResultMatchers.java index d1413b7..55bc69c 100644 --- a/src/main/java/co/unruly/control/matchers/ResultMatchers.java +++ b/src/main/java/co/unruly/control/matchers/ResultMatchers.java @@ -3,6 +3,8 @@ import co.unruly.control.result.Result; import org.hamcrest.Description; import org.hamcrest.Matcher; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import static org.hamcrest.CoreMatchers.equalTo; @@ -13,33 +15,57 @@ public class ResultMatchers { /** * Matches if the received value is a Success containing the specified value + * @param expectedValue success value to test against + * @param success + * @param failure + * @return matcher testing if input is a success containing expected value */ - public static Matcher> isSuccessOf(S expectedValue) { + @Contract("_ -> new") + public static @NotNull Matcher> + isSuccessOf(S expectedValue) { return isSuccessThat(equalTo(expectedValue)); } /** * Matches if the received value is a Success matching the specified value + * @param expectedSuccess success to test against + * @param success + * @param failure + * @return matcher testing if input matches success value */ - public static Matcher> isSuccessThat(Matcher expectedSuccess) { + @Contract("_ -> new") + public static @NotNull Matcher> + isSuccessThat(Matcher expectedSuccess) { return new SuccessMatcher<>(expectedSuccess); } /** * Matches if the received value is a Failure containing the specified value + * @param expectedValue value to test failure against + * @param success + * @param failure + * @return matcher that matches input against failure value */ - public static Matcher> isFailureOf(F expectedValue) { + @Contract("_ -> new") + public static @NotNull Matcher> + isFailureOf(F expectedValue) { return isFailureThat(equalTo(expectedValue)); } /** * Matches if the received value is a Failure matching the specified value + * @param expectedFailure failure to test against + * @param success + * @param failure + * @return a matcher for the expected failure */ - public static Matcher> isFailureThat(Matcher expectedFailure) { + @Contract("_ -> new") + public static @NotNull Matcher> + isFailureThat(Matcher expectedFailure) { return new FailureMatcher<>(expectedFailure); } - static void describeTo(Result result, Description description) { + static void describeTo(@NotNull Result result, Description description) { result.either( success -> description.appendText("A Success containing " + success), failure -> description.appendText("A Failure containing " + failure) diff --git a/src/main/java/co/unruly/control/matchers/SuccessMatcher.java b/src/main/java/co/unruly/control/matchers/SuccessMatcher.java index dfde335..ff8aee8 100644 --- a/src/main/java/co/unruly/control/matchers/SuccessMatcher.java +++ b/src/main/java/co/unruly/control/matchers/SuccessMatcher.java @@ -4,17 +4,26 @@ import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; +import org.jetbrains.annotations.NotNull; +/** + * @param success + * @param failure + */ +@SuppressWarnings("unused") public class SuccessMatcher extends TypeSafeDiagnosingMatcher> { private final Matcher innerMatcher; + /** + * @param innerMatcher . + */ public SuccessMatcher(Matcher innerMatcher) { this.innerMatcher = innerMatcher; } @Override - protected boolean matchesSafely(Result result, Description description) { + protected boolean matchesSafely(@NotNull Result result, Description description) { Boolean matches = result.either( innerMatcher::matches, failure -> false @@ -28,12 +37,12 @@ protected boolean matchesSafely(Result result, Description description) { } @Override - public void describeTo(Description description) { + public void describeTo(@NotNull Description description) { description.appendText("A Success containing "); innerMatcher.describeTo(description); } - private void describe(Result result, Description description) { + private void describe(@NotNull Result result, Description description) { result.either( success -> description.appendText("A Success containing " + success), failure -> description.appendText("A Failure containing " + failure) diff --git a/src/main/java/co/unruly/control/pair/Comprehensions.java b/src/main/java/co/unruly/control/pair/Comprehensions.java index 5d53014..d4e4239 100644 --- a/src/main/java/co/unruly/control/pair/Comprehensions.java +++ b/src/main/java/co/unruly/control/pair/Comprehensions.java @@ -3,6 +3,8 @@ import co.unruly.control.pair.Quad.QuadFunction; import co.unruly.control.pair.Triple.TriFunction; import co.unruly.control.result.Result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.Optional; import java.util.function.BiFunction; @@ -11,78 +13,201 @@ import static co.unruly.control.result.Transformers.attempt; import static co.unruly.control.result.Transformers.onSuccess; +/** + * Comprehensions seem to be a set of abstract functions that + * define ways to apply various kinds of function to tuples + */ +@SuppressWarnings({"optional", "OptionalUsedAsFieldOrParameterType"}) public interface Comprehensions { - static Function, T> onAll(BiFunction f) { + /** + * @param f function to apply pair to + * @param left + * @param right + * @param return type + * @return function that applies bifunction to the provided pair + */ + @Contract(pure = true) + static @NotNull Function, T> + onAll(BiFunction f) { return pair -> pair.then(f); } - static Function, T> onAll(TriFunction f) { + /** + * @param f the tri function to use + * @param . + * @param . + * @param . + * @param return type + * @return a function that will apply f to the passed in triple + */ + @Contract(pure = true) + static @NotNull Function, T> + onAll(TriFunction f) { return triple -> triple.then(f); } - static Function, T> onAll(QuadFunction f) { + /** + * @param f the quad function to use + * @param . + * @param . + * @param . + * @param . + * @param return type + * @return a function that takes a quad and applies the quad function to that quad + */ + @Contract(pure = true) + static @NotNull Function, T> + onAll(QuadFunction f) { return quad -> quad.then(f); } - static Optional> allOf(Optional maybeLeft, Optional maybeRight) { + /** + * @param maybeLeft left val + * @param maybeRight right val + * @param type l + * @param type r + * @return pair of left and right exists + */ + static Optional> + allOf(@NotNull Optional maybeLeft, Optional maybeRight) { return maybeLeft.flatMap(left -> maybeRight.map(right -> Pair.of(left, right))); } - static Optional> allOf(Optional maybeFirst, Optional maybeSecond, Optional maybeThird) { - return maybeFirst.flatMap(first -> maybeSecond.flatMap(second -> maybeThird.map(third -> Triple.of(first, second, third)))); + /** + * @param maybeFirst . + * @param maybeSecond . + * @param maybeThird . + * @param . + * @param . + * @param . + * @return tuple of values of three optionals + */ + static Optional> + allOf(@NotNull Optional maybeFirst, Optional maybeSecond, Optional maybeThird) { + return maybeFirst.flatMap(first -> + maybeSecond.flatMap(second -> + maybeThird.map(third -> + Triple.of(first, second, third)))); } - static Optional> allOf(Optional maybeFirst, Optional maybeSecond, Optional maybeThird, Optional maybeFourth) { - return maybeFirst.flatMap(first -> maybeSecond.flatMap(second -> maybeThird.flatMap(third -> maybeFourth.map(fourth -> Quad.of(first, second, third, fourth))))); + /** + * @param maybeFirst optional first + * @param maybeSecond second + * @param maybeThird third + * @param maybeFourth fourth + * @param type a + * @param type b + * @param type c + * @param type d + * @return quad tuple + */ + static Optional> + allOf(@NotNull Optional maybeFirst, Optional maybeSecond, Optional maybeThird, Optional maybeFourth) { + return maybeFirst.flatMap(first -> + maybeSecond.flatMap(second -> + maybeThird.flatMap(third -> + maybeFourth.map(fourth -> + Quad.of(first, second, third, fourth))))); } - static Result, F> allOf(Result left, Result right) { + /** + * @param left left result + * @param right right result + * @param failure + * @param left side of pair + * @param right side of pair + * @return pair of left and right success + */ + static Result, F> + allOf(@NotNull Result left, Result right) { return left.then(attempt(l -> right.then(onSuccess(r -> Pair.of(l, r))))); } - static Result, F> allOf(Result first, Result second, Result third) { + /** + * @param first | + * @param second | + * @param third | + * @param | + * @param | + * @param | + * @param | + * @return tuple of three successes + */ + static Result, F> + allOf(@NotNull Result first, Result second, Result third) { return first.then(attempt(firstValue -> second.then(attempt(secondValue -> third.then(onSuccess(thirdValue -> - Triple.of(firstValue, secondValue, thirdValue) - )) - )) - )); + Triple.of(firstValue, secondValue, thirdValue))))))); } - static Result, F> allOf(Result first, Result second, Result third, Result fourth) { + /** + * @param first . + * @param second . + * @param third . + * @param fourth . + * @param . + * @param . + * @param . + * @param . + * @param . + * @return collapses success states of four results to one + */ + static Result, F> + allOf(@NotNull Result first, Result second, Result third, Result fourth) { return first.then(attempt(firstValue -> second.then(attempt(secondValue -> third.then(attempt(thirdValue -> fourth.then(onSuccess(fourthValue -> - Quad.of(firstValue, secondValue, thirdValue, fourthValue) - )) - )) - )) - )); + Quad.of(firstValue, secondValue, thirdValue, fourthValue))))))))); } - static Function, F>, Result> ifAllSucceeded( - BiFunction f - ) { + /** + * @param f test function + * @param failure type + * @param left input + * @param right input + * @param success output + * @return a function that when passed a result with a pair-fail setup, returns + * applying that result to f + */ + static @NotNull Function, F>, Result> + ifAllSucceeded(BiFunction f) { return onSuccess(onAll(f)); } - static Function, F>, Result> ifAllSucceeded( - TriFunction f - ) { + /** + * @param f tri function collapsor + * @param failure type + * @param . + * @param . + * @param . + * @param result type + * @return dF(x -> y) where X is a result with success type triple and y is a result with a collapsed success type + */ + static @NotNull Function, F>, Result> + ifAllSucceeded(TriFunction f) { return onSuccess(onAll(f)); } - static Function, F>, Result> ifAllSucceeded( - QuadFunction f - ) { + /** + * @param f quad function to collapse + * @param fail type + * @param . + * @param . + * @param . + * @param . + * @param collapsed type + * @return dF(x -> y) where x is a result with a success quad type and y is a result with a collapsed success type + */ + static @NotNull Function, F>, Result> + ifAllSucceeded(QuadFunction f) { return onSuccess(onAll(f)); } diff --git a/src/main/java/co/unruly/control/pair/Maps.java b/src/main/java/co/unruly/control/pair/Maps.java index f639599..19a4c4d 100644 --- a/src/main/java/co/unruly/control/pair/Maps.java +++ b/src/main/java/co/unruly/control/pair/Maps.java @@ -1,5 +1,8 @@ package co.unruly.control.pair; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.Map; import java.util.stream.Collector; import java.util.stream.Collectors; @@ -36,21 +39,23 @@ static Map mapOf(Pair ...entries) { * @param the right type of the pair, interpreted as the value type * @return a Collector which collects a Stream of Pairs into a Map */ - static Collector, ?, Map> toMap() { + @Contract(value = " -> new", pure = true) + static @NotNull Collector, ?, Map> toMap() { return Collectors.toMap(Pair::left, Pair::right); } /** * Creates a key-value pair. - * - * This is just an alias for Pair.of, that makes more sense in a map-initialisation context. + *

+ * This is just an alias for Pair. Of, that makes more sense in a map-initialisation context. * @param key the key * @param value the value * @param the key type * @param the value type * @return a key-value pair */ - static Pair entry(K key, V value) { + @Contract(value = "_, _ -> new", pure = true) + static @NotNull Pair entry(K key, V value) { return Pair.of(key, value); } } diff --git a/src/main/java/co/unruly/control/pair/Pair.java b/src/main/java/co/unruly/control/pair/Pair.java index e45346d..c7e06e0 100644 --- a/src/main/java/co/unruly/control/pair/Pair.java +++ b/src/main/java/co/unruly/control/pair/Pair.java @@ -1,30 +1,42 @@ package co.unruly.control.pair; -import java.util.Objects; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.BiFunction; import java.util.function.Function; /** * A basic tuple type */ -public class Pair { - - public final L left; - public final R right; +public record Pair(L left, R right) { - public Pair(L left, R right) { - this.left = left; - this.right = right; + /** + * @param left left value + * @param right right value + */ + public Pair { } - public static Pair of(L left, R right) { + /** + * @param left . + * @param right . + * @param left type + * @param right type + * @return new pair from left and right + */ + @Contract(value = "_, _ -> new", pure = true) + public static @NotNull Pair of(L left, R right) { return new Pair<>(left, right); } /** * Gets the left element. Note that Pair also supports direct member access, but this is useful when you need * a method reference to extract one side of the pair. + * + * @return left */ + @Override public L left() { return left; } @@ -32,7 +44,10 @@ public L left() { /** * Gets the right element. Note that Pair also supports direct member access, but this is useful when you need * a method reference to extract one side of the pair. + * + * @return right */ + @Override public R right() { return right; @@ -40,34 +55,29 @@ public R right() { /** * Applies the given function to this pair. + * + * @param function action + * @param result type + * @return result of applying function to this pair */ - public T then(Function, T> function) { + public T then(@NotNull Function, T> function) { return function.apply(this); } /** * Applies the given bifunction to this pair, using left for the first argument and right for the second + * + * @param function bifunction pair + * @param output type + * @return output type */ - public T then(BiFunction function) { + public T then(@NotNull BiFunction function) { return function.apply(this.left, this.right); } + @Contract(pure = true) @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Pair pair = (Pair) o; - return Objects.equals(left, pair.left) && - Objects.equals(right, pair.right); - } - - @Override - public int hashCode() { - return Objects.hash(left, right); - } - - @Override - public String toString() { + public @NotNull String toString() { return "Pair{" + "left=" + left + ", right=" + right + diff --git a/src/main/java/co/unruly/control/pair/PairListCollector.java b/src/main/java/co/unruly/control/pair/PairListCollector.java index 0980eaf..766bc6f 100644 --- a/src/main/java/co/unruly/control/pair/PairListCollector.java +++ b/src/main/java/co/unruly/control/pair/PairListCollector.java @@ -18,6 +18,10 @@ public class PairListCollector implements Collector, Pa private final Function, FL> leftFinisher; private final Function, FR> rightFinisher; + /** + * @param leftFinisher . + * @param rightFinisher . + */ public PairListCollector(Function, FL> leftFinisher, Function, FR> rightFinisher) { this.leftFinisher = leftFinisher; this.rightFinisher = rightFinisher; @@ -31,23 +35,23 @@ public Supplier, List>> supplier() { @Override public BiConsumer, List>, Pair> accumulator() { return (pairs, pair) -> { - pairs.left.add(pair.left); - pairs.right.add(pair.right); + pairs.left().add(pair.left()); + pairs.right().add(pair.right()); }; } @Override public BinaryOperator, List>> combiner() { return (first, second) -> { - first.left.addAll(second.left); - first.right.addAll(second.right); + first.left().addAll(second.left()); + first.right().addAll(second.right()); return first; }; } @Override public Function, List>, Pair> finisher() { - return pair -> Pair.of(leftFinisher.apply(pair.left), rightFinisher.apply(pair.right)); + return pair -> Pair.of(leftFinisher.apply(pair.left()), rightFinisher.apply(pair.right())); } @Override diff --git a/src/main/java/co/unruly/control/pair/PairReducingCollector.java b/src/main/java/co/unruly/control/pair/PairReducingCollector.java index 738d01f..bf9fb7a 100644 --- a/src/main/java/co/unruly/control/pair/PairReducingCollector.java +++ b/src/main/java/co/unruly/control/pair/PairReducingCollector.java @@ -20,7 +20,16 @@ public class PairReducingCollector implements Collector, PairRe private final BinaryOperator leftReducer; private final BinaryOperator rightReducer; - public PairReducingCollector(L leftIdentity, R rightIdentity, BinaryOperator leftReducer, BinaryOperator rightReducer) { + /** + * @param leftIdentity . + * @param rightIdentity . + * @param leftReducer . + * @param rightReducer . + */ + public PairReducingCollector( + L leftIdentity, R rightIdentity, + BinaryOperator leftReducer, + BinaryOperator rightReducer) { this.leftIdentity = leftIdentity; this.rightIdentity = rightIdentity; this.leftReducer = leftReducer; @@ -35,8 +44,8 @@ public Supplier> supplier() { @Override public BiConsumer, Pair> accumulator() { return (acc, item) -> { - acc.left = leftReducer.apply(acc.left, item.left); - acc.right = rightReducer.apply(acc.right, item.right); + acc.left = leftReducer.apply(acc.left, item.left()); + acc.right = rightReducer.apply(acc.right, item.right()); }; } @@ -59,7 +68,11 @@ public Set characteristics() { return EnumSet.noneOf(Characteristics.class); } - static class MutablePair { + /** + * @param left type + * @param right type + */ + public static class MutablePair { L left; R right; diff --git a/src/main/java/co/unruly/control/pair/Pairs.java b/src/main/java/co/unruly/control/pair/Pairs.java index f965832..fe5987b 100644 --- a/src/main/java/co/unruly/control/pair/Pairs.java +++ b/src/main/java/co/unruly/control/pair/Pairs.java @@ -1,16 +1,16 @@ package co.unruly.control.pair; import co.unruly.control.result.Result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.Collections; import java.util.List; -import java.util.Optional; import java.util.function.BiFunction; import java.util.function.BinaryOperator; import java.util.function.Function; import java.util.function.IntFunction; import java.util.stream.Collector; -import java.util.stream.Collectors; import java.util.stream.Stream; import static co.unruly.control.result.Result.failure; @@ -20,94 +20,167 @@ /** * Convenience functions on Pairs */ +@SuppressWarnings("unused") public interface Pairs { /** * Applies the given function to the left element of a Pair, returning a new Pair with the result of that * function as the left element and the original right element untouched + * @param leftMapper mapping function for left value + * @param

    old left value type + * @param new left value type + * @param right type + * @return function that takes a pair, and converts the left type to a new type */ - static Function, Pair> onLeft(Function leftMapper) { - return pair -> Pair.of(leftMapper.apply(pair.left), pair.right); + @Contract(pure = true) + static @NotNull Function, Pair> + onLeft(Function leftMapper) { + return pair -> Pair.of(leftMapper.apply(pair.left()), pair.right()); } /** * Applies the given function to the right element of a Pair, returning a new Pair with the result of that * function as the right element and the original left element untouched + * @param rightMapper mapping function for right value + * @param old right value type + * @param new right value type + * @param right type + * @return function that takes a pair, and converts the right type to a new type */ - static Function, Pair> onRight(Function rightMapper) { - return pair -> Pair.of(pair.left, rightMapper.apply(pair.right)); + @Contract(pure = true) + static @NotNull Function, Pair> + onRight(Function rightMapper) { + return pair -> Pair.of(pair.left(), rightMapper.apply(pair.right())); } /** - * Applies the given function to both elements off a Pair, assuming that both elements are of the + * Applies the given function to both elements of a Pair, assuming that both elements are of the * same type + * @param f mutating function + * @param old type + * @param new type + * @return function that asks for a pair in the form P(T, T) and returns P(R, R) */ - static Function, Pair> onBoth(Function f) { - return pair -> Pair.of(f.apply(pair.left), f.apply(pair.right)); + @Contract(pure = true) + static @NotNull Function, Pair> + onBoth(Function f) { + return pair -> Pair.of(f.apply(pair.left()), f.apply(pair.right())); } /** * Applies the given function to both elements off a Pair, yielding a non-Pair value + * @param f merging function + * @param left type + * @param right type + * @param output type + * @return function that asks for a pair and returns T */ - static Function, T> merge(BiFunction f) { + @Contract(pure = true) + static @NotNull Function, T> + merge(BiFunction f) { return pair -> pair.then(f); } /** * Merges a Pair of Lists of T into a single List of T, with the left items at the front of the list. + * @param type + * @return list with left before right, merged */ - static Function, List>, List> mergeLists() { - return pair -> Stream.of(pair.left, pair.right).flatMap(List::stream).collect(toList()); + @Contract(pure = true) + static @NotNull Function, List>, List> mergeLists() { + return pair -> Stream.of(pair.left(), pair.right()).flatMap(List::stream).collect(toList()); } /** * Collects a Stream of Pairs into a single Pair of lists, where a given index can be used to access the left * and right parts of the input pairs respectively. + * @param left type + * @param right type + * @return a collector representing a single list of pairs that is indexable */ - static Collector, Pair, List>, Pair, List>> toParallelLists() { + @Contract(value = " -> new", pure = true) + static @NotNull Collector, Pair, List>, Pair, List>> + toParallelLists() { return using(Collections::unmodifiableList, Collections::unmodifiableList); } /** * Collects a Stream of Pairs into a single Pair of arrays, where a given index can be used to access the left * and right parts of the input pairs respectively. + * @param leftArrayConstructor left constructing function + * @param rightArrayConstructor right constructing function + * @param left type + * @param right type + * @return collector representing a single pair of arrays, where an index can be used to access the + * left and right parts */ - static Collector, Pair, List>, Pair> toArrays(IntFunction leftArrayConstructor, IntFunction rightArrayConstructor) { + @Contract(value = "_, _ -> new", pure = true) + static @NotNull Collector, Pair, List>, Pair> + toArrays(IntFunction leftArrayConstructor, IntFunction rightArrayConstructor) { return using( - left -> left.stream().toArray(leftArrayConstructor), - right -> right.stream().toArray(rightArrayConstructor) + left -> left.toArray(leftArrayConstructor), + right -> right.toArray(rightArrayConstructor) ); } /** * Reduces a stream of pairs to a single pair, using the provided identities and reducer functions + * @param leftIdentity left input + * @param leftReducer left reducing function + * @param rightIdentity right input + * @param rightReducer right reducing function + * @param left type + * @param right type + * @return collector that represents a single pair, representing the reduced pairs + * based on the identities and reducing mechanisms */ - static PairReducingCollector reducing( - L leftIdentity, BinaryOperator leftReducer, - R rightIdentity, BinaryOperator rightReducer) { + @Contract(value = "_, _, _, _ -> new", pure = true) + static @NotNull PairReducingCollector + reducing(L leftIdentity, BinaryOperator leftReducer, + R rightIdentity, BinaryOperator rightReducer) { return new PairReducingCollector<>(leftIdentity, rightIdentity, leftReducer, rightReducer); } - static Collector, Pair, List>, Pair> using( - Function, FL> leftFinisher, - Function, FR> rightFinisher) { + /** + * @param leftFinisher left collection mechanism + * @param rightFinisher right collection mechanism + * @param left type + * @param right type + * @param new left finisher + * @param new right finisher + * @return pair of lists + */ + @Contract(value = "_, _ -> new", pure = true) + static @NotNull Collector, Pair, List>, Pair> + using(Function, FL> leftFinisher, Function, FR> rightFinisher) { return new PairListCollector<>(leftFinisher, rightFinisher); } /** - * If there are any elements in the right side of the Pair, return a failure of + * If there are any elements on the right side of the Pair, return a failure of * the right side, otherwise return a success of the left. + * @param sides pair of lists + * @param left type + * @param right type + * @return result representing success if right side has pairs, otherwise returns + * list of left side */ - static Result, List> anyFailures(Pair, List> sides) { - return sides.right.isEmpty() ? success(sides.left) : failure(sides.right); + static Result, List> + anyFailures(@NotNull Pair, List> sides) { + return sides.right().isEmpty() ? success(sides.left()) : failure(sides.right()); } /** - * If there are any elements in the left side of the Pair, return a success of + * If there are any elements on the left side of the Pair, return a success of * the left side, otherwise return a failure of the left. + * @param sides pair of lists + * @param left type + * @param right type + * @return result where success is if left side has elements, failure otherwise */ - static Result, List> anySuccesses(Pair, List> sides) { - return sides.left.isEmpty() ? failure(sides.right) : success(sides.left); + static Result, List> + anySuccesses(@NotNull Pair, List> sides) { + return sides.left().isEmpty() ? failure(sides.right()) : success(sides.left()); } } diff --git a/src/main/java/co/unruly/control/pair/Quad.java b/src/main/java/co/unruly/control/pair/Quad.java index 34108de..4fe32e9 100644 --- a/src/main/java/co/unruly/control/pair/Quad.java +++ b/src/main/java/co/unruly/control/pair/Quad.java @@ -1,74 +1,78 @@ package co.unruly.control.pair; -import java.util.Objects; -import java.util.function.Function; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; -public class Quad { +import java.util.function.Function; +/** + * @param first . + * @param second . + * @param third . + * @param fourth . + * @param . + * @param . + * @param . + * @param . + */ +public record Quad(A first, B second, C third, D fourth) { + + /** + * @param . + * @param . + * @param . + * @param . + * @param output type + */ @FunctionalInterface public interface QuadFunction { + /** + * @param a . + * @param b . + * @param c . + * @param d . + * @return T + */ T apply(A a, B b, C c, D d); } - public final A first; - public final B second; - public final C third; - public final D fourth; - - - public Quad(A first, B second, C third, D fourth) { - this.first = first; - this.second = second; - this.third = third; - this.fourth = fourth; - } - - public static Quad of(A first, B second, C third, D fourth) { - return new Quad(first, second, third, fourth); - } - - public A first() { - return first; - } - - public B second() { - return second; + /** + * @param first . + * @param second . + * @param third . + * @param fourth . + * @param . + * @param . + * @param . + * @param . + * @return new quad of first-fourth params + */ + @Contract("_, _, _, _ -> new") + public static @NotNull Quad of(A first, B second, C third, D fourth) { + return new Quad<>(first, second, third, fourth); } - public C third() { - return third; - } - - public D fourth() { - return fourth; - } - - public T then(Function, T> function) { + /** + * @param function quad function to use + * @param return type + * @return T given this + */ + public T then(@NotNull Function, T> function) { return function.apply(this); } - public T then(QuadFunction function) { + /** + * @param function quad function to use + * @param return type + * @return T + */ + public T then(@NotNull QuadFunction function) { return function.apply(first, second, third, fourth); } + @Contract(pure = true) @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Quad quad = (Quad) o; - return Objects.equals(first, quad.first) && - Objects.equals(second, quad.second) && - Objects.equals(third, quad.third) && - Objects.equals(fourth, quad.fourth); - } - - @Override - public int hashCode() { - return Objects.hash(first, second, third, fourth); - } - - @Override - public String toString() { + public @NotNull String toString() { return "Quad{" + "first=" + first + ", second=" + second + diff --git a/src/main/java/co/unruly/control/pair/Triple.java b/src/main/java/co/unruly/control/pair/Triple.java index 537549a..0531721 100644 --- a/src/main/java/co/unruly/control/pair/Triple.java +++ b/src/main/java/co/unruly/control/pair/Triple.java @@ -1,66 +1,74 @@ package co.unruly.control.pair; -import java.util.Objects; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Function; -public class Triple { +/** + * @param first . + * @param second . + * @param third . + * @param . + * @param . + * @param . + */ +@SuppressWarnings("unused") +public record Triple(A first, B second, C third) { + /** + * @param . + * @param . + * @param . + * @param result type + */ @FunctionalInterface public interface TriFunction { + /** + * @param a . + * @param b . + * @param c . + * @return R + */ R apply(A a, B b, C c); } - public final A first; - public final B second; - public final C third; - - public Triple(A first, B second, C third) { - this.first = first; - this.second = second; - this.third = third; - } - - public static Triple of(A first, B second, C third) { + /** + * @param first . + * @param second . + * @param third . + * @param . + * @param . + * @param . + * @return triple if inputs + */ + @Contract(value = "_, _, _ -> new", pure = true) + public static @NotNull Triple + of(A first, B second, C third) { return new Triple<>(first, second, third); } - public A first() { - return first; - } - - public B second() { - return second; - } - - public C third() { - return third; - } - - public T then(Function, T> function) { + /** + * @param function triple function + * @param output type + * @return T from collapsing triple function + */ + public T then(@NotNull Function, T> function) { return function.apply(this); } - public T then(TriFunction function) { + /** + * @param function tri function + * @param output type + * @return T from collapsing tri types + */ + public T then(@NotNull TriFunction function) { return function.apply(first, second, third); } + @Contract(pure = true) @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - Triple triple = (Triple) o; - return Objects.equals(first, triple.first) && - Objects.equals(second, triple.second) && - Objects.equals(third, triple.third); - } - - @Override - public int hashCode() { - return Objects.hash(first, second, third); - } - - @Override - public String toString() { + public @NotNull String toString() { return "Triple{" + "first=" + first + ", second=" + second + diff --git a/src/main/java/co/unruly/control/result/Combiners.java b/src/main/java/co/unruly/control/result/Combiners.java index d61cacd..5984f09 100644 --- a/src/main/java/co/unruly/control/result/Combiners.java +++ b/src/main/java/co/unruly/control/result/Combiners.java @@ -5,33 +5,58 @@ import static co.unruly.control.result.Result.success; +/** + * interface for combining different data structures + */ public interface Combiners { /** * Combines two Results into a single Result. If both arguments are a Success, then * it applies the given function to their values and returns a Success of it. - * + * @param a + * @param b + * @param f + * @param secondArgument result to merge + * @return first failure * If either or both arguments are Failures, then this returns the first failure * it encountered. */ - static Function, MergeableResults> combineWith(Result secondArgument) { + @org.jetbrains.annotations.NotNull + @org.jetbrains.annotations.Contract(pure = true) + static Function, MergeableResults> + combineWith(Result secondArgument) { // ugh ugh ugh we need an abstract class because otherwise it can't infer generics properly can i be sick now? ta - return result -> new MergeableResults() { + return result -> new MergeableResults<>() { + /** + * @param combiner combining mechanism + * @param combiner + * @return an either + */ @Override public Result using(BiFunction combiner) { return result.either( - s1 -> secondArgument.either( - s2 -> success(combiner.apply(s1, s2)), + s1 -> secondArgument.either( + s2 -> success(combiner.apply(s1, s2)), + Result::failure + ), Result::failure - ), - Result::failure ); } }; } + /** + * @param input 1 + * @param input 2 + * @param failure + */ @FunctionalInterface interface MergeableResults { + /** + * @param combiner combining function + * @param success combiner + * @return result with the combined result as the success and fail as fail + */ Result using(BiFunction combiner); } } diff --git a/src/main/java/co/unruly/control/result/Introducers.java b/src/main/java/co/unruly/control/result/Introducers.java index be47a7a..d9e8248 100644 --- a/src/main/java/co/unruly/control/result/Introducers.java +++ b/src/main/java/co/unruly/control/result/Introducers.java @@ -1,6 +1,8 @@ package co.unruly.control.result; import co.unruly.control.ThrowingLambdas; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.Map; import java.util.Optional; @@ -9,61 +11,97 @@ import java.util.function.Supplier; import java.util.stream.Stream; -import static co.unruly.control.result.Result.failure; -import static co.unruly.control.result.Result.success; import static co.unruly.control.result.Transformers.unwrapSuccesses; import static java.util.function.Function.identity; /** - * A collection of sample functions which take regular values and output a Result. + * A collection of sample functions which take regular values and output a Result. */ +@SuppressWarnings("unused") public interface Introducers { + /** * Returns a Function which creates a new Success wrapping the provided value + * @param success type + * @param fail type + * @return success wrapper */ - static Function> success() { + @Contract(pure = true) + static @NotNull Function> + success() { return Result::success; } /** * Returns a Function which creates a new Failure wrapping the provided value + * @param success type + * @param fail type + * @return failure wrapper */ - static Function> failure() { + @Contract(pure = true) + static @NotNull Function> failure() { return Result::failure; } /** * Returns a function which takes an Optional value, and returns a success of the * wrapped value if it was present, otherwise returns a failure using the provided Supplier + * @param onEmpty failure supplier + * @param success type + * @param failure type + * @return result type */ - static Function, Result> fromOptional(Supplier onEmpty) { + @Contract(pure = true) + static @NotNull Function, Result> + fromOptional(Supplier onEmpty) { return maybe -> maybe.map(Result::success).orElseGet(() -> Result.failure(onEmpty.get())); } /** * Returns a function which takes a value and checks a predicate on it: if the predicate passes, then * return a success of that value, otherwise apply the failure mapper to it + * @param test a predicate testing function + * @param fail + * @param success + * @param failureMapper func to map to + * @return dF(x -> y) where x is S and y is a result type determined by testing x against test */ - static Function> ifFalse(Predicate test, Function failureMapper) { + @Contract(pure = true) + static @NotNull Function> ifFalse(Predicate test, Function failureMapper) { return val -> test.test(val) ? Result.success(val) : Result.failure(failureMapper.apply(val)); } /** * Returns a function which takes a value and checks a predicate on it: if the predicate passes, then * return a success of that value, otherwise return a failure of the provided value + * @param test testing function + * @param failureValue fail value + * @param success type + * @param fail type + * @return result */ - static Function> ifFalse(Predicate test, F failureValue) { + @Contract(pure = true) + static @NotNull Function> + ifFalse(Predicate test, F failureValue) { return val -> test.test(val) ? Result.success(val) : Result.failure(failureValue); } /** * Returns a function which takes a value, applies the given function to it, and returns a * success of the returned value, unless it's null, when we return the given failure value + * @param mapper mapping function + * @param failure failure type + * @param input type + * @param output type + * @param failure type + * @return failure if null, success of output otherwise */ - static Function> ifNull(Function mapper, F failure) { + @Contract(pure = true) + static @NotNull Function> + ifNull(Function mapper, F failure) { return input -> { - final S1 output = mapper.apply(input); + final Output output = mapper.apply(input); return output == null ? Result.failure(failure) : Result.success(output); }; } @@ -72,10 +110,18 @@ static Function> ifNull(Function mapper, F fa * Returns a function which takes a value, applies the given function to it, and returns a * success of the returned value, unless it's null, when we return a failure of the given * function to the input value. + * @param mapper mapping function + * @param failureMapper mapping (to failure) funcntion + * @param input type + * @param mapped type + * @param fail type + * @return returns result with either success w/ output or failure with input */ - static Function> ifNull(Function mapper, Function failureMapper) { + @Contract(pure = true) + static @NotNull Function> + ifNull(Function mapper, Function failureMapper) { return input -> { - final S1 output = mapper.apply(input); + final Output output = mapper.apply(input); return output == null ? Result.failure(failureMapper.apply(input)) : Result.success(output); }; } @@ -84,12 +130,21 @@ static Function> ifNull(Function mapper, Func * Returns a function which takes a value, applies the given function to it, and returns a success of * the input unless the returned value matches the provided value. Otherwise, it returns a failure of the * failure value provided. - * + *

    * Note that the success path returns a success of the original value, not the result of applying this * function. This can be used to build more complex predicates, or to check the return value of a * consumer-with-return-code. + * @param checker maps input type to value type + * @param value value to check against + * @param failure failure value + * @param success type + * @param failure type + * @param value type + * @return dF(x->y) where x is S and returns a result of type R(S, F) based on comparing S to V */ - static Function> ifYields(Function checker, V value, F failure) { + @Contract(pure = true) + static @NotNull Function> + ifYields(Function checker, V value, F failure) { return input -> checker.apply(input) == value ? Result.failure(failure) : Result.success(input); } @@ -97,13 +152,24 @@ static Function> ifYields(Function checker, V va * Returns a function which takes a value, applies the given function to it, and returns a success of * the input unless the returned value matches the provided value. Otherwise, it returns a failure of the * input value applied to the failure mapping function. - * + *

    * Note that the success path returns a success of the original value, not the result of applying this * function. This can be used to build more complex predicates, or to check the return value of a * consumer-with-return-code. + * @param checker maps S to V + * @param value type to compare against + * @param failureMapper maps success to failure outcome + * @param success type + * @param fail type + * @param value comparison type + * @return dF(x -> y) where */ - static Function> ifYields(Function checker, V value, Function failureMapper) { - return input -> checker.apply(input) == value ? Result.failure(failureMapper.apply(input)) : Result.success(input); + @Contract(pure = true) + static @NotNull Function> + ifYields(Function checker, V value, Function failureMapper) { + return input -> checker.apply(input) == value ? + Result.failure(failureMapper.apply(input)) : + Result.success(input); } /** @@ -111,23 +177,32 @@ static Function> ifYields(Function checker, V va * a success of the output of that function. In the case where the function throws an exception, * that exception is passed to the provided exception-mapper, and the output of that call is the * failure value. - * + *

    * Whilst we take a ThrowingFunction which throws a specific checked exception type X, our * eventual Result is of the more general type Exception. That's because it's also possible for the * function to throw other types of RuntimeException, and we have two choices: don't catch (or rethrow) * RuntimeException, or have a more general failure type. Rethrowing exceptions goes against the whole * point of constraining the error path, so we opt for the latter. - * + *

    * If the provided function throws an Error, we don't catch that. Errors in general are not * intended to be caught. - * + *

    * Note that idiomatic handling of Exceptions as failure type does allow specialised catch blocks * on specific exception types. + * @param throwingFunction function that may fail + * @param exceptionMapper maps the exception to the failure type + * @param input type + * @param output type + * @param exception type + * @param failure type + * @return df(IS -> R(OS, F)) where x is the input type passed to throwingFunction + * and the output wrapped in a try-catch that returns the exception mapped to a failure + * via the exceptionMapper */ - static Function> tryTo( - ThrowingLambdas.ThrowingFunction throwingFunction, - Function exceptionMapper - ) { + @Contract(pure = true) + static @NotNull Function> + tryTo(ThrowingLambdas.ThrowingFunction throwingFunction, + Function exceptionMapper) { return input -> { try { return Result.success(throwingFunction.apply(input)); @@ -141,22 +216,28 @@ static Function> tryTo( * Returns a function which takes a value, applies the provided function to it, and returns * a success of the output of that function, or a failure of the exception thrown by that function * if it threw an exception. - * + *

    * Whilst we take a ThrowingFunction which throws a specific checked exception type X, our * eventual Result is of the more general type Exception. That's because it's also possible for the * function to throw other types of RuntimeException, and we have two choices: don't catch (or rethrow) * RuntimeException, or have a more general failure type. Rethrowing exceptions goes against the whole * point of constraining the error path, so we opt for the latter. - * + *

    * If the provided function throws an Error, we don't catch that. Errors in general are not * intended to be caught. - * + *

    * Note that idiomatic handling of Exceptions as failure type does allow specialised catch blocks * on specific exception types. + * @param throwingFunction function that throws type X + * @param input type + * @param output type + * @param exception type + * @return dF(IS -> R(OS, Exception)) + * input is passed to the throwing function, + * output is a result with either the OS or F(Exception) */ - static Function> tryTo( - ThrowingLambdas.ThrowingFunction throwingFunction - ) { + static @NotNull Function> + tryTo(ThrowingLambdas.ThrowingFunction throwingFunction) { return tryTo(throwingFunction, identity()); } @@ -164,23 +245,29 @@ static Function> tryTo( * Returns a function which takes a value, applies the provided function to it, and returns * a success of the output of that function. If an exception is thrown, return a failure of * the specified failure case value. - * + *

    * Whilst we take a ThrowingFunction which throws a specific checked exception type X, our * eventual Result is of the more general type Exception. That's because it's also possible for the * function to throw other types of RuntimeException, and we have two choices: don't catch (or rethrow) * RuntimeException, or have a more general failure type. Rethrowing exceptions goes against the whole * point of constraining the error path, so we opt for the latter. - * + *

    * If the provided function throws an Error, we don't catch that. Errors in general are not * intended to be caught. - * + *

    * Note that idiomatic handling of Exceptions as failure type does allow specialised catch blocks * on specific exception types. + * @param throwingFunction function that takes an input type IS, returns an output type OS, or throws X + * @param failureCase function mapping exception to failure? + * @param input type + * @param output type + * @param exception type + * @param failure value + * @return dF(x -> y) where x is of type IS and y is a result of type R(OS, F) */ - static Function> tryTo( - ThrowingLambdas.ThrowingFunction throwingFunction, - F failureCase - ) { + @Contract(pure = true) + static @NotNull Function> + tryTo(ThrowingLambdas.ThrowingFunction throwingFunction, F failureCase) { return tryTo(throwingFunction, __ -> failureCase); } @@ -189,8 +276,15 @@ static Function> tryTo( * Returns a function which takes a value, applies the provided stream-returning function to it, * and return a stream which is the stream returned by the function, with each element wrapped in * a success, or a single failure of the exception thrown by that function if it threw an exception. + * @param f function that may throw an exception + * @param input type + * @param output type + * @param exception type + * @return dF(x -> y) where x is provided to f and returns a stream of success results or a single failure result + * of the exception type X if f failed */ - static Function>> tryAndUnwrap(ThrowingLambdas.ThrowingFunction, X> f) { + static @NotNull Function>> + tryAndUnwrap(ThrowingLambdas.ThrowingFunction, X> f) { return tryTo(f).andThen(unwrapSuccesses()); } @@ -198,12 +292,18 @@ static Function>> * Takes a class and returns a function which takes a value, attempts to cast it to that class, and returns * a Success of the provided type if it's a member of it, and a Failure of the known type otherwise, in both * cases containing the input value. - * + *

    * This differs from exactCastTo in that exactCastTo will only return a Success if the given value is exactly * the target type, whereas this will also return a Success if it is a subtype of that type. + * @param targetClass class to cast to + * @param input type + * @param output type + * @return result with either cast type or failure */ + @Contract(pure = true) @SuppressWarnings("unchecked") - static Function> castTo(Class targetClass) { + static @NotNull Function> + castTo(Class targetClass) { return input -> targetClass.isAssignableFrom(input.getClass()) ? Result.success((OS)input) : Result.failure(input); @@ -213,12 +313,18 @@ static Function> castTo(Class targetC * Takes a class and returns a function which takes a value, attempts to cast it to that class, and returns * a Success of the provided type if it's the same type as it, and a Failure of the known type otherwise, in both * cases containing the input value. - * + *

    * This differs from castTo in that castTo will return a Success if the given value is a subtype of the target * type, whereas this will only return a Success if it is exactly that type. + * @param targetClass class to cast to + * @param input type + * @param success output type + * @return result with either cast type or fail tye */ + @Contract(pure = true) @SuppressWarnings("unchecked") - static Function> exactCastTo(Class targetClass) { + static @NotNull Function> + exactCastTo(Class targetClass) { return input -> targetClass.equals(input.getClass()) ? Result.success((OS)input) : Result.failure(input); @@ -229,8 +335,16 @@ static Function> exactCastTo(Class ta * Takes a java.util.Map and a failure function, and returns a function which takes a key and returns * a success of the associated value in the Map, if present, or applies the failure function to the * key otherwise. + * @param map map with K -> S relationship + * @param failureProvider function to call with K in fail case + * @param key + * @param success type + * @param failure type + * @return result based on whether K is in map */ - static Function> fromMap(Map map, Function failureProvider) { + @Contract(pure = true) + static @NotNull Function> + fromMap(Map map, Function failureProvider) { return key -> { if(map.containsKey(key)) { return Result.success(map.get(key)); diff --git a/src/main/java/co/unruly/control/result/Match.java b/src/main/java/co/unruly/control/result/Match.java index 5aff1b9..b08eb18 100644 --- a/src/main/java/co/unruly/control/result/Match.java +++ b/src/main/java/co/unruly/control/result/Match.java @@ -1,5 +1,8 @@ package co.unruly.control.result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Function; import java.util.stream.Stream; @@ -10,7 +13,7 @@ /** * A small DSL for building compact dispatch tables: better than if-expressions, worse than * proper pattern matching. But hey, it's Java, what do you expect? - * + *

    * This models a match attempt as a sequence of operations on a Result, starting with a Failure * and continuously trying to use flatMapFailure to convert that Result into a Success. */ @@ -21,9 +24,15 @@ public class Match { * a function, the otherwise() method must be called on the result of this function: * as there's no way to determine if the dispatch table is complete, a base case is * required. + * @param potentialMatchers an arbitrary list of matching functions + * @param input type + * @param success output type + * @return a match attempt type representing the outcome when given an input */ + @Contract(pure = true) @SafeVarargs - public static MatchAttempt match(Function>... potentialMatchers) { + public static @NotNull MatchAttempt + match(Function>... potentialMatchers) { return f -> attemptMatch(potentialMatchers).andThen(ifFailed(f)); } @@ -31,8 +40,14 @@ public static MatchAttempt match(Function>... poten * Builds a dispatch function from the provided matchers. Note that this returns a Result, * as there's no way to determine if the dispatch table is complete: if no match is found, * returns a Failure of the input value. + * @param potentialMatchers an arbitrary number of matching functions + * @param input type + * @param success output type + * @return a matching function that maps an input I to a result output */ - public static Function> attemptMatch(Function>... potentialMatchers) { + @SafeVarargs + public static @NotNull Function> + attemptMatch(Function>... potentialMatchers) { return compose(Stream.of(potentialMatchers).map(Transformers::recover)).compose(Result::failure); } @@ -41,22 +56,45 @@ public static Function> attemptMatch(Function input type + * @param output type + * @return match attempt result based on passed in failure value */ + @Contract(pure = true) @SafeVarargs - public static BoundMatchAttempt matchValue(I inputValue, Function>... potentialMatchers) { + public static @NotNull BoundMatchAttempt + matchValue(I inputValue, Function>... potentialMatchers) { return f -> pipe(inputValue) .then(attemptMatch(potentialMatchers)) .then(ifFailed(f)) .resolve(); } + /** + * @param input + * @param output + */ @FunctionalInterface public interface MatchAttempt { + /** + * @param baseCase . + * @return basecase + */ Function otherwise(Function baseCase); } + /** + * @param input + * @param output + */ @FunctionalInterface public interface BoundMatchAttempt { + /** + * @param baseCase . + * @return output + */ O otherwise(Function baseCase); } } diff --git a/src/main/java/co/unruly/control/result/MonadicAliases.java b/src/main/java/co/unruly/control/result/MonadicAliases.java index 8438dcb..7df5499 100644 --- a/src/main/java/co/unruly/control/result/MonadicAliases.java +++ b/src/main/java/co/unruly/control/result/MonadicAliases.java @@ -1,5 +1,8 @@ package co.unruly.control.result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.function.Function; import static co.unruly.control.result.Introducers.success; @@ -9,20 +12,33 @@ * Aliases for standard functions on Results which use names more familiar * to users of Haskell */ +@SuppressWarnings("unused") public interface MonadicAliases { /** * Returns a function which converts a regular value into a Result (as a Success) + * @param success + * @param failure + * @return result type */ - static Function> pure() { + @Contract(pure = true) + static @NotNull Function> + pure() { return success(); } /** * Returns a function which, when applied to a Result, applies the provided function to * the wrapped value if it's a Success, otherwise perpetuates the existing failure + * @param f function to map success to + * @param input type + * @param success output type + * @param fail type + * @return function that, given a result type, maps the success input + * through the provided function and returns a new result with success output type */ - static Function, Result> map(Function f) { + static @NotNull Function, Result> + map(Function f) { return onSuccess(f); } @@ -30,29 +46,51 @@ static Function, Result> map(Function f) { * Returns a function which, when applied to a Result, applies the provided function to * the wrapped value, returning that Result, if it's a Success. This can turn a Success into a * Failure. - * + *

    * If the result was already a failure, it perpetuates the existing failure. + * @param f the mapping function + * @param input type + * @param output type + * @param failure type + * @return a function that takes an input and maps it to a new output for success */ - static Function, Result> flatMap(Function> f) { + @Contract(pure = true) + static @NotNull Function, Result> + flatMap(Function> f) { return attempt(f); } + /** * Returns a function which, when applied to a Result, applies the provided function to * the wrapped value, returning that Result, if it's a Success. This can turn a Success into a * Failure. - * + *

    * If the result was already a failure, it perpetuates the existing failure. + * @param f the mapping function + * @param input type + * @param output type + * @param fail type + * @return a function that takes an input type and maps it to an output type + * inside a result */ - static Function, Result> bind(Function> f) { + @Contract(pure = true) + static @NotNull Function, Result> + bind(Function> f) { return attempt(f); } /** * Returns a function which, when applied to a Result, applies the provided function to * the wrapped value if it's a failure, otherwise perpetuates the existing success + * @param f the mapping function + * @param success type + * @param input type + * @param output type + * @return a function that maps a failure input to a new failure output */ - static Function, Result> mapFailure(Function f) { + static @NotNull Function, Result> + mapFailure(Function f) { return onFailure(f); } @@ -60,10 +98,17 @@ static Function, Result> mapFailure(Function * If the result was already a success, it perpetuates the existing success. + * @param f the mapping function + * @param success type + * @param input type + * @param output type + * @return a function that maps a failure input to a new failure output */ - static Function, Result> flatMapFailure(Function> f) { + @Contract(pure = true) + static @NotNull Function, Result> + flatMapFailure(Function> f) { return recover(f); } @@ -72,10 +117,17 @@ static Function, Result> flatMapFailure(Function< * Returns a function which, when applied to a Result, applies the provided function to * the wrapped value, returning that Result, if it's a Failure. This can turn a Failure into a * Success. - * + *

    * If the result was already a success, it perpetuates the existing success. + * @param f the mapping function + * @param success type + * @param input type + * @param output type + * @return a function that maps a failure input to a new failure output */ - static Function, Result> bindFailure(Function> f) { + @Contract(pure = true) + static @NotNull Function, Result> + bindFailure(Function> f) { return recover(f); } } diff --git a/src/main/java/co/unruly/control/result/Recover.java b/src/main/java/co/unruly/control/result/Recover.java index 8e505a1..b339b6e 100644 --- a/src/main/java/co/unruly/control/result/Recover.java +++ b/src/main/java/co/unruly/control/result/Recover.java @@ -1,5 +1,8 @@ package co.unruly.control.result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.util.Optional; import java.util.function.Function; import java.util.function.Predicate; @@ -8,13 +11,21 @@ /** * A collection of functions to (conditionally) recover a failure into a success. */ +@SuppressWarnings("unused") public interface Recover { /** * Returns a function which takes an Optional value, and returns a failure of the * wrapped value if it was present, otherwise returns a success using the provided Supplier + * @param onEmpty supplier function + * @param success type + * @param fail type + * @return dF(x -> y) where x is an optional such that if x is a + * failure it gets wrapped, otherwise the supplier is called */ - static Function, Result> whenAbsent(Supplier onEmpty) { + @Contract(pure = true) + static @NotNull Function, Result> + whenAbsent(Supplier onEmpty) { return maybe -> maybe.map(Result::failure).orElseGet(() -> Result.success(onEmpty.get())); } @@ -22,17 +33,36 @@ static Function, Result> whenAbsent(Supplier onEmpty * Takes a class and a mapping function and returns a function which takes a value and, if it's of the * provided class, applies the mapping function to it and returns it as a Success, otherwise returning * the input value as a Failure. + * @param targetClass to map to + * @param mapper maps from NarrowFailType to S + * @param success type + * @param broad fail type + * @param narrow fail type + * @return dF(BroadFailType -> R(S, BroadFailType)) where + * NarrowFailType !extends BroadFailType -> R(BroadFailType) + * NarrowFailType extends BroadFailType -> mapper(BroadFailType as NarrowFailType) -> R(S) */ - static Function> ifType(Class targetClass, Function mapper) { - return Introducers.castTo(targetClass).andThen(Transformers.onSuccess(mapper)); + static @NotNull + Function> + ifType(Class targetClass, Function mapper) { + return Introducers.castTo(targetClass) + .andThen(Transformers.onSuccess(mapper)); } /** * Takes a predicate and a mapping function and returns a function which takes a value and, if it satisfies * the predicate, applies the mapping function to it and returns it as a Success, otherwise returning * the input value as a Failure. + * @param test predicate function + * @param mapper mapping function + * @param success type + * @param fail type + * @return dF(x -> y) where if x satisfies test, return mapper(x) as a success or + * failure otherwise */ - static Function> ifIs(Predicate test, Function mapper) { + @Contract(pure = true) + static @NotNull Function> + ifIs(Predicate test, Function mapper) { return input -> test.test(input) ? Result.success(mapper.apply(input)) : Result.failure(input); @@ -42,8 +72,15 @@ static Function> ifIs(Predicate test, Function m * Takes a predicate and a mapping function and returns a function which takes a value and, if it doesn't * satisfy the predicate, applies the mapping function to it and returns it as a Success, otherwise returning * the input value as a Failure. + * @param test testing function + * @param mapper mapping function + * @param success type + * @param fail type + * @return dF(x -> y) where if x doesn't satisfy test, x is passed to mapper and put into a success + * and is otherwise a failure */ - static Function> ifNot(Predicate test, Function mapper) { + static @NotNull Function> + ifNot(@NotNull Predicate test, Function mapper) { return ifIs(test.negate(), mapper); } @@ -51,8 +88,15 @@ static Function> ifNot(Predicate test, Function * Takes a value and a mapping function and returns a function which takes a value and, if it is equal to * the provided value, applies the mapping function to it and returns it as a Success, otherwise returning * the input value as a Failure. + * @param expectedValue value to check against input + * @param mapper mapping function for success case + * @param success type + * @param fail type + * @return dF(x -> y) where y is a result whose success applies the mapper to x */ - static Function> ifEquals(F expectedValue, Function mapper) { + @Contract(pure = true) + static @NotNull Function> + ifEquals(F expectedValue, Function mapper) { return input -> expectedValue.equals(input) ? Result.success(mapper.apply(input)) : Result.failure(input); @@ -61,8 +105,14 @@ static Function> ifEquals(F expectedValue, Function /** * Matches the value if the provided function yields an Optional whose value is * present, returning the value in that Optional. + * @param successProvider function providing an optional success + * @param success type + * @param fail type + * @return function that, given an input, pipes it through success provider into a result */ - static Function> ifPresent(Function> successProvider) { + @Contract(pure = true) + static @NotNull Function> + ifPresent(Function> successProvider) { return value -> successProvider .apply(value) .map(Result::success) diff --git a/src/main/java/co/unruly/control/result/Resolvers.java b/src/main/java/co/unruly/control/result/Resolvers.java index a5bec4f..114a284 100644 --- a/src/main/java/co/unruly/control/result/Resolvers.java +++ b/src/main/java/co/unruly/control/result/Resolvers.java @@ -2,6 +2,8 @@ import co.unruly.control.pair.Pair; import co.unruly.control.pair.Pairs; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.Optional; @@ -17,13 +19,18 @@ * A set of common functions to convert from a Result to * an unwrapped value. */ +@SuppressWarnings("unused") public interface Resolvers { /** * Takes a Result where both success and failure types are the same, and returns * either the success or failure value as appropriate + * @param input type + * @return T */ - static Function, T> collapse() { + @Contract(pure = true) + static @NotNull Function, T> + collapse() { return r -> r.either(identity(), identity()); } @@ -31,8 +38,16 @@ static Function, T> collapse() { * Takes a Result and returns the success value if it is a success, or if it's * a failure, returns the result of applying the recovery function to the * failure value. + * @param recoveryFunction function to recover from F + * @param output success + * @param input success + * @param failure to recovery type + * @param failure type + * @return output success or recovered failure */ - static Function, OS> ifFailed(Function recoveryFunction) { + @Contract(pure = true) + static @NotNull Function, OS> + ifFailed(Function recoveryFunction) { return r -> r.either(identity(), recoveryFunction); } @@ -40,8 +55,13 @@ static Function, OS> ifFaile * Takes a Result for which the failure type is an Exception, and returns the * success value if it's a success, or throws the failure exception, wrapped in a * RuntimeException. + * @param success type + * @param exception type + * @return success value or throws an exception */ - static Function, S> getOrThrow() { + @Contract(pure = true) + static @NotNull Function, S> + getOrThrow() { return r -> r.either(identity(), ex -> { throw new RuntimeException(ex); }); } @@ -49,8 +69,14 @@ static Function, S> getOrThrow() { * Takes a Result and returns the success value if it is a success, or if it's * a failure, throws the result of applying the exception converter to the * failure value. + * @param exceptionConverter converts F to an exception + * @param success type + * @param fail type + * @return success or throws a runtime exception */ - static Function, S> getOrThrow(Function exceptionConverter) { + @Contract(pure = true) + static @NotNull Function, S> + getOrThrow(Function exceptionConverter) { return r -> r.either(identity(), failure -> { throw exceptionConverter.apply(failure); }); } @@ -58,8 +84,13 @@ static Function, S> getOrThrow(Function * Returns a Stream of successes: a stream of a single value if this is a success, * or an empty stream if this is a failure. This is intended to be used to flat-map * over a stream of Results to extract a stream of just the successes. + * @param success type + * @param success type + * @return function that, given a result, provides a stream of successes + * or an empty stream on failure */ - static Function, Stream> successes() { + @Contract(pure = true) + static @NotNull Function, Stream> successes() { return r -> r.either(Stream::of, __ -> empty()); } @@ -67,48 +98,80 @@ static Function, Stream> successes() { * Returns a Stream of failures: a stream of a single value if this is a failure, * or an empty stream if this is a success. This is intended to be used to flat-map * over a stream of Results to extract a stream of just the failures. + * @param success type + * @param fail type + * @return function that provides a stream of failures + * or an empty stream on success, given a result */ - static Function, Stream> failures() { + @Contract(pure = true) + static @NotNull Function, Stream> failures() { return r -> r.either(__ -> empty(), Stream::of); } /** * Returns an Optional success value, which is present if this result was a failure * and empty if it was a failure. + * @param success type + * @param fail type + * @return function that, given result, gives an optional if there was + * a success, or None otherwise */ - static Function, Optional> toOptional() { + @Contract(pure = true) + static @NotNull Function, Optional> + toOptional() { return r -> r.either(Optional::of, __ -> Optional.empty()); } /** * Returns an Optional failure value, which is present if this result was a failure * and empty if it was a success. + * @param success type + * @param fail type + * @return function that, given result, gives an optional if there was + * a failure, or None otherwise */ - static Function, Optional> toOptionalFailure() { + @Contract(pure = true) + static @NotNull Function, Optional> + toOptionalFailure() { return r -> r.either(__ -> Optional.empty(), Optional::of); } /** * Collects a Stream of Results into a Pair of Lists, the left containing the unwrapped * success values, the right containing the unwrapped failures. + * @param success type + * @param fail type + * @return pair of lists with unwrapped successes and failures */ - static Collector, Pair, List>, Pair, List>> split() { - return new ResultCollector<>(pair -> Pair.of(unmodifiableList(pair.left), unmodifiableList(pair.right))); + @Contract(value = " -> new", pure = true) + static @NotNull Collector, Pair, List>, Pair, List>> + split() { + return new ResultCollector<>(pair -> Pair.of(unmodifiableList(pair.left()), unmodifiableList(pair.right()))); } /** * Collects a Stream of Results into a Result which contains a List of Successes, if all results in * the stream were successful, or a list of Failures if any failed. + * @param success type + * @param fail type + * @return collector with list of all successes or list of failures */ - static Collector, Pair, List>, Result, List>> allSucceeded() { + @Contract(value = " -> new", pure = true) + static @NotNull Collector, Pair, List>, Result, List>> + allSucceeded() { return new ResultCollector<>(Pairs::anyFailures); } /** * Collects a Stream of Results into a Result which contains a List of Successes, if any results in * the stream were successful, or a list of Failures if all failed. + * @param success type + * @param fail type + * @return collector with list of successes, or list of all failures */ - static Collector, Pair, List>, Result, List>> anySucceeded() { + @Contract(value = " -> new", pure = true) + static @NotNull Collector, Pair, List>, Result, List>> + anySucceeded() { return new ResultCollector<>(Pairs::anySuccesses); } } diff --git a/src/main/java/co/unruly/control/result/Result.java b/src/main/java/co/unruly/control/result/Result.java index b41b8ab..ee2c0c9 100644 --- a/src/main/java/co/unruly/control/result/Result.java +++ b/src/main/java/co/unruly/control/result/Result.java @@ -1,5 +1,8 @@ package co.unruly.control.result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; + import java.io.Serializable; import java.util.Objects; import java.util.function.Function; @@ -11,12 +14,13 @@ *

    * The interface for Result is minimal: many common sample operations are implemented * with static methods on Introducers, Transformers, and Resolvers. - * + *

    * These can be composed upon a Result by passing them as arguments to then(). * - * @param The type of a success - * @param The type of a failure + * @param The type of success + * @param The type of failure */ +@SuppressWarnings("unused") public abstract class Result implements Serializable { private Result() { @@ -24,29 +28,53 @@ private Result() { /** * Creates a new Success + * @param value to wrap + * @param success type + * @param fail type + * @return success wrapper of S */ - public static Result success(S value) { + @Contract("_ -> new") + public static @NotNull Result success(S value) { return new Success<>(value); } /** * Creates a new Success, taking the failure type for contexts where it can't be inferred. + * @param value to wrap + * @param failureType class type + * @param success type + * @param failure type + * @return S wrapped in success */ - public static Result success(S value, Class failureType) { + @Contract("_, _ -> new") + public static @NotNull Result + success(S value, Class failureType) { return new Success<>(value); } /** * Creates a new Failure + * @param error to wrap + * @param success type + * @param fail type + * @return F wrapped in failure */ - public static Result failure(F error) { + @Contract("_ -> new") + public static @NotNull Result failure(F error) { return new Failure<>(error); } /** * Creates a new Failure, taking the success type for contexts where it can't be inferred. + * @param error to wrap + * @param successType for context + * @param success type + * @param fail type + * @return F wrapped in failure */ - public static Result failure(F error, Class successType) { + @Contract("_, _ -> new") + public static @NotNull Result + failure(F error, Class successType) { return new Failure<>(error); } @@ -59,8 +87,11 @@ public static Result failure(F error, Class successType) { * @param onFailure the function to process the failure value, if this is a Failure * @param the type of the end result * @return The result of executing onSuccess if this result is a Success, or onFailure if it's a failure + * @param success fail type + * @param failure fail type */ - public abstract R either(Function onSuccess, Function onFailure); + public abstract R + either(Function onSuccess, Function onFailure); /** * Applies a function to this Result. This permits inverting the calling convention, so that instead of the following: @@ -95,8 +126,13 @@ public static Result failure(F error, Class successType) { * .then(map(Shop::purchaseHat)); * } * + * @param biMapper function to apply result to + * @param parent type + * @param child type + * @return parent type of applying the mapper of result to WideType */ - public T then(Function, T2> biMapper) { + public WideType + then(@NotNull Function, NarrowType> biMapper) { return biMapper.apply(this); } @@ -108,12 +144,13 @@ private Success(L value) { } @Override - public S either(Function onSuccess, Function onFailure) { + public S either(@NotNull Function onSuccess, Function onFailure) { return onSuccess.apply(value); } + @Contract(pure = true) @Override - public String toString() { + public @NotNull String toString() { return "Success{" + value + '}'; } @@ -139,12 +176,13 @@ private Failure(R value) { } @Override - public S either(Function onSuccess, Function onFailure) { + public S either(Function onSuccess, @NotNull Function onFailure) { return onFailure.apply(value); } + @Contract(pure = true) @Override - public String toString() { + public @NotNull String toString() { return "Failure{" + value + '}'; } diff --git a/src/main/java/co/unruly/control/result/ResultCollector.java b/src/main/java/co/unruly/control/result/ResultCollector.java index fea78b8..ea8ee5d 100644 --- a/src/main/java/co/unruly/control/result/ResultCollector.java +++ b/src/main/java/co/unruly/control/result/ResultCollector.java @@ -1,6 +1,8 @@ package co.unruly.control.result; import co.unruly.control.pair.Pair; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.Collections; @@ -13,47 +15,40 @@ import java.util.stream.Collector; import java.util.stream.Stream; -import static java.util.Collections.unmodifiableList; import static java.util.stream.Collectors.toList; /** * Collects a Stream of Results into a Pair, with the left being a list of success values * and the right being a list of failure values. */ -class ResultCollector implements Collector, Pair, List>, T> { - - private final Function, List>, T> finisher; - - ResultCollector(Function, List>, T> finisher) { - this.finisher = finisher; - } +record ResultCollector( + Function, List>, T> finisher) implements Collector, Pair, List>, T> { + @Contract(pure = true) @Override - public Supplier, List>> supplier() { + public @NotNull Supplier, List>> supplier() { return () -> new Pair<>(new ArrayList<>(), new ArrayList<>()); } + @Contract(pure = true) @Override - public BiConsumer, List>, Result> accumulator() { - return (accumulator, Result) -> Result.either(accumulator.left::add, accumulator.right::add); + public @NotNull BiConsumer, List>, Result> accumulator() { + return (accumulator, Result) -> Result.either(accumulator.left()::add, accumulator.right()::add); } + @Contract(pure = true) @Override - public BinaryOperator, List>> combiner() { + public @NotNull BinaryOperator, List>> combiner() { return (x, y) -> Pair.of( - Stream.of(x, y).flatMap(l -> l.left.stream()).collect(toList()), - Stream.of(x, y).flatMap(r -> r.right.stream()).collect(toList()) + Stream.of(x, y).flatMap(l -> l.left().stream()).collect(toList()), + Stream.of(x, y).flatMap(r -> r.right().stream()).collect(toList()) ); } - @Override - public Function, List>, T> finisher() { - return finisher; - } - + @Contract(pure = true) @Override - public Set characteristics() { + public @NotNull Set characteristics() { return Collections.emptySet(); } } diff --git a/src/main/java/co/unruly/control/result/Transformers.java b/src/main/java/co/unruly/control/result/Transformers.java index 8cb1ce5..8acefa3 100644 --- a/src/main/java/co/unruly/control/result/Transformers.java +++ b/src/main/java/co/unruly/control/result/Transformers.java @@ -3,6 +3,8 @@ import co.unruly.control.ConsumableFunction; import co.unruly.control.HigherOrderFunctions; import co.unruly.control.ThrowingLambdas; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.function.Consumer; import java.util.function.Function; @@ -14,20 +16,34 @@ /** * A collection of functions which take a Result and return a Result. */ +@SuppressWarnings("unused") public interface Transformers { /** * Returns a function which takes a Result and, if it's a success, applies the mapping value to that * success, otherwise returning the original failure. + * @param mappingFunction to pipe the success + * @param input success + * @param output success + * @param failure type + * @return dF(R(IS, F) -> R(OS, F)) IS -> mappingFunction -> OS */ - static Function, Result> onSuccess(Function mappingFunction) { + static @NotNull Function, Result> + onSuccess(@NotNull Function mappingFunction) { return attempt(mappingFunction.andThen(Result::success)); } /** * Returns a Consumer which takes a Result and, if it's a Success, passes it to the provided consumer. + * @param consumer to use on success + * @param success + * @param failure type + * @return dF(x -> x) where x is consumed by the + * consumer to produce a side effect if it's a success */ - static ConsumableFunction> onSuccessDo(Consumer consumer) { + @Contract(pure = true) + static @NotNull ConsumableFunction> + onSuccessDo(Consumer consumer) { return r -> r.then(onSuccess(peek(consumer))); } @@ -35,10 +51,20 @@ static ConsumableFunction> onSuccessDo(Consumer consumer) * Returns a function which takes a Result with an Exception failure type and, if it's a success, applies * the mapping value to that success, returning a new success unless an exception is thrown, when it * returns a failure of that exception. If the input was a failure, it returns that failure. + * @param throwingFunction to try to map the success but may throw + * @param input success + * @param output success + * @param exception type + * @return dF(R(IS, Exception) -> R(OS, Exception)) + *

    + * if input success -> R(IS -> OS) + *

    + * if input failure -> R(Exception) + *

    + * if throwingFunction failure -> R(X) */ - static Function, Result> onSuccessTry( - ThrowingLambdas.ThrowingFunction throwingFunction - ) { + static @NotNull Function, Result> + onSuccessTry(ThrowingLambdas.ThrowingFunction throwingFunction) { return attempt(tryTo(throwingFunction)); } @@ -48,11 +74,19 @@ static Function, Result input success + * @param output success + * @param fail type + * @param exception type + * @return dF(x -> y) where y uses the throwing function if + * x is a success AND if the throwing function throws instead + * uses the exception mapper to fail gracefully into a failure type */ - static Function, Result> onSuccessTry( - ThrowingLambdas.ThrowingFunction throwingFunction, - Function exceptionMapper - ) { + static @NotNull Function, Result> + onSuccessTry(ThrowingLambdas.ThrowingFunction throwingFunction, + Function exceptionMapper) { return attempt(tryTo(throwingFunction).andThen(onFailure(exceptionMapper))); } @@ -60,34 +94,66 @@ static Function, Result> o * Returns a function which takes a Result and, if it's a success, applies the provided function * to that success - generating a new Result - and returns that Result. Otherwise, returns the * original failure. + * @param mappingFunction to use on success + * @param input success + * @param output success + * @param parent failure type + * @param child failure type + * @return dF(R(InputSuccess, WF) -> R(OutputSuccess, WF)) */ - static Function, Result> attempt(Function> mappingFunction) { - return r -> r.either(mappingFunction.andThen(onFailure((Function) (fv) -> HigherOrderFunctions.upcast(fv))), Result::failure); + @Contract(pure = true) + static @NotNull + Function, Result> + attempt(Function> mappingFunction) { + Function upcaster = HigherOrderFunctions::upcast; + Function, Result> upcastOnFailure + = onFailure(upcaster); + return r -> r.either(mappingFunction.andThen(upcastOnFailure), Result::failure); } /** * Returns a function which takes a Result and, if it's a failure, applies the provided function * to that failure. Otherwise, returns the original success. + * @param mappingFunction to map the failure against + * @param success type + * @param input failure type + * @param output failure type + * @return dF(R(S, IF) -> R(S, OF)) where the output uses + * the mapping function if x is a failure */ - static Function, Result> onFailure(Function mappingFunction) { + static @NotNull + Function, Result> + onFailure(@NotNull Function mappingFunction) { return recover(mappingFunction.andThen(Result::failure)); } /** * Returns a consumer which takes a Result and, if it's a failure, passes it to the provided consumer + * @param consumer to use on failure + * @param success type + * @param failure type + * @return dF(x -> y) where if x is a failure it passes it to the consumer */ - static ConsumableFunction> onFailureDo(Consumer consumer) { + @Contract(pure = true) + static @NotNull ConsumableFunction> + onFailureDo(Consumer consumer) { return r -> r.then(onFailure(peek(consumer))); } /** * Takes a Result of a Stream as a success or a single failure, and returns a Stream of Results * containing all the successes, or the single failure. - * + *

    * The main use-case for this is to follow mapping over tryTo() on a function which was designed to * be flat-mapped over. + * @param success type + * @param fail type + * @return dF(x -> y) where y is either a stream of success results + * or a failure */ - static Function, F>, Stream>> unwrapSuccesses() { + @Contract(pure = true) + static @NotNull Function, F>, Stream>> + unwrapSuccesses() { return r -> r.either( successes -> successes.map(Result::success), failure -> Stream.of(Result.failure(failure)) @@ -98,53 +164,83 @@ static Function, F>, Stream>> unwrapSuccess * Returns a function which takes a Result and, if it's a failure, applies the provided function to * that failure - generating a new Result - and returns that Result. Otherwise, return the original * success. + * @param recoveryFunction function to generate recovery result if input is a failure + * @param success type + * @param input fail type + * @param output fail type + * @param output success type + * @return dF(R(S, IF) -> R(S/OS, OF)) where + * R = success -> R(S) + * R = failure -> recoveryFunction(IF) -> R(OS, OF) */ - static Function, Result> recover(Function> recoveryFunction) { - return r -> r.either(Result::success, recoveryFunction.andThen(onSuccess((Function) (fv) -> HigherOrderFunctions.upcast(fv)))); + @Contract(pure = true) + static @NotNull Function, Result> + recover(Function> recoveryFunction) { + return r -> r.either( + Result::success, + recoveryFunction.andThen(onSuccess((Function) HigherOrderFunctions::upcast))); } /** * Returns a function which takes a Result, and converts failures to successes and vice versa. + * @param success type + * @param fail type + * @return dF(x -> y) where if x is R(S, F) then y is R(F, S) */ - static Function, Result> invert() { + @Contract(pure = true) + static @NotNull Function, Result> invert() { return r -> r.either(Result::failure, Result::success); } /** - * Returns a function which takes a Result whose success type is itself a Result, and merges the failure cases + * Returns a function which takes a Result whose success type is itself a Result, and merges the failure cases, * so we have a flat Result. - * + *

    * Note that *most of the time* this shouldn't be required, and indicates using onSuccess() when attempt() would * be more appropriate. - * + *

    * There are some situations though where we do end up with constructs like this: one example * is when a function which returns a Result can throw exceptions (eg, when a Result-returning handler is passed * into a database context). Passing that call into a tryTo() will yield a success type of the inner Result, wrapped * in an outer Result for the tryTo(). - * + *

    * If the failure types of the inner and outer failure types do not match, you'll need to either first convert the * failures of the outer Result or use the overload which maps the failures of the inner Result. + * @param success type + * @param fail type + * @return dF(x -> y) where x of the form R(R(S, FInner) FOuter) + * y is the result of merging x's failures into R(S, FMerged) */ - static Function, F>, Result> mergeFailures() { + @Contract(pure = true) + static @NotNull Function, F>, Result> + mergeFailures() { return attempt(i -> i); } /** - * Returns a function which takes a Result whose success type is itself a Result, and merges the failure cases + * Returns a function which takes a Result whose success type is itself a Result, and merges the failure cases, * so we have a flat Result. - * + *

    * Note that *most of the time* this shouldn't be required, and indicates using onSuccess() when attempt() would * be more appropriate. - * + *

    * There are some situations though where we do end up with constructs like this: one example * is when a function which returns a Result can throw exceptions (eg, when a Result-returning handler is passed * into a database context). Passing that call into a tryTo() will yield a success type of the inner Result, wrapped * in an outer Result for the tryTo(). - * + *

    * In these cases, it's more likely the inner failure type is domain-specific, so the default approach is to map the * outer failure to the inner failure and then merge. + * @param failureMapper f(F2 -> F1) merges f2 into f1 + * @param success type + * @param left fail type + * @param right fail type + * @return dF(x -> y) where R is a result function yielding F2 + * y is a result where the failure is merged if necessary */ - static Function, F2>, Result> mergeFailures(Function failureMapper) { + @Contract(pure = true) + static @NotNull Function, F2>, Result> + mergeFailures(Function failureMapper) { return r -> r.then(onFailure(failureMapper)).then(mergeFailures()); } } diff --git a/src/main/java/co/unruly/control/result/TypeOf.java b/src/main/java/co/unruly/control/result/TypeOf.java index b3ea090..76016d5 100644 --- a/src/main/java/co/unruly/control/result/TypeOf.java +++ b/src/main/java/co/unruly/control/result/TypeOf.java @@ -1,6 +1,9 @@ package co.unruly.control.result; import co.unruly.control.HigherOrderFunctions; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.util.function.Function; @@ -8,47 +11,84 @@ /** * Some syntax-fu in order to get nice, readable up-casting operations on Results. - * + *

    * Usage isn't totally obvious from the implementation: to upcast a success to an Animal, for example, you need: * - * using(TypeOf.forSuccesses()) + * using(TypeOf.{@literal ()}forSuccesses()) * - * - * That'll give you a Function, Function> (inferring + *

    + * That'll give you a {@code (Function, Function>)} (inferring * the types Animal and String from context), which you can then use for mapping a Stream or use in * a Result then-operation chain. */ -public interface TypeOf { +@SuppressWarnings("unused") +public interface TypeOf { /** * Generalises the success type for a Result to an appropriate superclass. + * @param dummy class for overload differentiation + * @param success parent type + * @param failure type + * @param success child type + * @return f(R(NS, F) -> R(WS, F)) */ - static Function, Result> using(ForSuccesses dummy) { - return result -> result.then(onSuccess(HigherOrderFunctions::upcast)); + @Contract(pure = true) + static @NotNull + Function, Result> + using(ForSuccesses dummy) { + Function, Result> upcastSuccess + = onSuccess(HigherOrderFunctions::upcast); + return result -> result.then(upcastSuccess); } /** * Generalises the failure type for a Result to an appropriate superclass. + * @param dummy class for overload differentiation + * @param success type + * @param > failure parent type + * @param failure child type + * @return result with failure upcasted */ - static Function, Result> using(ForFailures dummy) { - return result -> result.then(Transformers.onFailure(HigherOrderFunctions::upcast)); + @Contract(pure = true) + static @NotNull + Function, Result> + using(ForFailures dummy) { + Function, Result> upcastFailure + = Transformers.onFailure(HigherOrderFunctions::upcast); + return result -> result.then(upcastFailure); } + /** + * @param input type + * @return null + */ // we don't use the return value - all this does is provide type context - static ForSuccesses forSuccesses() { + @Contract(pure = true) + static @Nullable ForSuccesses forSuccesses() { return null; } + /** + * @param input type + * @return null + */ // we don't use the return value - all this does is provide type context - static ForFailures forFailures() { + @Contract(pure = true) + static @Nullable ForFailures forFailures() { return null; } - // this class only exists so we can differentiate the overloads of using() + /** + * @param input type + */ + // this class only exists, so we can differentiate the overloads of using() // we don't even instantiate it class ForSuccesses { } - // this class only exists so we can differentiate the overloads of using() + /** + * @param input type + */ + // this class only exists, so we can differentiate the overloads of using() // we don't even instantiate it class ForFailures { } } diff --git a/src/main/java/co/unruly/control/validation/FailedValidation.java b/src/main/java/co/unruly/control/validation/FailedValidation.java index 609f24c..2c28b0b 100644 --- a/src/main/java/co/unruly/control/validation/FailedValidation.java +++ b/src/main/java/co/unruly/control/validation/FailedValidation.java @@ -1,40 +1,27 @@ package co.unruly.control.validation; -import java.util.List; -import java.util.Objects; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; -public final class FailedValidation implements ForwardingList { +import java.util.List; - public final T value; - public final List errors; - - public FailedValidation(T value, List errors) { - this.value = value; - this.errors = errors; - } +/** + * @param value value under consideration + * @param errors errors associated with value + * @param value type + * @param error type + */ +public record FailedValidation(T value, List errors) implements ForwardingList { + @Contract(pure = true) @Override - public String toString() { + public @NotNull String toString() { return "FailedValidation{" + "value=" + value + ", errors=" + errors + '}'; } - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - FailedValidation that = (FailedValidation) o; - return Objects.equals(value, that.value) && - Objects.equals(errors, that.errors); - } - - @Override - public int hashCode() { - return Objects.hash(value, errors); - } - @Override public List delegate() { return errors; diff --git a/src/main/java/co/unruly/control/validation/ForwardingList.java b/src/main/java/co/unruly/control/validation/ForwardingList.java index 3f045d5..4acc744 100644 --- a/src/main/java/co/unruly/control/validation/ForwardingList.java +++ b/src/main/java/co/unruly/control/validation/ForwardingList.java @@ -1,13 +1,24 @@ package co.unruly.control.validation; +import org.jetbrains.annotations.NotNull; + import java.util.*; import java.util.function.Consumer; import java.util.function.Predicate; import java.util.function.UnaryOperator; import java.util.stream.Stream; +/** + * @param list type + * here is a link to forward lists in C++ + * link + * It /should/ be the same principle + */ public interface ForwardingList extends List { + /** + * @return delegate list + */ List delegate(); default int size() { @@ -22,15 +33,15 @@ default boolean contains(Object o) { return delegate().contains(o); } - default Iterator iterator() { + default @NotNull Iterator iterator() { return delegate().iterator(); } - default Object[] toArray() { + default Object @NotNull [] toArray() { return delegate().toArray(); } - default T1[] toArray(T1[] a) { + default T1 @NotNull [] toArray(T1 @NotNull [] a) { return delegate().toArray(a); } @@ -42,23 +53,23 @@ default boolean remove(Object o) { return delegate().remove(o); } - default boolean containsAll(Collection c) { - return delegate().containsAll(c); + default boolean containsAll(@NotNull Collection c) { + return new HashSet<>(delegate()).containsAll(c); } - default boolean addAll(Collection c) { + default boolean addAll(@NotNull Collection c) { return delegate().addAll(c); } - default boolean addAll(int index, Collection c) { + default boolean addAll(int index, @NotNull Collection c) { return delegate().addAll(index, c); } - default boolean removeAll(Collection c) { + default boolean removeAll(@NotNull Collection c) { return delegate().removeAll(c); } - default boolean retainAll(Collection c) { + default boolean retainAll(@NotNull Collection c) { return delegate().retainAll(c); } @@ -98,15 +109,15 @@ default int lastIndexOf(Object o) { return delegate().lastIndexOf(o); } - default ListIterator listIterator() { + default @NotNull ListIterator listIterator() { return delegate().listIterator(); } - default ListIterator listIterator(int index) { + default @NotNull ListIterator listIterator(int index) { return delegate().listIterator(index); } - default List subList(int fromIndex, int toIndex) { + default @NotNull List subList(int fromIndex, int toIndex) { return delegate().subList(fromIndex, toIndex); } diff --git a/src/main/java/co/unruly/control/validation/Validator.java b/src/main/java/co/unruly/control/validation/Validator.java index e69cac1..c55d725 100644 --- a/src/main/java/co/unruly/control/validation/Validator.java +++ b/src/main/java/co/unruly/control/validation/Validator.java @@ -8,6 +8,10 @@ import static java.util.stream.Collectors.toList; +/** + * @param input + * @param errors + */ @FunctionalInterface public interface Validator extends Function>> { @@ -15,9 +19,13 @@ default Result> apply(T item) { List errors = validate(item).collect(toList()); return errors.isEmpty() ? Result.success(item) - : Result.failure(new FailedValidation(item, errors)); + : Result.failure(new FailedValidation<>(item, errors)); } + /** + * @param item input + * @return stream of errors E + */ Stream validate(T item); } diff --git a/src/main/java/co/unruly/control/validation/Validators.java b/src/main/java/co/unruly/control/validation/Validators.java index 9372fb7..8dc8121 100644 --- a/src/main/java/co/unruly/control/validation/Validators.java +++ b/src/main/java/co/unruly/control/validation/Validators.java @@ -4,6 +4,8 @@ import co.unruly.control.Optionals; import co.unruly.control.ThrowingLambdas.ThrowingFunction; import co.unruly.control.result.Result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.function.BiFunction; @@ -18,46 +20,146 @@ import static co.unruly.control.result.Transformers.onFailure; import static co.unruly.control.result.Transformers.recover; +/** + * interface for working with validation + */ +@SuppressWarnings("unused") public interface Validators { + /** + * @param validators arbitrary set of validators + * @param input type + * @param error type + * @return dF(x -> y) where dF represents the composition of the validators + * and x is the input that is threaded through all of them + */ + @Contract(pure = true) @SafeVarargs - public static Validator compose(Validator... validators) { + static @NotNull Validator + compose(Validator... validators) { return t -> Arrays.stream(validators).flatMap(v -> v.validate(t)); } - public static Validator rejectIf(Predicate test, E error) { + /** + * @param test predicate function + * @param error error type + * @param input type + * @param error type + * @return dF(x -> y) where x yields error if passing test + */ + static @NotNull Validator + rejectIf(@NotNull Predicate test, E error) { return acceptIf(test.negate(), error); } - public static Validator rejectIf(Predicate test, Function errorGenerator) { + /** + * @param test predicate function + * @param errorGenerator f(T -> E) + * @param input type + * @param error type + * @return dF(x -> y) where x yields output from errorGenerator + * if passing test + */ + static @NotNull Validator + rejectIf(@NotNull Predicate test, Function errorGenerator) { return acceptIf(test.negate(), errorGenerator); } - public static Validator acceptIf(Predicate test, E error) { + /** + * @param test predicate function + * @param error error type + * @param input type + * @param error type + * @return dF(x -> y) where x yields error if failing test + */ + @Contract(pure = true) + static @NotNull Validator + acceptIf(Predicate test, E error) { return acceptIf(test, t -> error); } - public static Validator acceptIf(Predicate test, Function errorGenerator) { + /** + * @param test predicate function + * @param errorGenerator generates errors from T + * @param input type + * @param error type + * @return dF(x -> y) where if x fails test, it returns + * a stream of E from errorGenerator + */ + @Contract(pure = true) + static @NotNull Validator + acceptIf(Predicate test, Function errorGenerator) { return t -> test.test(t) ? Stream.empty() : Stream.of(errorGenerator.apply(t)); } - public static Validator firstOf(Validator validator) { + /** + * @param validator validation function + * @param input type + * @param output type + * @return optional stream getting the first result of the stream validation + */ + @Contract(pure = true) + static @NotNull Validator firstOf(Validator validator) { return t -> Optionals.stream(validator.validate(t).findFirst()); } - public static Validator onlyIf(Predicate test, Validator validator) { + /** + * @param test predicate function + * @param validator validation function + * @param input type + * @param error type + * @return dF(x -> y) where x is tested and, if passed, is then validated + * otherwise it returns an empty stream + */ + @Contract(pure = true) + static @NotNull Validator onlyIf(Predicate test, Validator validator) { return t -> test.test(t) ? validator.validate(t) : Stream.empty(); } - public static Validator mappingErrors(Validator validator, BiFunction errorMapper) { + /** + * @param validator maps input to validation outcome + * @param errorMapper f((T, E) -> E1) maps input and error outcome to new error type + * @param input type + * @param input error type + * @param output error type + * @return dF(x -> y) where x is validated and mapped with any yielded errors into + * the mapper + */ + @Contract(pure = true) + static @NotNull Validator + mappingErrors(Validator validator, BiFunction errorMapper) { return t -> validator.validate(t).map(e -> errorMapper.apply(t, e)); } - public static Validator on(Function accessor, Validator innerValidator) { + /** + * @param accessor f(T -> T1) + * @param innerValidator validator for T1 + * @param input type + * @param output type + * @param error type + * @return dF(x -> y) where x converted to T1 and validated + */ + @Contract(pure = true) + static @NotNull Validator + on(Function accessor, Validator innerValidator) { return t -> innerValidator.validate(accessor.apply(t)); } - public static Validator tryOn(ThrowingFunction accessor, Function onException, Validator innerValidator) { + /** + * @param accessor function that converts T -> T1 or throws + * @param onException f(exception -> E), called when accessor throws + * @param innerValidator validates T1 or yields E + * @param input type + * @param output type + * @param error type + * @param exception type + * @return dF(x -> y) where x is provided to accessor and then validated + * y is the output of the validation wrapped in a try-catch where + * the failure maps the exception to an error state + */ + @Contract(pure = true) + static @NotNull Validator + tryOn(ThrowingFunction accessor, Function onException, Validator innerValidator) { return t -> { try { return innerValidator.validate(accessor.apply(t)); @@ -67,11 +169,33 @@ public static Validator tryOn(ThrowingFunc }; } - public static Validator onEach(Function> iterator, Validator innerValidator) { - return t -> StreamSupport.stream(iterator.apply(t).spliterator(), false).flatMap(innerValidator::validate); + /** + * @param iterator f(x1 -> Iterable(x2)) + * @param innerValidator f(x2 -> E) + * @param input type + * @param output type + * @param error type + * @return validator outcome + */ + @Contract(pure = true) + static @NotNull Validator + onEach(Function> iterator, Validator innerValidator) { + return t -> StreamSupport.stream(iterator.apply(t).spliterator(), false) + .flatMap(innerValidator::validate); } - public static Validator tryTo(Validator validatorWhichThrowsRuntimeExceptions, Function errorMapper) { + /** + * @param validatorWhichThrowsRuntimeExceptions validator function that throws + * @param errorMapper f(exception -> error type) + * @param success type + * @param error type + * @return dF(x -> y) where x is an input to our validator function + * and y is the result of the validation or a stream of the error mapper + * if an exception is thrown + */ + @Contract(pure = true) + static @NotNull Validator + tryTo(Validator validatorWhichThrowsRuntimeExceptions, Function errorMapper) { return t -> { try { return validatorWhichThrowsRuntimeExceptions.validate(t); @@ -81,10 +205,25 @@ public static Validator tryTo(Validator validatorWhichThrowsR }; } - public static Function>, Result>> ignoreWhen(Predicate filterCondition) { - return result -> result - .then(onFailure(fv -> new FailedValidation<>(fv.value, fv.errors.stream().filter(filterCondition.negate()).collect(Collectors.toList())))) - .then(recover(fv -> fv.errors.isEmpty() ? success(fv.value) : failure(fv))); + /** + * @param filterCondition predicate function to filter the failure validation + * @param success + * @param errors(?) + * @return a function that expects a result, and does some filtering + * based on the failure outcome + */ + @Contract(pure = true) + static @NotNull Function>, Result>> + ignoreWhen(Predicate filterCondition) { + Function, FailedValidation> filteredFailedValidation = fv -> { + var t = fv.errors().stream() + .filter(filterCondition.negate()) + .collect(Collectors.toList()); + return new FailedValidation<>(fv.value(), t); + }; + Function, Result>> isEmptyResult = + fv -> fv.errors().isEmpty() ? success(fv.value()) : failure(fv); + return result -> result.then(onFailure(filteredFailedValidation)).then(recover(isEmptyResult)); } } diff --git a/src/test/java/co/unruly/control/ThrowingLambdasTest.java b/src/test/java/co/unruly/control/ThrowingLambdasTest.java index e9c87c1..1e12ef8 100644 --- a/src/test/java/co/unruly/control/ThrowingLambdasTest.java +++ b/src/test/java/co/unruly/control/ThrowingLambdasTest.java @@ -1,5 +1,6 @@ package co.unruly.control; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.function.Predicate; @@ -7,6 +8,7 @@ import static co.unruly.control.ThrowingLambdas.ThrowingPredicate.throwingRuntime; import static org.junit.Assert.assertTrue; +@SuppressWarnings("RedundantThrows") public class ThrowingLambdasTest { // @Test @@ -17,6 +19,7 @@ public class ThrowingLambdasTest { @Test public void canHandleThrowingMethodsWithAppropriateFunctionalInterfaceType() { assertTrue(tryToTest(2, ThrowingLambdasTest::dodgyIsEven)); + assertTrue(tryToTest(4, ThrowingLambdasTest::dodgyIsEven)); } @Test @@ -32,9 +35,10 @@ public void canConvertThrowingLambdasToNonThrowingLambdas() throws Exception { @Test public void canConvertMultiThrowingLambdasToNonThrowingLambdas() throws Exception { assertTrue(test(2, throwingRuntime(ThrowingLambdasTest::veryDodgyIsEven))); + assertTrue(test(4, throwingRuntime(ThrowingLambdasTest::veryDodgyIsEven))); } - private static boolean test(T item, Predicate test) { + private static boolean test(T item, @NotNull Predicate test) { return test.test(item); } diff --git a/src/test/java/co/unruly/control/ZipTest.java b/src/test/java/co/unruly/control/ZipTest.java index 9857dd9..1f66c49 100644 --- a/src/test/java/co/unruly/control/ZipTest.java +++ b/src/test/java/co/unruly/control/ZipTest.java @@ -11,6 +11,7 @@ import static co.unruly.control.HigherOrderFunctions.zip; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; +import static org.junit.Assert.assertEquals; public class ZipTest { @@ -20,8 +21,10 @@ public void zipsItemsTogether() { Stream.of("hello", "goodbye"), Stream.of("world", "cruel world")) .collect(Collectors.toList()); - - assertThat(pairs, contains(Pair.of("hello", "world"), Pair.of("goodbye", "cruel world"))); + var listPairs = List.of( + Pair.of("hello", "world"), + Pair.of("goodbye", "cruel world")); + assertEquals(listPairs, pairs); } @Test @@ -50,7 +53,11 @@ public void generatedStreamIsShorterOfInputStreams() { public void buildsIndexedList() { List> indexed = withIndices(Stream.of("zero", "one", "two", "three")) .collect(Collectors.toList()); - - assertThat(indexed, contains(Pair.of(0, "zero"), Pair.of(1, "one"), Pair.of(2, "two"), Pair.of(3, "three"))); + var comparison = List.of( + Pair.of(0, "zero"), + Pair.of(1, "one"), + Pair.of(2, "two"), + Pair.of(3, "three")); + assertEquals(indexed, comparison); } } diff --git a/src/test/java/co/unruly/control/pair/PairTest.java b/src/test/java/co/unruly/control/pair/PairTest.java index a168203..cd140eb 100644 --- a/src/test/java/co/unruly/control/pair/PairTest.java +++ b/src/test/java/co/unruly/control/pair/PairTest.java @@ -54,15 +54,15 @@ public void canCollectToParallelArrays() { Pair parallelArrays = Stream.of(Pair.of(2, "hello"), Pair.of(4, "goodbye")) .collect(toArrays(Integer[]::new, String[]::new)); - assertThat(asList(parallelArrays.left), is(asList(2, 4))); - assertThat(asList(parallelArrays.right), is(asList("hello", "goodbye"))); + assertThat(asList(parallelArrays.left()), is(asList(2, 4))); + assertThat(asList(parallelArrays.right()), is(asList("hello", "goodbye"))); } @Test public void canReduceAStreamOfPairs() { Pair reduced = Stream.of(Pair.of(2, "hello"), Pair.of(4, "goodbye")) .collect(reducing( - 0, (x, y) -> x + y, + 0, Integer::sum, "", String::concat )); diff --git a/src/test/java/co/unruly/control/result/CastsTest.java b/src/test/java/co/unruly/control/result/CastsTest.java index a5205ff..16e3306 100644 --- a/src/test/java/co/unruly/control/result/CastsTest.java +++ b/src/test/java/co/unruly/control/result/CastsTest.java @@ -6,7 +6,7 @@ import static co.unruly.control.matchers.ResultMatchers.isFailureOf; import static co.unruly.control.matchers.ResultMatchers.isSuccessOf; import static co.unruly.control.result.Introducers.castTo; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class CastsTest { @@ -17,7 +17,7 @@ public void castingToCorrectTypeYieldsSuccess() { Result cast = pipe(helloWorld) .resolveWith(castTo(String.class)); - assertThat(cast, isSuccessOf("Hello World")); + assertTrue(isSuccessOf("Hello World").matches(cast)); } @Test @@ -27,6 +27,6 @@ public void castingToIncorrectTypeYieldsFailure() { Result cast = pipe(helloWorld) .resolveWith(castTo(Integer.class)); - assertThat(cast, isFailureOf("Hello World")); + assertTrue(isFailureOf("Hello World").matches(cast)); } } diff --git a/src/test/java/co/unruly/control/result/MatchTest.java b/src/test/java/co/unruly/control/result/MatchTest.java index cf19983..2028862 100644 --- a/src/test/java/co/unruly/control/result/MatchTest.java +++ b/src/test/java/co/unruly/control/result/MatchTest.java @@ -9,7 +9,7 @@ import static co.unruly.control.result.Match.matchValue; import static co.unruly.control.result.Recover.*; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class MatchTest { @@ -19,10 +19,10 @@ public void canMatchOnTypeWithFlowTyping() { ifType(B.class, B::messageForB), ifType(C.class, C::messageForC) ).otherwise(A::message); - - assertThat(matchByType.apply(new A("Cheese")), is("Cheese")); - assertThat(matchByType.apply(new B("Ketchup")), is("I'm a B and I say Ketchup")); - assertThat(matchByType.apply(new C("Pickles")), is("I'm a C and I say Pickles")); + var bMatch = matchByType.apply(new B("Ketchup")); + assertTrue(is("Cheese").matches(matchByType.apply(new A("Cheese")))); + assertTrue(is("I'm a B and I say Ketchup").matches(bMatch)); + assertTrue(is("I'm a C and I say Pickles").matches(matchByType.apply(new C("Pickles")))); } @Test @@ -31,11 +31,11 @@ public void canMatchOnValue() { ifEquals(4, x -> x + " sure looks like a 4 to me!"), ifEquals(7, x -> x + " looks like one of them gosh-darned 7s?") ).otherwise(x -> "I have no idea what a " + x + " is though..."); - - assertThat(matchByType.apply(3), is("I have no idea what a 3 is though...")); - assertThat(matchByType.apply(4), is("4 sure looks like a 4 to me!")); - assertThat(matchByType.apply(6), is("I have no idea what a 6 is though...")); - assertThat(matchByType.apply(7), is("7 looks like one of them gosh-darned 7s?")); + var nineMatch = matchByType.apply(7); + assertTrue(is("I have no idea what a 3 is though...").matches(matchByType.apply(3))); + assertTrue(is("4 sure looks like a 4 to me!").matches(matchByType.apply(4))); + assertTrue(is("I have no idea what a 6 is though...").matches(matchByType.apply(6))); + assertTrue(is("7 looks like one of them gosh-darned 7s?").matches(nineMatch)); } @Test @@ -45,10 +45,10 @@ public void canMatchOnTest() { ifIs(x -> x < 0, x -> x + " is one of those banker's negative number thingies") ).otherwise(x -> x + " is a regular, god-fearing number for god-fearing folks"); - assertThat(matchByType.apply(2), is("2, well, that's one of those even numbers")); - assertThat(matchByType.apply(-6), is("-6, well, that's one of those even numbers")); - assertThat(matchByType.apply(3), is("3 is a regular, god-fearing number for god-fearing folks")); - assertThat(matchByType.apply(-9), is("-9 is one of those banker's negative number thingies")); + assertTrue(is("2, well, that's one of those even numbers").matches(matchByType.apply(2))); + assertTrue(is("-6, well, that's one of those even numbers").matches(matchByType.apply(-6))); + assertTrue(is("3 is a regular, god-fearing number for god-fearing folks").matches(matchByType.apply(3))); + assertTrue(is("-9 is one of those banker's negative number thingies").matches(matchByType.apply(-9))); } @Test @@ -58,7 +58,7 @@ public void canMatchOnTestPassingArgument() { ifIs(x -> x < 0, x -> x + " is one of those banker's negative number thingies") ).otherwise(x -> x + " is a regular, god-fearing number for god-fearing folks"); - assertThat(matchByResult, is("4, well, that's one of those even numbers")); + assertTrue(is("4, well, that's one of those even numbers").matches(matchByResult)); } @Test @@ -69,7 +69,7 @@ public void canOperateOverAListOfOptionalProviders() { ifPresent(Things::c) ).otherwise(__ -> "Ketchup!"); - assertThat(cheese, is("Cheese!")); + assertTrue(is("Cheese!").matches(cheese)); } @@ -81,14 +81,14 @@ public void usesDefaultIfNoOptionalProvidersProvideAValue() { ifPresent(Things::c) ).otherwise(__ -> "Ketchup!"); - assertThat(cheese, is("Ketchup!")); + assertTrue(is("Ketchup!").matches(cheese)); } @Test public void useMatchToCalculateFactorial() { - assertThat(factorial(0), is(1)); - assertThat(factorial(1), is(1)); - assertThat(factorial(6), is(720)); + assertTrue(is(1).matches(factorial(0))); + assertTrue(is(1).matches(factorial(1))); + assertTrue(is(720).matches(factorial(6))); } @Test(expected = IllegalArgumentException.class) diff --git a/src/test/java/co/unruly/control/result/PiperTest.java b/src/test/java/co/unruly/control/result/PiperTest.java index 0def996..5c90da5 100644 --- a/src/test/java/co/unruly/control/result/PiperTest.java +++ b/src/test/java/co/unruly/control/result/PiperTest.java @@ -12,7 +12,7 @@ import static co.unruly.control.result.Introducers.tryTo; import static co.unruly.control.result.Transformers.attempt; import static co.unruly.control.result.Transformers.onFailure; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; public class PiperTest { @@ -24,10 +24,10 @@ public void canChainSeveralOperationsBeforeOneWhichMayFail() { .then(pattern::matcher) .then(ifIs(Matcher::find, m -> m.group(1))) .then(onFailure(__ -> "Could not find group to match")) - .then(attempt(tryTo(Integer::parseInt, ex -> ex.getMessage()))) + .then(attempt(tryTo(Integer::parseInt, Throwable::getMessage))) .resolve(); - assertThat(result, isSuccessOf(1234)); + assertTrue(isSuccessOf(1234).matches(result)); } @Test @@ -38,10 +38,10 @@ public void canChainSeveralOperationsBeforeOneWhichMayFail2() { .then(pattern::matcher) .then(ifIs(Matcher::find, m -> m.group(1))) .then(onFailure(__ -> "Could not find group to match")) - .then(attempt(tryTo(Integer::parseInt, ex -> ex.getMessage()))) + .then(attempt(tryTo(Integer::parseInt, Throwable::getMessage))) .resolve(); - assertThat(result, isFailureOf("Could not find group to match")); + assertTrue(isFailureOf("Could not find group to match").matches(result)); } @Test @@ -55,6 +55,6 @@ public void canChainSeveralOperationsBeforeOneWhichMayFail3() { .then(attempt(tryTo(Integer::parseInt, ex -> "Parse failure: " + ex.getMessage()))) .resolve(); - assertThat(result, isFailureOf("Parse failure: For input string: \"a\"")); + assertTrue(isFailureOf("Parse failure: For input string: \"a\"").matches(result)); } } diff --git a/src/test/java/co/unruly/control/result/ResultsTest.java b/src/test/java/co/unruly/control/result/ResultsTest.java index c02c787..53fac7e 100644 --- a/src/test/java/co/unruly/control/result/ResultsTest.java +++ b/src/test/java/co/unruly/control/result/ResultsTest.java @@ -1,5 +1,6 @@ package co.unruly.control.result; +import co.unruly.control.ConsumableFunction; import co.unruly.control.Lists; import co.unruly.control.pair.Comprehensions; import co.unruly.control.pair.Pair; @@ -28,46 +29,43 @@ import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.*; import static org.mockito.Mockito.*; - +@SuppressWarnings("unchecked") public class ResultsTest { @Test public void canCreateSuccess() { Result shouldBeSuccess = success(5); - - assertThat(shouldBeSuccess.either(success -> true, failure -> false), is(true)); + Boolean isSuccess = shouldBeSuccess.either(success -> true, failure -> false); + assertTrue(isSuccess); } @Test public void canCreateFailure() { Result shouldFail = failure("oh poop"); - - assertThat(shouldFail.either(success -> true, failure -> false), is(false)); + assertFalse(shouldFail.either(success -> true, failure -> false)); } @Test public void canReduceResultToValue() { Result success = success(5); Result failure = failure("i blew up"); - - assertThat(success.either( + String successString = success.either( succ -> String.format("I got %d out of this Result", succ), - err -> err), - is("I got 5 out of this Result")); - - assertThat(failure.either( + err -> err); + String failString = failure.either( succ -> String.format("I got %d out of this Result", succ), - err -> err), - is("i blew up")); + err -> err); + assertEquals(successString, "I got 5 out of this Result"); + assertEquals(failString, "i blew up"); } @Test public void canDoSideEffectsOnCorrectSideForSuccess() { - final Consumer successCallback = mock(Consumer.class); - final Consumer failureCallback = mock(Consumer.class); + final Consumer successCallback = (Consumer) mock(Consumer.class); + final Consumer failureCallback = (Consumer) mock(Consumer.class); Result success = success(5); @@ -76,22 +74,22 @@ public void canDoSideEffectsOnCorrectSideForSuccess() { .then(onFailureDo(failureCallback)); verify(successCallback).accept(5); - verifyZeroInteractions(failureCallback); + verifyNoInteractions(failureCallback); } @Test public void canDoSideEffectsOnCorrectSideForFailure() { - final Consumer successCallback = mock(Consumer.class); - final Consumer failureCallback = mock(Consumer.class); + final Consumer successCallback = (Consumer) mock(Consumer.class); + final Consumer failureCallback = (Consumer) mock(Consumer.class); Result failure = failure("oops"); - + ConsumableFunction> failureDo = onFailureDo(failureCallback); failure .then(onSuccessDo(successCallback)) - .then(onFailureDo(failureCallback)); + .then(failureDo); verify(failureCallback).accept("oops"); - verifyZeroInteractions(successCallback); + verifyNoInteractions(successCallback); } @Test @@ -104,9 +102,10 @@ public void flatMapsSuccessesIntoAppropriateValues() { final Result failure = failure("Cannot parse number"); - assertThat(six.then(attempt(halve)), isSuccessOf(3)); - assertThat(five.then(attempt(halve)), isFailureOf("Cannot halve an odd number into an integer")); - assertThat(failure.then(attempt(halve)), isFailureOf("Cannot parse number")); + assertTrue(isSuccessOf(3).matches(six.then(attempt(halve)))); + assertTrue(isFailureOf("Cannot halve an odd number into an integer") + .matches(five.then(attempt(halve)))); + assertTrue(isFailureOf("Cannot parse number").matches(failure.then(attempt(halve)))); } @Test @@ -117,8 +116,8 @@ public void canMapSuccesses() { final Result twelve = six.then(onSuccess(x -> x * 2)); final Result stillFailure = failure.then(onSuccess(x -> x * 2)); - assertThat(twelve, isSuccessOf(12)); - assertThat(stillFailure, is(failure)); + assertTrue(isSuccessOf(12).matches(twelve)); + assertTrue(is(failure).matches(stillFailure)); } @Test @@ -129,8 +128,8 @@ public void canMapFailures() { final Result stillSix = six.then(onFailure(String::toLowerCase)); final Result lowerCaseFailure = failure.then(onFailure(String::toLowerCase)); - assertThat(stillSix, Is.is(success(6))); - assertThat(lowerCaseFailure, Is.is(failure("cannot parse number"))); + assertTrue(Is.is(success(6)).matches(stillSix)); + assertTrue(Is.is(failure("cannot parse number")).matches(lowerCaseFailure)); } @Test @@ -141,18 +140,19 @@ public void canMapOverExceptionThrowingMethods() { Result parsedSix = six.then(onSuccessTry(Long::parseLong, Exception::toString)); Result parsedNaN = notANumber.then(onSuccessTry(Long::parseLong, Exception::toString)); - assertThat(parsedSix, Is.is(success(6L))); - assertThat(parsedNaN, Is.is(failure("java.lang.NumberFormatException: For input string: \"NaN\""))); + assertTrue(Is.is(success(6L)).matches(parsedSix)); + assertTrue(Is.is(failure("java.lang.NumberFormatException: For input string: \"NaN\"")).matches(parsedNaN)); } @Test public void canStreamSuccesses() { - Stream> results = Stream.of(success(6), success(5), failure("darnit")); + Stream> results + = Stream.of(success(6), success(5), failure("darnit")); Stream resultStream = results.flatMap(successes()); List successes = resultStream.collect(toList()); - assertThat(successes, hasItems(6, 5)); + assertTrue(hasItems(6, 5).matches(successes)); } @Test @@ -163,45 +163,55 @@ public void canMergeOperationsOnTwoResults() { Result oddFive = Result.failure("Five is odd"); Result oddSeven = Result.failure("Seven is odd"); - assertThat(evenSix.then(combineWith(evenTwo)).using((x, y) -> x * y), isSuccessOf(12)); - assertThat(evenSix.then(combineWith(oddSeven)).using((x, y) -> x * y), isFailureOf("Seven is odd")); - assertThat(oddFive.then(combineWith(evenTwo)).using((x, y) -> x * y), isFailureOf("Five is odd")); - assertThat(oddFive.then(combineWith(oddSeven)).using((x, y) -> x * y), isFailureOf("Five is odd")); + assertTrue(isSuccessOf(12) + .matches(evenSix.then(combineWith(evenTwo)).using((x, y) -> x * y))); + assertTrue(isFailureOf("Seven is odd") + .matches(evenSix.then(combineWith(oddSeven)).using((x, y) -> x * y))); + assertTrue(isFailureOf("Five is odd") + .matches(oddFive.then(combineWith(evenTwo)).using((x, y) -> x * y))); + assertTrue(isFailureOf("Five is odd") + .matches(oddFive.then(combineWith(oddSeven)).using((x, y) -> x * y))); } @Test public void canStreamFailures() { - Stream> results = Stream.of(success(6), success(5), failure("darnit")); + Stream> results + = Stream.of(success(6), success(5), failure("darnit")); - List failures = results.flatMap(failures()).collect(toList()); + List failures = results.flatMap(failures()).toList(); - assertThat(failures, hasItems("darnit")); + assertTrue(failures.contains("darnit")); } @Test public void canExtractValuesFromMap() { Map frenchNumberNames = mapOf(entry("un", 1), entry("deux", 2), entry("trois", 3)); - Function> extractor = fromMap(frenchNumberNames, word -> String.format("%s is not a french number", word)); - - assertThat(extractor.apply("deux"), isSuccessOf(2)); - assertThat(extractor.apply("quattro"), isFailureOf("quattro is not a french number")); + Function> extractor + = fromMap(frenchNumberNames, word -> String.format("%s is not a french number", word)); + var outcome = extractor.apply("deux"); + var successOfTwo = isSuccessOf(2); + assertTrue(successOfTwo.matches(outcome)); + assertTrue(isFailureOf("quattro is not a french number") + .matches(extractor.apply("quattro"))); } @Test public void canConvertListOfResultsIntoResultOfList() { - List> results = asList(success(1), success(42), success(69)); + List> results + = asList(success(1), success(42), success(69)); Result, List> unwrapped = Lists.successesOrFailures(results); - assertThat(unwrapped, isSuccessOf(asList(1, 42, 69))); + assertTrue(isSuccessOf(asList(1, 42, 69)).matches(unwrapped)); } @Test public void canConvertListOfResultsIntoFailureOfListOfReasons() { - List> results = asList(success(1), failure("cheese"), success(69), failure("hotdog")); + List> results + = asList(success(1), failure("cheese"), success(69), failure("hotdog")); Result, List> unwrapped = Lists.successesOrFailures(results); - assertThat(unwrapped, isFailureOf(asList("cheese", "hotdog"))); + assertTrue(isFailureOf(asList("cheese", "hotdog")).matches(unwrapped)); } @Test @@ -217,7 +227,7 @@ public void exampleParseAndHalveNumbers() { .flatMap(successes()) .collect(toList()); - assertThat(halvedNumbers, hasItems(3L)); + assertTrue(hasItems(3L).matches(halvedNumbers)); verify(failureCallback).accept("java.lang.NumberFormatException: For input string: \"NaN\""); verify(failureCallback).accept("5 is odd"); @@ -225,7 +235,6 @@ public void exampleParseAndHalveNumbers() { } @Test - @SuppressWarnings("unchecked") public void exampleSplitResults() { Stream inputs = Stream.of("6", "5", "NaN"); @@ -234,8 +243,9 @@ public void exampleSplitResults() { .map(attempt(x -> x % 2 == 0 ? success(x / 2) : failure(x + " is odd"))) .collect(split()); - assertThat(halvedNumbers.left, hasItems(3L)); - assertThat(halvedNumbers.right, hasItems("java.lang.NumberFormatException: For input string: \"NaN\"", "5 is odd")); + assertTrue(hasItems(3L).matches(halvedNumbers.left())); + assertTrue(hasItems("java.lang.NumberFormatException: For input string: \"NaN\"", "5 is odd") + .matches(halvedNumbers.right())); } @Test @@ -247,7 +257,7 @@ public void shouldAggregateResults_BothSuccessful() { ) .then(ifAllSucceeded((x, y) -> x + " = " + y)); - assertThat(actualResult, isSuccessOf("Yay! = 123")); + assertTrue(isSuccessOf("Yay! = 123").matches(actualResult)); } @Test @@ -257,7 +267,7 @@ public void shouldAggregateResults_OneFailure(){ failure("No!") ).then(ifAllSucceeded((x, y) -> x + " = " + y)); - assertThat(result, isFailureOf("No!")); + assertTrue(isFailureOf("No!").matches(result)); } @Test @@ -268,7 +278,7 @@ public void shouldAggregateResults_AllThreeSuccessful() { success("boo") ).then(ifAllSucceeded((x, y, z) -> x + " " + y + " " + z)); - assertThat(song, isSuccessOf("bibbidy bobbidy boo")); + assertTrue(isSuccessOf("bibbidy bobbidy boo").matches(song)); } @Test @@ -279,7 +289,7 @@ public void shouldAggregateResults_AllThreeFailed() { failure("nooo") ).then(ifAllSucceeded((x, y, z) -> x + " " + y + " " + z)); - assertThat(uhoh, isFailureOf("no")); + assertTrue(isFailureOf("no").matches(uhoh)); } @Test @@ -291,7 +301,7 @@ public void shouldAggregateResults_AllFourPassed() { success("YesYesYesYes") ).then(ifAllSucceeded((a, b, c, d) -> a + b + c + d)); - assertThat(result, isSuccessOf("YesYesYesYesYesYesYesYesYesYes")); + assertTrue(isSuccessOf("YesYesYesYesYesYesYesYesYesYes").matches(result)); } @Test @@ -303,6 +313,6 @@ public void shouldAggregateResults_AllFourFailures() { failure("NoNo") // There's no limit ).then(ifAllSucceeded((a, b, c, d) -> a + b + c + d)); - assertThat(result, isFailureOf("NoNo")); + assertTrue(isFailureOf("NoNo").matches(result)); } } diff --git a/src/test/java/co/unruly/control/result/TryTest.java b/src/test/java/co/unruly/control/result/TryTest.java index 429c812..e5f907c 100644 --- a/src/test/java/co/unruly/control/result/TryTest.java +++ b/src/test/java/co/unruly/control/result/TryTest.java @@ -1,5 +1,6 @@ package co.unruly.control.result; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.List; @@ -18,9 +19,6 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.contains; -import static org.hamcrest.Matchers.containsInAnyOrder; - -//import static co.unruly.control.result.Results.ifFailed; public class TryTest { @@ -79,14 +77,14 @@ public void canHandleStreamFunctionsUsingTryToAndUnwrap() { )); } - private static String throwsRuntimeException(String instruction) { + private static @NotNull String throwsRuntimeException(String instruction) { if("throw".equals(instruction)) { throw new RuntimeException("This is a naughty method"); } return "Today, I was good"; } - private static String throwsCheckedException(String instruction) throws CustomCheckedException { + private static @NotNull String throwsCheckedException(String instruction) throws CustomCheckedException { if("throw".equals(instruction)) { throw new CustomCheckedException("This is a naughty method"); } @@ -101,6 +99,7 @@ private static Stream throwsAndMakesStream(String possiblyNumber) { return IntStream.range(1, Integer.parseInt(possiblyNumber) + 1).boxed(); } + @SuppressWarnings("unused") static class CustomCheckedException extends Exception { public CustomCheckedException(String message) { diff --git a/src/test/java/co/unruly/control/validation/ValidatorTest.java b/src/test/java/co/unruly/control/validation/ValidatorTest.java index b54b15f..563e61a 100644 --- a/src/test/java/co/unruly/control/validation/ValidatorTest.java +++ b/src/test/java/co/unruly/control/validation/ValidatorTest.java @@ -5,28 +5,29 @@ import co.unruly.control.pair.Pair; import co.unruly.control.result.Result; import org.hamcrest.Matcher; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import java.util.List; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Predicate; -import java.util.stream.Collectors; import java.util.stream.Stream; import static co.unruly.control.matchers.ResultMatchers.isSuccessOf; import static co.unruly.control.result.Resolvers.*; import static co.unruly.control.result.Result.failure; -import static co.unruly.control.result.Result.success; import static co.unruly.control.result.Transformers.onFailureDo; import static co.unruly.control.result.Transformers.onSuccessDo; import static co.unruly.control.validation.Validators.*; import static java.util.Arrays.asList; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.hasItems; -import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.*; +@SuppressWarnings("unchecked") public class ValidatorTest { @Test @@ -36,22 +37,23 @@ public void canCreateValidatorsWithFixedErrorMessages() { Result> validate4 = isEven.apply(4); Result> validate5 = isEven.apply(5); - assertThat(validate4, isSuccessOf(4)); + assertTrue(isSuccessOf(4).matches(validate4)); - assertThat(validate5, isFailedValidationOf(5, "odd")); + assertTrue(isFailedValidationOf(5, "odd").matches(validate5)); } @Test public void canCreateValidatorsWithDynamicErrorMessages() { - Validator isEven = acceptIf(divisibleBy(2), x -> String.format("%d is odd", x)); + Validator isEven = + acceptIf(divisibleBy(2), x -> String.format("%d is odd", x)); Result> validate4 = isEven.apply(4); Result> validate5 = isEven.apply(5); - assertThat(validate4, isSuccessOf(4)); + assertTrue(isSuccessOf(4).matches(validate4)); - assertThat(validate5, isFailedValidationOf(5, "5 is odd")); + assertTrue(isFailedValidationOf(5, "5 is odd").matches(validate5)); } @Test @@ -63,9 +65,9 @@ public void canComposeValidators() { Result> validate4 = fizzbuzz.apply(4); Result> validate5 = fizzbuzz.apply(15); - assertThat(validate4, isSuccessOf(4)); + assertTrue(isSuccessOf(4).matches(validate4)); - assertThat(validate5, isFailedValidationOf(15, "fizz", "15 is a buzz")); + assertTrue(isFailedValidationOf(15, "fizz", "15 is a buzz").matches(validate5)); } @@ -78,25 +80,27 @@ public void canComposeValidatorsForFirstError() { Result> validate5 = fizzbuzz.apply(5); Result> validate15 = fizzbuzz.apply(15); - assertThat(validate5, isFailedValidationOf(5, "5 is a buzz")); - assertThat(validate15, isFailedValidationOf(15, "fizz")); + assertTrue(isFailedValidationOf(5, "5 is a buzz").matches(validate5)); + assertTrue(isFailedValidationOf(15, "fizz").matches(validate15)); } @Test public void doesNotExecuteValidatorsIfAlreadyFailedAndOnlyReportingFirst() { Validator fizzbuzz = firstOf(compose( rejectIf(divisibleBy(3), "fizz"), - rejectIf(divisibleBy(5), x -> { throw new AssertionError("should not exercise this method"); }))); + rejectIf(divisibleBy(5), x -> { + throw new AssertionError("should not exercise this method"); }))); Validator biglittle = firstOf(compose( rejectIf(x -> x > 10, "big"), - rejectIf(x -> x < 3, x -> { throw new AssertionError("should not exercise this method"); }))); + rejectIf(x -> x < 3, x -> { + throw new AssertionError("should not exercise this method"); }))); Validator combined = compose(fizzbuzz, biglittle); Result> validate15 = combined.apply(15); - assertThat(validate15, isFailedValidationOf(15, "fizz", "big")); + assertTrue(isFailedValidationOf(15, "fizz", "big").matches(validate15)); } @Test @@ -104,28 +108,29 @@ public void canStreamSuccesses() { Validator isEven = acceptIf(divisibleBy(2), "odd"); List evens = Stream.of(1,2,3,4,5,6,7,8,9) - .map((item) -> isEven.apply(item)) + .map(isEven) .flatMap(successes()) .collect(toList()); - assertThat(evens, hasItems(2,4,6,8)); + assertTrue(hasItems(2,4,6,8).matches(evens)); } @Test public void canStreamFailures() { Validator isEven = acceptIf(divisibleBy(2), "odd"); - List> odds = Stream.of(1, 2, 3, 4, 5, 6, 7, 8, 9) - .map((item) -> isEven.apply(item)) + List> odds = + Stream.of(1, 2, 3, 4, 5, 6, 7, 8, 9) + .map(isEven) .flatMap(failures()) .collect(toList()); - assertThat(odds, hasItems( + assertTrue(hasItems( validationFailure(1, "odd"), validationFailure(3, "odd"), validationFailure(5, "odd"), validationFailure(7, "odd"), - validationFailure(9, "odd"))); + validationFailure(9, "odd")).matches(odds)); } @Test @@ -139,7 +144,7 @@ public void canConsumeSuccesses() { rejectIf(multipleOf(7), x -> x + " divides by 7") ); - Stream.of(1,2,3,4,5,6,7,8,9).map((item) -> isPrime.apply(item)).forEach(onSuccessDo(log)); + Stream.of(1,2,3,4,5,6,7,8,9).map(isPrime).forEach(onSuccessDo(log)); verify(log).accept(1); verify(log).accept(2); @@ -160,7 +165,7 @@ public void canConsumeFailures() { rejectIf(multipleOf(7), x -> x + " divides by 7") ); - Stream.of(1,2,3,4,5,6,7,8,9).map((item) -> isPrime.apply(item)).forEach(onFailureDo(log)); + Stream.of(1,2,3,4,5,6,7,8,9).map(isPrime).forEach(onFailureDo(log)); verify(log).accept(validationFailure(4, "4 divides by 2")); verify(log).accept(validationFailure(6, "6 divides by 2", "6 divides by 3")); @@ -180,7 +185,7 @@ public void canFireFirstErrorForEachFailure() { rejectIf(multipleOf(7), x -> x + " divides by 7") )); - Stream.of(1,2,3,4,5,6,7,8,9).map((item) -> isPrime.apply(item)).forEach(onFailureDo(log)); + Stream.of(1,2,3,4,5,6,7,8,9).map(isPrime).forEach(onFailureDo(log)); verify(log).accept(validationFailure(4, "4 divides by 2")); verify(log).accept(validationFailure(6, "6 divides by 2")); @@ -192,7 +197,7 @@ public void canFireFirstErrorForEachFailure() { @Test public void canCreateConditionalValidator() { Validator, String> containsEvens = acceptIf( - list -> list.stream().filter(x -> x % 2 == 0).collect(Collectors.toList()).isEmpty(), + list -> list.stream().noneMatch(x -> x % 2 == 0), "List contains even numbers"); Validator, String> onlyChecksEvenLengthLists = onlyIf( @@ -200,11 +205,14 @@ public void canCreateConditionalValidator() { containsEvens ); - Result, FailedValidation, String>> ofFiveNumbers = onlyChecksEvenLengthLists.apply(asList(1, 2, 3, 4, 5)); - Result, FailedValidation, String>> ofSixNumbers = onlyChecksEvenLengthLists.apply(asList(1, 2, 3, 4, 5, 6)); + Result, FailedValidation, String>> ofFiveNumbers + = onlyChecksEvenLengthLists.apply(asList(1, 2, 3, 4, 5)); + Result, FailedValidation, String>> ofSixNumbers + = onlyChecksEvenLengthLists.apply(asList(1, 2, 3, 4, 5, 6)); - assertThat(ofFiveNumbers, isSuccessOf(asList(1,2,3,4,5))); - assertThat(ofSixNumbers, isFailedValidationOf(asList(1,2,3,4,5,6), "List contains even numbers")); + assertTrue(isSuccessOf(asList(1,2,3,4,5)).matches(ofFiveNumbers)); + assertTrue(isFailedValidationOf(asList(1,2,3,4,5,6), "List contains even numbers") + .matches(ofSixNumbers)); } @Test @@ -218,7 +226,8 @@ public void canFireAllErrorsForEachFailure() { rejectIf(multipleOf(7), x -> x + " divides by 7") ); - Stream.of(1,2,3,4,5,6,7,8,9).map((item) -> isPrime.apply(item)).forEach(onFailureDo(v -> v.errors.forEach(e -> log.accept(v.value, e)))); + Stream.of(1,2,3,4,5,6,7,8,9).map(isPrime) + .forEach(onFailureDo(v -> v.errors().forEach(e -> log.accept(v.value(), e)))); verify(log).accept(4, "4 divides by 2"); verify(log).accept(6, "6 divides by 2"); @@ -239,7 +248,8 @@ public void canMapErrors() { rejectIf(multipleOf(7), x -> x + " divides by 7") ), (num, msg) -> msg + ", oh boy"); - Stream.of(1,2,3,4,5,6,7,8,9).map((item) -> isPrime.apply(item)).forEach(onFailureDo(v -> v.errors.forEach(e -> log.accept(v.value, e)))); + Stream.of(1,2,3,4,5,6,7,8,9).map(isPrime) + .forEach(onFailureDo(v -> v.errors().forEach(e -> log.accept(v.value(), e)))); verify(log).accept(4, "4 divides by 2, oh boy"); verify(log).accept(6, "6 divides by 2, oh boy"); @@ -260,69 +270,71 @@ public void canSplitResults() { Pair, List>> results = Stream .of(4,5,6,7,8) - .map((item) -> isPrime.apply(item)) + .map(isPrime) .collect(split()); - assertThat(results.left, hasItems(5, 7)); - assertThat(results.right, hasItems( + assertTrue(hasItems(5, 7).matches(results.left())); + assertTrue(hasItems( validationFailure(4, "4 divides by 2"), validationFailure(6, "6 divides by 2", "6 divides by 3"), validationFailure(8, "8 divides by 2") - )); + ).matches(results.right())); } @Test public void canIgnoreErrors() { - Result> failedValidation = failure(new FailedValidation(42, asList("fail1", "fail2", "error1"))); + Result> failedValidation + = failure(new FailedValidation<>(42, asList("fail1", "fail2", "error1"))); Result> filteredValidation = failedValidation .then(ignoreWhen(error -> error.startsWith("fail"))); - assertThat(filteredValidation, isFailedValidationOf(42, "error1")); + assertTrue(isFailedValidationOf(42, "error1").matches(filteredValidation)); } @Test public void convertsToSuccessWhenAllErrorsIgnored() { - Result> failedValidation = failure(new FailedValidation(42, asList("fail1", "fail2", "fail3"))); + Result> failedValidation + = failure(new FailedValidation<>(42, asList("fail1", "fail2", "fail3"))); Result> filteredValidation = failedValidation .then(ignoreWhen(error -> error.startsWith("fail"))); - assertThat(filteredValidation, isSuccessOf(42)); + assertTrue(isSuccessOf(42).matches(filteredValidation)); } @Test public void blammo() { - safelyDoSomethingDodgy(x -> { throw new Exception("hello"); }, "cheese"); + safelyDoSomethingDodgy(x -> { throw new Exception("hello"); }); } - private static void safelyDoSomethingDodgy(ThrowingLambdas.ThrowingConsumer consumer, String message) { + private static void safelyDoSomethingDodgy(ThrowingLambdas.ThrowingConsumer consumer) { try { - consumer.accept(message); + consumer.accept("cheese"); } catch (Exception ex) { // do nothing cos that's how I roll } } - private static void doSomethingDodgy(String message) throws Exception { - throw new Exception(message); - } - - private static Predicate divisibleBy(int factor) { + @Contract(pure = true) + private static @NotNull Predicate divisibleBy(int factor) { return x -> x % factor == 0; } - private static Predicate multipleOf(int factor) { + @Contract(pure = true) + private static @NotNull Predicate multipleOf(int factor) { return x -> x != factor && x % factor == 0; } + @Contract("_, _ -> new") @SafeVarargs - private final FailedValidation validationFailure(T value, E... errors) { - return new FailedValidation(value, asList(errors)); + private @NotNull FailedValidation validationFailure(T value, E... errors) { + return new FailedValidation<>(value, asList(errors)); } - private Matcher>> isFailedValidationOf(T value, E... errors) { + private @NotNull Matcher>> + isFailedValidationOf(T value, E... errors) { FailedValidation failedValidation = validationFailure(value, errors); return ResultMatchers.isFailureOf(failedValidation); } diff --git a/src/test/java/examples/ConciseEquals.java b/src/test/java/examples/ConciseEquals.java index 62dede5..d19fd6d 100644 --- a/src/test/java/examples/ConciseEquals.java +++ b/src/test/java/examples/ConciseEquals.java @@ -8,6 +8,7 @@ * Just a demonstration of how we can build a cleaner way to check equality * using Result-based casts under the hood. */ +@SuppressWarnings("unused") public class ConciseEquals { private final int number; @@ -30,7 +31,8 @@ public ConciseEquals(int number, String text) { @Override public boolean equals(Object o) { - return areEqual(this, o, (a, b) -> + return getClass() == o.getClass() && + areEqual(this, o, (a, b) -> a.number == b.number && Objects.equals(a.text, b.text) ); diff --git a/src/test/java/examples/ExceptionsInStreamsHandling.java b/src/test/java/examples/ExceptionsInStreamsHandling.java index cb449f9..6ed76b2 100644 --- a/src/test/java/examples/ExceptionsInStreamsHandling.java +++ b/src/test/java/examples/ExceptionsInStreamsHandling.java @@ -10,11 +10,10 @@ import static co.unruly.control.result.Introducers.tryTo; import static co.unruly.control.result.Resolvers.ifFailed; import static co.unruly.control.result.Transformers.*; -import static java.util.stream.Collectors.toList; +@SuppressWarnings({"unused", "NewClassNamingConvention"}) public class ExceptionsInStreamsHandling { - @Test public void handling_exceptions_with_result_example() { List customerAges = Stream.of("Bob", "Bill") @@ -27,7 +26,7 @@ public void handling_exceptions_with_result_example() { }))) .map(recover(ifType(IOException.class, error -> -2))) .map(ifFailed(__ -> -127)) - .collect(toList()); + .toList(); } @Test @@ -43,22 +42,22 @@ public void handling_multiple_exceptions_with_result_example() { }))) .map(recover(ifType(IOException.class, error -> -2))) .map(ifFailed(__ -> -127)) - .collect(toList()); + .toList(); } static class CustomerNotFound extends Exception {} static class NoCustomerWithThatName extends CustomerNotFound {} - public Customer findCustomerByName(String name) throws CustomerNotFound { + public Customer findCustomerByName(String name) { return customer; } private void sendEmailUpdateTo(Customer potentialCustomer) { - email(customer.emailAddress(), customer.name(), "Blah blah blah"); + email(customer.emailAddress(), customer.name()); } - private void email(String email, String name, String message) { + private void email(String email, String name) { } @@ -71,7 +70,7 @@ public interface Customer { default String name() { return ""; } default int age() { return 0; } - default int calculateValue() throws CostUnknown { return 0; } + default int calculateValue() { return 0; } class CostUnknown extends Exception {} } diff --git a/src/test/java/examples/FlatMapVariance.java b/src/test/java/examples/FlatMapVariance.java index 6b53e5e..94ae671 100644 --- a/src/test/java/examples/FlatMapVariance.java +++ b/src/test/java/examples/FlatMapVariance.java @@ -4,6 +4,8 @@ import co.unruly.control.result.TypeOf; import co.unruly.control.validation.Validator; import co.unruly.control.validation.Validators; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import java.util.List; import java.util.stream.Collectors; @@ -15,18 +17,19 @@ import static co.unruly.control.result.TypeOf.using; import static co.unruly.control.validation.Validators.rejectIf; +@SuppressWarnings("unused") public class FlatMapVariance { - private static Validator fizzbuzz = Validators.compose( + private static final Validator fizzbuzz = Validators.compose( rejectIf(n -> n % 3 == 0, "fizz"), rejectIf(n -> n % 5 == 0, "buzz")); - private static Validator under100 = Validators.compose( + private static final Validator under100 = Validators.compose( rejectIf(s -> s.length() > 2, s -> s + " is too damn high") ); public void canFlatmapErrorTypeOfStringIntoErrorTypeOfString() { - divideExactlyByTwo(3) + divideExactlyByTwo() .then(attempt(this::isPrime)); } @@ -64,13 +67,12 @@ public void canFlatmapErrorTypeOfFailedValidationIntoErrorTypeOfListOfString() { public void canFlatmapErrorTypeOfListOfStringIntoErrorTypeOfFailedValidation() { Result> foo = listFactors(5) - .then(attempt((item) -> fizzbuzz.apply(item))); + .then(attempt(fizzbuzz)); } - private Result divideExactlyByTwo(int number) { - return number % 2 == 0 - ? Result.success(number / 2) - : Result.failure(number + " is odd: cannot divide exactly by two"); + @Contract(" -> new") + private @NotNull Result divideExactlyByTwo() { + return Result.failure(3 + " is odd: cannot divide exactly by two"); } private Result isPrime(int number) { diff --git a/src/test/java/examples/FunctionalErrorHandling.java b/src/test/java/examples/FunctionalErrorHandling.java index a57dfc6..fe48bb2 100644 --- a/src/test/java/examples/FunctionalErrorHandling.java +++ b/src/test/java/examples/FunctionalErrorHandling.java @@ -1,6 +1,8 @@ package examples; import co.unruly.control.result.Result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import org.junit.Test; import static co.unruly.control.result.Combiners.combineWith; @@ -10,6 +12,7 @@ import static co.unruly.control.result.Transformers.attempt; import static co.unruly.control.result.Transformers.onSuccess; +@SuppressWarnings({"unused", "NewClassNamingConvention"}) public class FunctionalErrorHandling { @Test @@ -37,6 +40,7 @@ public void howToMakeBreakfast() { // I am however good enough to put the eggs on toast Result eggsOnToast = scrambledEggs.then(combineWith(toast)).using(ScrambledEggsOnToast::new); + @SuppressWarnings("unused") Breakfast breakfast = eggsOnToast.then(ifFailed(__ -> new BowlOfCornflakes())); } @@ -46,14 +50,16 @@ public boolean areEggsOff() { return false; } - public Eggs getEggs() { + @Contract(value = " -> new", pure = true) + public @NotNull Eggs getEggs() { return new Eggs(); } } private static class Bread { - public Toast toast() { + @Contract(value = " -> new", pure = true) + public @NotNull Toast toast() { return new Toast(); } } @@ -75,7 +81,8 @@ private static class ScrambledEggs { private static class Eggs { - public Result scramble() { + @Contract(" -> new") + public @NotNull Result scramble() { return success(new ScrambledEggs()); } } @@ -86,14 +93,7 @@ public static ScrambledEggs salt(ScrambledEggs unsalted) { } } - private static class ScrambledEggsOnToast implements Breakfast { - private final ScrambledEggs eggs; - private final Toast toast; - - private ScrambledEggsOnToast(ScrambledEggs eggs, Toast toast) { - this.eggs = eggs; - this.toast = toast; - } + private record ScrambledEggsOnToast(ScrambledEggs eggs, Toast toast) implements Breakfast { } private static class BowlOfCornflakes implements Breakfast { diff --git a/src/test/java/examples/NovelErrorHandling.java b/src/test/java/examples/NovelErrorHandling.java index c9248a8..46d1963 100644 --- a/src/test/java/examples/NovelErrorHandling.java +++ b/src/test/java/examples/NovelErrorHandling.java @@ -1,6 +1,8 @@ package examples; import co.unruly.control.result.Result; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; import static co.unruly.control.result.Resolvers.collapse; import static co.unruly.control.result.Result.failure; @@ -9,9 +11,14 @@ import static co.unruly.control.result.Transformers.onSuccess; import static java.lang.String.format; +@SuppressWarnings("unused") public class NovelErrorHandling { - public static String novelSales(Author author, Publisher publisher, Editor editor, Retailer retailer) { + public static String + novelSales(@NotNull Author author, + @NotNull Publisher publisher, + @NotNull Editor editor, + @NotNull Retailer retailer) { return author.getIdea() .then(attempt(publisher::getAdvance)) .then(attempt(author::writeNovel)) @@ -23,7 +30,7 @@ public static String novelSales(Author author, Publisher publisher, Editor edito } public static class Author { - private Result idea; + private final Result idea; private final int skill; private final int lifestyleCosts; @@ -37,7 +44,7 @@ public Result getIdea() { return idea; } - public Result writeNovel(Advance advance) { + public Result writeNovel(@NotNull Advance advance) { if(advance.amount > lifestyleCosts) { int happiness = advance.amount - lifestyleCosts; return success(new Manuscript(advance.idea.title, happiness * skill)); @@ -47,31 +54,24 @@ public Result writeNovel(Advance advance) { } } - public static class Publisher { + public record Publisher(int qualityThreshold, int generosity) { - public final int qualityThreshold; - public final int generosity; - - public Publisher(int qualityThreshold, int generosity) { - this.qualityThreshold = qualityThreshold; - this.generosity = generosity; - } - - public Result getAdvance(Idea idea) { - if(idea.appeal >= qualityThreshold) { - return success(new Advance(idea.appeal * generosity, idea)); - } else { - return failure("This novel wouldn't sell"); + public Result getAdvance(@NotNull Idea idea) { + if (idea.appeal >= qualityThreshold) { + return success(new Advance(idea.appeal * generosity, idea)); + } else { + return failure("This novel wouldn't sell"); + } } - } - public Novel publishNovel(Manuscript manuscript) { - return new Novel(manuscript.title, manuscript.quality); + @Contract("_ -> new") + public @NotNull Novel publishNovel(@NotNull Manuscript manuscript) { + return new Novel(manuscript.title, manuscript.quality); + } } - } public static class Editor { - public Manuscript editNovel(Manuscript manuscript) { + public Manuscript editNovel(@NotNull Manuscript manuscript) { return new Manuscript(manuscript.title, manuscript.quality + 3); } } @@ -88,44 +88,16 @@ public Sales sellNovel(Novel novel) { } } - public static class Idea { - public final String title; - public final int appeal; - - public Idea(String title, int appeal) { - this.title = title; - this.appeal = appeal; - } + public record Idea(String title, int appeal) { } - public static class Advance { - public final int amount; - public final Idea idea; - - public Advance(int amount, Idea idea) { - this.amount = amount; - this.idea = idea; - } + public record Advance(int amount, Idea idea) { } - public static class Manuscript { - public final String title; - public final int quality; - - public Manuscript(String title, int quality) { - this.title = title; - this.quality = quality; - } + public record Manuscript(String title, int quality) { } - public static class Novel { - public final String title; - public final int quality; - - public Novel(String title, int quality) { - this.title = title; - this.quality = quality; - } + public record Novel(String title, int quality) { } public static class Sales { From 2e0b282ace7b988bdbf10b91f5b63c7bc29780d7 Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Thu, 14 Dec 2023 22:27:20 -0600 Subject: [PATCH 3/6] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 04b1cda..c029c20 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -# co.unruly.control +# AJ's control + +This repo is for studying and documenting behavior, as well as updating and changing a few various parts + +## co.unruly.control [![Build Status](https://travis-ci.org/unruly/control.svg?branch=master)](https://travis-ci.org/unruly/control) [![Release Version](https://img.shields.io/maven-central/v/co.unruly/control.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22co.unruly%22%20AND%20a%3A%22control%22) From 6208cc4576d22ed6391997d4cf5f7deee1b120af Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Thu, 14 Dec 2023 23:08:53 -0600 Subject: [PATCH 4/6] remove pom --- pom.xml | 178 -------------------------------------------------------- 1 file changed, 178 deletions(-) delete mode 100644 pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index a6a5003..0000000 --- a/pom.xml +++ /dev/null @@ -1,178 +0,0 @@ - - 4.0.0 - - co.unruly - control - 0.8.14-SNAPSHOT - jar - - control - - A collection of functional utilities around error handling, wrapping a successfully returned value or - error - - - https://github.com/unruly/control - - - 1.8 - 1.8 - 1.8 - UTF-8 - -Xdoclint:none - - - - - Unruly Developers - oss@unrulymedia.com - - - - - - MIT License - http://www.opensource.org/licenses/mit-license.php - - - - - scm:git:git@github.com:unruly/${project.artifactId}.git - scm:git:git@github.com:unruly/${project.artifactId}.git - git@github.com:unruly/${project.artifactId}.git - HEAD - - - - - - - org.hamcrest - java-hamcrest - 2.0.0.0 - - - - - - junit - junit - 4.12 - test - - - org.mockito - mockito-core - 2.6.2 - test - - - org.hamcrest - hamcrest-junit - 2.0.0.0 - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - ${java.version} - ${java.version} - - - - org.apache.maven.plugins - maven-source-plugin - 2.2.1 - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.10.4 - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5 - - true - false - release - deploy - forked-path - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.5 - true - - ossrh - https://oss.sonatype.org/ - true - - - - - - - - release - - - - org.apache.maven.plugins - maven-gpg-plugin - 1.6 - - - sign-artifacts - verify - - sign - - - false - gpg - - - - - - - - - - - - ossrh - https://oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - From 7f988871effbaba13a7cd5b4a902d4a4cbfac95a Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Thu, 14 Dec 2023 23:30:13 -0600 Subject: [PATCH 5/6] adding equals and hashcode back --- src/main/java/co/unruly/control/pair/Pair.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/main/java/co/unruly/control/pair/Pair.java b/src/main/java/co/unruly/control/pair/Pair.java index c7e06e0..03ba3d7 100644 --- a/src/main/java/co/unruly/control/pair/Pair.java +++ b/src/main/java/co/unruly/control/pair/Pair.java @@ -3,6 +3,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; +import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; @@ -75,6 +76,20 @@ public T then(@NotNull BiFunction function) { return function.apply(this.left, this.right); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Pair pair = (Pair) o; + return Objects.equals(left, pair.left) && + Objects.equals(right, pair.right); + } + + @Override + public int hashCode() { + return Objects.hash(left, right); + } + @Contract(pure = true) @Override public @NotNull String toString() { From f2c09d2db16c6338528a07f5a4ba4b64b11fc00f Mon Sep 17 00:00:00 2001 From: Albert Snow Date: Thu, 14 Dec 2023 23:45:38 -0600 Subject: [PATCH 6/6] adding remaining equals and hashcode back --- src/main/java/co/unruly/control/pair/Quad.java | 17 +++++++++++++++++ .../java/co/unruly/control/pair/Triple.java | 16 ++++++++++++++++ .../control/validation/FailedValidation.java | 17 +++++++++++++++++ 3 files changed, 50 insertions(+) diff --git a/src/main/java/co/unruly/control/pair/Quad.java b/src/main/java/co/unruly/control/pair/Quad.java index 4fe32e9..f97a10d 100644 --- a/src/main/java/co/unruly/control/pair/Quad.java +++ b/src/main/java/co/unruly/control/pair/Quad.java @@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull; import java.util.function.Function; +import java.util.Objects; /** * @param first . @@ -70,6 +71,22 @@ public T then(@NotNull QuadFunction function) { return function.apply(first, second, third, fourth); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Quad quad = (Quad) o; + return Objects.equals(first, quad.first) && + Objects.equals(second, quad.second) && + Objects.equals(third, quad.third) && + Objects.equals(fourth, quad.fourth); + } + + @Override + public int hashCode() { + return Objects.hash(first, second, third, fourth); + } + @Contract(pure = true) @Override public @NotNull String toString() { diff --git a/src/main/java/co/unruly/control/pair/Triple.java b/src/main/java/co/unruly/control/pair/Triple.java index 0531721..a45b6b5 100644 --- a/src/main/java/co/unruly/control/pair/Triple.java +++ b/src/main/java/co/unruly/control/pair/Triple.java @@ -3,6 +3,7 @@ import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; +import java.util.Objects; import java.util.function.Function; /** @@ -66,6 +67,21 @@ public T then(@NotNull TriFunction function) { return function.apply(first, second, third); } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Triple triple = (Triple) o; + return Objects.equals(first, triple.first) && + Objects.equals(second, triple.second) && + Objects.equals(third, triple.third); + } + + @Override + public int hashCode() { + return Objects.hash(first, second, third); + } + @Contract(pure = true) @Override public @NotNull String toString() { diff --git a/src/main/java/co/unruly/control/validation/FailedValidation.java b/src/main/java/co/unruly/control/validation/FailedValidation.java index 2c28b0b..daf3862 100644 --- a/src/main/java/co/unruly/control/validation/FailedValidation.java +++ b/src/main/java/co/unruly/control/validation/FailedValidation.java @@ -4,6 +4,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; +import java.util.Objects; /** * @param value value under consideration @@ -22,6 +23,22 @@ public record FailedValidation(T value, List errors) implements Forward '}'; } + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + FailedValidation that = (FailedValidation) o; + return Objects.equals(value, that.value) && + Objects.equals(errors, that.errors); + } + + @Override + public int hashCode() { + return Objects.hash(value, errors); + } + + + @Override public List delegate() { return errors;