TouchInstinct
/
java-cas-client
305
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Issue #152 Use CommonUtils for null checks.

This commit is contained in:
Marvin S. Addison 2016-03-07 07:42:31 -05:00
parent 40291a4478
commit 812198b6a5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthentication.java
View File

@ -1,6 +1,7 @@
package org.jasig.cas.client.jetty;
import org.eclipse.jetty.security.UserAuthentication;
import org.jasig.cas.client.util.CommonUtils;
import org.jasig.cas.client.validation.Assertion;
/**
@ -26,8 +27,8 @@ public class CasAuthentication extends UserAuthentication {
*/
public CasAuthentication(final CasAuthenticator authenticator, final String ticket, final Assertion assertion) {
super(authenticator.getAuthMethod(), new CasUserIdentity(assertion, authenticator.getRoleAttribute()));
assert ticket != null : "Ticket cannot be null";
assert authenticator != null : "CasAuthenticator cannot be null";
CommonUtils.assertNotNull(ticket, "Ticket cannot be null");
CommonUtils.assertNotNull(authenticator, "CasAuthenticator cannot be null");
this.authenticator = authenticator;
this.ticket = ticket;
}

2
cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasAuthenticator.java
View File

@ -89,7 +89,7 @@ public class CasAuthenticator extends AbstractLifeCycle implements Authenticator
* @param ticketValidator Ticket validator, MUST NOT be null.
*/
public void setTicketValidator(final TicketValidator ticketValidator) {
assert ticketValidator != null : "TicketValidator cannot be null";
CommonUtils.assertNotNull(ticketValidator, "TicketValidator cannot be null");
if (ticketValidator instanceof AbstractUrlBasedTicketValidator) {
if (ticketValidator instanceof AbstractCasProtocolUrlBasedTicketValidator) {
protocol = Protocol.CAS2;

3
cas-client-integration-jetty/src/main/java/org/jasig/cas/client/jetty/CasUserIdentity.java
View File

@ -2,6 +2,7 @@ package org.jasig.cas.client.jetty;
import org.eclipse.jetty.server.UserIdentity;
import org.jasig.cas.client.authentication.AttributePrincipal;
import org.jasig.cas.client.util.CommonUtils;
import org.jasig.cas.client.validation.Assertion;
import javax.security.auth.Subject;
@ -29,7 +30,7 @@ public class CasUserIdentity implements UserIdentity {
* @param roleAttribute Principal attribute containing role data.
*/
public CasUserIdentity(final Assertion assertion, final String roleAttribute) {
assert assertion != null : "Assertion cannot be null";
CommonUtils.assertNotNull(assertion, "Assertion cannot be null");
this.principal = assertion.getPrincipal();
this.roleAttribute = roleAttribute;
}