Merge branch '2.3.x' into 2.4.x

Closes gh-25176

buildSrc/src/test/java/org/springframework/boot/build/context/properties/ConfigurationPropertiesTests.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2012-2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.build.context.properties;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link ConfigurationProperties}
+ *
+ * @author Andy Wilkinson
+ */
+class ConfigurationPropertiesTests {
+
+	@Test
+	void whenJsonHasAnIntegerDefaultValueThenItRemainsAnIntegerWhenRead() {
+		Map<String, ConfigurationProperty> properties = ConfigurationProperties
+				.fromFiles(Arrays.asList(new File("src/test/resources/spring-configuration-metadata.json")));
+		assertThat(properties.get("example.counter").getDefaultValue()).isEqualTo(0);
+	}
+
+}

buildSrc/src/test/resources/spring-configuration-metadata.json

@@ -0,0 +1,9 @@
+{
+  "properties": [
+    {
+      "name": "example.counter",
+      "type": "java.lang.Integer",
+      "defaultValue": 0
+    }
+  ]
+}