From 9672a9f9f8dbed426f5f91c90f4e247484676dcb Mon Sep 17 00:00:00 2001 From: Johannes Edmeier Date: Fri, 20 Dec 2024 08:42:23 +0100 Subject: [PATCH] chore: update dependencies --- bestseller-fashion/src/main/resources/application.yml | 8 +++----- bestseller-fashion/src/test/resources/application.yml | 3 +-- bestseller-toys/src/main/resources/application.yml | 8 +++----- bestseller-toys/src/test/resources/application.yml | 3 +-- checkout/src/main/resources/application.yml | 8 +++----- gateway/src/main/resources/application.yml | 8 +++----- hot-deals/src/main/resources/application.yml | 8 +++----- hot-deals/src/test/resources/application.yml | 3 +-- .../shopping/inventory/InventoryRestController.java | 5 +++-- .../src/main/resources/application.yml | 9 ++++----- order/src/main/resources/application.yml | 8 ++------ pom.xml | 5 ++--- shopping-ui/src-gen/ui-api.ts | 2 +- 13 files changed, 30 insertions(+), 48 deletions(-) diff --git a/bestseller-fashion/src/main/resources/application.yml b/bestseller-fashion/src/main/resources/application.yml index c5ab0ac..60cc59b 100644 --- a/bestseller-fashion/src/main/resources/application.yml +++ b/bestseller-fashion/src/main/resources/application.yml @@ -12,11 +12,9 @@ spring: management: metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/bestseller-fashion/src/test/resources/application.yml b/bestseller-fashion/src/test/resources/application.yml index 60016da..e51d9da 100644 --- a/bestseller-fashion/src/test/resources/application.yml +++ b/bestseller-fashion/src/test/resources/application.yml @@ -1,6 +1,5 @@ spring: - datasource: - platform: hsqldb + sql.init.platform: hsqldb rest: endpoint: diff --git a/bestseller-toys/src/main/resources/application.yml b/bestseller-toys/src/main/resources/application.yml index 08d9a14..0e1a55b 100644 --- a/bestseller-toys/src/main/resources/application.yml +++ b/bestseller-toys/src/main/resources/application.yml @@ -12,11 +12,9 @@ spring: management: metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/bestseller-toys/src/test/resources/application.yml b/bestseller-toys/src/test/resources/application.yml index 60016da..e51d9da 100644 --- a/bestseller-toys/src/test/resources/application.yml +++ b/bestseller-toys/src/test/resources/application.yml @@ -1,6 +1,5 @@ spring: - datasource: - platform: hsqldb + sql.init.platform: hsqldb rest: endpoint: diff --git a/checkout/src/main/resources/application.yml b/checkout/src/main/resources/application.yml index 5468014..1629003 100644 --- a/checkout/src/main/resources/application.yml +++ b/checkout/src/main/resources/application.yml @@ -17,11 +17,9 @@ spring: management: metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/gateway/src/main/resources/application.yml b/gateway/src/main/resources/application.yml index cf454f8..a1e17d3 100644 --- a/gateway/src/main/resources/application.yml +++ b/gateway/src/main/resources/application.yml @@ -10,11 +10,9 @@ management: circuitbreakers: enabled: true metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/hot-deals/src/main/resources/application.yml b/hot-deals/src/main/resources/application.yml index 8cec789..85295cb 100644 --- a/hot-deals/src/main/resources/application.yml +++ b/hot-deals/src/main/resources/application.yml @@ -12,11 +12,9 @@ spring: management: metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/hot-deals/src/test/resources/application.yml b/hot-deals/src/test/resources/application.yml index 60016da..e51d9da 100644 --- a/hot-deals/src/test/resources/application.yml +++ b/hot-deals/src/test/resources/application.yml @@ -1,6 +1,5 @@ spring: - datasource: - platform: hsqldb + sql.init.platform: hsqldb rest: endpoint: diff --git a/inventory-service-mock/src/main/java/com/steadybit/shopping/inventory/InventoryRestController.java b/inventory-service-mock/src/main/java/com/steadybit/shopping/inventory/InventoryRestController.java index decaf5f..809d8af 100644 --- a/inventory-service-mock/src/main/java/com/steadybit/shopping/inventory/InventoryRestController.java +++ b/inventory-service-mock/src/main/java/com/steadybit/shopping/inventory/InventoryRestController.java @@ -1,5 +1,6 @@ package com.steadybit.shopping.inventory; +import java.util.concurrent.ThreadLocalRandom; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -10,8 +11,8 @@ public class InventoryRestController { @GetMapping - public boolean isAvailable(@RequestParam(value = "id") String id) { - return Math.random() > 0.005; + public boolean isAvailable(@RequestParam String id) { + return ThreadLocalRandom.current().nextDouble() > 0.005; } } diff --git a/inventory-service-mock/src/main/resources/application.yml b/inventory-service-mock/src/main/resources/application.yml index 77cb43c..e8dd974 100644 --- a/inventory-service-mock/src/main/resources/application.yml +++ b/inventory-service-mock/src/main/resources/application.yml @@ -7,13 +7,12 @@ spring: jmx: enabled: true + management: metrics: - web: - server: - request: - autotime: - percentiles: 0.75 + distribution: + percentiles: + http.server.requests: 0.5, 0.95, 0.99 endpoints: jmx: exposure: diff --git a/order/src/main/resources/application.yml b/order/src/main/resources/application.yml index 8d57e8f..5067c80 100644 --- a/order/src/main/resources/application.yml +++ b/order/src/main/resources/application.yml @@ -7,12 +7,8 @@ spring: enabled: true management: - metrics: - web: - server: - request: - autotime: - percentiles: 0.95 + # This property is deprecated: Should be applied at the ObservationRegistry level. + # percentiles: 0.95 endpoints: jmx: exposure: diff --git a/pom.xml b/pom.xml index a947b5c..89f5804 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.5 + 3.3.7 @@ -34,7 +34,7 @@ UTF-8 UTF-8 21 - 2023.0.3 + 2023.0.4 3.3.0 3.2.1263 @@ -100,7 +100,6 @@ org.apache.maven.plugins maven-surefire-plugin - ${maven-surefire-plugin.version} true 2 diff --git a/shopping-ui/src-gen/ui-api.ts b/shopping-ui/src-gen/ui-api.ts index e81f721..ced1cd6 100644 --- a/shopping-ui/src-gen/ui-api.ts +++ b/shopping-ui/src-gen/ui-api.ts @@ -1,6 +1,6 @@ /* tslint:disable */ /* eslint-disable */ -// Generated using typescript-generator version 3.2.1263 on 2024-06-25 19:14:21. +// Generated using typescript-generator version 3.2.1263 on 2024-12-20 08:28:45. export interface Order { id: string;