diff --git a/core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java index 8b15aa845c..d6a021c6b3 100644 --- a/core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java @@ -63,7 +63,7 @@ public final class ObservationAuthenticationManager implements AuthenticationMan * * @since 6.1 */ - public void setConvention(ObservationConvention convention) { + public void setObservationConvention(ObservationConvention convention) { Assert.notNull(convention, "The observation convention cannot be null"); this.convention = convention; } diff --git a/core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java b/core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java index 93d7dd9d75..6e159361f9 100644 --- a/core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java +++ b/core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java @@ -70,7 +70,7 @@ public class ObservationReactiveAuthenticationManager implements ReactiveAuthent * * @since 6.1 */ - public void setConvention(ObservationConvention convention) { + public void setObservationConvention(ObservationConvention convention) { Assert.notNull(convention, "The observation convention cannot be null"); this.convention = convention; } diff --git a/core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java index 624d704961..30392eafc3 100644 --- a/core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java @@ -76,7 +76,7 @@ public final class ObservationAuthorizationManager implements AuthorizationMa * * @since 6.1 */ - public void setConvention(ObservationConvention> convention) { + public void setObservationConvention(ObservationConvention> convention) { Assert.notNull(convention, "The observation convention cannot be null"); this.convention = convention; } diff --git a/core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java b/core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java index d7e3d522d7..ddef8f182c 100644 --- a/core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java +++ b/core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java @@ -75,7 +75,7 @@ public final class ObservationReactiveAuthorizationManager implements Reactiv * * @since 6.1 */ - public void setConvention(ObservationConvention> convention) { + public void setObservationConvention(ObservationConvention> convention) { Assert.notNull(convention, "The observation convention cannot be null"); this.convention = convention; } diff --git a/core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java index 6eff320e2e..475b4158a1 100644 --- a/core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java @@ -94,8 +94,9 @@ public class ObservationAuthenticationManagerTests { } @Test - void conventionSetterThrowsWhenNull() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> this.tested.setConvention(null)); + void setObservationConventionWhenNullThenException() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> this.tested.setObservationConvention(null)); } } diff --git a/core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java b/core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java index 55032f833c..8daf102cc3 100644 --- a/core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java @@ -97,8 +97,9 @@ public class ObservationReactiveAuthenticationManagerTests { } @Test - void conventionSetterThrowsWhenNull() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> this.tested.setConvention(null)); + void setObservationConventionWhenNullThenException() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> this.tested.setObservationConvention(null)); } } diff --git a/core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java index e3e492adcd..f3cd921aed 100644 --- a/core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java @@ -119,8 +119,9 @@ public class ObservationAuthorizationManagerTests { } @Test - void conventionSetterThrowsWhenNull() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> this.tested.setConvention(null)); + void setObservationConventionWhenNullThenException() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> this.tested.setObservationConvention(null)); } } diff --git a/core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java b/core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java index ab2b61f1ec..cb5d851420 100644 --- a/core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java +++ b/core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java @@ -118,8 +118,9 @@ public class ObservationReactiveAuthorizationManagerTests { } @Test - void conventionSetterThrowsWhenNull() { - assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> this.tested.setConvention(null)); + void setObservationConventionWhenNullThenException() { + assertThatExceptionOfType(IllegalArgumentException.class) + .isThrownBy(() -> this.tested.setObservationConvention(null)); } }