ExpressionFunctionParameterValues subclasses toString function.name

src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValues.java

@@ -58,5 +58,9 @@ public final Class<T> returnType() {
     final ExpressionFunction<T, C> function;
 
     @Override
-    public abstract String toString();
+    public final String toString() {
+        return this.name()
+                .map(FunctionExpressionName::toString)
+                .orElseGet(this.function::toString);
+    }
 }

src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilter.java

@@ -80,9 +80,4 @@ public ExpressionFunction<T, C> filterParameterValues(final BiPredicate<Object,
      * A {@link BiPredicate} that is used to filter parameter values during the prepare parameters phase before the actual wrapped {@link ExpressionFunction} is executed.
      */
     private final BiPredicate<Object, C> filter;
-
-    @Override
-    public String toString() {
-        return this.function + "(" + this.filter + ")";
-    }
 }

src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapper.java

@@ -73,9 +73,4 @@ public ExpressionFunction<T, C> mapParameterValues(final BiFunction<List<Object>
      * The {@link BiFunction} that is used to pre-process all parameter values before the wrapped {@link ExpressionFunction} is executed.
      */
     private final BiFunction<List<Object>, C, List<Object>> mapper;
-
-    @Override
-    public String toString() {
-        return this.function + "(" + this.mapper + ")";
-    }
 }

src/main/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesParameters.java

@@ -64,9 +64,4 @@ public T apply(final List<Object> parameters,
      * The different/custom parameters definitions that will be used to preprocess parameter values before the wrapped {@link #function} is executed.
      */
     private final List<ExpressionFunctionParameter<?>> parameters;
-
-    @Override
-    public String toString() {
-        return this.function.toString();
-    }
 }

src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionCustomNameTest.java

@@ -73,17 +73,6 @@ public void testSetNameDifferent() {
         this.checkEquals(NAME, function.name());
     }
 
-    // toString.........................................................................................................
-
-    @Test
-    public void testToString() {
-        this.toStringAndCheck(
-                this.createBiFunction(),
-                NAME.get()
-                        .toString()
-        );
-    }
-
     @Override
     public ExpressionFunctionCustomName<String, ExpressionEvaluationContext> createBiFunction() {
         return Cast.to(ExpressionFunctionCustomName.with(wrapped(), NAME));

src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesFilterTest.java

@@ -113,14 +113,6 @@ public void testFilterParameterValuesSamePredicate() {
         assertSame(function, function.filterParameterValues(FILTER));
     }
 
-    @Test
-    public void testToString() {
-        this.toStringAndCheck(
-                this.createBiFunction(),
-                FUNCTION + "(" + FILTER + ")"
-        );
-    }
-
     // helpers..........................................................................................................
 
     @Override

src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesMapperTest.java

@@ -116,11 +116,6 @@ public void testMapFunctionThenApply() {
                 "PARAM-1-A-namedFunction,PARAM-2-A-namedFunction,3-A-namedFunction");
     }
 
-    @Test
-    public void testToString() {
-        this.toStringAndCheck(this.createBiFunction(), FUNCTION + "(" + MAPPER + ")");
-    }
-
     // helpers..........................................................................................................
 
     @Override

src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionParameterValuesParametersTest.java

@@ -133,14 +133,6 @@ public void testParameters() {
         );
     }
 
-    @Test
-    public void testToString() {
-        this.toStringAndCheck(
-                this.createBiFunction(),
-                FUNCTION.toString()
-        );
-    }
-
     // helpers..........................................................................................................
 
     @Override

src/test/java/walkingkooka/tree/expression/function/ExpressionFunctionTestCase.java

@@ -48,6 +48,18 @@ public boolean isPure(final FunctionExpressionName name) {
         );
     }
 
+    @Test
+    public final void testToString() {
+        final F function = this.createBiFunction();
+
+        this.toStringAndCheck(
+                function,
+                function.name()
+                        .get()
+                        .toString()
+        );
+    }
+
     @Override
     public ExpressionEvaluationContext createContext() {
         return ExpressionEvaluationContexts.fake();