This is an automated email from the ASF dual-hosted git repository.
kusal pushed a commit to branch WW-5411-delete-deprecated-1
in repository https://gitbox.apache.org/repos/asf/struts.git
commit 4944f1838f2752c1e00f19305fe2c23397ccbf81
Author: Kusal Kithul-Godage <g...@kusal.io>
AuthorDate: Mon Jul 8 17:03:38 2024 +1000
WW-5411 Delete deprecated methods from OgnlValueStack
---
.../opensymphony/xwork2/ognl/OgnlValueStack.java | 45 ----------------------
.../xwork2/ognl/OgnlValueStackFactory.java | 9 -----
.../xwork2/ognl/OgnlValueStackTest.java | 2 +-
.../parameter/ParametersInterceptorTest.java | 3 +-
4 files changed, 3 insertions(+), 56 deletions(-)
diff --git
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
index 980d634c1..0da14020d 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
@@ -23,7 +23,6 @@ import com.opensymphony.xwork2.TextProvider;
import com.opensymphony.xwork2.conversion.impl.XWorkConverter;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.ognl.accessor.RootAccessor;
import com.opensymphony.xwork2.util.ClearableValueStack;
import com.opensymphony.xwork2.util.CompoundRoot;
@@ -109,34 +108,6 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
this(vs, xworkConverter, accessor, null, securityMemberAccess);
}
- /**
- * @deprecated since 6.4.0, use {@link #OgnlValueStack(ValueStack,
XWorkConverter, RootAccessor, TextProvider, SecurityMemberAccess)} instead.
- */
- @Deprecated
- protected OgnlValueStack(ValueStack vs,
- XWorkConverter xworkConverter,
- CompoundRootAccessor accessor,
- TextProvider prov,
- boolean allowStaticFieldAccess) {
- this(vs, xworkConverter, accessor, prov, new
SecurityMemberAccess(allowStaticFieldAccess));
- }
-
- /**
- * @deprecated since 6.4.0, use {@link #OgnlValueStack(XWorkConverter,
RootAccessor, TextProvider, SecurityMemberAccess)} instead.
- */
- @Deprecated
- protected OgnlValueStack(XWorkConverter xworkConverter,
CompoundRootAccessor accessor, TextProvider prov, boolean
allowStaticFieldAccess) {
- this(xworkConverter, accessor, prov, new
SecurityMemberAccess(allowStaticFieldAccess));
- }
-
- /**
- * @deprecated since 6.4.0, use {@link #OgnlValueStack(ValueStack,
XWorkConverter, RootAccessor, SecurityMemberAccess)} instead.
- */
- @Deprecated
- protected OgnlValueStack(ValueStack vs, XWorkConverter xworkConverter,
CompoundRootAccessor accessor, boolean allowStaticFieldAccess) {
- this(vs, xworkConverter, accessor, new
SecurityMemberAccess(allowStaticFieldAccess));
- }
-
@Inject
protected void setOgnlUtil(OgnlUtil ognlUtil) {
this.ognlUtil = ognlUtil;
@@ -155,14 +126,6 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
((OgnlContext) context).setKeepLastEvaluation(false);
}
- /**
- * @deprecated since 6.4.0, use {@link #setRoot(XWorkConverter,
RootAccessor, CompoundRoot, SecurityMemberAccess)} instead.
- */
- @Deprecated
- protected void setRoot(XWorkConverter xworkConverter, CompoundRootAccessor
accessor, CompoundRoot compoundRoot, boolean allowStaticFieldAccess) {
- setRoot(xworkConverter, accessor, compoundRoot, new
SecurityMemberAccess(allowStaticFieldAccess));
- }
-
@Inject(StrutsConstants.STRUTS_DEVMODE)
protected void setDevMode(String mode) {
this.devMode = BooleanUtils.toBoolean(mode);
@@ -535,12 +498,4 @@ public class OgnlValueStack implements Serializable,
ValueStack, ClearableValueS
public void useExcludeProperties(Set<Pattern> excludeProperties) {
securityMemberAccess.useExcludeProperties(excludeProperties);
}
-
- /**
- * @deprecated since 6.4.0, no replacement.
- */
- @Deprecated
- protected void setXWorkConverter(final XWorkConverter converter) {
- // no-op
- }
}
diff --git
a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
index 2910d40a6..137889110 100644
--- a/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
+++ b/core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStackFactory.java
@@ -30,7 +30,6 @@ import com.opensymphony.xwork2.util.ValueStackFactory;
import ognl.MethodAccessor;
import ognl.OgnlRuntime;
import ognl.PropertyAccessor;
-import org.apache.commons.lang3.BooleanUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.StrutsConstants;
@@ -159,12 +158,4 @@ public class OgnlValueStackFactory implements
ValueStackFactory {
LOG.debug("Registered custom OGNL PropertyAccessor [{}] for class
[{}]", propertyAccessor.getClass().getName(), cls.getName());
}
}
-
- /**
- * @deprecated since 6.4.0, no replacement.
- */
- @Deprecated
- protected boolean containerAllowsStaticFieldAccess() {
- return BooleanUtils.toBoolean(container.getInstance(String.class,
StrutsConstants.STRUTS_ALLOW_STATIC_FIELD_ACCESS));
- }
}
diff --git
a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
index 7fb560c5b..a983b5d26 100644
--- a/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
+++ b/core/src/test/java/com/opensymphony/xwork2/ognl/OgnlValueStackTest.java
@@ -1061,7 +1061,7 @@ public class OgnlValueStackTest extends XWorkTestCase {
OgnlValueStack stack2 = new OgnlValueStack(vs,
container.getInstance(XWorkConverter.class),
- (CompoundRootAccessor) container.getInstance(RootAccessor.class),
true);
+ (CompoundRootAccessor) container.getInstance(RootAccessor.class),
new SecurityMemberAccess(true));
container.inject(stack2);
assertEquals(vs.getRoot(), stack2.getRoot());
diff --git
a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java
b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java
index b15594f95..1092cc521 100644
---
a/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java
+++
b/core/src/test/java/org/apache/struts2/interceptor/parameter/ParametersInterceptorTest.java
@@ -36,6 +36,7 @@ import com.opensymphony.xwork2.interceptor.ValidationAware;
import com.opensymphony.xwork2.mock.MockActionInvocation;
import com.opensymphony.xwork2.ognl.OgnlValueStack;
import com.opensymphony.xwork2.ognl.OgnlValueStackFactory;
+import com.opensymphony.xwork2.ognl.SecurityMemberAccess;
import com.opensymphony.xwork2.ognl.accessor.CompoundRootAccessor;
import com.opensymphony.xwork2.ognl.accessor.RootAccessor;
import com.opensymphony.xwork2.util.ValueStack;
@@ -964,7 +965,7 @@ public class ParametersInterceptorTest extends
XWorkTestCase {
ValueStack stack = new OgnlValueStack(
container.getInstance(XWorkConverter.class),
(CompoundRootAccessor) container.getInstance(RootAccessor.class),
- container.getInstance(TextProvider.class, "system"), true) {
+ container.getInstance(TextProvider.class, "system"), new
SecurityMemberAccess(true)) {
@Override
public void setValue(String expr, Object value) {
actual.put(expr, value);
