Polish "Do not set primitive default value for unsupported expressions"

See gh-46551

Author: snicoll

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/metadata/JsonConverter.java

@@ -145,9 +145,6 @@ private void putHintValue(JSONObject jsonObject, Object value) throws Exception
 	}
 
 	private void putDefaultValue(JSONObject jsonObject, Object value) throws Exception {
-		if (value == null) {
-			return;
-		}
 		Object defaultValue = extractItemValue(value);
 		jsonObject.put("defaultValue", defaultValue);
 	}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/ConfigurationMetadataAnnotationProcessorTests.java

@@ -18,17 +18,13 @@
 
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.configurationprocessor.metadata.ConfigurationMetadata;
 import org.springframework.boot.configurationprocessor.metadata.ItemMetadata;
 import org.springframework.boot.configurationprocessor.metadata.Metadata;
-import org.springframework.boot.configurationprocessor.test.CompiledMetadataReader;
-import org.springframework.boot.configurationprocessor.test.TestConfigurationMetadataAnnotationProcessor;
 import org.springframework.boot.configurationsample.deprecation.Dbcp2Configuration;
-import org.springframework.boot.configurationsample.fieldvalues.ArithmeticExpressionProperties;
 import org.springframework.boot.configurationsample.method.NestedPropertiesMethod;
 import org.springframework.boot.configurationsample.record.ExampleRecord;
 import org.springframework.boot.configurationsample.record.NestedPropertiesRecord;
@@ -71,9 +67,6 @@
 import org.springframework.boot.configurationsample.specific.SimplePojo;
 import org.springframework.boot.configurationsample.specific.StaticAccessor;
 import org.springframework.core.test.tools.CompilationException;
-import org.springframework.core.test.tools.ResourceFile;
-import org.springframework.core.test.tools.SourceFile;
-import org.springframework.core.test.tools.TestCompiler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
@@ -89,7 +82,6 @@
  * @author Pavel Anisimov
  * @author Scott Frederick
  * @author Moritz Halbritter
- * @author Hyeon Jae Kim
  */
 class ConfigurationMetadataAnnotationProcessorTests extends AbstractMetadataGenerationTests {
 
@@ -578,19 +570,4 @@ void recordPropertiesWithDescriptions() {
 			.withDescription("last description in Javadoc"));
 	}
 
-	@Test
-	void arithmeticExpressionPropertiesShouldOmitUnknownDefaultValues(){
-		ConfigurationMetadata metadata = compile(ArithmeticExpressionProperties.class);
-		assertThat(metadata).has(Metadata.withProperty("arithmetic.calculated", Integer.class)
-				.fromSource(ArithmeticExpressionProperties.class));
-		assertThat(metadata).has(Metadata.withProperty("arithmetic.literal", Integer.class)
-				.fromSource(ArithmeticExpressionProperties.class)
-				.withDefaultValue(100));
-		assertThat(metadata).has(Metadata.withProperty("arithmetic.simple-flag", Boolean.class)
-				.fromSource(ArithmeticExpressionProperties.class)
-				.withDefaultValue(true));
-		assertThat(metadata).has(Metadata.withProperty("arithmetic.complex-flag", Boolean.class)
-				.fromSource(ArithmeticExpressionProperties.class));
-	}
-
 }

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationprocessor/fieldvalues/AbstractFieldValuesProcessorTests.java

@@ -61,12 +61,15 @@ void getFieldValues() {
 		assertThat(values.get("bool")).isEqualTo(true);
 		assertThat(values.get("boolNone")).isEqualTo(false);
 		assertThat(values.get("boolConst")).isEqualTo(true);
+		assertThat(values.get("boolInverted")).isNull();
 		assertThat(values.get("boolObject")).isEqualTo(true);
 		assertThat(values.get("boolObjectNone")).isNull();
 		assertThat(values.get("boolObjectConst")).isEqualTo(true);
 		assertThat(values.get("integer")).isEqualTo(1);
 		assertThat(values.get("integerNone")).isEqualTo(0);
 		assertThat(values.get("integerConst")).isEqualTo(2);
+		assertThat(values.get("integerArithmetic")).isNull();
+		assertThat(values.get("integerMax")).isNull();
 		assertThat(values.get("integerObject")).isEqualTo(3);
 		assertThat(values.get("integerObjectNone")).isNull();
 		assertThat(values.get("integerObjectConst")).isEqualTo(4);
@@ -84,6 +87,7 @@ void getFieldValues() {
 		assertThat(values.get("stringArrayConst")).isEqualTo(new Object[] { "OK", "KO" });
 		assertThat(values.get("stringArrayConstElements")).isEqualTo(new Object[] { "c" });
 		assertThat(values.get("integerArray")).isEqualTo(new Object[] { 42, 24 });
+		assertThat(values.get("intArrayUnsupportedExpression")).isNull();
 		assertThat(values.get("unknownArray")).isNull();
 		assertThat(values.get("durationNone")).isNull();
 		assertThat(values.get("durationNanos")).isEqualTo("5ns");

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/ArithmeticExpressionProperties.java

@@ -64,6 +64,8 @@ public class FieldValues {
 
 	private boolean boolConst = BOOLEAN_CONST;
 
+	private boolean boolInverted = !false;
+
 	private Boolean boolObject = Boolean.TRUE;
 
 	private Boolean boolObjectNone;
@@ -76,6 +78,10 @@ public class FieldValues {
 
 	private int integerConst = INTEGER_CONST;
 
+	private int integerArithmetic = 10 * 10;
+
+	private int integerMax = Math.max(10, 20);
+
 	private Integer integerObject = 3;
 
 	private Integer integerObjectNone;
@@ -110,6 +116,8 @@ public class FieldValues {
 
 	private Integer[] integerArray = new Integer[] { 42, 24 };
 
+	private int[] intArrayUnsupportedExpression = new int[] { 10 + 10 };
+
 	private UnknownElementType[] unknownArray = new UnknownElementType[] { new UnknownElementType() };
 
 	private Duration durationNone;

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/fieldvalues/FieldValues.java

@@ -85,4 +85,5 @@
 	<suppress files="MyInterface\.java" checks="InterfaceIsType" />
 	<suppress files="SpringBootBanner\.java" checks="SpringLeadingWhitespace" />
 	<suppress files="LoadTimeWeaverAwareConsumerContainers\.java" checks="InterfaceIsType" />
+	<suppress files="FieldValues\.java" checks="SimplifyBooleanExpression" />
 </suppressions>