Skip to content

Commit 34d6dd9

Browse files
committed
Polishing
1 parent 5499878 commit 34d6dd9

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

spring-context/src/test/java/org/springframework/validation/DataBinderConstructTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-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.
@@ -225,7 +225,7 @@ public int param3() {
225225
}
226226

227227

228-
private static class NestedDataClass {
228+
static class NestedDataClass {
229229

230230
private final String param1;
231231

spring-core/src/test/java/org/springframework/aot/hint/annotation/RegisterReflectionReflectiveProcessorTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-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.
@@ -180,10 +180,7 @@ public void setDescription(String description) {
180180
@RegisterReflection(memberCategories = MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)
181181
static class AnnotatedSimplePojo {
182182

183-
private String test;
184-
185183
AnnotatedSimplePojo(String test) {
186-
this.test = test;
187184
}
188185
}
189186

spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-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.
@@ -405,7 +405,10 @@ void someMethod(T theArg, Object otherArg) {
405405
}
406406

407407

408-
public abstract static class SubBar<T extends StringBuffer> extends InterBar<T> {
408+
public abstract static class SubBar<T extends StringProducer> extends InterBar<T> {
409+
}
410+
411+
public interface StringProducer extends CharSequence {
409412
}
410413

411414

spring-core/src/test/java/org/springframework/core/convert/support/GenericConversionServiceTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,12 @@ void stringListToListOfSubclassOfUnboundGenericClass() {
570570
conversionService.addConverter(new StringListToAListConverter());
571571
conversionService.addConverter(new StringListToBListConverter());
572572

573-
List<ARaw> aList = (List<ARaw>) conversionService.convert(List.of("foo"),
573+
List<?> aList = (List<?>) conversionService.convert(List.of("foo"),
574574
TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(String.class)),
575575
TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(ARaw.class)));
576576
assertThat(aList).allMatch(e -> e instanceof ARaw);
577577

578-
List<BRaw> bList = (List<BRaw>) conversionService.convert(List.of("foo"),
578+
List<?> bList = (List<?>) conversionService.convert(List.of("foo"),
579579
TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(String.class)),
580580
TypeDescriptor.collection(List.class, TypeDescriptor.valueOf(BRaw.class)));
581581
assertThat(bList).allMatch(e -> e instanceof BRaw);
@@ -945,9 +945,11 @@ public Color convert(String source) {
945945
private static class GenericBaseClass<T> {
946946
}
947947

948+
@SuppressWarnings("rawtypes")
948949
private static class ARaw extends GenericBaseClass {
949950
}
950951

952+
@SuppressWarnings("rawtypes")
951953
private static class BRaw extends GenericBaseClass {
952954
}
953955

spring-web/src/test/java/org/springframework/web/bind/support/WebExchangeDataBinderTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2024 the original author or authors.
2+
* Copyright 2002-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.
@@ -330,7 +330,7 @@ public void setSomePartList(List<FilePart> somePartList) {
330330
}
331331

332332

333-
private static class MultipartDataClass {
333+
static class MultipartDataClass {
334334

335335
private final FilePart part;
336336

@@ -351,4 +351,5 @@ public FilePart getNullablePart() {
351351
return nullablePart;
352352
}
353353
}
354+
354355
}

0 commit comments

Comments
 (0)