From d6cfcd0825359b29a312062a626e869d9c8175ce Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 3 Oct 2022 00:52:23 +0900 Subject: [PATCH] Fix compile errors Closes gh-32569 --- .../client/ClientHttpObservationConventionAdapterTests.java | 3 +-- .../boot/context/properties/ConfigurationPropertiesTests.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/ClientHttpObservationConventionAdapterTests.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/ClientHttpObservationConventionAdapterTests.java index 9ee0437adf..417ebc2f58 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/ClientHttpObservationConventionAdapterTests.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/metrics/web/client/ClientHttpObservationConventionAdapterTests.java @@ -55,8 +55,7 @@ class ClientHttpObservationConventionAdapterTests { @BeforeEach void setup() { - this.context = new ClientHttpObservationContext(); - this.context.setCarrier(this.request); + this.context = new ClientHttpObservationContext(this.request); this.context.setResponse(this.response); this.context.setUriTemplate("/resource/{name}"); } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java index 095adf7153..706463529f 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/context/properties/ConfigurationPropertiesTests.java @@ -2202,7 +2202,6 @@ class ConfigurationPropertiesTests { } - @ConstructorBinding @ConfigurationProperties(prefix = "test") static class ConstructorParameterWithUnitProperties { @@ -2212,6 +2211,7 @@ class ConfigurationPropertiesTests { private final Period period; + @ConstructorBinding ConstructorParameterWithUnitProperties(@DefaultValue("2") @DurationUnit(ChronoUnit.DAYS) Duration duration, @DefaultValue("3") @DataSizeUnit(DataUnit.MEGABYTES) DataSize size, @DefaultValue("4") @PeriodUnit(ChronoUnit.YEARS) Period period) {