From c5d1b1ef84f4b42569d778f73ef74c4a27fcf90b Mon Sep 17 00:00:00 2001 From: Matt Drees Date: Tue, 24 Jul 2018 16:07:44 -0600 Subject: [PATCH] Stop using "matches" terminology --- .../org/jasig/cas/client/session/SingleSignOutHandler.java | 4 ++-- .../jasig/cas/client/session/SingleSignOutHandlerTests.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java index 2023268..e1803c5 100644 --- a/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java +++ b/cas-client-core/src/main/java/org/jasig/cas/client/session/SingleSignOutHandler.java @@ -173,7 +173,7 @@ public final class SingleSignOutHandler { private boolean isLogoutRequest(final HttpServletRequest request) { if ("POST".equalsIgnoreCase(request.getMethod())) { return !isMultipartRequest(request) - && pathMatches(request) + && pathEligibleForLogout(request) && CommonUtils.isNotBlank(CommonUtils.safeGetParameter(request, this.logoutParameterName, this.safeParameters)); } @@ -184,7 +184,7 @@ public final class SingleSignOutHandler { return false; } - private boolean pathMatches(HttpServletRequest request) { + private boolean pathEligibleForLogout(HttpServletRequest request) { return logoutPath == null || logoutPath.equals(getPath(request)); } diff --git a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java index 64d837f..109fd4b 100644 --- a/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java +++ b/cas-client-core/src/test/java/org/jasig/cas/client/session/SingleSignOutHandlerTests.java @@ -122,7 +122,7 @@ public final class SingleSignOutHandlerTests { } @Test - public void backChannelLogoutDoesDoesNotRunIfLogoutPathDoesNotMatch() { + public void backChannelLogoutDoesNotRunIfPathIsNotEligibleForLogout() { handler.setLogoutPath("/logout"); request.setServletPath("/not-a-logout"); final MockHttpSession session = doBackChannelLogout(); @@ -131,7 +131,7 @@ public final class SingleSignOutHandlerTests { } @Test - public void backChannelLogoutRunsWhenLogoutPathDoesMatch() { + public void backChannelLogoutRunsIfPathEqualsLogoutPath() { handler.setLogoutPath("/logout"); request.setServletPath("/logout"); final MockHttpSession session = doBackChannelLogout();