Skip to content

Commit de4db38

Browse files
committed
Merge branch '6.2.x'
2 parents 9eae0b6 + 440a259 commit de4db38

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

Diff for: spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java

+2-1
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.
@@ -422,6 +422,7 @@ void proxyTargetClassInCaseOfNoInterfaces() {
422422
}
423423

424424
@Test // SPR-13328
425+
@SuppressWarnings("unchecked")
425426
void varargsWithEnumArray() {
426427
ProxyFactory proxyFactory = new ProxyFactory(new MyBean());
427428
MyBean proxy = (MyBean) proxyFactory.getProxy();

Diff for: spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java

+2-1
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.
@@ -141,6 +141,7 @@ void equalsAndHashCodeDefined() {
141141
}
142142

143143
@Test // SPR-13328
144+
@SuppressWarnings("unchecked")
144145
void varargsWithEnumArray() {
145146
ProxyFactory proxyFactory = new ProxyFactory(new VarargTestBean());
146147
VarargTestInterface proxy = (VarargTestInterface) proxyFactory.getProxy();

Diff for: spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java

+2-2
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.
@@ -218,14 +218,14 @@ public String doWork() {
218218
}
219219

220220

221+
@SuppressWarnings("serial")
221222
private static class MyProblemDetail extends ProblemDetail {
222223

223224
private static final long serialVersionUID = -3036911788793188054L;
224225

225226
public MyProblemDetail(HttpStatus status) {
226227
super(status.value());
227228
}
228-
229229
}
230230

231231
}

Diff for: spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

+2-2
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.
@@ -839,14 +839,14 @@ SimpleBean getSimpleBean() {
839839
}
840840

841841

842+
@SuppressWarnings("serial")
842843
private static class MyProblemDetail extends ProblemDetail {
843844

844845
private static final long serialVersionUID = 848059476504348430L;
845846

846847
public MyProblemDetail(HttpStatus status) {
847848
super(status.value());
848849
}
849-
850850
}
851851

852852

0 commit comments

Comments
 (0)