WIP - servlet related changes

weld · Jun 13, 2022 · 4c1a05d · 4c1a05d
1 parent 154f417
commit 4c1a05d
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 97 deletions.
diff --git a/environments/se/pom.xml b/environments/se/pom.xml
@@ -24,7 +24,7 @@
     </description>
 
    <properties>
-      <undertow.version>2.2.16.Final</undertow.version>
+      <undertow.version>2.3.0.Alpha1</undertow.version>
    </properties>
 
    <dependencyManagement>

diff --git a/environments/servlet/core/pom.xml b/environments/servlet/core/pom.xml
@@ -143,9 +143,10 @@
         <!-- Undertow support -->
         <dependency>
             <groupId>io.undertow</groupId>
-            <artifactId>undertow-servlet-jakartaee9</artifactId>
+            <artifactId>undertow-servlet</artifactId>
             <version>${undertow.version}</version>
             <scope>provided</scope>
+            <!-- TODO this might not be relevant anymore -->
             <!-- Undertow brings in a dependency that breaks jboss logging processor as it
             enforces usage of javax.annotation.Generated instead of javax.annotation.processing.Generated -->
             <exclusions>

diff --git a/...a/org/jboss/weld/environment/servlet/deployment/ServletContextBeanArchiveHandlerTest.java b/...a/org/jboss/weld/environment/servlet/deployment/ServletContextBeanArchiveHandlerTest.java
@@ -144,34 +144,11 @@ public RequestDispatcher getNamedDispatcher(String name) {
             return null;
         }
 
-        @Override
-        public Servlet getServlet(String name) throws ServletException {
-
-            return null;
-        }
-
-        @Override
-        public Enumeration<Servlet> getServlets() {
-
-            return null;
-        }
-
-        @Override
-        public Enumeration<String> getServletNames() {
-
-            return null;
-        }
-
         @Override
         public void log(String msg) {
 
         }
 
-        @Override
-        public void log(Exception exception, String msg) {
-
-        }
-
         @Override
         public void log(String message, Throwable throwable) {
 

diff --git a/environments/servlet/pom.xml b/environments/servlet/pom.xml
@@ -28,15 +28,11 @@
     </description>
 
     <properties>
-        <jsf.version>3.0.0</jsf.version>
-        <tomcat.version>10.0.16</tomcat.version>
+        <tomcat.version>10.1.0-M16</tomcat.version>
         <jetty.version>11.0.8</jetty.version>
         <jetty9.asm.version>7.0</jetty9.asm.version>
-        <websockets.api>2.0.0</websockets.api>
-        <!-- We need undertow which uses Jakarta 9 packages! -->
-        <undertow.version>2.2.13.Final</undertow.version>
-        <!-- Testing deps -->
-        <apache.httpclient.version>3.1</apache.httpclient.version>
+        <websockets.api>2.1.0</websockets.api>
+        <undertow.version>2.3.0.Alpha1</undertow.version>
     </properties>
 
     <!-- Import the BOMs -->
@@ -46,7 +42,7 @@
             <dependency>
                 <groupId>jakarta.faces</groupId>
                 <artifactId>jakarta.faces-api</artifactId>
-                <version>${jsf.version}</version>
+                <version>${jsf.api.version}</version>
             </dependency>
 
             <dependency>
@@ -61,6 +57,12 @@
                 <version>${tomcat.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.tomcat</groupId>
                 <artifactId>tomcat-catalina</artifactId>

diff --git a/environments/servlet/tests/tomcat/pom.xml b/environments/servlet/tests/tomcat/pom.xml
@@ -43,10 +43,6 @@
             <scope>test</scope>
         </dependency>
 
-        <!-- Used to use jboss version that doesn't yet exist for Jakarta 9
-        <groupId>org.jboss.spec.javax.faces</groupId>
-        <artifactId>jboss-jsf-api_2.3_spec</artifactId>
-        -->
         <dependency>
             <groupId>jakarta.faces</groupId>
             <artifactId>jakarta.faces-api</artifactId>
@@ -82,6 +78,13 @@
             <scope>test</scope>
         </dependency>
 
+        <!-- TODO why do we need this dep now?! -->
+        <dependency>
+            <groupId>org.apache.tomcat.embed</groupId>
+            <artifactId>tomcat-embed-websocket</artifactId>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/modules/web/src/main/java/org/jboss/weld/module/web/HttpSessionBean.java b/modules/web/src/main/java/org/jboss/weld/module/web/HttpSessionBean.java
@@ -25,7 +25,6 @@
 import jakarta.enterprise.inject.spi.InjectionPoint;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionContext;
 
 import org.jboss.weld.bean.builtin.AbstractStaticallyDecorableBuiltInBean;
 import org.jboss.weld.manager.BeanManagerImpl;
@@ -98,51 +97,26 @@ public int getMaxInactiveInterval() {
             return session().getMaxInactiveInterval();
         }
 
-        @Override
-        public HttpSessionContext getSessionContext() {
-            return session().getSessionContext();
-        }
-
         @Override
         public Object getAttribute(String name) {
             return session().getAttribute(name);
         }
 
-        @Override
-        public Object getValue(String name) {
-            return session().getValue(name);
-        }
-
         @Override
         public Enumeration<String> getAttributeNames() {
             return session().getAttributeNames();
         }
 
-        @Override
-        public String[] getValueNames() {
-            return session().getValueNames();
-        }
-
         @Override
         public void setAttribute(String name, Object value) {
             session().setAttribute(name, value);
         }
 
-        @Override
-        public void putValue(String name, Object value) {
-            session().putValue(name, value);
-        }
-
         @Override
         public void removeAttribute(String name) {
             session().removeAttribute(name);
         }
 
-        @Override
-        public void removeValue(String name) {
-            session().removeValue(name);
-        }
-
         @Override
         public void invalidate() {
             session().invalidate();

diff --git a/modules/web/src/main/java/org/jboss/weld/module/web/util/el/ForwardingExpressionFactory.java b/modules/web/src/main/java/org/jboss/weld/module/web/util/el/ForwardingExpressionFactory.java
@@ -32,9 +32,8 @@ public abstract class ForwardingExpressionFactory extends ExpressionFactory {
 
     protected abstract ExpressionFactory delegate();
 
-
     @Override
-    public Object coerceToType(Object obj, Class<?> targetType) {
+    public <T> T coerceToType(Object obj, Class<T> targetType) {
         return delegate().coerceToType(obj, targetType);
     }
 

diff --git a/modules/web/src/main/java/org/jboss/weld/module/web/util/el/ForwardingMethodExpression.java b/modules/web/src/main/java/org/jboss/weld/module/web/util/el/ForwardingMethodExpression.java
@@ -70,12 +70,6 @@ public boolean isParametersProvided() {
         return delegate().isParametersProvided();
     }
 
-    @Override
-    @Deprecated
-    public boolean isParmetersProvided() {
-        return delegate().isParametersProvided();
-    }
-
     @Override
     public int hashCode() {
         return delegate().hashCode();

diff --git a/pom.xml b/pom.xml
@@ -57,7 +57,7 @@
         <arquillian.graphene.version>2.5.4</arquillian.graphene.version>
         <arquillian.weld.version>3.0.2.Final</arquillian.weld.version>
         <arquillian.se.container.version>1.0.2.Final</arquillian.se.container.version>
-        <arquillian.tomcat.version>1.2.0.Alpha1</arquillian.tomcat.version>
+        <arquillian.tomcat.version>1.2.0-SNAPSHOT</arquillian.tomcat.version>
         <arquillian.jetty.version>1.0.0.CR3</arquillian.jetty.version>
         <arquillian.glassfish.version>1.0.2</arquillian.glassfish.version>
         <atinject.tck.version>2.0.1</atinject.tck.version>
@@ -68,29 +68,28 @@
         <classfilewriter.version>1.2.5.Final</classfilewriter.version>
         <spotbugs-maven-plugin.version>4.5.3.0</spotbugs-maven-plugin.version>
         <spotbugs-annotations-version>4.5.3</spotbugs-annotations-version>
-        <glassfish.el.version>2.2.1-b05</glassfish.el.version>
         <groovy.version>3.0.9</groovy.version>
         <htmlunit.version>2.58.0</htmlunit.version>
         <jacoco.version>0.8.7</jacoco.version>
         <jandex.version>2.4.2.Final</jandex.version>
-        <javax.activation.version>2.1.0</javax.activation.version>
-        <jakarta.el.version>4.0.0</jakarta.el.version>
-        <glassfish.jakarta.el.version>4.0.2</glassfish.jakarta.el.version>
-        <jakarta.jms.api.version>3.0.0</jakarta.jms.api.version>
+        <jakarta.activation.version>2.1.0</jakarta.activation.version>
+        <jakarta.el.version>5.0.0</jakarta.el.version>
+        <glassfish.jakarta.el.version>5.0.0-M1</glassfish.jakarta.el.version>
+        <jakarta.jms.api.version>3.1.0</jakarta.jms.api.version>
         <jsf.api.version>4.0.1</jsf.api.version>
         <jboss.logging.version>3.4.3.Final</jboss.logging.version>
         <jboss.logging.processor.version>2.2.1.Final</jboss.logging.processor.version>
         <jboss.logmanager.version>2.1.18.Final</jboss.logmanager.version>
         <jsf.impl.version>4.0.0</jsf.impl.version>
-        <jsp.api.version>3.0.0</jsp.api.version>
-        <jstl.api.version>2.0.0</jstl.api.version>
+        <jsp.api.version>3.1.0</jsp.api.version>
+        <jstl.api.version>3.0.0</jstl.api.version>
         <junit.version>4.13.2</junit.version>
         <log4j.version>1.2.17</log4j.version>
         <shrinkwrap.version>1.2.6</shrinkwrap.version>
         <shrinkwrap.descriptors.version>2.0.0</shrinkwrap.descriptors.version>
         <shrinkwrap.resolver.version>3.1.4</shrinkwrap.resolver.version>
         <testng.version>7.4.0</testng.version>
-        <weld.api.version>5.0.Final</weld.api.version>
+        <weld.api.version>5.0-SNAPSHOT</weld.api.version>
         <weld.logging.tools.version>1.0.3.Final</weld.logging.tools.version>
         <wildfly.arquillian.version>3.0.1.Final</wildfly.arquillian.version>
     </properties>
@@ -128,7 +127,7 @@
             <dependency>
                 <groupId>jakarta.activation</groupId>
                 <artifactId>jakarta.activation-api</artifactId>
-                <version>${javax.activation.version}</version>
+                <version>${jakarta.activation.version}</version>
             </dependency>
 
             <dependency>
@@ -204,12 +203,6 @@
                 <version>${atinject.tck.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.glassfish.web</groupId>
-                <artifactId>el-impl</artifactId>
-                <version>${glassfish.el.version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.classfilewriter</groupId>
                 <artifactId>jboss-classfilewriter</artifactId>

diff --git a/...test/java/org/jboss/weld/tests/alternatives/ee/AlternativeHttpServletRequestProducer.java b/...test/java/org/jboss/weld/tests/alternatives/ee/AlternativeHttpServletRequestProducer.java
@@ -33,6 +33,7 @@
 import jakarta.servlet.AsyncContext;
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletConnection;
 import jakarta.servlet.ServletContext;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletInputStream;
@@ -181,11 +182,6 @@ public boolean isRequestedSessionIdFromURL() {
                 return false;
             }
 
-            @Override
-            public boolean isRequestedSessionIdFromUrl() {
-                return false;
-            }
-
             @Override
             public boolean authenticate(HttpServletResponse response) throws IOException, ServletException {
                 return false;
@@ -336,11 +332,6 @@ public RequestDispatcher getRequestDispatcher(String path) {
                 return null;
             }
 
-            @Override
-            public String getRealPath(String path) {
-                return null;
-            }
-
             @Override
             public int getRemotePort() {
                 return 0;
@@ -395,6 +386,21 @@ public AsyncContext getAsyncContext() {
             public DispatcherType getDispatcherType() {
                 return null;
             }
+
+            @Override
+            public String getRequestId() {
+                return null;
+            }
+
+            @Override
+            public String getProtocolRequestId() {
+                return null;
+            }
+
+            @Override
+            public ServletConnection getServletConnection() {
+                return null;
+            }
         };
     }