[wicket] branch master updated: WICKET-6671 IAjaxLink should be serializable

[mg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/master by this push:
     new cebb9aa  WICKET-6671 IAjaxLink should be serializable
cebb9aa is described below

commit cebb9aaaaa06f3307ea084189be6e5b66dabe266
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Wed May 29 10:03:21 2019 +0300

    WICKET-6671 IAjaxLink should be serializable
    
    Same for IAjaxIndicatorAware, IAjaxRegionMarkupIdProvider and IDebugBarContributor
    
    (cherry picked from commit 8e9b2dadbf799fd97c2844964c8cdf6a945cc880)
---
 .../src/main/java/org/apache/wicket/ajax/IAjaxIndicatorAware.java | 5 ++++-
 .../java/org/apache/wicket/ajax/IAjaxRegionMarkupIdProvider.java  | 3 ++-
 .../main/java/org/apache/wicket/ajax/markup/html/IAjaxLink.java   | 3 ++-
 .../org/apache/wicket/devutils/debugbar/IDebugBarContributor.java | 5 ++---
 .../src/test/java/org/apache/wicket/guice/ITestService.java       | 8 ++++----
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxIndicatorAware.java b/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxIndicatorAware.java
index 0391f98..c25e773 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxIndicatorAware.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxIndicatorAware.java
@@ -17,6 +17,8 @@
 package org.apache.wicket.ajax;
 
 
+import org.apache.wicket.util.io.IClusterable;
+
 /**
  * This interface makes it trivial to use busy indicators for ajax requests. This interface can be
  * implemented by a component that has an ajax behavior attached to it, or any parent of the
@@ -32,7 +34,8 @@ package org.apache.wicket.ajax;
  * @author Igor Vaynberg (ivaynberg)
  * 
  */
-public interface IAjaxIndicatorAware
+@FunctionalInterface
+public interface IAjaxIndicatorAware extends IClusterable
 {
 	/**
 	 * @return the value of the markup id attribute of the indicating element
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxRegionMarkupIdProvider.java b/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxRegionMarkupIdProvider.java
index 147c7c3..b44d942 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxRegionMarkupIdProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/IAjaxRegionMarkupIdProvider.java
@@ -18,6 +18,7 @@ package org.apache.wicket.ajax;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.util.io.IClusterable;
 
 /**
  * A mixin that allows behaviors and components to override the id of the markup region that will be
@@ -92,7 +93,7 @@ import org.apache.wicket.markup.html.form.TextField;
  * @author Igor Vaynberg (ivaynberg)
  */
 @FunctionalInterface
-public interface IAjaxRegionMarkupIdProvider
+public interface IAjaxRegionMarkupIdProvider extends IClusterable
 {
 	/**
 	 * @param component
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/IAjaxLink.java b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/IAjaxLink.java
index ea825ba..07018c2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/IAjaxLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/markup/html/IAjaxLink.java
@@ -17,6 +17,7 @@
 package org.apache.wicket.ajax.markup.html;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.util.io.IClusterable;
 
 /**
  * Interface for Ajax callback links.
@@ -27,7 +28,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
  * @author Martijn Dashorst
  */
 @FunctionalInterface
-public interface IAjaxLink
+public interface IAjaxLink extends IClusterable
 {
 	/**
 	 * Listener method invoked on the ajax request generated when the user clicks the link
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
index 5fe61f6..43fd315 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/IDebugBarContributor.java
@@ -16,14 +16,13 @@
  */
 package org.apache.wicket.devutils.debugbar;
 
-import java.io.Serializable;
-
 import org.apache.wicket.Component;
+import org.apache.wicket.util.io.IClusterable;
 
 /**
  * 
  */
-public interface IDebugBarContributor extends Serializable
+public interface IDebugBarContributor extends IClusterable
 {
 	/**
 	 * 
diff --git a/wicket-guice/src/test/java/org/apache/wicket/guice/ITestService.java b/wicket-guice/src/test/java/org/apache/wicket/guice/ITestService.java
index 80ae225..3b270b5 100644
--- a/wicket-guice/src/test/java/org/apache/wicket/guice/ITestService.java
+++ b/wicket-guice/src/test/java/org/apache/wicket/guice/ITestService.java
@@ -21,14 +21,14 @@ package org.apache.wicket.guice;
 public interface ITestService
 {
 	/** */
-	public static final String RESULT = "foo";
+	String RESULT = "foo";
 	/** */
-	public static final String RESULT_RED = "red";
+	String RESULT_RED = "red";
 	/** */
-	public static final String RESULT_BLUE = "blue";
+	String RESULT_BLUE = "blue";
 
 	/**
 	 * @return string
 	 */
-	public String getString();
+	String getString();
 }