You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2026/07/20 11:51:02 UTC
(struts) 01/01: WW-5640 refactor(webjars): rename DefaultWebJarUrlProvider to StrutsWebJarUrlProvider
This is an automated email from the ASF dual-hosted git repository.
lukaszlenart pushed a commit to branch WW-5640-rename-webjar-url-provider
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 0c86e975d8163368d8bb09f03e69bf2f31e4841e
Author: Lukasz Lenart <lu...@apache.org>
AuthorDate: Mon Jul 20 13:50:50 2026 +0200
WW-5640 refactor(webjars): rename DefaultWebJarUrlProvider to StrutsWebJarUrlProvider
Use the Struts* prefix convention for the framework's default
WebJarUrlProvider implementation instead of Default*.
Co-Authored-By: Claude Opus 4.8 <no...@anthropic.com>
---
.../{DefaultWebJarUrlProvider.java => StrutsWebJarUrlProvider.java} | 4 ++--
core/src/main/resources/struts-beans.xml | 2 +-
.../struts2/dispatcher/DefaultStaticContentLoaderWebJarTest.java | 4 ++--
...tWebJarUrlProviderTest.java => StrutsWebJarUrlProviderTest.java} | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/core/src/main/java/org/apache/struts2/webjars/DefaultWebJarUrlProvider.java b/core/src/main/java/org/apache/struts2/webjars/StrutsWebJarUrlProvider.java
similarity index 97%
rename from core/src/main/java/org/apache/struts2/webjars/DefaultWebJarUrlProvider.java
rename to core/src/main/java/org/apache/struts2/webjars/StrutsWebJarUrlProvider.java
index 892ccd47f..d0cf37bb7 100644
--- a/core/src/main/java/org/apache/struts2/webjars/DefaultWebJarUrlProvider.java
+++ b/core/src/main/java/org/apache/struts2/webjars/StrutsWebJarUrlProvider.java
@@ -37,9 +37,9 @@ import java.util.Set;
* Default {@link WebJarUrlProvider} backed by a singleton {@link WebJarVersionLocator}
* (from {@code webjars-locator-lite}). Thread-safe.
*/
-public class DefaultWebJarUrlProvider implements WebJarUrlProvider {
+public class StrutsWebJarUrlProvider implements WebJarUrlProvider {
- private static final Logger LOG = LogManager.getLogger(DefaultWebJarUrlProvider.class);
+ private static final Logger LOG = LogManager.getLogger(StrutsWebJarUrlProvider.class);
private static final String WEBJARS_URL_SEGMENT = "/webjars/";
diff --git a/core/src/main/resources/struts-beans.xml b/core/src/main/resources/struts-beans.xml
index 90912b84e..2de4ebc40 100644
--- a/core/src/main/resources/struts-beans.xml
+++ b/core/src/main/resources/struts-beans.xml
@@ -208,7 +208,7 @@
<bean type="org.apache.struts2.dispatcher.StaticContentLoader"
class="org.apache.struts2.dispatcher.DefaultStaticContentLoader" name="struts"/>
<bean type="org.apache.struts2.webjars.WebJarUrlProvider"
- class="org.apache.struts2.webjars.DefaultWebJarUrlProvider" name="struts"/>
+ class="org.apache.struts2.webjars.StrutsWebJarUrlProvider" name="struts"/>
<bean type="org.apache.struts2.UnknownHandlerManager"
class="org.apache.struts2.DefaultUnknownHandlerManager" name="struts"/>
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderWebJarTest.java b/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderWebJarTest.java
index 009721b08..830a9f0c4 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderWebJarTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/DefaultStaticContentLoaderWebJarTest.java
@@ -68,8 +68,8 @@ public class DefaultStaticContentLoaderWebJarTest {
webJarLoader.setServeStaticContent("true");
webJarLoader.setStaticContentPath("/static");
webJarLoader.setServeStaticBrowserCache("true");
- org.apache.struts2.webjars.DefaultWebJarUrlProvider provider =
- new org.apache.struts2.webjars.DefaultWebJarUrlProvider();
+ org.apache.struts2.webjars.StrutsWebJarUrlProvider provider =
+ new org.apache.struts2.webjars.StrutsWebJarUrlProvider();
provider.setEnabled(String.valueOf(enabled));
provider.setAllowlist("");
provider.setStaticContentPath("/static");
diff --git a/core/src/test/java/org/apache/struts2/webjars/DefaultWebJarUrlProviderTest.java b/core/src/test/java/org/apache/struts2/webjars/StrutsWebJarUrlProviderTest.java
similarity index 96%
rename from core/src/test/java/org/apache/struts2/webjars/DefaultWebJarUrlProviderTest.java
rename to core/src/test/java/org/apache/struts2/webjars/StrutsWebJarUrlProviderTest.java
index 6d8d2d37e..314150409 100644
--- a/core/src/test/java/org/apache/struts2/webjars/DefaultWebJarUrlProviderTest.java
+++ b/core/src/test/java/org/apache/struts2/webjars/StrutsWebJarUrlProviderTest.java
@@ -26,14 +26,14 @@ import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class DefaultWebJarUrlProviderTest {
+public class StrutsWebJarUrlProviderTest {
- private DefaultWebJarUrlProvider provider;
+ private StrutsWebJarUrlProvider provider;
private HttpServletRequest request;
@Before
public void setUp() {
- provider = new DefaultWebJarUrlProvider();
+ provider = new StrutsWebJarUrlProvider();
provider.setEnabled("true");
provider.setAllowlist("");
provider.setStaticContentPath("/static");