From 5d1aa6edcf537149f8edf0574ef57ac71d6ba044 Mon Sep 17 00:00:00 2001
From: jdyer1 <jdyer@apache.org>
Date: Mon, 30 Oct 2023 12:42:52 -0500
Subject: [PATCH] WN-5141

- remove el method deprecarted/removed from api
---
 .../org/apache/struts2/jasper/el/ELResolverImpl.java  |  6 ------
 .../struts2/jasper/runtime/JspContextWrapper.java     | 11 +++--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java
index 3555cb7eb..0ba1a85b9 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/el/ELResolverImpl.java
@@ -18,8 +18,6 @@
  */
 package org.apache.struts2.jasper.el;
 
-import java.util.Iterator;
-
 import jakarta.el.ArrayELResolver;
 import jakarta.el.BeanELResolver;
 import jakarta.el.CompositeELResolver;
@@ -133,10 +131,6 @@ public final class ELResolverImpl extends ELResolver {
 		return DefaultResolver.isReadOnly(context, base, property);
 	}
 
-	public Iterator<java.beans.FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) {
-		return DefaultResolver.getFeatureDescriptors(context, base);
-	}
-
 	public Class<?> getCommonPropertyType(ELContext context, Object base) {
 		if (base == null) {
 			return String.class;
diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java
index fdeec90a0..3f1c9fad2 100644
--- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java
+++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/runtime/JspContextWrapper.java
@@ -26,6 +26,9 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.struts2.jasper.compiler.Localizer;
+import org.apache.struts2.jasper.util.Enumerator;
+
 import jakarta.el.ELContext;
 import jakarta.servlet.Servlet;
 import jakarta.servlet.ServletConfig;
@@ -38,14 +41,10 @@ import jakarta.servlet.jsp.JspContext;
 import jakarta.servlet.jsp.JspWriter;
 import jakarta.servlet.jsp.PageContext;
 import jakarta.servlet.jsp.el.ELException;
-import jakarta.servlet.jsp.el.ExpressionEvaluator;
 import jakarta.servlet.jsp.el.VariableResolver;
 import jakarta.servlet.jsp.tagext.BodyContent;
 import jakarta.servlet.jsp.tagext.VariableInfo;
 
-import org.apache.struts2.jasper.compiler.Localizer;
-import org.apache.struts2.jasper.util.Enumerator;
-
 /**
  * Implementation of a JSP Context Wrapper.
  * 
@@ -296,10 +295,6 @@ public class JspContextWrapper extends PageContext implements VariableResolver {
 		return invokingJspCtxt.popBody();
 	}
 
-	public ExpressionEvaluator getExpressionEvaluator() {
-		return invokingJspCtxt.getExpressionEvaluator();
-	}
-
 	public void handlePageException(Exception ex) throws IOException,
 			ServletException {
 		// Should never be called since handleException() called with a