You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2016/03/12 23:19:52 UTC

wicket git commit: Rename package 'lambdas' to 'lambda'

Repository: wicket
Updated Branches:
  refs/heads/static-factories-for-lambdas 9bdbea7e1 -> 547ed161d


Rename package 'lambdas' to 'lambda'


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/547ed161
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/547ed161
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/547ed161

Branch: refs/heads/static-factories-for-lambdas
Commit: 547ed161d78ecc00dc74b33d1626e0cd6a3ad23b
Parents: 9bdbea7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sat Mar 12 23:19:22 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sat Mar 12 23:19:22 2016 +0100

----------------------------------------------------------------------
 .../wicket/ajax/AbstractAjaxTimerBehavior.java  |   4 +-
 .../wicket/ajax/AjaxClientInfoBehavior.java     |   4 +-
 .../apache/wicket/ajax/AjaxEventBehavior.java   |   4 +-
 .../ajax/AjaxNewWindowNotifyingBehavior.java    |   4 +-
 .../ajax/AjaxSelfUpdatingTimerBehavior.java     |   4 +-
 ...AjaxFormChoiceComponentUpdatingBehavior.java |   6 +-
 .../form/AjaxFormComponentUpdatingBehavior.java |   6 +-
 .../ajax/form/AjaxFormSubmitBehavior.java       |   4 +-
 .../wicket/ajax/form/OnChangeAjaxBehavior.java  |   6 +-
 .../wicket/ajax/markup/html/AjaxLink.java       |   4 +-
 .../ajax/markup/html/form/AjaxButton.java       |   4 +-
 .../ajax/markup/html/form/AjaxCheckBox.java     |   4 +-
 .../ajax/markup/html/form/AjaxSubmitLink.java   |   4 +-
 .../java/org/apache/wicket/lambda/Lambdas.java  | 382 +++++++++++++++++++
 .../apache/wicket/lambda/WicketBiConsumer.java  |  32 ++
 .../apache/wicket/lambda/WicketConsumer.java    |  30 ++
 .../apache/wicket/lambda/WicketFunction.java    |  32 ++
 .../apache/wicket/lambda/WicketSupplier.java    |  30 ++
 .../java/org/apache/wicket/lambdas/Lambdas.java | 382 -------------------
 .../apache/wicket/lambdas/WicketBiConsumer.java |  32 --
 .../apache/wicket/lambdas/WicketConsumer.java   |  30 --
 .../apache/wicket/lambdas/WicketFunction.java   |  32 --
 .../apache/wicket/lambdas/WicketSupplier.java   |  30 --
 .../apache/wicket/markup/html/link/Link.java    |   4 +-
 .../java/org/apache/wicket/model/Model.java     |   4 +-
 .../apache/wicket/model/lambda/LambdaModel.java |   4 +-
 .../model/lambda/SupplierCachingModel.java      |   2 +-
 .../wicket/model/lambda/SupplierModel.java      |   2 +-
 .../wicket/model/lambda/LambdaModelTest.java    |   4 +-
 .../model/lambda/SupplierCachingModelTest.java  |   2 +-
 .../wicket/model/lambda/SupplierModelTest.java  |   2 +-
 .../ajax/markup/html/IndicatingAjaxButton.java  |   2 +-
 .../ajax/markup/html/IndicatingAjaxLink.java    |   2 +-
 33 files changed, 549 insertions(+), 549 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
index 4a3609c..77396fa 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AbstractAjaxTimerBehavior.java
@@ -19,8 +19,8 @@ package org.apache.wicket.ajax;
 import org.apache.wicket.Component;
 import org.apache.wicket.Page;
 import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnLoadHeaderItem;
 import org.apache.wicket.util.time.Duration;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxClientInfoBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxClientInfoBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxClientInfoBehavior.java
index bd7c954..9d0e99c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxClientInfoBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxClientInfoBehavior.java
@@ -19,8 +19,8 @@ package org.apache.wicket.ajax;
 import org.apache.wicket.Component;
 import org.apache.wicket.Session;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.JavaScriptHeaderItem;
 import org.apache.wicket.markup.html.pages.BrowserInfoForm;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
index fa49035..6f8ff11 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxEventBehavior.java
@@ -21,8 +21,8 @@ import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.util.lang.Args;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
index 130666b..040490c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxNewWindowNotifyingBehavior.java
@@ -21,8 +21,8 @@ import java.util.UUID;
 import org.apache.wicket.Component;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
 import org.apache.wicket.markup.head.OnLoadHeaderItem;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
index d615ae5..ce7bab4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/AjaxSelfUpdatingTimerBehavior.java
@@ -16,8 +16,8 @@
  */
 package org.apache.wicket.ajax;
 
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.util.time.Duration;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
index 19915d6..9bd1019 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehavior.java
@@ -21,9 +21,9 @@ import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxCallListener;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.html.form.CheckBoxMultipleChoice;
 import org.apache.wicket.markup.html.form.CheckGroup;
 import org.apache.wicket.markup.html.form.FormComponent;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
index 490afd6..da570ad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormComponentUpdatingBehavior.java
@@ -23,9 +23,9 @@ import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.validation.IFormValidator;
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
index 7011481..7578d97 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehavior.java
@@ -21,8 +21,8 @@ import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.IFormSubmitter;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java b/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
index 01c07a8..48d95b9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/form/OnChangeAjaxBehavior.java
@@ -19,9 +19,9 @@ package org.apache.wicket.ajax.form;
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.html.form.FormComponent;
 import org.apache.wicket.markup.html.form.TextArea;
 import org.apache.wicket.markup.html.form.TextField;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
index 1907f58..8ba0bb1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
@@ -20,8 +20,8 @@ import org.apache.wicket.IGenericComponent;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.link.AbstractLink;
 import org.apache.wicket.model.IModel;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
index 9d3732f..29ff017 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxButton.java
@@ -19,8 +19,8 @@ package org.apache.wicket.ajax.markup.html.form;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.form.Button;
 import org.apache.wicket.markup.html.form.Form;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
index 5dba68e..62aee5d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxCheckBox.java
@@ -19,8 +19,8 @@ package org.apache.wicket.ajax.markup.html.form;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.html.form.CheckBox;
 import org.apache.wicket.model.IModel;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
index 552f64c..0ad0f26 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/form/AjaxSubmitLink.java
@@ -19,8 +19,8 @@ package org.apache.wicket.ajax.markup.html.form;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
 import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketBiConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketBiConsumer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.form.AbstractSubmitLink;
 import org.apache.wicket.markup.html.form.Form;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java b/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
new file mode 100644
index 0000000..510fe12
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/Lambdas.java
@@ -0,0 +1,382 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ *      http://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.
+ */
+package org.apache.wicket.lambda;
+
+import java.util.UUID;
+
+import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
+import org.apache.wicket.ajax.AjaxClientInfoBehavior;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxNewWindowNotifyingBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
+import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.protocol.http.request.WebClientInfo;
+import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.string.Strings;
+import org.apache.wicket.util.time.Duration;
+
+/**
+ *
+ */
+public class Lambdas
+{
+	public static AbstractAjaxTimerBehavior onTimer(Duration interval, WicketConsumer<AjaxRequestTarget> onTimer)
+	{
+		Args.notNull(onTimer, "onTimer");
+
+		return new AbstractAjaxTimerBehavior(interval)
+		{
+			@Override
+			protected void onTimer(AjaxRequestTarget target)
+			{
+				onTimer.accept(target);
+			}
+		};
+	}
+
+	public static AjaxClientInfoBehavior onClientInfo(WicketBiConsumer<AjaxRequestTarget, WebClientInfo> onClientInfo)
+	{
+		Args.notNull(onClientInfo, "onClientInfo");
+
+		return new AjaxClientInfoBehavior()
+		{
+			@Override
+			protected void onClientInfo(AjaxRequestTarget target, WebClientInfo clientInfo)
+			{
+				onClientInfo.accept(target, clientInfo);
+			}
+		};
+	}
+
+	public static AjaxEventBehavior onEvent(String eventName, WicketConsumer<AjaxRequestTarget> onEvent)
+	{
+		Args.notNull(onEvent, "onEvent");
+
+		return new AjaxEventBehavior(eventName)
+		{
+			@Override
+			protected void onEvent(AjaxRequestTarget target)
+			{
+				onEvent.accept(target);
+			}
+		};
+	}
+
+	public static AjaxNewWindowNotifyingBehavior onNewWindow(String windowName, WicketConsumer<AjaxRequestTarget> onNewWindow)
+	{
+		Args.notNull(onNewWindow, "onNewWindow");
+
+		if (Strings.isEmpty(windowName))
+		{
+			windowName = UUID.randomUUID().toString();
+		}
+
+		return new AjaxNewWindowNotifyingBehavior(windowName)
+		{
+			@Override
+			protected void onNewWindow(AjaxRequestTarget target)
+			{
+				onNewWindow.accept(target);
+			}
+		};
+	}
+
+	public static AbstractAjaxTimerBehavior onSelfUpdate(Duration interval, WicketConsumer<AjaxRequestTarget> onTimer)
+	{
+		Args.notNull(onTimer, "onTimer");
+
+		return new AjaxSelfUpdatingTimerBehavior(interval)
+		{
+			@Override
+			protected void onPostProcessTarget(AjaxRequestTarget target)
+			{
+				onTimer.accept(target);
+			}
+		};
+	}
+
+
+	public static AjaxFormChoiceComponentUpdatingBehavior onUpdateChoice(WicketConsumer<AjaxRequestTarget> onUpdateChoice) {
+		Args.notNull(onUpdateChoice, "onUpdateChoice");
+		return new AjaxFormChoiceComponentUpdatingBehavior()
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onUpdateChoice.accept(target);
+			}
+		};
+	}
+
+	public static AjaxFormChoiceComponentUpdatingBehavior onUpdateChoice(WicketConsumer<AjaxRequestTarget> onUpdateChoice,
+	                                                                     WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError) {
+		Args.notNull(onUpdateChoice, "onUpdateChoice");
+		Args.notNull(onError, "onError");
+		return new AjaxFormChoiceComponentUpdatingBehavior()
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onUpdateChoice.accept(target);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target, RuntimeException e)
+			{
+				onError.accept(target, e);
+			}
+		};
+	}
+
+
+	public static AjaxFormComponentUpdatingBehavior onUpdate(String eventName, WicketConsumer<AjaxRequestTarget> onUpdate)
+	{
+		Args.notNull(onUpdate, "onUpdate");
+
+		return new AjaxFormComponentUpdatingBehavior(eventName)
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onUpdate.accept(target);
+			}
+		};
+	}
+
+	public static AjaxFormComponentUpdatingBehavior onUpdate(String eventName,
+	                                                         WicketConsumer<AjaxRequestTarget> onUpdate,
+	                                                         WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError)
+	{
+		Args.notNull(onUpdate, "onUpdate");
+		Args.notNull(onError, "onError");
+
+		return new AjaxFormComponentUpdatingBehavior(eventName)
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onUpdate.accept(target);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target, RuntimeException e)
+			{
+				onError.accept(target, e);
+			}
+		};
+	}
+
+	public static AjaxFormSubmitBehavior onSubmit(String eventName, WicketConsumer<AjaxRequestTarget> onSubmit)
+	{
+		Args.notNull(onSubmit, "onSubmit");
+
+		return new AjaxFormSubmitBehavior(eventName)
+		{
+			@Override
+			protected void onSubmit(AjaxRequestTarget target)
+			{
+				onSubmit.accept(target);
+			}
+		};
+	}
+
+	public static AjaxFormSubmitBehavior onSubmit(String eventName,
+	                                              WicketConsumer<AjaxRequestTarget> onSubmit,
+	                                              WicketConsumer<AjaxRequestTarget> onError) {
+		Args.notNull(onSubmit, "onSubmit");
+		Args.notNull(onError, "onError");
+
+		return new AjaxFormSubmitBehavior(eventName)
+		{
+			@Override
+			protected void onSubmit(AjaxRequestTarget target)
+			{
+				onSubmit.accept(target);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target)
+			{
+				onError.accept(target);
+			}
+		};
+	}
+
+
+	public static OnChangeAjaxBehavior onChange(WicketConsumer<AjaxRequestTarget> onChange)
+	{
+		Args.notNull(onChange, "onChange");
+
+		return new OnChangeAjaxBehavior()
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onChange.accept(target);
+			}
+		};
+	}
+
+	public static OnChangeAjaxBehavior onChange(WicketConsumer<AjaxRequestTarget> onChange,
+	                                            WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError)
+	{
+		Args.notNull(onChange, "onChange");
+		Args.notNull(onError, "onError");
+
+		return new OnChangeAjaxBehavior()
+		{
+			@Override
+			protected void onUpdate(AjaxRequestTarget target)
+			{
+				onChange.accept(target);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target, RuntimeException e)
+			{
+				onError.accept(target, e);
+			}
+		};
+	}
+
+	public static <T> AjaxLink<T> ajaxLink(String id, WicketConsumer<AjaxRequestTarget> onClick)
+	{
+		Args.notNull(onClick, "onClick");
+
+		return new AjaxLink<T>(id)
+		{
+			@Override
+			public void onClick(AjaxRequestTarget target)
+			{
+				onClick.accept(target);
+			}
+		};
+	}
+
+
+	public static AjaxButton ajaxButton(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+	{
+		Args.notNull(onSubmit, "onSubmit");
+
+		return new AjaxButton(id)
+		{
+			@Override
+			public void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				onSubmit.accept(target, form);
+			}
+		};
+	}
+
+	public static AjaxButton ajaxButton(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
+	                                    WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+	{
+		Args.notNull(onSubmit, "onSubmit");
+		Args.notNull(onError, "onError");
+
+		return new AjaxButton(id)
+		{
+			@Override
+			public void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				onSubmit.accept(target, form);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target, Form<?> form)
+			{
+				onError.accept(target, form);
+			}
+		};
+	}
+
+	public static AjaxCheckBox ajaxCheckBox(String id, WicketConsumer<AjaxRequestTarget> onUpdate)
+	{
+		Args.notNull(onUpdate, "onUpdate");
+
+		return new AjaxCheckBox(id)
+		{
+			@Override
+			public void onUpdate(AjaxRequestTarget target)
+			{
+				onUpdate.accept(target);
+			}
+		};
+	}
+
+
+	public static AjaxSubmitLink ajaxSubmitLink(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
+	{
+		Args.notNull(onSubmit, "onSubmit");
+
+		return new AjaxSubmitLink(id)
+		{
+			@Override
+			public void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				onSubmit.accept(target, form);
+			}
+		};
+	}
+
+	public static AjaxSubmitLink ajaxSubmitLink(String id,
+	                                            WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
+	                                            WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
+	{
+		Args.notNull(onSubmit, "onSubmit");
+		Args.notNull(onError, "onError");
+
+		return new AjaxSubmitLink(id)
+		{
+			@Override
+			public void onSubmit(AjaxRequestTarget target, Form<?> form)
+			{
+				onSubmit.accept(target, form);
+			}
+
+			@Override
+			protected void onError(AjaxRequestTarget target, Form<?> form)
+			{
+				onError.accept(target, form);
+			}
+		};
+	}
+
+	public static <T> Link<T> link(String id, WicketConsumer<Void> onClick)
+	{
+		Args.notNull(onClick, "onClick");
+
+		return new Link<T>(id)
+		{
+			@Override
+			public void onClick()
+			{
+				onClick.accept((Void)null);
+			}
+		};
+	}
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambda/WicketBiConsumer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketBiConsumer.java b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketBiConsumer.java
new file mode 100644
index 0000000..c035fe0
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketBiConsumer.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ *      http://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.
+ */
+package org.apache.wicket.lambda;
+
+import java.io.Serializable;
+import java.util.function.BiConsumer;
+
+/**
+ * A {@link Serializable} {@link BiConsumer}.
+ *
+ * @param <T>
+ *            - the type of the first input to consume
+ * @param <T>
+ *            - the type of the second input to consume
+ */
+public interface WicketBiConsumer<T, U> extends BiConsumer<T, U>, Serializable
+{
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
new file mode 100644
index 0000000..44f0bd0
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketConsumer.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ *      http://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.
+ */
+package org.apache.wicket.lambda;
+
+import java.io.Serializable;
+import java.util.function.Consumer;
+
+/**
+ * A {@link Serializable} {@link Consumer}.
+ *
+ * @param <T>
+ *            - the type of the input to consume
+ */
+public interface WicketConsumer<T> extends Consumer<T>, Serializable
+{
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
new file mode 100644
index 0000000..1ce20ff
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketFunction.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ *      http://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.
+ */
+package org.apache.wicket.lambda;
+
+import java.io.Serializable;
+import java.util.function.Function;
+
+/**
+ * A {@link Serializable} {@link Function}.
+ *
+ * @param <T>
+ *            - the type of the input to the function
+ * @param <R>
+ *            - the type of the result of the function
+ */
+public interface WicketFunction<T, R> extends Function<T, R>, Serializable
+{
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
new file mode 100644
index 0000000..86f31ba
--- /dev/null
+++ b/wicket-core/src/main/java/org/apache/wicket/lambda/WicketSupplier.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
+ *
+ *      http://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.
+ */
+package org.apache.wicket.lambda;
+
+import java.io.Serializable;
+import java.util.function.Supplier;
+
+/**
+ * A {@link Serializable} {@link Supplier}.
+ *
+ * @param <T>
+ *            - the type of results supplied by this supplier
+ */
+public interface WicketSupplier<T> extends Supplier<T>, Serializable
+{
+}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambdas/Lambdas.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambdas/Lambdas.java b/wicket-core/src/main/java/org/apache/wicket/lambdas/Lambdas.java
deleted file mode 100644
index 9bb6f1f..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/lambdas/Lambdas.java
+++ /dev/null
@@ -1,382 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://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.
- */
-package org.apache.wicket.lambdas;
-
-import java.util.UUID;
-
-import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
-import org.apache.wicket.ajax.AjaxClientInfoBehavior;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxNewWindowNotifyingBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.AjaxSelfUpdatingTimerBehavior;
-import org.apache.wicket.ajax.form.AjaxFormChoiceComponentUpdatingBehavior;
-import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.ajax.form.AjaxFormSubmitBehavior;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.protocol.http.request.WebClientInfo;
-import org.apache.wicket.util.lang.Args;
-import org.apache.wicket.util.string.Strings;
-import org.apache.wicket.util.time.Duration;
-
-/**
- *
- */
-public class Lambdas
-{
-	public static AbstractAjaxTimerBehavior onTimer(Duration interval, WicketConsumer<AjaxRequestTarget> onTimer)
-	{
-		Args.notNull(onTimer, "onTimer");
-
-		return new AbstractAjaxTimerBehavior(interval)
-		{
-			@Override
-			protected void onTimer(AjaxRequestTarget target)
-			{
-				onTimer.accept(target);
-			}
-		};
-	}
-
-	public static AjaxClientInfoBehavior onClientInfo(WicketBiConsumer<AjaxRequestTarget, WebClientInfo> onClientInfo)
-	{
-		Args.notNull(onClientInfo, "onClientInfo");
-
-		return new AjaxClientInfoBehavior()
-		{
-			@Override
-			protected void onClientInfo(AjaxRequestTarget target, WebClientInfo clientInfo)
-			{
-				onClientInfo.accept(target, clientInfo);
-			}
-		};
-	}
-
-	public static AjaxEventBehavior onEvent(String eventName, WicketConsumer<AjaxRequestTarget> onEvent)
-	{
-		Args.notNull(onEvent, "onEvent");
-
-		return new AjaxEventBehavior(eventName)
-		{
-			@Override
-			protected void onEvent(AjaxRequestTarget target)
-			{
-				onEvent.accept(target);
-			}
-		};
-	}
-
-	public static AjaxNewWindowNotifyingBehavior onNewWindow(String windowName, WicketConsumer<AjaxRequestTarget> onNewWindow)
-	{
-		Args.notNull(onNewWindow, "onNewWindow");
-
-		if (Strings.isEmpty(windowName))
-		{
-			windowName = UUID.randomUUID().toString();
-		}
-
-		return new AjaxNewWindowNotifyingBehavior(windowName)
-		{
-			@Override
-			protected void onNewWindow(AjaxRequestTarget target)
-			{
-				onNewWindow.accept(target);
-			}
-		};
-	}
-
-	public static AbstractAjaxTimerBehavior onSelfUpdate(Duration interval, WicketConsumer<AjaxRequestTarget> onTimer)
-	{
-		Args.notNull(onTimer, "onTimer");
-
-		return new AjaxSelfUpdatingTimerBehavior(interval)
-		{
-			@Override
-			protected void onPostProcessTarget(AjaxRequestTarget target)
-			{
-				onTimer.accept(target);
-			}
-		};
-	}
-
-
-	public static AjaxFormChoiceComponentUpdatingBehavior onUpdateChoice(WicketConsumer<AjaxRequestTarget> onUpdateChoice) {
-		Args.notNull(onUpdateChoice, "onUpdateChoice");
-		return new AjaxFormChoiceComponentUpdatingBehavior()
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onUpdateChoice.accept(target);
-			}
-		};
-	}
-
-	public static AjaxFormChoiceComponentUpdatingBehavior onUpdateChoice(WicketConsumer<AjaxRequestTarget> onUpdateChoice,
-	                                                                     WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError) {
-		Args.notNull(onUpdateChoice, "onUpdateChoice");
-		Args.notNull(onError, "onError");
-		return new AjaxFormChoiceComponentUpdatingBehavior()
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onUpdateChoice.accept(target);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target, RuntimeException e)
-			{
-				onError.accept(target, e);
-			}
-		};
-	}
-
-
-	public static AjaxFormComponentUpdatingBehavior onUpdate(String eventName, WicketConsumer<AjaxRequestTarget> onUpdate)
-	{
-		Args.notNull(onUpdate, "onUpdate");
-
-		return new AjaxFormComponentUpdatingBehavior(eventName)
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onUpdate.accept(target);
-			}
-		};
-	}
-
-	public static AjaxFormComponentUpdatingBehavior onUpdate(String eventName,
-	                                                         WicketConsumer<AjaxRequestTarget> onUpdate,
-	                                                         WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError)
-	{
-		Args.notNull(onUpdate, "onUpdate");
-		Args.notNull(onError, "onError");
-
-		return new AjaxFormComponentUpdatingBehavior(eventName)
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onUpdate.accept(target);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target, RuntimeException e)
-			{
-				onError.accept(target, e);
-			}
-		};
-	}
-
-	public static AjaxFormSubmitBehavior onSubmit(String eventName, WicketConsumer<AjaxRequestTarget> onSubmit)
-	{
-		Args.notNull(onSubmit, "onSubmit");
-
-		return new AjaxFormSubmitBehavior(eventName)
-		{
-			@Override
-			protected void onSubmit(AjaxRequestTarget target)
-			{
-				onSubmit.accept(target);
-			}
-		};
-	}
-
-	public static AjaxFormSubmitBehavior onSubmit(String eventName,
-	                                              WicketConsumer<AjaxRequestTarget> onSubmit,
-	                                              WicketConsumer<AjaxRequestTarget> onError) {
-		Args.notNull(onSubmit, "onSubmit");
-		Args.notNull(onError, "onError");
-
-		return new AjaxFormSubmitBehavior(eventName)
-		{
-			@Override
-			protected void onSubmit(AjaxRequestTarget target)
-			{
-				onSubmit.accept(target);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target)
-			{
-				onError.accept(target);
-			}
-		};
-	}
-
-
-	public static OnChangeAjaxBehavior onChange(WicketConsumer<AjaxRequestTarget> onChange)
-	{
-		Args.notNull(onChange, "onChange");
-
-		return new OnChangeAjaxBehavior()
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onChange.accept(target);
-			}
-		};
-	}
-
-	public static OnChangeAjaxBehavior onChange(WicketConsumer<AjaxRequestTarget> onChange,
-	                                            WicketBiConsumer<AjaxRequestTarget, RuntimeException> onError)
-	{
-		Args.notNull(onChange, "onChange");
-		Args.notNull(onError, "onError");
-
-		return new OnChangeAjaxBehavior()
-		{
-			@Override
-			protected void onUpdate(AjaxRequestTarget target)
-			{
-				onChange.accept(target);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target, RuntimeException e)
-			{
-				onError.accept(target, e);
-			}
-		};
-	}
-
-	public static <T> AjaxLink<T> ajaxLink(String id, WicketConsumer<AjaxRequestTarget> onClick)
-	{
-		Args.notNull(onClick, "onClick");
-
-		return new AjaxLink<T>(id)
-		{
-			@Override
-			public void onClick(AjaxRequestTarget target)
-			{
-				onClick.accept(target);
-			}
-		};
-	}
-
-
-	public static AjaxButton ajaxButton(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
-	{
-		Args.notNull(onSubmit, "onSubmit");
-
-		return new AjaxButton(id)
-		{
-			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form)
-			{
-				onSubmit.accept(target, form);
-			}
-		};
-	}
-
-	public static AjaxButton ajaxButton(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
-	                                    WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
-	{
-		Args.notNull(onSubmit, "onSubmit");
-		Args.notNull(onError, "onError");
-
-		return new AjaxButton(id)
-		{
-			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form)
-			{
-				onSubmit.accept(target, form);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target, Form<?> form)
-			{
-				onError.accept(target, form);
-			}
-		};
-	}
-
-	public static AjaxCheckBox ajaxCheckBox(String id, WicketConsumer<AjaxRequestTarget> onUpdate)
-	{
-		Args.notNull(onUpdate, "onUpdate");
-
-		return new AjaxCheckBox(id)
-		{
-			@Override
-			public void onUpdate(AjaxRequestTarget target)
-			{
-				onUpdate.accept(target);
-			}
-		};
-	}
-
-
-	public static AjaxSubmitLink ajaxSubmitLink(String id, WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit)
-	{
-		Args.notNull(onSubmit, "onSubmit");
-
-		return new AjaxSubmitLink(id)
-		{
-			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form)
-			{
-				onSubmit.accept(target, form);
-			}
-		};
-	}
-
-	public static AjaxSubmitLink ajaxSubmitLink(String id,
-	                                            WicketBiConsumer<AjaxRequestTarget, Form<?>> onSubmit,
-	                                            WicketBiConsumer<AjaxRequestTarget, Form<?>> onError)
-	{
-		Args.notNull(onSubmit, "onSubmit");
-		Args.notNull(onError, "onError");
-
-		return new AjaxSubmitLink(id)
-		{
-			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form)
-			{
-				onSubmit.accept(target, form);
-			}
-
-			@Override
-			protected void onError(AjaxRequestTarget target, Form<?> form)
-			{
-				onError.accept(target, form);
-			}
-		};
-	}
-
-	public static <T> Link<T> link(String id, WicketConsumer<Void> onClick)
-	{
-		Args.notNull(onClick, "onClick");
-
-		return new Link<T>(id)
-		{
-			@Override
-			public void onClick()
-			{
-				onClick.accept((Void)null);
-			}
-		};
-	}
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketBiConsumer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketBiConsumer.java b/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketBiConsumer.java
deleted file mode 100644
index 509a6c5..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketBiConsumer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://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.
- */
-package org.apache.wicket.lambdas;
-
-import java.io.Serializable;
-import java.util.function.BiConsumer;
-
-/**
- * A {@link Serializable} {@link BiConsumer}.
- *
- * @param <T>
- *            - the type of the first input to consume
- * @param <T>
- *            - the type of the second input to consume
- */
-public interface WicketBiConsumer<T, U> extends BiConsumer<T, U>, Serializable
-{
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketConsumer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketConsumer.java b/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketConsumer.java
deleted file mode 100644
index 36404f2..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketConsumer.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://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.
- */
-package org.apache.wicket.lambdas;
-
-import java.io.Serializable;
-import java.util.function.Consumer;
-
-/**
- * A {@link Serializable} {@link Consumer}.
- *
- * @param <T>
- *            - the type of the input to consume
- */
-public interface WicketConsumer<T> extends Consumer<T>, Serializable
-{
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketFunction.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketFunction.java b/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketFunction.java
deleted file mode 100644
index 7c6b9ae..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketFunction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://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.
- */
-package org.apache.wicket.lambdas;
-
-import java.io.Serializable;
-import java.util.function.Function;
-
-/**
- * A {@link Serializable} {@link Function}.
- *
- * @param <T>
- *            - the type of the input to the function
- * @param <R>
- *            - the type of the result of the function
- */
-public interface WicketFunction<T, R> extends Function<T, R>, Serializable
-{
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketSupplier.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketSupplier.java b/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketSupplier.java
deleted file mode 100644
index 85a4bdb..0000000
--- a/wicket-core/src/main/java/org/apache/wicket/lambdas/WicketSupplier.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You 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
- *
- *      http://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.
- */
-package org.apache.wicket.lambdas;
-
-import java.io.Serializable;
-import java.util.function.Supplier;
-
-/**
- * A {@link Serializable} {@link Supplier}.
- *
- * @param <T>
- *            - the type of results supplied by this supplier
- */
-public interface WicketSupplier<T> extends Supplier<T>, Serializable
-{
-}

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
index 7a39c06..6259618 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/Link.java
@@ -20,8 +20,8 @@ import org.apache.wicket.Component;
 import org.apache.wicket.IGenericComponent;
 import org.apache.wicket.Page;
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.lambdas.Lambdas;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.Lambdas;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.request.mapper.parameter.PageParameters;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/model/Model.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/Model.java b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
index ba790e6..97c4882 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/Model.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/Model.java
@@ -24,8 +24,8 @@ import java.util.Map;
 import java.util.Set;
 
 import org.apache.wicket.WicketRuntimeException;
-import org.apache.wicket.lambdas.WicketConsumer;
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketConsumer;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.lambda.LambdaModel;
 import org.apache.wicket.model.lambda.SupplierCachingModel;
 import org.apache.wicket.model.lambda.SupplierModel;

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
index 6b1b3ea..694a1de 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/LambdaModel.java
@@ -18,8 +18,8 @@ package org.apache.wicket.model.lambda;
 
 import java.util.Objects;
 
-import org.apache.wicket.lambdas.WicketConsumer;
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketConsumer;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.lang.Args;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java
index e26dcbd..9e16832 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierCachingModel.java
@@ -18,7 +18,7 @@ package org.apache.wicket.model.lambda;
 
 import java.util.Objects;
 
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.util.lang.Args;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java
index 4a8b77c..f36e9ac 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/lambda/SupplierModel.java
@@ -18,7 +18,7 @@ package org.apache.wicket.model.lambda;
 
 import java.util.Objects;
 
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.util.lang.Args;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/test/java/org/apache/wicket/model/lambda/LambdaModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/lambda/LambdaModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/lambda/LambdaModelTest.java
index 9f8d2b4..a823095 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/lambda/LambdaModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/lambda/LambdaModelTest.java
@@ -22,8 +22,8 @@ import static org.hamcrest.Matchers.nullValue;
 import static org.junit.Assert.*;
 
 import org.apache.wicket.core.util.lang.WicketObjects;
-import org.apache.wicket.lambdas.WicketConsumer;
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketConsumer;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.IModel;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierCachingModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierCachingModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierCachingModelTest.java
index e2b95e4..88bfadf 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierCachingModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierCachingModelTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.apache.wicket.core.util.lang.WicketObjects;
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.IModel;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierModelTest.java
index f0ecc02..7e4a9ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/lambda/SupplierModelTest.java
@@ -25,7 +25,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import org.apache.wicket.core.util.lang.WicketObjects;
-import org.apache.wicket.lambdas.WicketSupplier;
+import org.apache.wicket.lambda.WicketSupplier;
 import org.apache.wicket.model.IModel;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
index 7d91e4c..06c81a6 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxButton.java
@@ -21,7 +21,7 @@ import org.apache.wicket.ajax.IAjaxIndicatorAware;
 import org.apache.wicket.ajax.markup.html.form.AjaxButton;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.lambdas.WicketBiConsumer;
+import org.apache.wicket.lambda.WicketBiConsumer;
 import org.apache.wicket.util.lang.Args;
 
 /**

http://git-wip-us.apache.org/repos/asf/wicket/blob/547ed161/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
index 59c4fcc..d6056e8 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
@@ -20,7 +20,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.IAjaxIndicatorAware;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.lambdas.WicketConsumer;
+import org.apache.wicket.lambda.WicketConsumer;
 import org.apache.wicket.util.lang.Args;
 
 /**