Skip to content

Commit 8e7f7d3

Browse files
committed
Merge branch '2.5.x' into 2.6.x
2 parents 6bc0005 + b97a3ae commit 8e7f7d3

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2021 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.
@@ -554,7 +554,6 @@ private String determineAccessorSuffix(String propertyName) {
554554
return StringUtils.capitalize(propertyName);
555555
}
556556

557-
@SuppressWarnings("deprecation")
558557
private Constructor<?> findBindConstructor(Class<?> type) {
559558
boolean classConstructorBinding = MergedAnnotations
560559
.from(type, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/ConfigurationPropertiesBindConstructorProvider.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2020 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.
@@ -85,7 +85,6 @@ private boolean isImplicitConstructorBindingType(Class<?> type) {
8585
return (superclass != null) && "java.lang.Record".equals(superclass.getName());
8686
}
8787

88-
@SuppressWarnings("deprecation")
8988
private boolean isConstructorBindingAnnotatedType(Class<?> type) {
9089
return MergedAnnotations.from(type, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)
9190
.isPresent(ConstructorBinding.class);

0 commit comments

Comments
 (0)