Skip to content

Commit 0b12ceb

Browse files
committed
Fix warnings reported in Eclipse
1 parent 379b2ce commit 0b12ceb

File tree

14 files changed

+25
-21
lines changed

14 files changed

+25
-21
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import org.springframework.boot.actuate.endpoint.invoke.OperationParameter;
2727
import org.springframework.core.annotation.MergedAnnotation;
2828
import org.springframework.core.annotation.MergedAnnotations;
29-
import org.springframework.lang.Nullable;
3029
import org.springframework.util.ClassUtils;
3130

3231
/**
@@ -80,7 +79,8 @@ public boolean isMandatory() {
8079

8180
@SuppressWarnings("deprecation")
8281
private boolean isOptional() {
83-
return this.parameter.getAnnotationsByType(Nullable.class).length > 0 || this.optional.test(this.parameter);
82+
return this.parameter.getAnnotationsByType(org.springframework.lang.Nullable.class).length > 0
83+
|| this.optional.test(this.parameter);
8484
}
8585

8686
@Override

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/web/mappings/servlet/RequestMappingConditionsDescription.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.web.bind.annotation.RequestMethod;
2323
import org.springframework.web.servlet.mvc.condition.MediaTypeExpression;
2424
import org.springframework.web.servlet.mvc.condition.NameValueExpression;
25-
import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition;
2625
import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
2726

2827
/**
@@ -70,9 +69,10 @@ public class RequestMappingConditionsDescription {
7069
.toList();
7170
}
7271

73-
@SuppressWarnings("removal")
72+
@SuppressWarnings({ "removal", "deprecation" })
7473
private Set<String> extractPathPatterns(RequestMappingInfo requestMapping) {
75-
PatternsRequestCondition patternsCondition = requestMapping.getPatternsCondition();
74+
org.springframework.web.servlet.mvc.condition.PatternsRequestCondition patternsCondition = requestMapping
75+
.getPatternsCondition();
7676
return (patternsCondition != null) ? patternsCondition.getPatterns()
7777
: requestMapping.getPathPatternsCondition().getPatternValues();
7878
}

spring-boot-project/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/endpoint/invoke/reflect/OperationMethodParameterTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
import org.springframework.boot.actuate.endpoint.annotation.Selector;
3434
import org.springframework.boot.actuate.endpoint.annotation.Selector.Match;
3535
import org.springframework.core.annotation.MergedAnnotations;
36-
import org.springframework.lang.Nullable;
3736
import org.springframework.util.ReflectionUtils;
3837

3938
import static org.assertj.core.api.Assertions.assertThat;
@@ -135,7 +134,7 @@ void example(String one, @TestOptional String two) {
135134
}
136135

137136
@SuppressWarnings("deprecation")
138-
void exampleSpringNullable(String one, @Nullable String two) {
137+
void exampleSpringNullable(String one, @org.springframework.lang.Nullable String two) {
139138
}
140139

141140
void exampleJsr305(String one, @javax.annotation.Nullable String two) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/GraphQlTestDataFetchers.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import graphql.schema.DataFetcher;
2323
import reactor.core.publisher.Flux;
2424

25-
import org.springframework.lang.Nullable;
26-
2725
/**
2826
* Test utility class holding {@link DataFetcher} implementations.
2927
*
@@ -49,7 +47,7 @@ public static DataFetcher<Flux<Book>> getBooksOnSaleDataFetcher() {
4947
}
5048

5149
@SuppressWarnings("deprecation")
52-
@Nullable
50+
@org.springframework.lang.Nullable
5351
public static Book getBookById(String id) {
5452
return books.stream().filter((book) -> book.getId().equals(id)).findFirst().orElse(null);
5553
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebFluxSecurityAutoConfigurationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
import org.springframework.graphql.execution.ReactiveSecurityDataFetcherExceptionResolver;
4343
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
4444
import org.springframework.http.MediaType;
45-
import org.springframework.lang.Nullable;
4645
import org.springframework.security.access.prepost.PreAuthorize;
4746
import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
4847
import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
@@ -170,7 +169,7 @@ BookService bookService() {
170169
static class BookService {
171170

172171
@PreAuthorize("hasRole('USER')")
173-
@Nullable
172+
@org.springframework.lang.Nullable
174173
@SuppressWarnings("deprecation")
175174
Mono<Book> getBookdById(String id) {
176175
return Mono.justOrEmpty(GraphQlTestDataFetchers.getBookById(id));

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/graphql/security/GraphQlWebMvcSecurityAutoConfigurationTests.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.springframework.graphql.execution.RuntimeWiringConfigurer;
4040
import org.springframework.graphql.execution.SecurityDataFetcherExceptionResolver;
4141
import org.springframework.http.MediaType;
42-
import org.springframework.lang.Nullable;
4342
import org.springframework.security.access.prepost.PreAuthorize;
4443
import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
4544
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -159,7 +158,7 @@ BookService bookService() {
159158
static class BookService {
160159

161160
@PreAuthorize("hasRole('USER')")
162-
@Nullable
161+
@org.springframework.lang.Nullable
163162
@SuppressWarnings("deprecation")
164163
Book getBookdById(String id) {
165164
return GraphQlTestDataFetchers.getBookById(id);

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -97,6 +97,7 @@ private ConfigurationMetadata readMetadata(String location) {
9797
/**
9898
* Write the module {@link ConfigurationMetadata} to the filesystem.
9999
* @param metadata the metadata to write
100+
* @throws IOException when the write fails
100101
*/
101102
void writeMetadata(ConfigurationMetadata metadata) throws IOException {
102103
writeMetadata(metadata, () -> createMetadataResource(METADATA_PATH));
@@ -107,6 +108,7 @@ void writeMetadata(ConfigurationMetadata metadata) throws IOException {
107108
* filesystem.
108109
* @param metadata the metadata to write
109110
* @param typeElement the type to write metadata for
111+
* @throws IOException when the write fails
110112
*/
111113
void writeMetadata(ConfigurationMetadata metadata, TypeElement typeElement) throws IOException {
112114
writeMetadata(metadata, () -> createMetadataResource(SOURCE_METADATA_PATH.apply(typeElement, this.typeUtils)));

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/ImmutableSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,13 @@
2222
*/
2323
public class ImmutableSource {
2424

25+
@SuppressWarnings("unused")
2526
private final String name;
2627

28+
@SuppressWarnings("unused")
2729
private final String description;
2830

31+
@SuppressWarnings("unused")
2932
private final String type;
3033

3134
public ImmutableSource(String name, String description, String type) {

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/LombokSource.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@
2727
@Setter
2828
public class LombokSource {
2929

30+
@SuppressWarnings("unused")
3031
private String name;
3132

33+
@SuppressWarnings("unused")
3234
private String description;
3335

36+
@SuppressWarnings("unused")
3437
private String type;
3538

3639
}

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/RecordSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.boot.configurationsample.source;
1818

19-
/**
19+
/*
2020
* Record type with manual metadata. This illustrates the case where the type of a
2121
* property is defined in a separate class and source-based metadata cannot be discovered.
2222
*/

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/ImmutablePropertiesSource.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,13 @@ public class ImmutablePropertiesSource {
2525
/**
2626
* Description of this simple property.
2727
*/
28+
@SuppressWarnings("unused")
2829
private final String name;
2930

3031
/**
3132
* Whether it is enabled.
3233
*/
34+
@SuppressWarnings("unused")
3335
private final boolean enabled;
3436

3537
public ImmutablePropertiesSource(@DefaultValue("boot") String name, boolean enabled) {

spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/java/org/springframework/boot/configurationsample/source/generation/LombokPropertiesSource.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,13 @@ public class LombokPropertiesSource {
2929
/**
3030
* Description of this simple property.
3131
*/
32+
@SuppressWarnings("unused")
3233
private String name = "boot";
3334

3435
/**
3536
* Whether it is enabled.
3637
*/
38+
@SuppressWarnings("unused")
3739
private boolean enabled;
3840

3941
}

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.springframework.core.OrderComparator;
3737
import org.springframework.core.Ordered;
3838
import org.springframework.core.annotation.Order;
39-
import org.springframework.test.context.junit4.SpringRunner;
4039
import org.springframework.util.Assert;
4140
import org.springframework.util.ClassUtils;
4241

@@ -48,7 +47,7 @@
4847
* {@link ApplicationContext} and/or custom {@link ImportSelector} implementations.
4948
* <p>
5049
* This class is primarily intended for use with tests that need to specify configuration
51-
* classes but can't use {@link SpringRunner}.
50+
* classes but can't use {@link org.springframework.test.context.junit4.SpringRunner}.
5251
* <p>
5352
* Implementations of this class should be annotated with {@link Order @Order} or
5453
* implement {@link Ordered}.

spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-data-jpa/src/main/java/smoketest/data/jpa/domain/Review.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@
2727
import jakarta.persistence.Id;
2828
import jakarta.persistence.ManyToOne;
2929
import jakarta.persistence.SequenceGenerator;
30-
import jakarta.persistence.Temporal;
31-
import jakarta.persistence.TemporalType;
3230

3331
import org.springframework.util.Assert;
3432

@@ -53,7 +51,7 @@ public class Review implements Serializable {
5351
private Rating rating;
5452

5553
@Column(nullable = false)
56-
@Temporal(TemporalType.DATE)
54+
@jakarta.persistence.Temporal(jakarta.persistence.TemporalType.DATE)
5755
@SuppressWarnings("deprecation")
5856
private Date checkInDate;
5957

0 commit comments

Comments
 (0)