WW-5767 Apply value substitution to scoped-constant values

[lukaszlenart]

Fixes WW-5767

Summary

<scoped-constant> values (added in WW-3476) are now run through the injected ValueSubstitutor when the configuration loads, the same way <constant> values have been since 2.5.6. ${env.NAME} and ${system.property} now resolve instead of being kept as literal text.

<package name="admin" extends="struts-default">
    <scoped-constant name="some.scopable.constant" value="${env.SOME_VALUE}"/>
</package>

registerConstant and loadScopedConstants now call one private helper, substituteValue, so the two elements can't drift apart. Substitution still runs once, at load time, and produces a static string. This is not the per-request evaluation that WW-3476 ruled out. PackageConfig, the startup validation and ScopedConstantProvider are unchanged.

Tests

ScopedConstantsSubstitutionTest (new, JUnit 4) with a new fixture, struts-scoped-constants-substitution.xml:

• A scoped constant set to ${ww5767.value} resolves to the system property the test sets, then clears.
• A literal value is kept as written.

The end-to-end test loads struts-default.xml in Dispatcher order, so loadPackages() gets its ValueSubstitutor from the main container, as in production, where it comes from struts-beans.xml.

XmlConfigurationProviderPackagesTest.testScopedConstantIsKeptAsWrittenWithoutValueSubstitutor covers the other branch. The substitutor is injected with required = false, so a provider used without injection keeps values as written. Every harness in the suite injects one through DefaultConfiguration.bootstrapFactories, so no existing test reached that branch.

Before the fix, the end-to-end test failed with but was: "${ww5767.value}". The existing XmlConfigurationProviderEnvsSubstitutionTest still passes after the refactor. The full core suite passes: 3448 tests, 0 failures.

Follow-up

The struts-site page core-developers/package-configuration.md says value substitution is not supported for scoped constants (apache/struts-site#351). That sentence needs updating once this is merged.

🤖 Generated with Claude Code

[Copilot]

Warning

Copilot couldn't run its full agentic review because it didn't start before the timeout. Make sure your repository has a runner available, or add a copilot-code-review.yml file specifying one with the runs-on attribute. See the docs for more details.

Copilot review overview

0 open findings

What changed in this PR

Applies ValueSubstitutor to <scoped-constant> values at configuration load time (matching existing <constant> behavior) to resolve ${env.*} / ${system.*}-style placeholders, and adds regression tests for WW-5767.

Changes:

• Refactors value substitution into a shared helper and applies it to both global constants and scoped constants.
• Adds a new XML fixture and a new JUnit test validating scoped-constant substitution at load time.
• Adds an additional test case to verify behavior when no ValueSubstitutor is configured.

File	Description
core/​src/​main/​java/​org/​apache/​struts2/​config/​providers/​XmlDocConfigurationProvider.java	Centralizes substitution logic and applies it to scoped constants during config load.
core/​src/​test/​java/​org/​apache/​struts2/​config/​ScopedConstantsSubstitutionTest.java	New regression test verifying scoped-constant values are substituted from system properties.
core/​src/​test/​resources/​org/​apache/​struts2/​config/​struts-scoped-constants-substitution.xml	New fixture defining scoped constants used by the regression test.
core/​src/​test/​java/​org/​apache/​struts2/​config/​providers/​XmlConfigurationProviderPackagesTest.java	Adds a test intended to assert literals remain unchanged when no substitutor is present.

🧠 Review effort: Lite

---

💡 Configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud