From 67ceea6021551c2538ab7ab3a0b29cf21b00499f Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Wed, 6 Nov 2024 11:42:28 -0500 Subject: [PATCH 1/3] MYFACES-4692: provide default implementations for getActionExpression and setActionExpression --- .../java/jakarta/faces/component/ActionSource.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/jakarta/faces/component/ActionSource.java b/api/src/main/java/jakarta/faces/component/ActionSource.java index cd45737754..2575b42588 100755 --- a/api/src/main/java/jakarta/faces/component/ActionSource.java +++ b/api/src/main/java/jakarta/faces/component/ActionSource.java @@ -35,7 +35,13 @@ public interface ActionSource public void removeActionListener(jakarta.faces.event.ActionListener listener); - public MethodExpression getActionExpression(); - - public void setActionExpression(MethodExpression action); + default MethodExpression getActionExpression() + { + throw new UnsupportedOperationException(); + } + + default void setActionExpression(MethodExpression action) + { + throw new UnsupportedOperationException(); + } } From c275646b0d8f5cfb4e1330c7e4a45ef67bd20335 Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Mon, 18 Nov 2024 13:56:01 -0500 Subject: [PATCH 2/3] Exclude files from builder plugin Update myfaces-builder-plugin to 1.0.12 Update pom to exlude package.html --- api/pom.xml | 4 ++++ impl/pom.xml | 1 + parent/pom.xml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/pom.xml b/api/pom.xml index ccc15f51c9..16eb7de0c2 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -138,6 +138,9 @@ myfaces-builder-plugin + + **/src/main/java/jakarta/faces/component/ActionSource.java + build-metadata @@ -147,6 +150,7 @@ 20 componentClass20.vm + **/src/main/java/jakarta/faces/component/ActionSource.java make-components diff --git a/impl/pom.xml b/impl/pom.xml index bf94583264..d7b381d95a 100644 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -169,6 +169,7 @@ 20 componentClass20.vm + **/package.html make-components diff --git a/parent/pom.xml b/parent/pom.xml index 6ba755cecd..0c33f3213b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -187,7 +187,7 @@ org.apache.myfaces.buildtools myfaces-builder-plugin - 1.0.11 + 1.0.12 From 851d27488a0aa74e8533c19d6d2e1c7f0cc055ab Mon Sep 17 00:00:00 2001 From: Volodymyr Siedlecki Date: Tue, 19 Nov 2024 10:41:45 -0500 Subject: [PATCH 3/3] Add missing methods to ActionSource2 --- api/src/main/java/jakarta/faces/component/ActionSource2.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/src/main/java/jakarta/faces/component/ActionSource2.java b/api/src/main/java/jakarta/faces/component/ActionSource2.java index ce9e558553..a50d0bbfdc 100644 --- a/api/src/main/java/jakarta/faces/component/ActionSource2.java +++ b/api/src/main/java/jakarta/faces/component/ActionSource2.java @@ -19,11 +19,15 @@ package jakarta.faces.component; +import jakarta.el.MethodExpression; + /** * See Javadoc of Faces Specification */ @Deprecated(since = "4.1", forRemoval = true) public interface ActionSource2 extends ActionSource { + MethodExpression getActionExpression(); + void setActionExpression(MethodExpression action); }