Updated Jakarta EE example

Author: alejandro-du

Diff for: jakarta-ee/README.md

@@ -12,7 +12,7 @@ Add the Jakarta EE API:
 <dependency>
 	<groupId>jakarta.platform</groupId>
 	<artifactId>jakarta.jakartaee-api</artifactId>
-	<version>9.1.0</version>
+	<version>10.0.0</version>
 	<scope>provided</scope>
 </dependency>
 ```
@@ -32,7 +32,7 @@ Implement a JPA Entity and define a named query ([JPQL](https://jakarta.ee/speci
 ```Java
 @Entity
 @Table(name = "programming_language")
-@NamedQuery(name = "topProgrammingLanguages", query = "from ProgrammingLanguage pl where pl.rating > :rating")
+@NamedQuery(name = "popularProgrammingLanguages", query = "from ProgrammingLanguage pl where pl.rating > :rating order by pl.rating desc")
 public class ProgrammingLanguage {
 
 	@Id
@@ -62,28 +62,43 @@ Execute queries:
 
 ```java
 TypedQuery<ProgrammingLanguage> query = entityManager.createNamedQuery(
-		"topProgrammingLanguages", ProgrammingLanguage.class);
+		"popularProgrammingLanguages", ProgrammingLanguage.class);
 query.setParameter("rating", 5);
 List<ProgrammingLanguage> programmingLanguages = query.getResultList();
 ```
 
 ## Requirements
-- Java 17 or later. Previous versions should work (update the version in the pom.xml file).
-Apache Maven.
-- Eclipse GlassFish 6.2.5 or later.
-- MariaDB server. If you don't want to install anything extra, try creating a free [SkySQL account](https://cloud.mariadb.com).
-- MariaDB Connector/J 3.0.4 or later.
-- An SQL client tool like mariadb, DBeaver, or an SQL integration for your IDE.
+- [Java 17](https://whichjdk.com/) or later. Previous versions should work (update the version in the **pom.xml** file)
+- [Apache Maven](https://maven.apache.org/download.cgi)
+- [Eclipse GlassFish](https://glassfish.org/download.html) 7.0.9 or later
+- MariaDB server ([Enterprise](https://mariadb.com/products/enterprise/) or [Community](https://mariadb.com/products/community-server/))
+- [MariaDB Connector/J](https://mariadb.com/downloads/connectors/connectors-data-access/java8-connector) 3.2.0 or later
+- An SQL client tool like [Mariadb Shell](https://mariadb.com/downloads/tools/), DBeaver, or an [SQL integration](https://www.youtube.com/watch?v=rJYUTxD-2-M) for your IDE
 
-## Running the app
+## Preparing the database
 
-Prepare the database:
+If you don't have a MariaDB server running, you can easily run using [Docker](https://hub.docker.com/u/mariadb):
+
+```shell
+docker run --name mariadb -d -p 3306:3306 -e MARIADB_ROOT_PASSWORD='RootPassword123!' mariadb
+```
+
+Alternatively, you can [Download](https://mariadb.com/downloads/) and install the server directly on your OS.
+
+Connect to the database:
+
+```shell
+mariadb-shell --dsn mariadb://root:'RootPassword123!'@127.0.0.1
+```
+
+Alternatively, you can use any database client compatible with MariaDB.
+
+Execute the following SQL statements to create a user for the JakartaEE application, a database (or schema) and a table:
 
 ```sql
 CREATE DATABASE jakartaee_demo;
-CREATE USER 'user'@'%';
-GRANT ALL ON jakartaee_demo.* TO 'user'@'%' IDENTIFIED BY 'password';
-FLUSH PRIVILEGES;
+CREATE USER 'user'@'%' IDENTIFIED BY 'Password123!';
+GRANT SELECT, INSERT, UPDATE, DELETE ON jakartaee_demo.* TO 'user'@'%';
 
 USE jakartaee_demo;
 CREATE TABLE programming_language(
@@ -93,10 +108,12 @@ CREATE TABLE programming_language(
 );
 ```
 
-[Download MariaDB Connector/J](https://mariadb.com/downloads/connectors/connectors-data-access/java8-connector) (select Java8+ connector) and place the JAR in the **lib** directory of the fault GlassFish domain:
+## Building and deploying the application
+
+[Download MariaDB Connector/J](https://mariadb.com/downloads/connectors/connectors-data-access/java8-connector) (select Java8+ connector) and place the JAR in the **lib** directory of the fault GlassFish domain (replace `[GLASSFISH_HOME]` with the directory in which your GlassFish installation resides):
 
 ```
-cp ~/Downloads/mariadb-java-client-3.0.4.jar [GLASSFISH_HOME]/glassfish/domains/domain1/lib
+cp ~/Downloads/mariadb-java-client-3.2.0.jar [GLASSFISH_HOME]/glassfish/domains/domain1/lib/
 ```
 
 Start the GlassFish application server:
@@ -105,7 +122,7 @@ Start the GlassFish application server:
 [GLASSFISH_HOME]/bin/asadmin start-domain
 ```
 
-Configure the database connection pool using the [Administration Console](https://glassfish.org/docs/latest/administration-guide/overview.html#GSADG00698) by going to **Resources > JDBC > JDBC Connection Pools**. Click **New** and fill in the following details:
+Configure the database connection pool using the [Administration Console](https://glassfish.org/docs/latest/administration-guide.html#administration-console) (http://localhost:4848) by going to **Resources > JDBC > JDBC Connection Pools**. Click **New** and fill in the following details:
 
  * **Pool Name**: `MariaDB`
  * **Resource Type**: `java.sql.Driver`
@@ -116,29 +133,45 @@ Click **Next** and fill in the following details:
 
 Click **Finish**.
 
-In the JDBC Connection Pool list, click the newly created pool, select the **Additional Properties** tab, and add the following properties using the **Add Property** button:
+In the JDBC Connection Pool list, click on **MariaDB**, select the **Additional Properties** tab, and add the following properties using the **Add Property** button:
 
- * **url**: `jdbc:mariadb://localhost:3306/jakartaee_demo`
+ * **url**: `jdbc:mariadb://127.0.0.1:3306/jakartaee_demo`
  * **user**: `user`
- * **password**: `password`
+ * **password**: `Password123!`
 
 > If you are using [MariaDB SkySQL](https://mariadb.com/products/skysql/), enable SSL and specify the path to the CA chain file that you can download from the [SkySQL Portal](https://cloud.mariadb.com):
 > 
-> `jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/jakartaee_demo?useSsl=true&serverSslCert=/path/to/your/skysql_chain.pem`
+> `jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:3306/jakartaee_demo?sslMode=verify-ca&serverSslCert=/path/to/your/skysql_chain.pem`
 
 Go to **Resources > JDBC > JDBC Resources**. Click **New** and fill in the following details:
 
 * **JNDI Name**: `mariadb-database`
 * **Pool Name**: `MariaDB`
 
+Click **OK**.
+
 Build the WAR file:
 
-```
+```Bash
 git clone [email protected]:mariadb-developers/java-quickstart.git
 cd java-quickstart/jakarta-ee/
 mvn package
 ```
 
-Deploy the WAR file to GlassFish using the Administration Console. Go to **Applications** and click te button next to the **Location** field, select the WAR file (**java-quickstart/jakarta-ee/target/jakarta-ee-1.0-SNAPSHOT.war**), and click **Ok**.
+To deploy the WAR file to GlassFish using the Administration Console, go to **Applications** and click the **Deploy** button. Click on the button next to **Location** and select the WAR file (**java-quickstart/jakarta-ee/target/jakarta-ee-1.0-SNAPSHOT.war**). Click **Ok**.
+
+## Check the output
+
+Go to **Monitoring Data > server** and click either the **View Log Files** or **View Raw Log** button. You should be able to see log messages confirming that data was deleted, created, and read. You can also connect to the database and see the data in the `programming_language` table.
+
+Connect to the database:
 
-You should be able to see new rows in the `programming_language` table in the database as well as log messages confirming that data was deleted, created, and read. Go to **Monitoring Data > server** and click the **View Log Files** button.
+```shell
+mariadb-shell --dsn mariadb://user:'Password123!'@127.0.0.1
+```
+
+Run the following query:
+
+```SQL
+SELECT * FROM jakartaee_demo.programming_languages;
+```

Diff for: jakarta-ee/pom.xml

@@ -10,15 +10,15 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>jakarta.platform</groupId>
 			<artifactId>jakarta.jakartaee-api</artifactId>
-			<version>9.1.0</version>
+			<version>10.0.0</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -28,12 +28,12 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.3.2</version>
+				<version>3.4.0</version>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.10.1</version>
+				<version>3.11.0</version>
 			</plugin>
 		</plugins>
 	</build>

Diff for: jakarta-ee/src/main/java/com/example/Application.java

@@ -25,7 +25,7 @@ public class Application {
 	public void run() {
 		deleteProgrammingLanguages();
 		createProgrammingLanguages();
-		printTopProgrammingLanguages();
+		printPupularProgrammingLanguages();
 	}
 
 	@Transactional
@@ -37,22 +37,26 @@ public void deleteProgrammingLanguages() {
 	@Transactional
 	public void createProgrammingLanguages() {
 		log.info("Creating programming languages...");
-		Arrays.stream("Java,C++,C#,JavaScript,Rust,Go,Python,PHP".split(","))
+		var java = new ProgrammingLanguage("Java", 10);
+		entityManager.persist(java);
+		Arrays.stream("C++,C#,JavaScript,Rust,Go,Python,PHP".split(","))
 				.map(name -> new ProgrammingLanguage(name, (int) (Math.random() * 10)))
 				.forEach(entityManager::persist);
 	}
 
-	public void printTopProgrammingLanguages() {
-		log.info("Top programming languages:");
-
+	public void printPupularProgrammingLanguages() {
+		log.info("Printing popular programming languages...");
 		TypedQuery<ProgrammingLanguage> query = entityManager.createNamedQuery(
-				"topProgrammingLanguages", ProgrammingLanguage.class);
+				"popularProgrammingLanguages", ProgrammingLanguage.class);
 		query.setParameter("rating", 5);
 		List<ProgrammingLanguage> programmingLanguages = query.getResultList();
+		var output = new StringBuilder("Popular programming languages:");
 
 		programmingLanguages.stream()
-				.map(pl -> pl.getName() + ": " + pl.getRating())
-				.forEach(System.out::println);
+				.map(pl -> "\n" + pl.getName() + ": " + pl.getRating())
+				.forEach(output::append);
+
+		log.info(output.toString());
 	}
 
 }

Diff for: jakarta-ee/src/main/java/com/example/ProgrammingLanguage.java

@@ -6,7 +6,7 @@
 
 @Entity
 @Table(name = "programming_language")
-@NamedQuery(name = "topProgrammingLanguages", query = "from ProgrammingLanguage pl where pl.rating > :rating")
+@NamedQuery(name = "popularProgrammingLanguages", query = "from ProgrammingLanguage pl where pl.rating > :rating order by pl.rating desc")
 public class ProgrammingLanguage {
 
 	@Id

Diff for: jakarta-ee/src/main/resources/META-INF/persistence.xml

@@ -1,8 +1,5 @@
 <persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd" version="2.0">
 	<persistence-unit name="jakarta-ee-demo" transaction-type="JTA">
 		<jta-data-source>mariadb-database</jta-data-source> <!-- Use the same name in the application server -->
-		<properties>
-			<property name="eclipselink.target-database" value="MySQL" /> <!-- EclipseLink JPA (default JPA implementation in Glassfish) requires this -->
-		</properties>
 	</persistence-unit>
 </persistence>

Diff for: microprofile/pom.xml

@@ -31,7 +31,7 @@
 		<plugins>
 			<plugin>
 				<artifactId>maven-war-plugin</artifactId>
-				<version>3.3.2</version>
+				<version>3.4.0</version>
 				<configuration>
 					<failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>