mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Merge branch '2.5.x' into 2.6.x
This commit is contained in:
commit
8e7f7d3c76
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
* Copyright 2012-2021 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.
|
||||
@ -554,7 +554,6 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
|
||||
return StringUtils.capitalize(propertyName);
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private Constructor<?> findBindConstructor(Class<?> type) {
|
||||
boolean classConstructorBinding = MergedAnnotations
|
||||
.from(type, SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright 2012-2022 the original author or authors.
|
||||
* Copyright 2012-2020 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.
|
||||
@ -85,7 +85,6 @@ class ConfigurationPropertiesBindConstructorProvider implements BindConstructorP
|
||||
return (superclass != null) && "java.lang.Record".equals(superclass.getName());
|
||||
}
|
||||
|
||||
@SuppressWarnings("deprecation")
|
||||
private boolean isConstructorBindingAnnotatedType(Class<?> type) {
|
||||
return MergedAnnotations.from(type, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY_AND_ENCLOSING_CLASSES)
|
||||
.isPresent(ConstructorBinding.class);
|
||||
|
Loading…
Reference in New Issue
Block a user