From 0b12cebff42033d8ae66c7087749c923051b4553 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Wed, 14 May 2025 11:36:48 +0100 Subject: [PATCH] Fix warnings reported in Eclipse --- .../endpoint/invoke/reflect/OperationMethodParameter.java | 4 ++-- .../servlet/RequestMappingConditionsDescription.java | 6 +++--- .../invoke/reflect/OperationMethodParameterTests.java | 3 +-- .../boot/autoconfigure/graphql/GraphQlTestDataFetchers.java | 4 +--- .../GraphQlWebFluxSecurityAutoConfigurationTests.java | 3 +-- .../GraphQlWebMvcSecurityAutoConfigurationTests.java | 3 +-- .../boot/configurationprocessor/MetadataStore.java | 4 +++- .../boot/configurationsample/source/ImmutableSource.java | 3 +++ .../boot/configurationsample/source/LombokSource.java | 3 +++ .../boot/configurationsample/source/RecordSource.java | 2 +- .../source/generation/ImmutablePropertiesSource.java | 2 ++ .../source/generation/LombokPropertiesSource.java | 2 ++ .../boot/context/annotation/Configurations.java | 3 +-- .../src/main/java/smoketest/data/jpa/domain/Review.java | 4 +--- 14 files changed, 25 insertions(+), 21 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java index 68f9492c4f..71d4b0958b 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java @@ -26,7 +26,6 @@ import javax.annotation.meta.When; import org.springframework.boot.actuate.endpoint.invoke.OperationParameter; import org.springframework.core.annotation.MergedAnnotation; import org.springframework.core.annotation.MergedAnnotations; -import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; /** @@ -80,7 +79,8 @@ class OperationMethodParameter implements OperationParameter { @SuppressWarnings("deprecation") private boolean isOptional() { - return this.parameter.getAnnotationsByType(Nullable.class).length > 0 || this.optional.test(this.parameter); + return this.parameter.getAnnotationsByType(org.springframework.lang.Nullable.class).length > 0 + || this.optional.test(this.parameter); } @Override diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RequestMappingConditionsDescription.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RequestMappingConditionsDescription.java index 1caf98e9ca..21160be830 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RequestMappingConditionsDescription.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RequestMappingConditionsDescription.java @@ -22,7 +22,6 @@ import java.util.Set; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.condition.MediaTypeExpression; import org.springframework.web.servlet.mvc.condition.NameValueExpression; -import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; import org.springframework.web.servlet.mvc.method.RequestMappingInfo; /** @@ -70,9 +69,10 @@ public class RequestMappingConditionsDescription { .toList(); } - @SuppressWarnings("removal") + @SuppressWarnings({ "removal", "deprecation" }) private Set extractPathPatterns(RequestMappingInfo requestMapping) { - PatternsRequestCondition patternsCondition = requestMapping.getPatternsCondition(); + org.springframework.web.servlet.mvc.condition.PatternsRequestCondition patternsCondition = requestMapping + .getPatternsCondition(); return (patternsCondition != null) ? patternsCondition.getPatterns() : requestMapping.getPathPatternsCondition().getPatternValues(); } diff --git a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameterTests.java b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameterTests.java index 36a58f00f3..09ad76812d 100644 --- a/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameterTests.java +++ b/spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameterTests.java @@ -33,7 +33,6 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.actuate.endpoint.annotation.Selector; import org.springframework.boot.actuate.endpoint.annotation.Selector.Match; import org.springframework.core.annotation.MergedAnnotations; -import org.springframework.lang.Nullable; import org.springframework.util.ReflectionUtils; import static org.assertj.core.api.Assertions.assertThat; @@ -135,7 +134,7 @@ class OperationMethodParameterTests { } @SuppressWarnings("deprecation") - void exampleSpringNullable(String one, @Nullable String two) { + void exampleSpringNullable(String one, @org.springframework.lang.Nullable String two) { } void exampleJsr305(String one, @javax.annotation.Nullable String two) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java index 86ec527ad1..547bcb34a8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java @@ -22,8 +22,6 @@ import java.util.List; import graphql.schema.DataFetcher; import reactor.core.publisher.Flux; -import org.springframework.lang.Nullable; - /** * Test utility class holding {@link DataFetcher} implementations. * @@ -49,7 +47,7 @@ public final class GraphQlTestDataFetchers { } @SuppressWarnings("deprecation") - @Nullable + @org.springframework.lang.Nullable public static Book getBookById(String id) { return books.stream().filter((book) -> book.getId().equals(id)).findFirst().orElse(null); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java index d9a3e76bf8..720bf237da 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java @@ -42,7 +42,6 @@ import org.springframework.graphql.execution.ErrorType; import org.springframework.graphql.execution.ReactiveSecurityDataFetcherExceptionResolver; import org.springframework.graphql.execution.RuntimeWiringConfigurer; import org.springframework.http.MediaType; -import org.springframework.lang.Nullable; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; @@ -170,7 +169,7 @@ class GraphQlWebFluxSecurityAutoConfigurationTests { static class BookService { @PreAuthorize("hasRole('USER')") - @Nullable + @org.springframework.lang.Nullable @SuppressWarnings("deprecation") Mono getBookdById(String id) { return Mono.justOrEmpty(GraphQlTestDataFetchers.getBookById(id)); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java index 86a6d0ebcc..0a0b523ce6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java @@ -39,7 +39,6 @@ import org.springframework.graphql.execution.ErrorType; import org.springframework.graphql.execution.RuntimeWiringConfigurer; import org.springframework.graphql.execution.SecurityDataFetcherExceptionResolver; import org.springframework.http.MediaType; -import org.springframework.lang.Nullable; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -159,7 +158,7 @@ class GraphQlWebMvcSecurityAutoConfigurationTests { static class BookService { @PreAuthorize("hasRole('USER')") - @Nullable + @org.springframework.lang.Nullable @SuppressWarnings("deprecation") Book getBookdById(String id) { return GraphQlTestDataFetchers.getBookById(id); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java index 238e7e7f9b..9a492244ff 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/main/java/org/springframework/boot/configurationprocessor/MetadataStore.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2025 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. @@ -97,6 +97,7 @@ class MetadataStore { /** * Write the module {@link ConfigurationMetadata} to the filesystem. * @param metadata the metadata to write + * @throws IOException when the write fails */ void writeMetadata(ConfigurationMetadata metadata) throws IOException { writeMetadata(metadata, () -> createMetadataResource(METADATA_PATH)); @@ -107,6 +108,7 @@ class MetadataStore { * filesystem. * @param metadata the metadata to write * @param typeElement the type to write metadata for + * @throws IOException when the write fails */ void writeMetadata(ConfigurationMetadata metadata, TypeElement typeElement) throws IOException { writeMetadata(metadata, () -> createMetadataResource(SOURCE_METADATA_PATH.apply(typeElement, this.typeUtils))); diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/ImmutableSource.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/ImmutableSource.java index f85188028d..afdd84a376 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/ImmutableSource.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/ImmutableSource.java @@ -22,10 +22,13 @@ package org.springframework.boot.configurationsample.source; */ public class ImmutableSource { + @SuppressWarnings("unused") private final String name; + @SuppressWarnings("unused") private final String description; + @SuppressWarnings("unused") private final String type; public ImmutableSource(String name, String description, String type) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/LombokSource.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/LombokSource.java index 647bb28217..e363364738 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/LombokSource.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/LombokSource.java @@ -27,10 +27,13 @@ import lombok.Setter; @Setter public class LombokSource { + @SuppressWarnings("unused") private String name; + @SuppressWarnings("unused") private String description; + @SuppressWarnings("unused") private String type; } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/RecordSource.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/RecordSource.java index 40d38dd202..7a16f04bdf 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/RecordSource.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/RecordSource.java @@ -16,7 +16,7 @@ package org.springframework.boot.configurationsample.source; -/** +/* * Record type with manual metadata. This illustrates the case where the type of a * property is defined in a separate class and source-based metadata cannot be discovered. */ diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/ImmutablePropertiesSource.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/ImmutablePropertiesSource.java index b5e0fd6923..9795e8581b 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/ImmutablePropertiesSource.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/ImmutablePropertiesSource.java @@ -25,11 +25,13 @@ public class ImmutablePropertiesSource { /** * Description of this simple property. */ + @SuppressWarnings("unused") private final String name; /** * Whether it is enabled. */ + @SuppressWarnings("unused") private final boolean enabled; public ImmutablePropertiesSource(@DefaultValue("boot") String name, boolean enabled) { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/LombokPropertiesSource.java b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/LombokPropertiesSource.java index 04e9f1fda5..37fd535f85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/LombokPropertiesSource.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/LombokPropertiesSource.java @@ -29,11 +29,13 @@ public class LombokPropertiesSource { /** * Description of this simple property. */ + @SuppressWarnings("unused") private String name = "boot"; /** * Whether it is enabled. */ + @SuppressWarnings("unused") private boolean enabled; } diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java index 707b2367a0..7e413a9a5a 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java @@ -36,7 +36,6 @@ import org.springframework.context.annotation.ImportSelector; import org.springframework.core.OrderComparator; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.test.context.junit4.SpringRunner; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; @@ -48,7 +47,7 @@ import org.springframework.util.ClassUtils; * {@link ApplicationContext} and/or custom {@link ImportSelector} implementations. *

* This class is primarily intended for use with tests that need to specify configuration - * classes but can't use {@link SpringRunner}. + * classes but can't use {@link org.springframework.test.context.junit4.SpringRunner}. *

* Implementations of this class should be annotated with {@link Order @Order} or * implement {@link Ordered}. diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java index 55f3a62f14..cfa76ff516 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java @@ -27,8 +27,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.SequenceGenerator; -import jakarta.persistence.Temporal; -import jakarta.persistence.TemporalType; import org.springframework.util.Assert; @@ -53,7 +51,7 @@ public class Review implements Serializable { private Rating rating; @Column(nullable = false) - @Temporal(TemporalType.DATE) + @jakarta.persistence.Temporal(jakarta.persistence.TemporalType.DATE) @SuppressWarnings("deprecation") private Date checkInDate;