(struts) 01/01: WW-5406 Fix injection order issue for excluded patterns
This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5406-injection-order
in repository https://gitbox.apache.org/repos/asf/struts.git
commit ad49ea866a097396135fb347543ec581bcad4389
Author: Kusal Kithul-Godage
AuthorDate: Thu Apr 18 22:28:30 2024 +1000
WW-5406 Fix injection order issue for excluded patterns
---
.../org/apache/struts2/dispatcher/Dispatcher.java | 23 ++
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
index af5bb5402..a1f9094d1 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/Dispatcher.java
@@ -167,8 +167,9 @@ public class Dispatcher {
*/
private Pattern multipartValidationPattern =
Pattern.compile(MULTIPART_FORM_DATA_REGEX);
+private String actionExcludedPatternsStr;
private String actionExcludedPatternsSeparator = ",";
-private List actionExcludedPatterns = emptyList();
+private List actionExcludedPatterns;
/**
* Provide list of default configuration files.
@@ -355,18 +356,24 @@ public class Dispatcher {
@Inject(value = StrutsConstants.STRUTS_ACTION_EXCLUDE_PATTERN, required =
false)
public void setActionExcludedPatterns(String excludedPatterns) {
-this.actionExcludedPatterns =
buildExcludedPatternsList(excludedPatterns, actionExcludedPatternsSeparator);
+this.actionExcludedPatternsStr = excludedPatterns;
}
-private static List buildExcludedPatternsList(String patterns,
String separator) {
-if (patterns == null || patterns.trim().isEmpty()) {
-return emptyList();
+public List getActionExcludedPatterns() {
+if (actionExcludedPatterns == null) {
+initActionExcludedPatterns();
}
-return
unmodifiableList(Arrays.stream(patterns.split(separator)).map(String::trim).map(Pattern::compile).collect(toList()));
+return actionExcludedPatterns;
}
-public List getActionExcludedPatterns() {
-return actionExcludedPatterns;
+private void initActionExcludedPatterns() {
+if (actionExcludedPatternsStr == null ||
actionExcludedPatternsStr.trim().isEmpty()) {
+actionExcludedPatterns = emptyList();
+return;
+}
+actionExcludedPatterns = unmodifiableList(
+
Arrays.stream(actionExcludedPatternsStr.split(actionExcludedPatternsSeparator))
+
.map(String::trim).map(Pattern::compile).collect(toList()));
}
@Inject
(struts) branch WW-5406-injection-order created (now ad49ea866)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5406-injection-order in repository https://gitbox.apache.org/repos/asf/struts.git at ad49ea866 WW-5406 Fix injection order issue for excluded patterns This branch includes the following new commits: new ad49ea866 WW-5406 Fix injection order issue for excluded patterns The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
(struts) branch WW-5406-injection-order deleted (was ad49ea866)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch WW-5406-injection-order in repository https://gitbox.apache.org/repos/asf/struts.git was ad49ea866 WW-5406 Fix injection order issue for excluded patterns The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(struts) branch master updated (1562e66a8 -> 431053679)
This is an automated email from the ASF dual-hosted git repository. kusal pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/struts.git from 1562e66a8 Merge pull request #912 from atlassian-forks/issue/WW-5408-add-option-to-not-fallback-to-empty-namespace-when-unresolved add ad49ea866 WW-5406 Fix injection order issue for excluded patterns new 431053679 Merge pull request #917 from apache/WW-5406-injection-order The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/struts2/dispatcher/Dispatcher.java | 23 ++ 1 file changed, 15 insertions(+), 8 deletions(-)
(struts) 01/01: Merge pull request #917 from apache/WW-5406-injection-order
This is an automated email from the ASF dual-hosted git repository. kusal pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git commit 4310536799429cb206e2e5b6d90b8f1ff8b12b4a Merge: 1562e66a8 ad49ea866 Author: Kusal Kithul-Godage AuthorDate: Fri Apr 19 08:37:14 2024 +1000 Merge pull request #917 from apache/WW-5406-injection-order .../org/apache/struts2/dispatcher/Dispatcher.java | 23 ++ 1 file changed, 15 insertions(+), 8 deletions(-)
(struts) branch release/struts-7-0-x updated (f59a06063 -> 964590c9a)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git omit f59a06063 Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 add 964590c9a Merge pull request #904 from apache/merge/master-to-7xx-2024-04-07 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (f59a06063) \ N -- N -- N refs/heads/release/struts-7-0-x (964590c9a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. No new revisions were added by this update. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare release STRUTS_7_0_0_M4
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new aca2eb07e [maven-release-plugin] prepare release STRUTS_7_0_0_M4 aca2eb07e is described below commit aca2eb07ef9293575e1975d7810a85a825181a86 Author: Lukasz Lenart AuthorDate: Fri Apr 19 08:38:19 2024 +0200 [maven-release-plugin] prepare release STRUTS_7_0_0_M4 --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index 2154785f6..f0ff835a2 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index b5c19ab00..d9c545444 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-rest-showcase war -7.0.0-M4-SNAPSHOT +7.0.0-M4 Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 51a308c4a..444a2ca62 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 093e02641..4a97085c7 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 16b8caf36..8bbec2e21 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-bom -7.0.0-M4-SNAPSHOT +7.0.0-M4 pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M4-SNAPSHOT +7.0.0-M4 true true @@ -165,7 +165,7 @@ -HEAD +STRUTS_7_0_0_M4 scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index c73248252..10e54aec8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index d8eb4e004..126e80c21 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M4-SNAPSHOT +7.0.0-M4 struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index 50f6f40f1..fd12937e9 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4-SNAP
(struts) annotated tag STRUTS_7_0_0_M4 created (now ea2012ffe)
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a change to annotated tag STRUTS_7_0_0_M4 in repository https://gitbox.apache.org/repos/asf/struts.git at ea2012ffe (tag) tagging aca2eb07ef9293575e1975d7810a85a825181a86 (commit) replaces STRUTS_7_0_0_M3 by Lukasz Lenart on Fri Apr 19 08:38:24 2024 +0200 - Log - [maven-release-plugin] copy for tag STRUTS_7_0_0_M4 --- No new revisions were added by this update.
(struts) branch release/struts-7-0-x updated: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch release/struts-7-0-x in repository https://gitbox.apache.org/repos/asf/struts.git The following commit(s) were added to refs/heads/release/struts-7-0-x by this push: new 8b9173469 [maven-release-plugin] prepare for next development iteration 8b9173469 is described below commit 8b9173469ccf1baf988ba1b3dc654d0d13ff84bc Author: Lukasz Lenart AuthorDate: Fri Apr 19 08:38:28 2024 +0200 [maven-release-plugin] prepare for next development iteration --- apps/pom.xml| 2 +- apps/rest-showcase/pom.xml | 4 ++-- apps/showcase/pom.xml | 2 +- assembly/pom.xml| 2 +- bom/pom.xml | 8 core/pom.xml| 2 +- jakarta/freemarker-jakarta/pom.xml | 2 +- jakarta/pom.xml | 2 +- jakarta/sitemesh2-jakarta/pom.xml | 2 +- jakarta/velocity-tools-jsp-jakarta/pom.xml | 2 +- jakarta/velocity-tools-view-jakarta/pom.xml | 2 +- plugins/async/pom.xml | 2 +- plugins/bean-validation/pom.xml | 2 +- plugins/cdi/pom.xml | 2 +- plugins/config-browser/pom.xml | 2 +- plugins/convention/pom.xml | 2 +- plugins/jasperreports/pom.xml | 2 +- plugins/javatemplates/pom.xml | 2 +- plugins/jfreechart/pom.xml | 2 +- plugins/json/pom.xml| 2 +- plugins/junit/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/rest/pom.xml| 2 +- plugins/sitemesh/pom.xml| 2 +- plugins/spring/pom.xml | 2 +- plugins/testng/pom.xml | 2 +- plugins/tiles/pom.xml | 2 +- plugins/velocity/pom.xml| 2 +- plugins/xslt/pom.xml| 2 +- pom.xml | 6 +++--- 30 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/pom.xml b/apps/pom.xml index f0ff835a2..f02b21a10 100644 --- a/apps/pom.xml +++ b/apps/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-apps pom diff --git a/apps/rest-showcase/pom.xml b/apps/rest-showcase/pom.xml index d9c545444..218b676b3 100644 --- a/apps/rest-showcase/pom.xml +++ b/apps/rest-showcase/pom.xml @@ -24,12 +24,12 @@ org.apache.struts struts2-apps -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-rest-showcase war -7.0.0-M4 +7.0.0-M5-SNAPSHOT Struts 2 Rest Showcase Webapp Struts 2 Rest Showcase Example diff --git a/apps/showcase/pom.xml b/apps/showcase/pom.xml index 444a2ca62..867dac867 100644 --- a/apps/showcase/pom.xml +++ b/apps/showcase/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-apps -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-showcase diff --git a/assembly/pom.xml b/assembly/pom.xml index 4a97085c7..6dc24d2c1 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-assembly diff --git a/bom/pom.xml b/bom/pom.xml index 8bbec2e21..e4e96f59a 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -25,11 +25,11 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-bom -7.0.0-M4 +7.0.0-M5-SNAPSHOT pom Struts 2 Bill of Materials @@ -44,7 +44,7 @@ -7.0.0-M4 +7.0.0-M5-SNAPSHOT true true @@ -165,7 +165,7 @@ -STRUTS_7_0_0_M4 +HEAD scm:git:https://gitbox.apache.org/repos/asf/struts.git scm:git:https://gitbox.apache.org/repos/asf/struts.git https://github.com/apache/struts/ diff --git a/core/pom.xml b/core/pom.xml index 10e54aec8..c03a49dca 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-core jar diff --git a/jakarta/freemarker-jakarta/pom.xml b/jakarta/freemarker-jakarta/pom.xml index 126e80c21..ea6da0bf7 100644 --- a/jakarta/freemarker-jakarta/pom.xml +++ b/jakarta/freemarker-jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-jakarta -7.0.0-M4 +7.0.0-M5-SNAPSHOT struts2-freemarker-jakarta jar diff --git a/jakarta/pom.xml b/jakarta/pom.xml index fd12937e9..d3acd71c7 100644 --- a/jakarta/pom.xml +++ b/jakarta/pom.xml @@ -24,7 +24,7 @@ org.apache.struts struts2-parent -
