Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ExpressionFunctionParameterValues was ExpressionFunctionParameters #690

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@
/**
* Wraps an {@link ExpressionFunction} only the apply method remains to implemented by sub-classes.
*/
abstract class ExpressionFunctionParameters<T, C extends ExpressionEvaluationContext> implements ExpressionFunction<T, C> {
abstract class ExpressionFunctionParameterValues<T, C extends ExpressionEvaluationContext> implements ExpressionFunction<T, C> {

static void checkFunction(final ExpressionFunction<?, ?> function) {
Objects.requireNonNull(function, "namedFunction");
}

ExpressionFunctionParameters(final ExpressionFunction<T, C> function) {
ExpressionFunctionParameterValues(final ExpressionFunction<T, C> function) {
this.function = function;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameters<T, C> {
final class ExpressionFunctionParameterValuesFilter<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameterValues<T, C> {

static <T, C extends ExpressionEvaluationContext> ExpressionFunctionParameterValuesFilter<T, C> with(final BiPredicate<Object, C> filter,
final ExpressionFunction<T, C> function) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameters<T, C> {
final class ExpressionFunctionParameterValuesMapper<T, C extends ExpressionEvaluationContext> extends ExpressionFunctionParameterValues<T, C> {

static <T, C extends ExpressionEvaluationContext> ExpressionFunctionParameterValuesMapper<T, C> with(final BiFunction<List<Object>, C, List<Object>> mapper,
final ExpressionFunction<T, C> function) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
import walkingkooka.reflect.ClassTesting;
import walkingkooka.reflect.JavaVisibility;

public final class ExpressionFunctionParametersTest implements ClassTesting<ExpressionFunctionParameters<?, ?>> {
public final class ExpressionFunctionParameterValuesTest implements ClassTesting<ExpressionFunctionParameterValues<?, ?>> {

@Override
public Class<ExpressionFunctionParameters<?, ?>> type() {
return Cast.to(ExpressionFunctionParameters.class);
public Class<ExpressionFunctionParameterValues<?, ?>> type() {
return Cast.to(ExpressionFunctionParameterValues.class);
}

@Override
Expand Down
Loading