From b2548542ecbba516a2e4f79d9260ad359e442c1c Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 20 Jul 2026 13:58:04 +0200
Subject: [PATCH] WW-5640 refactor(webjars): rename DefaultWebJarUrlProvider to
 StrutsWebJarUrlProvider (#1795)

Use the Struts* prefix convention for the framework's default
WebJarUrlProvider implementation instead of Default*.

Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com>
---
 ...tWebJarUrlProvider.java => StrutsWebJarUrlProvider.java} | 4 ++--
 core/src/main/resources/struts-beans.xml                    | 2 +-
 .../dispatcher/DefaultStaticContentLoaderWebJarTest.java    | 4 ++--
 ...rlProviderTest.java => StrutsWebJarUrlProviderTest.java} | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename core/src/main/java/org/apache/struts2/webjars/{DefaultWebJarUrlProvider.java => StrutsWebJarUrlProvider.java} (97%)
 rename core/src/test/java/org/apache/struts2/webjars/{DefaultWebJarUrlProviderTest.java => StrutsWebJarUrlProviderTest.java} (96%)

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");