chore: bump to Jakarta EE 11

Author: hantsy

.github/workflows/build.yml

@@ -14,11 +14,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Set up JDK 17
+      - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: 17
-          distribution: 'zulu'
+          java-version: "21"
+          distribution: "zulu"
           cache: "maven"
       - name: Build with Maven
         run: mvn clean package --file pom.xml

README.md

@@ -2,11 +2,12 @@
 
 [![build](https://github.com/hantsy/jakartaee-mvc-sample/actions/workflows/build.yml/badge.svg)](https://github.com/hantsy/jakartaee-mvc-sample/actions/workflows/build.yml)
 
-As an alternative to Jakarta Faces, which is used to build web UIs with components, the [Jakarta MVC](https://www.mvc-spec.org/) spec is similar to traditional MVC frameworks, such as Apache Struts and Spring MVC, and provides the capability to build action-based web applications.
+As an alternative to Jakarta Faces, which is used to build web UIs with components, the [Jakarta MVC](https://www.mvc-spec.org/) spec is similar to traditional MVC frameworks, such as Apache Struts and Spring MVC, and enables the development of action-based web applications.
 
-The repository has already been upgraded to Jakarta EE 10.
+The repository has already been upgraded to Jakarta EE 11.
 
-* The Jakarta EE 8-based code was archived and also tagged with [v1.0 tag](https://github.com/hantsy/jakartaee-mvc-sample/releases/tag/v1.0).
+* For the Jakarta EE 10 version, check the release [Archive for Jakarta EE 10](https://github.com/hantsy/jakartaee-mvc-sample/releases/tag/ee10).
+* For the old Jakarta EE 8 version, check the release [Archive for Jakarta EE 8](https://github.com/hantsy/jakartaee-mvc-sample/releases/tag/v1.0).
 
 [Jakarta MVC](https://www.mvc-spec.org/) is based on the existing  JAX-RS specs, reuses the JAX-RS APIs, and adds additional APIs for specific *action* features.
 
@@ -16,6 +17,9 @@ The repository has already been upgraded to Jakarta EE 10.
 * Resteasy( Wildfly)
 * <del>Apache CXF</del> MVC 2.0 remove CXF support.
 
+> [!WARNING]
+> Jakarta MVC 3.0/Eclipse Krazo 4.0 removed Faclets as the view engine, and switched to Jakarta Pages as the default view engine, but it lacks a `Composite View Pattern` to layout views. I restored the `FaceletsViewEngine` that was deleted in the Eclipse Krazo 4.0, and reused the former Facelets views.
+
 ![home](./home.png)
 
 ![task list](./tasks.png)

pom.xml

@@ -13,7 +13,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.release>17</maven.compiler.release>
+        <maven.compiler.release>21</maven.compiler.release>
         <failOnMissingWebXml>false</failOnMissingWebXml>
 
         <!-- Maven Plugins -->
@@ -27,10 +27,10 @@
 
         <!-- Jakarta EE API -->
         <jakartaee-api.version>10.0.0</jakartaee-api.version>
-        <jakarta.mvc-api.version>2.1.0</jakarta.mvc-api.version>     
+        <jakarta.mvc-api.version>3.0.0</jakarta.mvc-api.version>
 
         <!-- Eclipse Krazo -->
-        <krazo.version>3.0.1</krazo.version>
+        <krazo.version>4.0.0</krazo.version>
 
         <!-- Arquillian BOM -->
         <arquillian.version>1.10.0.Final</arquillian.version>
@@ -47,10 +47,10 @@
         <hamcrest.version>3.0</hamcrest.version> 
 
         <!-- Glassfish server -->
-        <glassfish.version>7.0.24</glassfish.version>
+        <glassfish.version>8.0.0</glassfish.version>
         <arquillian-glassfish.version>7.0.14</arquillian-glassfish.version>
-        <jersey.version>3.1.0</jersey.version>
-        <eclipselink.version>4.0.9</eclipselink.version>
+        <jersey.version>4.0.0</jersey.version>
+        <eclipselink.version>5.0.0-B13</eclipselink.version>
 
         <!-- By default, skip tests -->
         <skipTests>true</skipTests>
@@ -117,6 +117,7 @@
                 <groupId>jakarta.mvc</groupId>
                 <artifactId>jakarta.mvc-api</artifactId>
                 <version>${jakarta.mvc-api.version}</version>
+                <scope>provided</scope>
             </dependency>
             <!-- https://mvnrepository.com/artifact/org.eclipse.krazo/krazo-jersey -->
             <dependency>
@@ -227,6 +228,7 @@
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
         </dependency>
 
     </dependencies>
@@ -328,7 +330,7 @@
                         <version>${cargo-maven3-plugin.version}</version>
                         <configuration>
                             <container>
-                                <containerId>glassfish7x</containerId>
+                                <containerId>glassfish8x</containerId>
                                 <zipUrlInstaller>
                                     <url>
                                         https://github.com/eclipse-ee4j/glassfish/releases/download/${glassfish.version}/glassfish-${glassfish.version}.zip
@@ -338,7 +340,7 @@
                             </container>
                             <configuration>
                                 <!-- the configuration used to deploy -->
-                                <home>${project.build.directory}/glassfish7x-home</home>
+                                <home>${project.build.directory}/glassfish8x-home</home>
                                 <properties>
                                     <cargo.remote.password></cargo.remote.password>
                                     <cargo.glassfish.removeDefaultDatasource>true
@@ -409,7 +411,7 @@
                                 --add-opens java.base/java.lang=ALL-UNNAMED
                             </argLine>
                             <environmentVariables>
-                                <GLASSFISH_HOME>${project.build.directory}/glassfish7</GLASSFISH_HOME>
+                                <GLASSFISH_HOME>${project.build.directory}/glassfish8</GLASSFISH_HOME>
                             </environmentVariables>
                         </configuration>
                     </plugin>

src/main/java/com/example/Bootstrap.java

@@ -2,21 +2,19 @@
 
 import com.example.domain.Task;
 import com.example.domain.TaskRepository;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.event.Startup;
+import jakarta.inject.Inject;
+import jakarta.transaction.Transactional;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import jakarta.annotation.PostConstruct;
-import jakarta.ejb.Singleton;
-import jakarta.ejb.Startup;
-import jakarta.inject.Inject;
 
-/**
- *
- * @author hantsy
- */
-@Startup
-@Singleton
+@ApplicationScoped
+@Transactional
 public class Bootstrap {
 
     @Inject
@@ -25,8 +23,7 @@ public class Bootstrap {
     @Inject
     TaskRepository taskRepository;
 
-    @PostConstruct
-    public void init() {
+    public void init(@Observes Startup startup) {
         LOG.log(Level.INFO, "bootstraping application...");
 
         Stream.of("first", "second")
@@ -38,7 +35,6 @@ public void init() {
                     return task;
                 })
                 .map(data -> taskRepository.save(data))
-                .collect(Collectors.toList())
                 .forEach(task -> LOG.log(Level.INFO, " task saved: {0}", new Object[]{task}));
     }
 }

src/main/java/com/example/config/MvcConfig.java

@@ -1,8 +1,12 @@
 package com.example.config;
 
+import jakarta.mvc.engine.ViewEngine;
 import jakarta.ws.rs.ApplicationPath;
 import jakarta.ws.rs.core.Application;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @ApplicationPath("mvc")
 public class MvcConfig extends Application {
 
@@ -33,14 +37,16 @@ public class MvcConfig extends Application {
      *
      *
      * ViewEngine.VIEW_FOLDER
-     *
+     * <p>
      * Csrf.CSRF_PROTECTION
-     *
+     * <p>
      * Csrf.CSRF_HEADER_NAME
-     *
-     *
-     *
-     * @Override public Map<String, Object> getProperties() { final Map<String, Object> map = new HashMap<>();
-     * map.put(ViewEngine.VIEW_FOLDER, "/jsp/"); return map; }
      */
+
+//    @Override
+//    public Map<String, Object> getProperties() {
+//        final Map<String, Object> map = new HashMap<>();
+//        map.put(ViewEngine.VIEW_EXTENSION, "xhtml");
+//        return map;
+//    }
 }

src/main/java/com/example/domain/Task.java

@@ -129,48 +129,14 @@ public void setLastModifiedDate(LocalDateTime lastModifiedDate) {
     }
 
     @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 67 * hash + Objects.hashCode(this.id);
-        hash = 67 * hash + Objects.hashCode(this.name);
-        hash = 67 * hash + Objects.hashCode(this.description);
-        hash = 67 * hash + Objects.hashCode(this.status);
-        hash = 67 * hash + Objects.hashCode(this.createdDate);
-        hash = 67 * hash + Objects.hashCode(this.lastModifiedDate);
-        return hash;
+    public boolean equals(Object o) {
+        if (!(o instanceof Task task)) return false;
+        return Objects.equals(name, task.name);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final Task other = (Task) obj;
-        if (!Objects.equals(this.name, other.name)) {
-            return false;
-        }
-        if (!Objects.equals(this.description, other.description)) {
-            return false;
-        }
-        if (!Objects.equals(this.id, other.id)) {
-            return false;
-        }
-        if (this.status != other.status) {
-            return false;
-        }
-        if (!Objects.equals(this.createdDate, other.createdDate)) {
-            return false;
-        }
-        if (!Objects.equals(this.lastModifiedDate, other.lastModifiedDate)) {
-            return false;
-        }
-        return true;
+    public int hashCode() {
+        return Objects.hashCode(name);
     }
 
     @PrePersist

src/main/java/com/example/domain/TaskRepository.java

@@ -1,22 +1,25 @@
 package com.example.domain;
 
-import java.util.List;
-import jakarta.ejb.Stateless;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.inject.Inject;
 import jakarta.persistence.EntityManager;
-import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.TypedQuery;
 import jakarta.persistence.criteria.CriteriaBuilder;
 import jakarta.persistence.criteria.CriteriaQuery;
 import jakarta.persistence.criteria.Root;
+import jakarta.transaction.Transactional;
+
+import java.util.List;
 
 /**
  *
  * @author hantsy
  */
-@Stateless
+@ApplicationScoped
+@Transactional
 public class TaskRepository {
 
-    @PersistenceContext
+    @Inject
     EntityManager em;
 
     public Task findById(Long id) {

src/main/java/com/example/web/TaskForm.java

@@ -50,41 +50,22 @@ public void setDescription(String description) {
     }
 
     @Override
-    public int hashCode() {
-        int hash = 7;
-        hash = 61 * hash + Objects.hashCode(this.id);
-        hash = 61 * hash + Objects.hashCode(this.name);
-        hash = 61 * hash + Objects.hashCode(this.description);
-        return hash;
+    public boolean equals(Object o) {
+        if (!(o instanceof TaskForm taskForm)) return false;
+        return Objects.equals(id, taskForm.id) && Objects.equals(name, taskForm.name) && Objects.equals(description, taskForm.description);
     }
 
     @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-            return true;
-        }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
-            return false;
-        }
-        final TaskForm other = (TaskForm) obj;
-        if (!Objects.equals(this.name, other.name)) {
-            return false;
-        }
-        if (!Objects.equals(this.description, other.description)) {
-            return false;
-        }
-        if (!Objects.equals(this.id, other.id)) {
-            return false;
-        }
-        return true;
+    public int hashCode() {
+        return Objects.hash(id, name, description);
     }
 
     @Override
     public String toString() {
-        return "TaskForm{" + "id=" + id + ", name=" + name + ", description=" + description + '}';
+        return "TaskForm{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                ", description='" + description + '\'' +
+                '}';
     }
-  
 }

src/main/java/org/eclipse/krazo/engine/FaceletsViewEngine.java

@@ -0,0 +1,48 @@
+package org.eclipse.krazo.engine;
+
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.mvc.engine.ViewEngine;
+import jakarta.mvc.engine.ViewEngineContext;
+import jakarta.mvc.engine.ViewEngineException;
+import jakarta.servlet.ServletException;
+import java.io.IOException;
+
+/**
+ * Implementation of the JSF Facelets engine. Uses a method in its base class to forward
+ * a request back to the servlet container.
+ *
+ * @author Manfred Riem
+ * @author Santiago Pericas-Geertsen
+ * @see ViewEngineBase#resolveView(jakarta.mvc.engine.ViewEngineContext)
+ */
+@Priority(ViewEngine.PRIORITY_BUILTIN)
+@ApplicationScoped
+public class FaceletsViewEngine extends ServletViewEngine {
+
+    /**
+     * Assumes that any view that ends with {@code .xhtml} is a facelet.
+     *
+     * @param view the name of the view.
+     * @return {@code true} if supported or {@code false} if not.
+     */
+    @Override
+    public boolean supports(String view) {
+        return view.endsWith(".xhtml");
+    }
+
+    /**
+     * Forwards request to servlet container.
+     *
+     * @param context view engine context.
+     * @throws ViewEngineException if any error occurs.
+     */
+    @Override
+    public void processView(ViewEngineContext context) throws ViewEngineException {
+        try {
+            forwardRequest(context, "*.xhtml");
+        } catch (ServletException | IOException e) {
+            throw new ViewEngineException(e);
+        }
+    }
+}