remove references to "javax" that can be avoided

lucee · Mar 12, 2024 · 601c7e9 · 601c7e9
1 parent 77b033b
commit 601c7e9
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 80 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -355,6 +355,12 @@
       <artifactId>ulid-creator</artifactId>
       <version>5.2.3</version>
     </dependency>
+    <dependency>
+<groupId>jakarta.platform</groupId>
+<artifactId>jakarta.jakartaee-api</artifactId>
+<version>10.0.0</version>
+<scope>provided</scope>
+</dependency>
   </dependencies>
 
   <repositories>

diff --git a/core/src/main/java/coldfusion/image/Image.java b/core/src/main/java/coldfusion/image/Image.java
@@ -23,8 +23,7 @@
 import java.awt.RenderingHints.Key;
 import java.awt.image.BufferedImage;
 
-import javax.servlet.jsp.PageContext;
-
+import lucee.runtime.PageContext;
 import lucee.runtime.type.Struct;
 
 public interface Image {

diff --git a/core/src/main/java/lucee/commons/color/ColorCaster.java b/core/src/main/java/lucee/commons/color/ColorCaster.java
@@ -20,8 +20,6 @@
 
 import java.awt.Color;
 
-import javax.servlet.ServletException;
-
 import lucee.commons.lang.NumberUtil;
 import lucee.commons.lang.StringUtil;
 import lucee.runtime.exp.ExpressionException;
@@ -38,7 +36,7 @@ public final class ColorCaster {
 	 * @return an int between 0 (badest) and 510 (best)
 	 * @throws ServletException
 	 */
-	public static int contrast(Color left, Color right) throws ServletException {
+	public static int contrast(Color left, Color right) {
 		return (Math.max(left.getRed(), right.getRed()) - Math.min(left.getRed(), right.getRed()))
 				+ (Math.max(left.getGreen(), right.getGreen()) - Math.min(left.getGreen(), right.getGreen()))
 				+ (Math.max(left.getBlue(), right.getBlue()) - Math.max(left.getBlue(), right.getBlue()));

diff --git a/core/src/main/java/lucee/runtime/ComponentPageImpl.java b/core/src/main/java/lucee/runtime/ComponentPageImpl.java
@@ -22,13 +22,12 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map.Entry;
 
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -1043,7 +1042,7 @@ private Charset getCharset(PageContext pc) {
 		return cs;
 	}
 
-	private void callWSDL(PageContext pc, Component component) throws ServletException, IOException, PageException {
+	private void callWSDL(PageContext pc, Component component) throws IOException, PageException {
 		// take wsdl file defined by user
 		String wsdl = component.getWSDLFile();
 		if (!StringUtil.isEmpty(wsdl)) {
@@ -1068,7 +1067,7 @@ private void callWSDL(PageContext pc, Component component) throws ServletExcepti
 		}
 	}
 
-	private void callWebservice(PageContext pc, Component component) throws IOException, ServletException, PageException {
+	private void callWebservice(PageContext pc, Component component) throws IOException, PageException {
 		((ConfigWebPro) ThreadLocalPageContext.getConfig(pc)).getWSHandler().getWSServer(pc).doPost(pc, pc.getHttpServletRequest(), pc.getHttpServletResponse(), component);
 	}
 

diff --git a/core/src/main/java/lucee/runtime/PageContextImpl.java b/core/src/main/java/lucee/runtime/PageContextImpl.java
@@ -49,7 +49,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
-import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.JspWriter;
 import javax.servlet.jsp.el.ExpressionEvaluator;
 import javax.servlet.jsp.el.VariableResolver;
@@ -3133,10 +3132,15 @@ public void reuse(Tag tag, String tagBundleName, String tagBundleVersion) {
 	}
 
 	@Override
-	public void initBody(BodyTag bodyTag, int state) throws JspException {
+	public void initBody(BodyTag bodyTag, int state) throws PageException {
 		if (state != Tag.EVAL_BODY_INCLUDE) {
 			bodyTag.setBodyContent(pushBody());
-			bodyTag.doInitBody();
+			try {
+				bodyTag.doInitBody();
+			}
+			catch (Exception e) {
+				throw Caster.toPageException(e);
+			}
 		}
 	}
 

diff --git a/core/src/main/java/lucee/runtime/config/CFConfigImport.java b/core/src/main/java/lucee/runtime/config/CFConfigImport.java
@@ -11,7 +11,6 @@
 import java.util.zip.ZipInputStream;
 
 import javax.servlet.http.Cookie;
-import javax.servlet.jsp.JspException;
 
 import org.apache.logging.log4j.core.layout.HtmlLayout;
 import org.apache.logging.log4j.core.layout.PatternLayout;
@@ -70,7 +69,7 @@ public class CFConfigImport {
 	private final boolean setPasswordIfNecessary;
 	private final boolean validatePassword;
 	private final boolean flushExistingData;
-	private JspException exd = null;
+	private PageException exd = null;
 
 	public CFConfigImport(Config config, Resource file, Charset charset, String password, String type, Struct placeHolderData, boolean setPasswordIfNecessary,
 			boolean validatePassword, boolean flushExistingData) throws PageException {
@@ -186,18 +185,11 @@ public Struct execute(boolean throwException) throws PageException {
 				pc.getConfig().getFactory().releaseLuceePageContext(pc, true);
 			}
 		}
-		if (throwException && exd != null) throw Caster.toPageException(exd);
+		if (throwException && exd != null) throw exd;
 		return json;
 
 	}
 
-	private void handleException(PageContext pc, Throwable t) {
-		ExceptionUtil.rethrowIfNecessary(t);
-		LogUtil.log(pc, "deploy", t);
-		if (t instanceof JspException) exd = (JspException) t;
-		else exd = Caster.toPageException(t);
-	}
-
 	private static void replacePlaceHolder(Collection coll, Struct placeHolderData) {
 		// ${MAILSERVER_HOST:smtp.sendgrid.net}
 		Iterator<Entry<Key, Object>> it = coll.entryIterator();

diff --git a/core/src/main/java/lucee/runtime/engine/CFMLEngineImpl.java b/core/src/main/java/lucee/runtime/engine/CFMLEngineImpl.java
@@ -60,7 +60,6 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
 
 import org.apache.felix.framework.Felix;
 import org.osgi.framework.BundleContext;
@@ -1610,7 +1609,7 @@ public ControllerState getControllerState() {
 	}
 
 	@Override
-	public void cli(Map<String, String> config, ServletConfig servletConfig) throws IOException, JspException, ServletException {
+	public void cli(Map<String, String> config, ServletConfig servletConfig) throws IOException, ServletException, PageException {
 		ServletContext servletContext = servletConfig.getServletContext();
 		HTTPServletImpl servlet = new HTTPServletImpl(servletConfig, servletContext, servletConfig.getServletName());
 

diff --git a/core/src/main/java/lucee/runtime/ext/tag/BodyTagImpl.java b/core/src/main/java/lucee/runtime/ext/tag/BodyTagImpl.java
@@ -18,10 +18,11 @@
  **/
 package lucee.runtime.ext.tag;
 
-import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyContent;
 import javax.servlet.jsp.tagext.BodyTag;
 
+import lucee.runtime.exp.PageException;
+
 /**
  * Implementation of the BodyTag
  */
@@ -35,12 +36,12 @@ public void setBodyContent(BodyContent bodyContent) {
 	}
 
 	@Override
-	public void doInitBody() throws JspException {
+	public void doInitBody() throws PageException {
 
 	}
 
 	@Override
-	public int doAfterBody() throws JspException {
+	public int doAfterBody() throws PageException {
 		return SKIP_BODY;
 	}
 

diff --git a/core/src/main/java/lucee/runtime/ext/tag/TagImpl.java b/core/src/main/java/lucee/runtime/ext/tag/TagImpl.java
@@ -18,12 +18,12 @@
  **/
 package lucee.runtime.ext.tag;
 
-import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.Tag;
 
 import lucee.commons.lang.StringUtil;
 import lucee.runtime.PageContext;
 import lucee.runtime.exp.ApplicationException;
+import lucee.runtime.exp.PageException;
 
 /**
  * Implementation of the Tag
@@ -63,12 +63,12 @@ public Tag getParent() {
 	}
 
 	@Override
-	public int doStartTag() throws JspException {
+	public int doStartTag() throws PageException {
 		return SKIP_BODY;
 	}
 
 	@Override
-	public int doEndTag() throws JspException {
+	public int doEndTag() throws PageException {
 		return EVAL_PAGE;
 	}
 

diff --git a/core/src/main/java/lucee/runtime/net/http/HttpServletRequestDummy.java b/core/src/main/java/lucee/runtime/net/http/HttpServletRequestDummy.java
@@ -37,7 +37,6 @@
 import javax.servlet.DispatcherType;
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
@@ -800,7 +799,7 @@ public AsyncContext startAsync(ServletRequest arg0, ServletResponse arg1) throws
 	}
 
 	@Override
-	public boolean authenticate(HttpServletResponse arg0) throws IOException, ServletException {
+	public boolean authenticate(HttpServletResponse arg0) throws IOException {
 		throw new RuntimeException("not supported!");
 	}
 
@@ -810,27 +809,27 @@ public String changeSessionId() {
 	}
 
 	@Override
-	public Part getPart(String arg0) throws IOException, ServletException {
+	public Part getPart(String arg0) throws IOException {
 		throw new RuntimeException("not supported!");
 	}
 
 	@Override
-	public Collection<Part> getParts() throws IOException, ServletException {
+	public Collection<Part> getParts() throws IOException {
 		throw new RuntimeException("not supported!");
 	}
 
 	@Override
-	public void login(String arg0, String arg1) throws ServletException {
+	public void login(String arg0, String arg1) {
 		throw new RuntimeException("not supported!");
 	}
 
 	@Override
-	public void logout() throws ServletException {
+	public void logout() {
 		throw new RuntimeException("not supported!");
 	}
 
 	@Override
-	public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) throws IOException, ServletException {
+	public <T extends HttpUpgradeHandler> T upgrade(Class<T> arg0) throws IOException {
 		throw new RuntimeException("not supported!");
 	}
 

diff --git a/core/src/main/java/lucee/runtime/net/http/RequestDispatcherDummy.java b/core/src/main/java/lucee/runtime/net/http/RequestDispatcherDummy.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 
 import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
@@ -31,14 +30,14 @@ public RequestDispatcherDummy(HttpServletRequestDummy dummy) {
 	}
 
 	@Override
-	public void forward(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException {
-		throw new ServletException("operation not supported");
+	public void forward(ServletRequest arg0, ServletResponse arg1) throws IOException {
+		throw new IOException("operation not supported");
 		// TODO impl
 	}
 
 	@Override
-	public void include(ServletRequest arg0, ServletResponse arg1) throws ServletException, IOException {
-		throw new ServletException("operation not supported");
+	public void include(ServletRequest arg0, ServletResponse arg1) throws IOException {
+		throw new IOException("operation not supported");
 		// TODO impl
 	}
 

diff --git a/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java b/core/src/main/java/lucee/runtime/net/http/ServletContextDummy.java
@@ -34,7 +34,6 @@
 import javax.servlet.RequestDispatcher;
 import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
-import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
 import javax.servlet.SessionCookieConfig;
 import javax.servlet.SessionTrackingMode;
@@ -194,7 +193,7 @@ public String getServerInfo() {
 	}
 
 	@Override
-	public Servlet getServlet(String arg0) throws ServletException {
+	public Servlet getServlet(String arg0) {
 		throw new RuntimeException("not supported");
 	}
 
@@ -256,17 +255,17 @@ public javax.servlet.ServletRegistration.Dynamic addServlet(String arg0, Class<?
 	}
 
 	@Override
-	public <T extends Filter> T createFilter(Class<T> arg0) throws ServletException {
+	public <T extends Filter> T createFilter(Class<T> arg0) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public <T extends EventListener> T createListener(Class<T> arg0) throws ServletException {
+	public <T extends EventListener> T createListener(Class<T> arg0) {
 		throw new RuntimeException("not supported");
 	}
 
 	@Override
-	public <T extends Servlet> T createServlet(Class<T> arg0) throws ServletException {
+	public <T extends Servlet> T createServlet(Class<T> arg0) {
 		throw new RuntimeException("not supported");
 	}
 

diff --git a/core/src/main/java/lucee/runtime/tag/Calendar.java b/core/src/main/java/lucee/runtime/tag/Calendar.java
@@ -18,9 +18,8 @@
  **/
 package lucee.runtime.tag;
 
-import javax.servlet.jsp.JspException;
-
 import lucee.runtime.exp.ApplicationException;
+import lucee.runtime.exp.PageException;
 import lucee.runtime.exp.TagNotSupported;
 import lucee.runtime.ext.tag.TagImpl;
 import lucee.runtime.type.dt.DateTime;
@@ -81,7 +80,7 @@ public void release() {
 	}
 
 	@Override
-	public int doStartTag() throws JspException {
+	public int doStartTag() throws PageException {
 		return super.doStartTag();
 	}
 

diff --git a/core/src/main/java/lucee/runtime/tag/Logout.java b/core/src/main/java/lucee/runtime/tag/Logout.java
@@ -18,8 +18,7 @@
  **/
 package lucee.runtime.tag;
 
-import javax.servlet.jsp.JspException;
-
+import lucee.runtime.exp.PageException;
 import lucee.runtime.ext.tag.TagImpl;
 
 /**
@@ -28,7 +27,7 @@
 public final class Logout extends TagImpl {
 
 	@Override
-	public int doStartTag() throws JspException {
+	public int doStartTag() throws PageException {
 		pageContext.clearRemoteUser();
 		return SKIP_BODY;
 	}

diff --git a/core/src/main/java/lucee/runtime/tag/Silent.java b/core/src/main/java/lucee/runtime/tag/Silent.java
@@ -20,9 +20,8 @@
 
 import java.io.IOException;
 
-import javax.servlet.jsp.JspException;
-
 import lucee.commons.lang.ExceptionUtil;
+import lucee.runtime.exp.PageException;
 import lucee.runtime.ext.tag.BodyTagTryCatchFinallyImpl;
 import lucee.runtime.listener.ApplicationContextSupport;
 import lucee.runtime.writer.BodyContentImpl;
@@ -41,7 +40,7 @@ public void setBufferoutput(boolean bufferOutput) {
 	}
 
 	@Override
-	public int doStartTag() throws JspException {
+	public int doStartTag() throws PageException {
 		if (bufferOutput == null) bufferOutput = ((ApplicationContextSupport) pageContext.getApplicationContext()).getBufferOutput() ? Boolean.TRUE : Boolean.FALSE;
 
 		if (bufferOutput.booleanValue()) bc = (BodyContentImpl) pageContext.pushBody();