Project upgrade

- Upgrade to spring-boot 3.2.5;
- Upgrade to springdoc-openapi 2.5.0;
- Upgrade to apache-maven 3.9.5;
- Upgrade to jib-maven-plugin 3.4.2;
- Upgrade to amazoncorretto-jdk 17.0.10
- Upgrade to elasticsearch docker image 8.10.4;
- Add in create-index.sh, a request to Elasticsearch to Fix High Disk Watermark issue;
- Remove obsolete version field in docker-compose.yml;
- Update README.

Author: Ivan Franchin

.mvn/wrapper/maven-wrapper.properties

@@ -1,2 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
 wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

README.adoc

@@ -1,6 +1,6 @@
 = springboot-elasticsearch-thymeleaf
 
-The goal of this project is to implement an application called `product-app`. It consists of two https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/[`Spring Boot`] services: `product-api` (backend) and `product-ui` (frontend). The data will be stored in https://www.elastic.co/products/elasticsearch[`Elasticsearch`].
+The goal of this project is to implement an application called `product-app`. It consists of two https://spring.io/projects/spring-boot[`Spring Boot`] services: `product-api` (backend) and `product-ui` (frontend). The data will be stored in https://www.elastic.co/products/elasticsearch[`Elasticsearch`].
 
 == Proof-of-Concepts & Articles
 
@@ -14,7 +14,7 @@ image::documentation/project-diagram.jpeg[]
 
 * **product-api**
 +
-`Spring Boot` Web Java application that exposes a REST API to manages products. The information about products is stored in `Elasticsearch`. `product-api` uses https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/[`Spring Data Elasticsearch`] to persist/query/delete data in https://www.elastic.co/products/elasticsearch[`Elasticsearch`]
+`Spring Boot` Web Java application that exposes a REST API to manages products. The information about products is stored in `Elasticsearch`. `product-api` uses https://docs.spring.io/spring-data/elasticsearch/reference/[`Spring Data Elasticsearch`] to persist/query/delete data in https://www.elastic.co/products/elasticsearch[`Elasticsearch`].
 
 * **product-ui**
 +
@@ -27,14 +27,14 @@ image::documentation/project-diagram.jpeg[]
 
 == Start Environment
 
-* Open a terminal and navigate to `springboot-elasticsearch-thymeleaf` root folder run
+* Open a terminal and navigate to `springboot-elasticsearch-thymeleaf` root folder run:
 +
 [source]
 ----
 docker compose up -d
 ----
 
-* Wait for `Elasticsearch` Docker container to be up and running. To check it, run
+* Wait for `Elasticsearch` Docker container to be up and running. To check it, run:
 +
 [source]
 ----
@@ -45,23 +45,23 @@ docker compose ps
 
 NOTE: In the following steps, we will create an index, an alias and do a reindex using pre-defined scripts. In case you prefer to do it step-by-step calling `Elasticsearch` API, refer to link:create-index-alias-reindex.adoc[Creating indexes, alias and reindexing using Elasticsearch API].
 
-* In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder
+* In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder;
 
-* Run the following script to create the index `ecommerce.products.v1` with the alias `ecommerce.products` (you can use the default values by just pressing `Enter` on every user input)
+* Run the following script to create the index `ecommerce.products.v1` with the alias `ecommerce.products` (you can use the default values by just pressing `Enter` on every user input):
 +
 [source]
 ----
 ./create-index.sh
 ----
 
-* If you want to insert some products, run
+* If you want to insert some products, run:
 +
 [source]
 ----
 ./insert-products.sh
 ----
 
-* If you want to fix the `reference` property mapping error (explained below), run
+* If you want to fix the `reference` property mapping error (explained below), run:
 +
 [source]
 ----
@@ -95,8 +95,8 @@ Below are the steps to start and run the applications using `Maven`. We will nee
 == Running applications as Docker containers
 
 * Build Docker Images
-** In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder
-** Run the following script
+** In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder;
+** Run the following script:
 +
 [source]
 ----
@@ -126,8 +126,8 @@ Below are the steps to start and run the applications using `Maven`. We will nee
 |===
 
 * Run Docker containers
-** In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder
-** Run the following script
+** In a terminal, make sure you are in `springboot-elasticsearch-thymeleaf` root folder;
+** Run the following script:
 +
 [source]
 ----
@@ -148,21 +148,21 @@ Below are the steps to start and run the applications using `Maven`. We will nee
 
 == Demo
 
-* Below is a simple demo that shows a user interacting with `product-ui`
+* Below is a simple demo that shows a user interacting with `product-ui`:
 +
 image::documentation/demo-user-interaction.gif[]
 
 == Shutdown
 
-* To stop applications
-** If they were started with `Maven`, go to `product-api` and `product-ui` terminals and press `Ctrl+C`
-** If they were started as Docker containers, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the script below
+* To stop applications:
+** If they were started with `Maven`, go to `product-api` and `product-ui` terminals and press `Ctrl+C`;
+** If they were started as Docker containers, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the script below:
 +
 [source]
 ----
 ./stop-apps.sh
 ----
-* To stop and remove docker compose containers, network and volumes, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the following command
+* To stop and remove docker compose containers, network and volumes, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the following command:
 +
 [source]
 ----
@@ -171,7 +171,7 @@ docker compose down -v
 
 == Cleanup
 
-To remove the Docker images created by this project, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the script below
+To remove the Docker images created by this project, go to a terminal and, inside `springboot-elasticsearch-thymeleaf` root folder, run the script below:
 [source]
 ----
 ./remove-docker-images.sh

create-index.sh

@@ -1,5 +1,19 @@
 #!/usr/bin/env bash
 
+echo "-----------------------"
+echo "Fix High Disk Watermark"
+echo "-----------------------"
+# Reference: https://www.elastic.co/guide/en/elasticsearch/reference/current/fix-watermark-errors.html
+
+curl -X PUT localhost:9200/_cluster/settings \
+  -H "Content-Type: application/json" \
+  -d '{ "persistent": { "cluster.routing.allocation.disk.watermark.low": "90%", "cluster.routing.allocation.disk.watermark.low.max_headroom": "100GB", "cluster.routing.allocation.disk.watermark.high": "95%", "cluster.routing.allocation.disk.watermark.high.max_headroom": "20GB", "cluster.routing.allocation.disk.watermark.flood_stage": "97%", "cluster.routing.allocation.disk.watermark.flood_stage.max_headroom": "5GB", "cluster.routing.allocation.disk.watermark.flood_stage.frozen": "97%", "cluster.routing.allocation.disk.watermark.flood_stage.frozen.max_headroom": "5GB" } }'
+
+echo
+echo "-----------------"
+echo "Configuring index"
+echo "-----------------"
+
 read -p "Type index alias (ecommerce.products): " index_alias
 index_alias=${index_alias:-ecommerce.products}
 

docker-compose.yml

@@ -1,9 +1,7 @@
-version: "3.8"
-
 services:
 
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.7.1
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.10.4
     container_name: elasticsearch
     restart: unless-stopped
     ports:

insert-products.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+echo "------------------"
+echo "Inserting products"
+echo "------------------"
+
 read -p "Type index name or alias (ecommerce.products): " index_name_alias
 index_name_alias=${index_name_alias:-ecommerce.products}
 

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.4</version>
+        <version>3.2.5</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -18,8 +18,8 @@
 
     <properties>
         <java.version>17</java.version>
-        <jib-maven-plugin.version>3.4.0</jib-maven-plugin.version>
-        <jdk-image.version>17.0.8</jdk-image.version>
+        <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
+        <jdk-image.version>17.0.10</jdk-image.version>
         <docker-image.prefix>ivanfranchin</docker-image.prefix>
     </properties>
 

product-api/pom.xml

@@ -15,7 +15,7 @@
 
     <properties>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
-        <springdoc-openapi.version>2.2.0</springdoc-openapi.version>
+        <springdoc-openapi.version>2.5.0</springdoc-openapi.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
     </properties>
 

product-ui/src/main/java/com/ivanfranchin/productui/client/ProductApiClientConfig.java

@@ -19,7 +19,7 @@ public ProductApiClient productApiClient() {
                 .baseUrl(productApiUrl)
                 .build();
         HttpServiceProxyFactory factory = HttpServiceProxyFactory
-                .builder(WebClientAdapter.forClient(webClient))
+                .builderFor(WebClientAdapter.create(webClient))
                 .build();
         return factory.createClient(ProductApiClient.class);
     }

reindex.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
+echo "-------------------"
+echo "Applying reindexing"
+echo "-------------------"
+
 read -p "Type the index alias (ecommerce.products): " index_alias
 index_alias=${index_alias:-ecommerce.products}