Merge pull request #297 from rokon12/jakarta11-jdk17

Adopt Jakarta EE 11

.github/workflows/main.yml

@@ -16,20 +16,28 @@ on:
 jobs:
   formatting:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [17]
     steps:
       - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: ${{matrix.java}}
+          distribution: 'temurin'
+      - name: Print Java Version
+        run: java -version
       - uses: axel-op/googlejavaformat-action@v3
         with:
-          # This version works will all IDEs including Eclipse.
-          version: 1.6
+          args: "--set-exit-if-changed --dry-run --skip-reflowing-long-strings"
+          version: v1.22.0
           skip-commit: true
-          # args: "--dry-run --set-exit-if-changed"        
   build:
     runs-on: ubuntu-latest
     needs: [formatting]
     strategy:
       matrix:
-        java: [11]
+        java: [17]
     steps:
       - uses: actions/checkout@v3
       - name: Set up Java

.github/workflows/nightly.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Cache Maven packages
         uses: actions/cache@v3

README.md

@@ -26,7 +26,7 @@ The [project website](https://eclipse-ee4j.github.io/cargotracker/) has detailed
 The simplest steps are the following (no IDE required):
 
 * Get the project source code.
-* Ensure you are running Java SE 11 or Java SE 17.
+* Ensure you are running Java SE 17+.
 * Make sure JAVA_HOME is set.
 * As long as you have Maven set up properly, navigate to the project source root and type:
 ```

nightly.yml

@@ -46,7 +46,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '11'
+          java-version: '17'
 
       - name: Cache Maven packages
         uses: actions/cache@v3

pom.xml

@@ -21,8 +21,8 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.report.sourceEncoding>UTF-8</project.report.sourceEncoding>
-    <maven.compiler.release>11</maven.compiler.release>
-    <jakartaee-api.version>10.0.0</jakartaee-api.version>
+    <maven.compiler.release>17</maven.compiler.release>
+    <jakartaee-api.version>11.0.0-M2</jakartaee-api.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -32,7 +32,7 @@
       <dependency>
         <groupId>org.jboss.arquillian</groupId>
         <artifactId>arquillian-bom</artifactId>
-        <version>1.7.1.Final</version>
+        <version>1.8.0.Final</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -52,6 +52,13 @@
       <version>${jakartaee-api.version}</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>jakarta.xml.bind</groupId>
+      <artifactId>jakarta.xml.bind-api</artifactId>
+      <version>4.0.2</version>
+    </dependency>
+
     <!-- The third-party dependencies this application has -->
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -113,13 +120,26 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.13.0</version>
       </plugin>
+
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
         <version>3.3.1</version>
       </plugin>
+      <plugin>
+        <groupId>com.diffplug.spotless</groupId>
+        <artifactId>spotless-maven-plugin</artifactId>
+        <version>2.37.0</version>
+        <configuration>
+          <java>
+            <googleJavaFormat>
+              <version>1.22.0</version>
+            </googleJavaFormat>
+          </java>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
@@ -139,7 +159,7 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <payara.version>6.2023.12</payara.version>
+        <payara.version>6.2024.7</payara.version>
         <!-- Application properties -->
         <webapp.graphTraversalUrl>http://localhost:8080/cargo-tracker/rest/graph-traversal/shortest-path</webapp.graphTraversalUrl>
         <db.driverClass>org.h2.jdbcx.JdbcDataSource</db.driverClass>
@@ -455,6 +475,7 @@
           <type>pom</type>
           <scope>test</scope>
         </dependency>
+
       </dependencies>
 
       <build>
@@ -463,7 +484,7 @@
           <plugin>
             <groupId>io.openliberty.tools</groupId>
             <artifactId>liberty-maven-plugin</artifactId>
-            <version>3.8.2</version>
+            <version>3.10.3</version>
             <configuration>
               <copyDependencies>
                 <dependencyGroup>

src/main/java/org/eclipse/cargotracker/application/BookingService.java

@@ -1,10 +1,10 @@
 package org.eclipse.cargotracker.application;
 
-import java.time.LocalDate;
-import java.util.List;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.Future;
 import jakarta.validation.constraints.NotNull;
+import java.time.LocalDate;
+import java.util.List;
 import org.eclipse.cargotracker.domain.model.cargo.Itinerary;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;
 import org.eclipse.cargotracker.domain.model.location.UnLocode;

src/main/java/org/eclipse/cargotracker/application/HandlingEventService.java

@@ -1,8 +1,8 @@
 package org.eclipse.cargotracker.application;
 
-import java.time.LocalDateTime;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
+import java.time.LocalDateTime;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;
 import org.eclipse.cargotracker.domain.model.handling.CannotCreateHandlingEventException;
 import org.eclipse.cargotracker.domain.model.handling.HandlingEvent;

src/main/java/org/eclipse/cargotracker/application/internal/DefaultBookingService.java

@@ -1,12 +1,11 @@
 package org.eclipse.cargotracker.application.internal;
 
+import jakarta.ejb.Stateless;
+import jakarta.inject.Inject;
 import java.time.LocalDate;
-import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import jakarta.ejb.Stateless;
-import jakarta.inject.Inject;
 import org.eclipse.cargotracker.application.BookingService;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;
 import org.eclipse.cargotracker.domain.model.cargo.CargoRepository;
@@ -49,7 +48,7 @@ public List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId) {
     Cargo cargo = cargoRepository.find(trackingId);
 
     if (cargo == null) {
-      return Collections.emptyList();
+      return List.of();
     }
 
     return routingService.fetchRoutesForSpecification(cargo.getRouteSpecification());

src/main/java/org/eclipse/cargotracker/application/internal/DefaultCargoInspectionService.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.application.internal;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import org.eclipse.cargotracker.application.ApplicationEvents;
 import org.eclipse.cargotracker.application.CargoInspectionService;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;

src/main/java/org/eclipse/cargotracker/application/internal/DefaultHandlingEventService.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.application.internal;
 
-import java.time.LocalDateTime;
-import java.util.logging.Logger;
 import jakarta.ejb.Stateless;
 import jakarta.inject.Inject;
+import java.time.LocalDateTime;
+import java.util.logging.Logger;
 import org.eclipse.cargotracker.application.ApplicationEvents;
 import org.eclipse.cargotracker.application.HandlingEventService;
 import org.eclipse.cargotracker.domain.model.cargo.TrackingId;

src/main/java/org/eclipse/cargotracker/application/util/ApplicationSettings.java

@@ -1,16 +1,17 @@
 package org.eclipse.cargotracker.application.util;
 
-import java.io.Serializable;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
+import java.io.Serial;
+import java.io.Serializable;
 
 /**
  * Application settings. Although this is stored in the database, it is not a true part of the
  * domain model but simply an application infrastructure artifact.
  */
 @Entity
 public class ApplicationSettings implements Serializable {
-  private static final long serialVersionUID = 1L;
+  @Serial private static final long serialVersionUID = 1L;
 
   @Id private Long id;
 

src/main/java/org/eclipse/cargotracker/application/util/RestConfiguration.java

@@ -1,9 +1,9 @@
 package org.eclipse.cargotracker.application.util;
 
-import java.util.HashMap;
-import java.util.Map;
 import jakarta.ws.rs.ApplicationPath;
 import jakarta.ws.rs.core.Application;
+import java.util.HashMap;
+import java.util.Map;
 import org.glassfish.jersey.server.ServerProperties;
 
 /** Jakarta REST configuration. */

src/main/java/org/eclipse/cargotracker/application/util/SampleDataGenerator.java

@@ -1,9 +1,5 @@
 package org.eclipse.cargotracker.application.util;
 
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Arrays;
-import java.util.logging.Logger;
 import jakarta.annotation.PostConstruct;
 import jakarta.ejb.Singleton;
 import jakarta.ejb.Startup;
@@ -14,6 +10,11 @@
 import jakarta.persistence.LockModeType;
 import jakarta.persistence.NoResultException;
 import jakarta.persistence.PersistenceContext;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Logger;
 import org.eclipse.cargotracker.domain.model.cargo.Cargo;
 import org.eclipse.cargotracker.domain.model.cargo.Itinerary;
 import org.eclipse.cargotracker.domain.model.cargo.Leg;
@@ -107,7 +108,7 @@ private void loadSampleCargos() {
 
     Itinerary itinerary1 =
         new Itinerary(
-            Arrays.asList(
+            List.of(
                 new Leg(
                     SampleVoyages.HONGKONG_TO_NEW_YORK,
                     SampleLocations.HONGKONG,

src/main/java/org/eclipse/cargotracker/domain/model/cargo/Cargo.java

@@ -1,6 +1,5 @@
 package org.eclipse.cargotracker.domain.model.cargo;
 
-import java.io.Serializable;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
@@ -9,6 +8,9 @@
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.NamedQuery;
 import jakarta.validation.constraints.NotNull;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Objects;
 import org.apache.commons.lang3.Validate;
 import org.eclipse.cargotracker.domain.model.handling.HandlingEvent;
 import org.eclipse.cargotracker.domain.model.handling.HandlingHistory;
@@ -57,7 +59,7 @@
     query = "Select c from Cargo c where c.trackingId = :trackingId")
 public class Cargo implements Serializable {
 
-  private static final long serialVersionUID = 1L;
+  @Serial private static final long serialVersionUID = 1L;
 
   @Id @GeneratedValue private Long id;
 
@@ -113,12 +115,16 @@ public RouteSpecification getRouteSpecification() {
     return routeSpecification;
   }
 
-  /** @return The delivery. Never null. */
+  /**
+   * @return The delivery. Never null.
+   */
   public Delivery getDelivery() {
     return delivery;
   }
 
-  /** @return The itinerary. Never null. */
+  /**
+   * @return The itinerary. Never null.
+   */
   public Itinerary getItinerary() {
     return DomainObjectUtils.nullSafe(this.itinerary, Itinerary.EMPTY_ITINERARY);
   }
@@ -158,32 +164,17 @@ public void deriveDeliveryProgress(HandlingHistory handlingHistory) {
     this.delivery = Delivery.derivedFrom(getRouteSpecification(), getItinerary(), handlingHistory);
   }
 
-  /**
-   * @param object to compare
-   * @return True if they have the same identity
-   * @see #sameIdentityAs(Cargo)
-   */
   @Override
-  public boolean equals(Object object) {
-    if (this == object) {
-      return true;
-    }
-    if (object == null || !(object instanceof Cargo)) {
-      return false;
-    }
-
-    Cargo other = (Cargo) object;
-    return sameIdentityAs(other);
-  }
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (!(o instanceof Cargo cargo)) return false;
 
-  private boolean sameIdentityAs(Cargo other) {
-    return other != null && trackingId.sameValueAs(other.trackingId);
+    return Objects.equals(trackingId, cargo.trackingId);
   }
 
-  /** @return Hash code of tracking id. */
   @Override
   public int hashCode() {
-    return trackingId.hashCode();
+    return Objects.hash(trackingId);
   }
 
   @Override