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

Annotation parameter scan finds first-level conflicts

Browse Source 
Closes PR-16312
This commit is contained in:
DingHao
2024-12-20 10:22:32 +08:00
committed by Josh Cummings
parent 103ccb3b9d
commit 96b9820e19
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/test/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScannerTests.java
View File

@@ -319,6 +319,13 @@ public class UniqueSecurityAnnotationScannerTests {
assertThat(pre).isNotNull();
}
@Test
void scanParameterAnnotationWhenPresentInParentAndInterfaceThenException() throws Exception {
Parameter parameter = DefaultUserService.class.getDeclaredMethod("batch", String[].class).getParameters()[0];
assertThatExceptionOfType(AnnotationConfigurationException.class)
.isThrownBy(() -> this.parameterScanner.scan(parameter));
}
interface UserService {
void add(@CustomParameterAnnotation("one") String user);
@@ -345,6 +352,8 @@ public class UniqueSecurityAnnotationScannerTests {
interface RemoteUserService extends ThirdPartyUserService {
void batch(@CustomParameterAnnotation("six") String... user);
}
static class UserServiceImpl implements UserService, OtherUserService, RemoteUserService {
@@ -369,6 +378,20 @@ public class UniqueSecurityAnnotationScannerTests {
}
@Override
public void batch(@CustomParameterAnnotation("seven") String... user) {
}
}
static class DefaultUserService extends UserServiceImpl implements RemoteUserService {
@Override
public void batch(String... user) {
}
}
@Target({ ElementType.PARAMETER })