Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x'

Browse Source
This commit is contained in:
Sam Brannen
2025-02-12 16:46:58 +01:00
parent 9eae0b6f6f 440a259b71
commit de4db3812a
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -422,6 +422,7 @@ class CglibProxyTests extends AbstractAopProxyTests {
} }
@Test // SPR-13328 @Test // SPR-13328
@SuppressWarnings("unchecked")
void varargsWithEnumArray() { void varargsWithEnumArray() {
ProxyFactory proxyFactory = new ProxyFactory(new MyBean()); ProxyFactory proxyFactory = new ProxyFactory(new MyBean());
MyBean proxy = (MyBean) proxyFactory.getProxy(); MyBean proxy = (MyBean) proxyFactory.getProxy();

3
spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -141,6 +141,7 @@ class JdkDynamicProxyTests extends AbstractAopProxyTests {
} }
@Test // SPR-13328 @Test // SPR-13328
@SuppressWarnings("unchecked")
void varargsWithEnumArray() { void varargsWithEnumArray() {
ProxyFactory proxyFactory = new ProxyFactory(new VarargTestBean()); ProxyFactory proxyFactory = new ProxyFactory(new VarargTestBean());
VarargTestInterface proxy = (VarargTestInterface) proxyFactory.getProxy(); VarargTestInterface proxy = (VarargTestInterface) proxyFactory.getProxy();

4
spring-webflux/src/test/java/org/springframework/web/reactive/result/method/annotation/ResponseBodyResultHandlerTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -218,6 +218,7 @@ class ResponseBodyResultHandlerTests {
} }
@SuppressWarnings("serial")
private static class MyProblemDetail extends ProblemDetail { private static class MyProblemDetail extends ProblemDetail {
private static final long serialVersionUID = -3036911788793188054L; private static final long serialVersionUID = -3036911788793188054L;
@@ -225,7 +226,6 @@ class ResponseBodyResultHandlerTests {
public MyProblemDetail(HttpStatus status) { public MyProblemDetail(HttpStatus status) {
super(status.value()); super(status.value());
} }
} }
} }

4
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2024 the original author or authors. * Copyright 2002-2025 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -839,6 +839,7 @@ class RequestResponseBodyMethodProcessorTests {
} }
@SuppressWarnings("serial")
private static class MyProblemDetail extends ProblemDetail { private static class MyProblemDetail extends ProblemDetail {
private static final long serialVersionUID = 848059476504348430L; private static final long serialVersionUID = 848059476504348430L;
@@ -846,7 +847,6 @@ class RequestResponseBodyMethodProcessorTests {
public MyProblemDetail(HttpStatus status) { public MyProblemDetail(HttpStatus status) {
super(status.value()); super(status.value());
} }
} }