Skip to content

Commit 318a8e7

Browse files
author
Ivan Franchin
committed
project upgrade
- upgrade to spring-boot 3.0.2; - upgrade to spring-cloud 2022.0.1; - upgrade to springdoc-openapi 2.0.2; - replace openjdk to amazoncorretto with version 17.0.6; - upgrade to elasticsearch docker image 8.5.3; - update README.
1 parent 49c393e commit 318a8e7

File tree

18 files changed

+57
-57
lines changed

18 files changed

+57
-57
lines changed

‎README.adoc‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -219,19 +219,19 @@ It should return something like
219219
[source]
220220
----
221221
{
222-
"name" : "5f932864548a",
222+
"name" : "99fdd70d5915",
223223
"cluster_name" : "docker-cluster",
224-
"cluster_uuid" : "J8k8aa6eSkOHlgJSZPl8kA",
224+
"cluster_uuid" : "1HUDp8N3SF2WLtzZYOGgxA",
225225
"version" : {
226-
"number" : "7.17.6",
226+
"number" : "8.5.3",
227227
"build_flavor" : "default",
228228
"build_type" : "docker",
229-
"build_hash" : "79878662c54c886ae89206c685d9f1051a9d6411",
230-
"build_date" : "2022-05-18T18:04:20.964345128Z",
229+
"build_hash" : "4ed5ee9afac63de92ec98f404ccbed7d3ba9584e",
230+
"build_date" : "2022-12-05T18:22:22.226119656Z",
231231
"build_snapshot" : false,
232-
"lucene_version" : "8.11.1",
233-
"minimum_wire_compatibility_version" : "6.8.0",
234-
"minimum_index_compatibility_version" : "6.0.0-beta1"
232+
"lucene_version" : "9.4.2",
233+
"minimum_wire_compatibility_version" : "7.17.0",
234+
"minimum_index_compatibility_version" : "7.0.0"
235235
},
236236
"tagline" : "You Know, for Search"
237237
}
@@ -263,8 +263,7 @@ It should return something like
263263
[source]
264264
----
265265
health status index uuid pri rep docs.count docs.deleted store.size pri.store.size
266-
green open .geoip_databases Ud5Jc_p1SZav1G5CPd6X6g 1 0 40 0 38.3mb 38.3mb
267-
yellow open ecommerce.products.v1 rmL6pbPMQyKroHl9_KXTVQ 1 1 0 0 226b 226b
266+
yellow open ecommerce.products.v1 qgIIfyD1TUCN2s0wiDlmzA 1 1 0 0 225b 225b
268267
----
269268

270269
* Check `ecommerce.products.v1` index mapping
@@ -386,9 +385,8 @@ It should return something like
386385
[source]
387386
----
388387
health status index uuid pri rep docs.count docs.deleted store.size pri.store.size
389-
green open .geoip_databases Ud5Jc_p1SZav1G5CPd6X6g 1 0 40 0 38.3mb 38.3mb
390-
yellow open ecommerce.products.v2 j9zvCjkbQM6ME-h2L5CxJA 1 1 0 0 226b 226b
391-
yellow open ecommerce.products.v1 rmL6pbPMQyKroHl9_KXTVQ 1 1 0 0 226b 226b
388+
yellow open ecommerce.products.v2 pGzs5rfCR32aBVukwmEu6Q 1 1 0 0 225b 225b
389+
yellow open ecommerce.products.v1 qgIIfyD1TUCN2s0wiDlmzA 1 1 0 0 225b 225b
392390
----
393391

394392
* Reindex from `ecommerce.products.v1` to `ecommerce.products.v2`
@@ -403,7 +401,7 @@ It should return something like
403401
+
404402
[source]
405403
----
406-
{"took":4,"timed_out":false,"total":0,"updated":0,"created":0,"deleted":0,"batches":0,"version_conflicts":0,"noops":0,"retries":{"bulk":0,"search":0},"throttled_millis":0,"requests_per_second":-1.0,"throttled_until_millis":0,"failures":[]}
404+
{"took":13,"timed_out":false,"total":0,"updated":0,"created":0,"deleted":0,"batches":0,"version_conflicts":0,"noops":0,"retries":{"bulk":0,"search":0},"throttled_millis":0,"requests_per_second":-1.0,"throttled_until_millis":0,"failures":[]}
407405
----
408406

409407
* Adjust alias after reindex from `ecommerce.products.v1` to `ecommerce.products.v2`
@@ -433,13 +431,13 @@ It should return something like
433431
[source]
434432
----
435433
{
436-
"ecommerce.products.v1" : {
437-
"aliases" : { }
438-
},
439434
"ecommerce.products.v2" : {
440435
"aliases" : {
441436
"ecommerce.products" : { }
442437
}
438+
},
439+
"ecommerce.products.v1" : {
440+
"aliases" : { }
443441
}
444442
}
445443
----

‎docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: "3.8"
33
services:
44

55
elasticsearch:
6-
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.6
6+
image: docker.elastic.co/elasticsearch/elasticsearch:8.5.3
77
container_name: elasticsearch
88
restart: unless-stopped
99
ports:

‎eureka-server/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,13 @@
3030
</dependency>
3131
</dependencies>
3232

33+
<build>
34+
<plugins>
35+
<plugin>
36+
<groupId>org.springframework.boot</groupId>
37+
<artifactId>spring-boot-maven-plugin</artifactId>
38+
</plugin>
39+
</plugins>
40+
</build>
41+
3342
</project>

‎pom.xml‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.7.5</version>
8+
<version>3.0.2</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111

@@ -18,9 +18,9 @@
1818

1919
<properties>
2020
<java.version>17</java.version>
21-
<spring-cloud.version>2021.0.5</spring-cloud.version>
21+
<spring-cloud.version>2022.0.1</spring-cloud.version>
2222
<jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
23-
<openjdk-image.version>17.0.2</openjdk-image.version>
23+
<jdk-image.version>17.0.6</jdk-image.version>
2424
<docker-image.prefix>ivanfranchin</docker-image.prefix>
2525
</properties>
2626

@@ -44,17 +44,13 @@
4444

4545
<build>
4646
<plugins>
47-
<plugin>
48-
<groupId>org.springframework.boot</groupId>
49-
<artifactId>spring-boot-maven-plugin</artifactId>
50-
</plugin>
5147
<plugin>
5248
<groupId>com.google.cloud.tools</groupId>
5349
<artifactId>jib-maven-plugin</artifactId>
5450
<version>${jib-maven-plugin.version}</version>
5551
<configuration>
5652
<from>
57-
<image>openjdk:${openjdk-image.version}</image>
53+
<image>amazoncorretto:${jdk-image.version}</image>
5854
</from>
5955
<to>
6056
<image>${docker-image.prefix}/${project.artifactId}:${project.version}</image>

‎product-api/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<properties>
1717
<org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
1818
<lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
19-
<springdoc-openapi.version>1.6.12</springdoc-openapi.version>
19+
<springdoc-openapi.version>2.0.2</springdoc-openapi.version>
2020
</properties>
2121

2222
<dependencies>
@@ -51,7 +51,7 @@
5151
<!-- SpringDoc OpenApi -->
5252
<dependency>
5353
<groupId>org.springdoc</groupId>
54-
<artifactId>springdoc-openapi-ui</artifactId>
54+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
5555
<version>${springdoc-openapi.version}</version>
5656
</dependency>
5757

‎product-api/src/main/java/com/ivanfranchin/productapi/config/SwaggerConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import io.swagger.v3.oas.models.Components;
44
import io.swagger.v3.oas.models.OpenAPI;
55
import io.swagger.v3.oas.models.info.Info;
6-
import org.springdoc.core.GroupedOpenApi;
6+
import org.springdoc.core.models.GroupedOpenApi;
77
import org.springframework.beans.factory.annotation.Value;
88
import org.springframework.context.annotation.Bean;
99
import org.springframework.context.annotation.Configuration;

‎product-api/src/main/java/com/ivanfranchin/productapi/rest/ProductController.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@
22

33
import com.ivanfranchin.productapi.mapper.ProductMapper;
44
import com.ivanfranchin.productapi.model.Product;
5-
import com.ivanfranchin.productapi.service.ProductService;
65
import com.ivanfranchin.productapi.rest.dto.CreateProductRequest;
76
import com.ivanfranchin.productapi.rest.dto.SearchRequest;
87
import com.ivanfranchin.productapi.rest.dto.UpdateProductRequest;
8+
import com.ivanfranchin.productapi.service.ProductService;
99
import io.swagger.v3.oas.annotations.Operation;
10+
import jakarta.validation.Valid;
1011
import lombok.RequiredArgsConstructor;
11-
import org.springdoc.api.annotations.ParameterObject;
12+
import org.springdoc.core.annotations.ParameterObject;
1213
import org.springframework.data.domain.Page;
1314
import org.springframework.data.domain.Pageable;
1415
import org.springframework.http.HttpStatus;
@@ -22,8 +23,6 @@
2223
import org.springframework.web.bind.annotation.ResponseStatus;
2324
import org.springframework.web.bind.annotation.RestController;
2425

25-
import javax.validation.Valid;
26-
2726
@RequiredArgsConstructor
2827
@RestController
2928
@RequestMapping("/api/products")

‎product-api/src/main/java/com/ivanfranchin/productapi/rest/ProductReviewController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33
import com.ivanfranchin.productapi.mapper.ProductMapper;
44
import com.ivanfranchin.productapi.model.Product;
55
import com.ivanfranchin.productapi.model.Review;
6-
import com.ivanfranchin.productapi.service.ProductService;
76
import com.ivanfranchin.productapi.rest.dto.AddReviewRequest;
7+
import com.ivanfranchin.productapi.service.ProductService;
88
import io.swagger.v3.oas.annotations.Operation;
9+
import jakarta.validation.Valid;
910
import lombok.RequiredArgsConstructor;
1011
import org.springframework.http.HttpStatus;
1112
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,7 +17,6 @@
1617
import org.springframework.web.bind.annotation.ResponseStatus;
1718
import org.springframework.web.bind.annotation.RestController;
1819

19-
import javax.validation.Valid;
2020
import java.util.List;
2121

2222
@RequiredArgsConstructor

‎product-api/src/main/java/com/ivanfranchin/productapi/rest/dto/AddReviewRequest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package com.ivanfranchin.productapi.rest.dto;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4+
import jakarta.validation.constraints.Max;
5+
import jakarta.validation.constraints.Min;
6+
import jakarta.validation.constraints.NotBlank;
7+
import jakarta.validation.constraints.NotNull;
48
import lombok.Data;
59

6-
import javax.validation.constraints.Max;
7-
import javax.validation.constraints.Min;
8-
import javax.validation.constraints.NotBlank;
9-
import javax.validation.constraints.NotNull;
10-
1110
@Data
1211
public class AddReviewRequest {
1312

‎product-api/src/main/java/com/ivanfranchin/productapi/rest/dto/CreateProductRequest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.ivanfranchin.productapi.rest.dto;
22

33
import io.swagger.v3.oas.annotations.media.Schema;
4+
import jakarta.validation.constraints.NotBlank;
5+
import jakarta.validation.constraints.NotNull;
46
import lombok.Data;
57

6-
import javax.validation.constraints.NotBlank;
7-
import javax.validation.constraints.NotNull;
88
import java.math.BigDecimal;
99
import java.util.Set;
1010

0 commit comments

Comments
 (0)