Merge pull request #688 from mP1/feature/ExpressionFunctionParameterV…

…aluesFilter-was-ExpressionFunctionParametersFilter ExpressionFunctionParameterValuesFilter was ExpressionFunctionParamet…
mP1 · Dec 6, 2023 · 41b7b71 · 41b7b71
2 parents fcebff1 + 1ffa687
commit 41b7b71
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/main/java/walkingkooka/tree/expression/function/ExpressionFunction.java b/src/main/java/walkingkooka/tree/expression/function/ExpressionFunction.java
@@ -128,6 +128,6 @@ default ExpressionFunction<T, C> mapParameterValues(final BiFunction<List<Object
      * Returns a new {@link ExpressionFunction} that filters parameters using the given {@link BiPredicate}.
      */
     default ExpressionFunction<T, C> filterParameters(final BiPredicate<Object, C> filter) {
-        return ExpressionFunctionParametersFilter.with(filter, this);
+        return ExpressionFunctionParameterValuesFilter.with(filter, this);
     }
 }
diff --git a/...n/ExpressionFunctionParametersFilter.java → ...ressionFunctionParameterValuesFilter.java b/...n/ExpressionFunctionParametersFilter.java → ...ressionFunctionParameterValuesFilter.java
@@ -28,22 +28,22 @@
 /**
  * Wraps an {@link ExpressionFunction} and applies a {@link java.util.function.Function} on the paraneters before calling the wrapped.
  */
-final class ExpressionFunctionParametersFilter<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameters<T, C> {
+final class ExpressionFunctionParameterValuesFilter<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameters<T, C> {
 
-    static <T, C extends ExpressionEvaluationContext> ExpressionFunctionParametersFilter<T, C> with(final BiPredicate<Object, C> filter,
-                                                                                                    final ExpressionFunction<T, C> function) {
+    static <T, C extends ExpressionEvaluationContext> ExpressionFunctionParameterValuesFilter<T, C> with(final BiPredicate<Object, C> filter,
+                                                                                                         final ExpressionFunction<T, C> function) {
         checkFilter(filter);
         checkFunction(function);
 
-        return new ExpressionFunctionParametersFilter<>(filter, function);
+        return new ExpressionFunctionParameterValuesFilter<>(filter, function);
     }
 
     private static void checkFilter(final BiPredicate<Object, ? extends Context> filter) {
         Objects.requireNonNull(filter, "filter");
     }
 
-    private ExpressionFunctionParametersFilter(final BiPredicate<Object, C> filter,
-                                               final ExpressionFunction<T, C> function) {
+    private ExpressionFunctionParameterValuesFilter(final BiPredicate<Object, C> filter,
+                                                    final ExpressionFunction<T, C> function) {
         super(function);
         this.filter = filter;
     }
@@ -68,7 +68,7 @@ public ExpressionFunction<T, C> filterParameters(final BiPredicate<Object, C> fi
 
         return this.filter.equals(filter) ?
                 this :
-                ExpressionFunctionParametersFilter.with(filter, this);
+                ExpressionFunctionParameterValuesFilter.with(filter, this);
     }
 
     /**

diff --git a/...pressionFunctionParametersFilterTest.java → ...ionFunctionParameterValuesFilterTest.java b/...pressionFunctionParametersFilterTest.java → ...ionFunctionParameterValuesFilterTest.java
@@ -32,7 +32,7 @@
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
-public final class ExpressionFunctionParametersFilterTest extends ExpressionFunctionTestCase<ExpressionFunctionParametersFilter<Object, ExpressionEvaluationContext>, Object> {
+public final class ExpressionFunctionParameterValuesFilterTest extends ExpressionFunctionTestCase<ExpressionFunctionParameterValuesFilter<Object, ExpressionEvaluationContext>, Object> {
 
     private final static BiPredicate<Object, ExpressionEvaluationContext> FILTER = (p, c) -> p instanceof String;
 
@@ -73,15 +73,15 @@ public List<ExpressionFunctionParameter<?>> parameters(final int count) {
     public void testWithNullFilterFails() {
         assertThrows(
                 NullPointerException.class,
-                () -> ExpressionFunctionParametersFilter.with(null, FUNCTION)
+                () -> ExpressionFunctionParameterValuesFilter.with(null, FUNCTION)
         );
     }
 
     @Test
     public void testWithNullFunctionFails() {
         assertThrows(
                 NullPointerException.class,
-                () -> ExpressionFunctionParametersFilter.with(FILTER, null)
+                () -> ExpressionFunctionParameterValuesFilter.with(FILTER, null)
         );
     }
 
@@ -108,7 +108,7 @@ public void testName() {
 
     @Test
     public void testMapFilterSamePredicate() {
-        final ExpressionFunctionParametersFilter<Object, ExpressionEvaluationContext> function = this.createBiFunction();
+        final ExpressionFunctionParameterValuesFilter<Object, ExpressionEvaluationContext> function = this.createBiFunction();
 
         assertSame(function, function.filterParameters(FILTER));
     }
@@ -124,8 +124,8 @@ public void testToString() {
     // helpers..........................................................................................................
 
     @Override
-    public ExpressionFunctionParametersFilter<Object, ExpressionEvaluationContext> createBiFunction() {
-        return ExpressionFunctionParametersFilter.with(
+    public ExpressionFunctionParameterValuesFilter<Object, ExpressionEvaluationContext> createBiFunction() {
+        return ExpressionFunctionParameterValuesFilter.with(
                 FILTER,
                 FUNCTION
         );
@@ -137,7 +137,7 @@ public int minimumParameterCount() {
     }
 
     @Override
-    public Class<ExpressionFunctionParametersFilter<Object, ExpressionEvaluationContext>> type() {
-        return Cast.to(ExpressionFunctionParametersFilter.class);
+    public Class<ExpressionFunctionParameterValuesFilter<Object, ExpressionEvaluationContext>> type() {
+        return Cast.to(ExpressionFunctionParameterValuesFilter.class);
     }
 }