From 4d40beca84df0d56a9cdef9430c80fbb55b37cbf Mon Sep 17 00:00:00 2001 From: Miroslav Pokorny Date: Wed, 6 Dec 2023 23:14:29 +1100 Subject: [PATCH] ExpressionFunctionParameterValues was ExpressionFunctionParameters --- ...rameters.java => ExpressionFunctionParameterValues.java} | 4 ++-- .../function/ExpressionFunctionParameterValuesFilter.java | 2 +- .../function/ExpressionFunctionParameterValuesMapper.java | 2 +- ...Test.java => ExpressionFunctionParameterValuesTest.java} | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/walkingkooka/tree/expression/function/{ExpressionFunctionParameters.java => ExpressionFunctionParameterValues.java} (89%) rename src/test/java/walkingkooka/tree/expression/function/{ExpressionFunctionParametersTest.java => ExpressionFunctionParameterValuesTest.java} (78%) diff --git a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameters.java b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValues.java similarity index 89% rename from src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameters.java rename to src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValues.java index 2c2be966..1f16e7f3 100644 --- a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameters.java +++ b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValues.java @@ -28,13 +28,13 @@ /** * Wraps an {@link ExpressionFunction} only the apply method remains to implemented by sub-classes. */ -abstract class ExpressionFunctionParameters implements ExpressionFunction { +abstract class ExpressionFunctionParameterValues implements ExpressionFunction { static void checkFunction(final ExpressionFunction function) { Objects.requireNonNull(function, "namedFunction"); } - ExpressionFunctionParameters(final ExpressionFunction function) { + ExpressionFunctionParameterValues(final ExpressionFunction function) { this.function = function; } diff --git a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilter.java b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilter.java index 40103636..dad25eda 100644 --- a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilter.java +++ b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilter.java @@ -28,7 +28,7 @@ /** * Wraps an {@link ExpressionFunction} and applies a {@link java.util.function.Function} on the paraneters before calling the wrapped. */ -final class ExpressionFunctionParameterValuesFilter extends ExpressionFunctionParameters { +final class ExpressionFunctionParameterValuesFilter extends ExpressionFunctionParameterValues { static ExpressionFunctionParameterValuesFilter with(final BiPredicate filter, final ExpressionFunction function) { diff --git a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapper.java b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapper.java index 3975b933..17d4c20d 100644 --- a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapper.java +++ b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapper.java @@ -26,7 +26,7 @@ /** * Wraps an {@link ExpressionFunction} and applies a {@link java.util.function.Function} on the parameters before calling the wrapped {@link ExpressionFunction}. */ -final class ExpressionFunctionParameterValuesMapper extends ExpressionFunctionParameters { +final class ExpressionFunctionParameterValuesMapper extends ExpressionFunctionParameterValues { static ExpressionFunctionParameterValuesMapper with(final BiFunction, C, List> mapper, final ExpressionFunction function) { diff --git a/src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParametersTest.java b/src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesTest.java similarity index 78% rename from src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParametersTest.java rename to src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesTest.java index 83906787..487686d7 100644 --- a/src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParametersTest.java +++ b/src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesTest.java @@ -21,11 +21,11 @@ import walkingkooka.reflect.ClassTesting; import walkingkooka.reflect.JavaVisibility; -public final class ExpressionFunctionParametersTest implements ClassTesting> { +public final class ExpressionFunctionParameterValuesTest implements ClassTesting> { @Override - public Class> type() { - return Cast.to(ExpressionFunctionParameters.class); + public Class> type() { + return Cast.to(ExpressionFunctionParameterValues.class); } @Override