Skip to content

Commit 75ea722

Browse files
committed
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
1 parent c5713ec commit 75ea722

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

web/src/main/java/org/springframework/security/web/csrf/CookieCsrfTokenRepository.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public CsrfToken loadToken(HttpServletRequest request) {
100100
* provide a token
101101
*/
102102
public void setParameterName(String parameterName) {
103-
Assert.notNull(parameterName, "parameterName is not null");
103+
Assert.notNull(parameterName, "parameterName cannot be null");
104104
this.parameterName = parameterName;
105105
}
106106

@@ -110,7 +110,7 @@ public void setParameterName(String parameterName) {
110110
* token
111111
*/
112112
public void setHeaderName(String headerName) {
113-
Assert.notNull(headerName, "headerName is not null");
113+
Assert.notNull(headerName, "headerName cannot be null");
114114
this.headerName = headerName;
115115
}
116116

@@ -120,7 +120,7 @@ public void setHeaderName(String headerName) {
120120
* and read from
121121
*/
122122
public void setCookieName(String cookieName) {
123-
Assert.notNull(cookieName, "cookieName is not null");
123+
Assert.notNull(cookieName, "cookieName cannot be null");
124124
this.cookieName = cookieName;
125125
}
126126

@@ -216,7 +216,7 @@ public void setSecure(Boolean secure) {
216216
* @since 5.5
217217
*/
218218
public void setCookieMaxAge(int cookieMaxAge) {
219-
Assert.isTrue(cookieMaxAge != 0, "cookieMaxAge is not zero");
219+
Assert.isTrue(cookieMaxAge != 0, "cookieMaxAge cannot be zero");
220220
this.cookieMaxAge = cookieMaxAge;
221221
}
222222

0 commit comments

Comments
 (0)