From 48ef27b80ac449c3221d1da057ab2d803482e903 Mon Sep 17 00:00:00 2001 From: Serdar Kuzucu Date: Sat, 14 Nov 2020 12:40:12 +0300 Subject: [PATCH] Make assertion messages in CookieCsrfTokenRepository clearer Changes assertion message format from 'X is not null' to 'X cannot be null' since this is more meaningful when the error occurs and the message is printed in the logs. Closes gh-9195 --- .../security/web/csrf/CookieCsrfTokenRepository.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java b/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java index d04a62ce89..80f036e7d8 100644 --- a/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java +++ b/web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java @@ -100,7 +100,7 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { * provide a token */ public void setParameterName(String parameterName) { - Assert.notNull(parameterName, "parameterName is not null"); + Assert.notNull(parameterName, "parameterName cannot be null"); this.parameterName = parameterName; } @@ -110,7 +110,7 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { * token */ public void setHeaderName(String headerName) { - Assert.notNull(headerName, "headerName is not null"); + Assert.notNull(headerName, "headerName cannot be null"); this.headerName = headerName; } @@ -120,7 +120,7 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { * and read from */ public void setCookieName(String cookieName) { - Assert.notNull(cookieName, "cookieName is not null"); + Assert.notNull(cookieName, "cookieName cannot be null"); this.cookieName = cookieName; } @@ -216,7 +216,7 @@ public final class CookieCsrfTokenRepository implements CsrfTokenRepository { * @since 5.5 */ public void setCookieMaxAge(int cookieMaxAge) { - Assert.isTrue(cookieMaxAge != 0, "cookieMaxAge is not zero"); + Assert.isTrue(cookieMaxAge != 0, "cookieMaxAge cannot be zero"); this.cookieMaxAge = cookieMaxAge; }