From c972de5369a1261ab674a3f5e3a80e8ce3e8cdfb Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Tue, 29 Apr 2025 15:50:08 -0600 Subject: [PATCH] Use .equals to Compare Methods Closes gh-17143 --- .../authorization/method/aspectj/PreAuthorizeAspectTests.java | 4 ++-- .../core/annotation/UniqueSecurityAnnotationScanner.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java b/aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java index d978b3c8ea..5fc9fb072c 100644 --- a/aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java +++ b/aspects/src/test/java/org/springframework/security/authorization/method/aspectj/PreAuthorizeAspectTests.java @@ -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"); * you may not use this file except in compliance with the License. @@ -144,7 +144,7 @@ public class PreAuthorizeAspectTests { protected void protectedMethod() { } - @PreAuthorize("hasRole('X')") + @PreAuthorize("hasRole('A')") void publicCallsPrivate() { privateMethod(); } diff --git a/core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java b/core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java index 32bc8ea57d..f4f5b22e51 100644 --- a/core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java +++ b/core/src/main/java/org/springframework/security/core/annotation/UniqueSecurityAnnotationScanner.java @@ -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"); * you may not use this file except in compliance with the License. @@ -267,7 +267,7 @@ final class UniqueSecurityAnnotationScanner extends Abstra private static Method findMethod(Method method, Class targetClass) { for (Method candidate : targetClass.getDeclaredMethods()) { - if (candidate == method) { + if (candidate.equals(method)) { return candidate; } if (isOverride(method, candidate)) {