[struts] 01/02: WW-5114 Drops deprecated struts.localeProvider

[lukaszlenart]

This is an automated email from the ASF dual-hosted git repository.

lukaszlenart pushed a commit to branch WW-5113-5114-drop
in repository https://gitbox.apache.org/repos/asf/struts.git

commit f20894552d6c8352617e36e3474cd5c2a3f8040d
Author: Lukasz Lenart <lukaszlen...@apache.org>
AuthorDate: Sat Jan 23 17:43:26 2021 +0100

    WW-5114 Drops deprecated struts.localeProvider
---
 core/src/main/java/org/apache/struts2/StrutsConstants.java |  7 -------
 .../org/apache/struts2/config/entities/ConstantConfig.java | 14 --------------
 2 files changed, 21 deletions(-)

diff --git a/core/src/main/java/org/apache/struts2/StrutsConstants.java 
b/core/src/main/java/org/apache/struts2/StrutsConstants.java
index 8009eb4..d4f207f 100644
--- a/core/src/main/java/org/apache/struts2/StrutsConstants.java
+++ b/core/src/main/java/org/apache/struts2/StrutsConstants.java
@@ -220,13 +220,6 @@ public final class StrutsConstants {
     @Deprecated
     public static final String STRUTS_XWORKTEXTPROVIDER = 
"struts.xworkTextProvider";
 
-    /**
-     * The {@link com.opensymphony.xwork2.LocaleProvider} implementation class
-     * @deprecated use {@link StrutsConstants#STRUTS_LOCALE_PROVIDER_FACTORY} 
instead
-     */
-    @Deprecated
-    public static final String STRUTS_LOCALE_PROVIDER = 
"struts.localeProvider";
-
     /** The {@link com.opensymphony.xwork2.LocaleProviderFactory} 
implementation class */
     public static final String STRUTS_LOCALE_PROVIDER_FACTORY = 
"struts.localeProviderFactory";
 
diff --git 
a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java 
b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
index 3c44fac..ac0cf0d 100644
--- a/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
+++ b/core/src/main/java/org/apache/struts2/config/entities/ConstantConfig.java
@@ -88,7 +88,6 @@ public class ConstantConfig {
     private BeanConfig xworkConverter;
     private Boolean mapperAlwaysSelectFullNamespace;
     private BeanConfig xworkTextProvider;
-    private BeanConfig localeProvider;
     private BeanConfig localeProviderFactory;
     private String mapperIdParameterName;
     private Boolean ognlAllowStaticFieldAccess;
@@ -219,7 +218,6 @@ public class ConstantConfig {
         map.put(StrutsConstants.STRUTS_XWORKCONVERTER, 
beanConfToString(xworkConverter));
         map.put(StrutsConstants.STRUTS_ALWAYS_SELECT_FULL_NAMESPACE, 
Objects.toString(mapperAlwaysSelectFullNamespace, null));
         map.put(StrutsConstants.STRUTS_XWORKTEXTPROVIDER, 
beanConfToString(xworkTextProvider));
-        map.put(StrutsConstants.STRUTS_LOCALE_PROVIDER, 
beanConfToString(localeProvider));
         map.put(StrutsConstants.STRUTS_LOCALE_PROVIDER_FACTORY, 
beanConfToString(localeProviderFactory));
         map.put(StrutsConstants.STRUTS_ID_PARAMETER_NAME, 
mapperIdParameterName);
         map.put(StrutsConstants.STRUTS_ALLOW_STATIC_FIELD_ACCESS, 
Objects.toString(ognlAllowStaticFieldAccess, null));
@@ -792,18 +790,6 @@ public class ConstantConfig {
         this.xworkTextProvider = new BeanConfig(clazz, clazz.getName());
     }
 
-    public BeanConfig getLocaleProvider() {
-        return localeProvider;
-    }
-
-    public void setLocaleProvider(BeanConfig localeProvider) {
-        this.localeProvider = localeProvider;
-    }
-
-    public void setLocaleProvider(Class<?> clazz) {
-        this.localeProvider = new BeanConfig(clazz, clazz.getName());
-    }
-
     public BeanConfig getLocaleProviderFactory() {
         return localeProviderFactory;
     }