From 3fddfee65c901d2aade6eb8a63781b766657d664 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 22 Feb 2018 13:35:50 +0100 Subject: [PATCH] Fix default value of endpoint's cache ttl Closes gh-12173 --- .../ConfigurationMetadataAnnotationProcessor.java | 2 +- .../ConfigurationMetadataAnnotationProcessorTests.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java index e0aa48b5fa3..629308a1299 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessor.java @@ -438,7 +438,7 @@ public class ConfigurationMetadataAnnotationProcessor extends AbstractProcessor if (hasMainReadOperation(element)) { this.metadataCollector.add(ItemMetadata.newProperty(endpointKey, "cache.time-to-live", Duration.class.getName(), type, null, - "Maximum time that a response can be cached.", 0, null)); + "Maximum time that a response can be cached.", "0ms", null)); } } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java index d7fcc5781d0..bfdbd10f55c 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java @@ -706,7 +706,7 @@ public class ConfigurationMetadataAnnotationProcessorTests { private Metadata.MetadataItemCondition cacheTtl(String endpointId) { return Metadata .withProperty("management.endpoint." + endpointId + ".cache.time-to-live") - .ofType(Duration.class).withDefaultValue(0) + .ofType(Duration.class).withDefaultValue("0ms") .withDescription("Maximum time that a response can be cached."); }