From 47a7a35aa425640c0f34f806bc05fadd59e92e95 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Wed, 5 Jul 2017 17:04:03 +0200 Subject: [PATCH] Remove use of `Assert#notNull` from core components Fixes gh-820 --- .../src/main/java/org/springframework/session/Session.java | 7 ++++--- .../session/web/http/CookieHttpSessionStrategy.java | 5 +++-- .../session/web/http/HeaderHttpSessionStrategy.java | 5 +++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/spring-session-core/src/main/java/org/springframework/session/Session.java b/spring-session-core/src/main/java/org/springframework/session/Session.java index c859c71d..3014c494 100644 --- a/spring-session-core/src/main/java/org/springframework/session/Session.java +++ b/spring-session-core/src/main/java/org/springframework/session/Session.java @@ -20,8 +20,6 @@ import java.time.Duration; import java.time.Instant; import java.util.Set; -import org.springframework.util.Assert; - /** * Provides a way to identify a user in an agnostic way. This allows the session to be * used by an HttpSession, WebSocket Session, or even non web related sessions. @@ -60,7 +58,10 @@ public interface Session { @SuppressWarnings("unchecked") default T getRequiredAttribute(String name) { T result = getAttribute(name); - Assert.notNull(result, "Required attribute '" + name + "' is missing."); + if (result == null) { + throw new IllegalArgumentException( + "Required attribute '" + name + "' is missing."); + } return result; } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java index 32947d82..61c5e465 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionStrategy.java @@ -33,7 +33,6 @@ import javax.servlet.http.HttpServletResponseWrapper; import org.springframework.session.Session; import org.springframework.session.web.http.CookieSerializer.CookieValue; -import org.springframework.util.Assert; /** * A {@link HttpSessionStrategy} that uses a cookie to obtain the session from. @@ -293,7 +292,9 @@ public final class CookieHttpSessionStrategy * @param cookieSerializer the cookieSerializer to set. Cannot be null. */ public void setCookieSerializer(CookieSerializer cookieSerializer) { - Assert.notNull(cookieSerializer, "cookieSerializer cannot be null"); + if (cookieSerializer == null) { + throw new IllegalArgumentException("cookieSerializer cannot be null"); + } this.cookieSerializer = cookieSerializer; } diff --git a/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java index 4072c319..f8534024 100644 --- a/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java +++ b/spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionStrategy.java @@ -20,7 +20,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.session.Session; -import org.springframework.util.Assert; /** * A {@link HttpSessionStrategy} that uses a header to obtain the session from. @@ -79,7 +78,9 @@ public class HeaderHttpSessionStrategy implements HttpSessionStrategy { * @param headerName the name of the header to obtain the session id from. */ public void setHeaderName(String headerName) { - Assert.notNull(headerName, "headerName cannot be null"); + if (headerName == null) { + throw new IllegalArgumentException("headerName cannot be null"); + } this.headerName = headerName; }