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/14 22:43:21 UTC
[12/13] wicket git commit: Add some more @FunctionalInterface where
possible
Add some more @FunctionalInterface where possible
Java 7 diamonds
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bf4d6592
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bf4d6592
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bf4d6592
Branch: refs/heads/master
Commit: bf4d659221888bf45494d805bab88888e04c0912
Parents: a6a8c5b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Mar 14 22:41:17 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Mar 14 22:42:55 2016 +0100
----------------------------------------------------------------------
.../wicket/feedback/IFeedbackMessageFilter.java | 23 +++-----------------
.../wicket/model/StringResourceModelTest.java | 4 +---
.../org/apache/wicket/util/IHierarchical.java | 1 +
.../org/apache/wicket/util/thread/ICode.java | 1 +
4 files changed, 6 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf4d6592/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java b/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
index fdd3057..fccee3e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/feedback/IFeedbackMessageFilter.java
@@ -23,35 +23,18 @@ import org.apache.wicket.util.io.IClusterable;
*
* @author Jonathan Locke
*/
+@FunctionalInterface
public interface IFeedbackMessageFilter extends IClusterable
{
/**
* Filter that returns simply all available messages.
*/
- IFeedbackMessageFilter ALL = new IFeedbackMessageFilter()
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean accept(FeedbackMessage message)
- {
- return true;
- }
- };
+ IFeedbackMessageFilter ALL = (IFeedbackMessageFilter) message -> true;
/**
* Filter that does not match any message
*/
- IFeedbackMessageFilter NONE = new IFeedbackMessageFilter()
- {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean accept(FeedbackMessage message)
- {
- return false;
- }
- };
+ IFeedbackMessageFilter NONE = (IFeedbackMessageFilter) message -> false;
/**
* @param message
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf4d6592/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
index de2c365..8c6353a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
@@ -49,7 +49,7 @@ public class StringResourceModelTest extends WicketTestCase
{
page = new TestPage();
ws = new WeatherStation();
- wsModel = new Model<WeatherStation>(ws);
+ wsModel = new Model<>(ws);
}
@@ -215,8 +215,6 @@ public class StringResourceModelTest extends WicketTestCase
{
return new WeatherStation();
}
-
-
};
StringResourceModel model = new StringResourceModel("simple.text", page, wsDetachModel);
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf4d6592/wicket-util/src/main/java/org/apache/wicket/util/IHierarchical.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/IHierarchical.java b/wicket-util/src/main/java/org/apache/wicket/util/IHierarchical.java
index 703efb5..4a39cf7 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/IHierarchical.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/IHierarchical.java
@@ -22,6 +22,7 @@ package org.apache.wicket.util;
* @author Igor Vaynberg (ivaynberg)
* @param <T>
*/
+@FunctionalInterface
public interface IHierarchical<T>
{
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/bf4d6592/wicket-util/src/main/java/org/apache/wicket/util/thread/ICode.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/thread/ICode.java b/wicket-util/src/main/java/org/apache/wicket/util/thread/ICode.java
index 8750048..90ecf38 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/thread/ICode.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/thread/ICode.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
* @author Jonathan Locke
* @since 1.2.6
*/
+@FunctionalInterface
public interface ICode
{
/**