Polish "Handle null Principal in AuditEvent"
Closes gh-11320
This commit is contained in:
parent
6b6a01a7e7
commit
7fb0bd77cd
|
@ -41,7 +41,6 @@ import org.springframework.util.Assert;
|
||||||
* (wrappers for AuditEvent).
|
* (wrappers for AuditEvent).
|
||||||
*
|
*
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
* @author Nakul Mishra
|
|
||||||
* @see AuditEventRepository
|
* @see AuditEventRepository
|
||||||
*/
|
*/
|
||||||
@JsonInclude(Include.NON_EMPTY)
|
@JsonInclude(Include.NON_EMPTY)
|
||||||
|
@ -117,7 +116,8 @@ public class AuditEvent implements Serializable {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the user principal responsible for the event.
|
* Returns the user principal responsible for the event or an empty String if the
|
||||||
|
* principal is not available.
|
||||||
* @return the principal
|
* @return the principal
|
||||||
*/
|
*/
|
||||||
public String getPrincipal() {
|
public String getPrincipal() {
|
||||||
|
|
|
@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||||
*
|
*
|
||||||
* @author Dave Syer
|
* @author Dave Syer
|
||||||
* @author Vedran Pavic
|
* @author Vedran Pavic
|
||||||
* @author Nakul Mishra
|
|
||||||
*/
|
*/
|
||||||
public class AuditEventTests {
|
public class AuditEventTests {
|
||||||
|
|
||||||
|
@ -56,6 +55,13 @@ public class AuditEventTests {
|
||||||
assertThat(event.getData().get("c")).isEqualTo("d");
|
assertThat(event.getData().get("c")).isEqualTo("d");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nullPrincipalIsMappedToEmptyString() {
|
||||||
|
AuditEvent auditEvent = new AuditEvent(null, "UNKNOWN",
|
||||||
|
Collections.singletonMap("a", (Object) "b"));
|
||||||
|
assertThat(auditEvent.getPrincipal()).isEmpty();
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void nullTimestamp() throws Exception {
|
public void nullTimestamp() throws Exception {
|
||||||
this.thrown.expect(IllegalArgumentException.class);
|
this.thrown.expect(IllegalArgumentException.class);
|
||||||
|
@ -64,12 +70,6 @@ public class AuditEventTests {
|
||||||
Collections.singletonMap("a", (Object) "b"));
|
Collections.singletonMap("a", (Object) "b"));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
|
||||||
public void nullPrincipal() {
|
|
||||||
AuditEvent auditEvent = new AuditEvent(null, "UNKNOWN", Collections.singletonMap("a", (Object) "b"));
|
|
||||||
assertThat(auditEvent.getPrincipal()).isEmpty();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void nullType() throws Exception {
|
public void nullType() throws Exception {
|
||||||
this.thrown.expect(IllegalArgumentException.class);
|
this.thrown.expect(IllegalArgumentException.class);
|
||||||
|
|
Loading…
Reference in New Issue