Browse Source

Polish ObservationConvention Configuration

Change to setObservationConvention so that it reads more clearly
when used, for example `authenticationManager.setObservationConvention`
is clearer than `authenticationManager.setConvention`.

Change unit test names to follow team conventions.

Issue gh-12534
pull/12948/head
Josh Cummings 3 years ago
parent
commit
607e40d366
  1. 2
      core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java
  2. 2
      core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java
  3. 2
      core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java
  4. 2
      core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java
  5. 5
      core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java
  6. 5
      core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java
  7. 5
      core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java
  8. 5
      core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java

2
core/src/main/java/org/springframework/security/authentication/ObservationAuthenticationManager.java

@ -63,7 +63,7 @@ public final class ObservationAuthenticationManager implements AuthenticationMan @@ -63,7 +63,7 @@ public final class ObservationAuthenticationManager implements AuthenticationMan
*
* @since 6.1
*/
public void setConvention(ObservationConvention<AuthenticationObservationContext> convention) {
public void setObservationConvention(ObservationConvention<AuthenticationObservationContext> convention) {
Assert.notNull(convention, "The observation convention cannot be null");
this.convention = convention;
}

2
core/src/main/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManager.java

@ -70,7 +70,7 @@ public class ObservationReactiveAuthenticationManager implements ReactiveAuthent @@ -70,7 +70,7 @@ public class ObservationReactiveAuthenticationManager implements ReactiveAuthent
*
* @since 6.1
*/
public void setConvention(ObservationConvention<AuthenticationObservationContext> convention) {
public void setObservationConvention(ObservationConvention<AuthenticationObservationContext> convention) {
Assert.notNull(convention, "The observation convention cannot be null");
this.convention = convention;
}

2
core/src/main/java/org/springframework/security/authorization/ObservationAuthorizationManager.java

@ -76,7 +76,7 @@ public final class ObservationAuthorizationManager<T> implements AuthorizationMa @@ -76,7 +76,7 @@ public final class ObservationAuthorizationManager<T> implements AuthorizationMa
*
* @since 6.1
*/
public void setConvention(ObservationConvention<AuthorizationObservationContext<?>> convention) {
public void setObservationConvention(ObservationConvention<AuthorizationObservationContext<?>> convention) {
Assert.notNull(convention, "The observation convention cannot be null");
this.convention = convention;
}

2
core/src/main/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManager.java

@ -75,7 +75,7 @@ public final class ObservationReactiveAuthorizationManager<T> implements Reactiv @@ -75,7 +75,7 @@ public final class ObservationReactiveAuthorizationManager<T> implements Reactiv
*
* @since 6.1
*/
public void setConvention(ObservationConvention<AuthorizationObservationContext<?>> convention) {
public void setObservationConvention(ObservationConvention<AuthorizationObservationContext<?>> convention) {
Assert.notNull(convention, "The observation convention cannot be null");
this.convention = convention;
}

5
core/src/test/java/org/springframework/security/authentication/ObservationAuthenticationManagerTests.java

@ -94,8 +94,9 @@ public class ObservationAuthenticationManagerTests { @@ -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));
}
}

5
core/src/test/java/org/springframework/security/authentication/ObservationReactiveAuthenticationManagerTests.java

@ -97,8 +97,9 @@ public class ObservationReactiveAuthenticationManagerTests { @@ -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));
}
}

5
core/src/test/java/org/springframework/security/authorization/ObservationAuthorizationManagerTests.java

@ -119,8 +119,9 @@ public class ObservationAuthorizationManagerTests { @@ -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));
}
}

5
core/src/test/java/org/springframework/security/authorization/ObservationReactiveAuthorizationManagerTests.java

@ -118,8 +118,9 @@ public class ObservationReactiveAuthorizationManagerTests { @@ -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));
}
}

Loading…
Cancel
Save