Skip to content

Commit 1d693b1

Browse files
committed
Merge branch '4.0.x'
Closes gh-50885
2 parents b140c8d + d8a47e7 commit 1d693b1

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

core/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/ValueObjectBinder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ List<ConstructorParameter> getConstructorParameters() {
339339
@SuppressWarnings("unchecked")
340340
static <T> @Nullable ValueObject<T> get(Constructor<?> bindConstructor, ResolvableType type,
341341
ParameterNameDiscoverer parameterNameDiscoverer) {
342-
@Nullable String @Nullable [] names = parameterNameDiscoverer.getParameterNames(bindConstructor);
342+
@Nullable String[] names = parameterNameDiscoverer.getParameterNames(bindConstructor);
343343
if (names == null) {
344344
return null;
345345
}
@@ -428,7 +428,7 @@ public String[] getParameterNames(Method method) {
428428

429429
@Override
430430
public @Nullable String @Nullable [] getParameterNames(Constructor<?> constructor) {
431-
@Nullable String @Nullable [] names = this.delegate.getParameterNames(constructor);
431+
@Nullable String[] names = this.delegate.getParameterNames(constructor);
432432
if (names != null) {
433433
return names;
434434
}

module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/Jackson2BeanSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ private boolean isCandidate(BeanDescription beanDesc, BeanPropertyWriter writer,
222222
@Nullable Constructor<?> constructor) {
223223
if (constructor != null) {
224224
Parameter[] parameters = constructor.getParameters();
225-
@Nullable String @Nullable [] names = parameterNameDiscoverer.getParameterNames(constructor);
225+
@Nullable String[] names = parameterNameDiscoverer.getParameterNames(constructor);
226226
if (names == null) {
227227
names = new String[parameters.length];
228228
}

module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/JacksonBeanSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ private boolean isCandidate(BeanDescription.Supplier beanDesc, BeanPropertyWrite
213213
@Nullable Constructor<?> constructor) {
214214
if (constructor != null) {
215215
Parameter[] parameters = constructor.getParameters();
216-
@Nullable String @Nullable [] names = parameterNameDiscoverer.getParameterNames(constructor);
216+
@Nullable String[] names = parameterNameDiscoverer.getParameterNames(constructor);
217217
if (names == null) {
218218
names = new String[parameters.length];
219219
}

0 commit comments

Comments
 (0)