spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50866 from quaff

Browse Source 
Closes gh-50866

* gh-50866:
  Polish "Remove unnecessary `@Nullable`s from local variable declarations"
  Remove unnecessary `@Nullable`s from local variable declarations
This commit is contained in:
Andy Wilkinson
2026-06-28 12:07:01 +01:00
parent 428963e02d ecacc0aa1e
commit 3edbc80a9f
5 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/spring-boot/src/main/java/org/springframework/boot/json/BasicJsonParser.java
+1 -1
View File
@@ -82,7 +82,7 @@ public class BasicJsonParser extends AbstractJsonParser {
Map<String, Object> map = new LinkedHashMap<>();
json = trimEdges(json, '{', '}').trim();
for (String pair : tokenize(json)) {
String @Nullable [] split = StringUtils.split(pair, ":");
String[] split = StringUtils.split(pair, ":");
Assert.state(split != null, () -> "Unable to parse '%s'".formatted(pair));
@Nullable String[] rawElement = StringUtils.trimArrayElements(split);
String rawKey = rawElement[0];
module/spring-boot-jackson/src/test/java/org/springframework/boot/jackson/autoconfigure/jsontest/app/ExampleJacksonComponent.java
+2 -3
View File
@@ -19,7 +19,6 @@ package org.springframework.boot.jackson.autoconfigure.jsontest.app;
import java.util.Date;
import java.util.UUID;
import org.jspecify.annotations.Nullable;
import tools.jackson.core.JsonGenerator;
import tools.jackson.core.JsonParser;
import tools.jackson.databind.DeserializationContext;
@@ -45,11 +44,11 @@ public class ExampleJacksonComponent {
@Override
protected void serializeObject(ExampleCustomObject value, JsonGenerator jgen, SerializationContext context) {
jgen.writeStringProperty("value", value.value());
@Nullable Date date = value.date();
Date date = value.date();
if (date != null) {
jgen.writeNumberProperty("date", date.getTime());
}
@Nullable UUID uuid = value.uuid();
UUID uuid = value.uuid();
if (uuid != null) {
jgen.writeStringProperty("uuid", uuid.toString());
}
module/spring-boot-micrometer-metrics/src/main/java/org/springframework/boot/micrometer/metrics/autoconfigure/PropertiesMeterFilter.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class PropertiesMeterFilter implements MeterFilter {
if (values.isEmpty()) {
return defaultValue;
}
@Nullable T result = doLookup(values, id);
T result = doLookup(values, id);
return (result != null) ? result : values.getOrDefault("all", defaultValue);
}
smoke-test/spring-boot-smoke-test-integration/src/test/java/smoketest/integration/producer/ProducerApplication.java
+1 -2
View File
@@ -19,7 +19,6 @@ package smoketest.integration.producer;
import java.io.File;
import java.io.FileOutputStream;
import org.jspecify.annotations.Nullable;
import smoketest.integration.ServiceProperties;
import org.springframework.boot.ApplicationArguments;
@@ -41,7 +40,7 @@ public class ProducerApplication implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
@Nullable File inputDir = this.serviceProperties.getInputDir();
File inputDir = this.serviceProperties.getInputDir();
Assert.notNull(inputDir, "No inputDir configured");
inputDir.mkdirs();
if (!args.getNonOptionArgs().isEmpty()) {
smoke-test/spring-boot-smoke-test-parent-context/src/test/java/smoketest/parent/producer/ProducerApplication.java
+1 -2
View File
@@ -19,7 +19,6 @@ package smoketest.parent.producer;
import java.io.File;
import java.io.FileOutputStream;
import org.jspecify.annotations.Nullable;
import smoketest.parent.ServiceProperties;
import org.springframework.boot.ApplicationArguments;
@@ -41,7 +40,7 @@ public class ProducerApplication implements ApplicationRunner {
@Override
public void run(ApplicationArguments args) throws Exception {
@Nullable File inputDir = this.serviceProperties.getInputDir();
File inputDir = this.serviceProperties.getInputDir();
Assert.notNull(inputDir, "No inputDir configured");
inputDir.mkdirs();
if (!args.getNonOptionArgs().isEmpty()) {