[java-identity-provider] branch master updated: Remove deprecated ticket constructors.
Scott Cantor
cantor.2 at osu.edu
Fri Aug 30 12:06:17 EDT 2019
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=b9e70bea66a33be1603d4c42184dcbb5b31561b8
The following commit(s) were added to refs/heads/master by this push:
new b9e70be Remove deprecated ticket constructors.
b9e70be is described below
commit b9e70bea66a33be1603d4c42184dcbb5b31561b8
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Fri Aug 30 12:06:13 2019 -0400
Remove deprecated ticket constructors.
---
.../idp/cas/ticket/ProxyGrantingTicket.java | 29 ++------------------
.../net/shibboleth/idp/cas/ticket/ProxyTicket.java | 30 ++------------------
.../shibboleth/idp/cas/ticket/ServiceTicket.java | 32 ++--------------------
.../java/net/shibboleth/idp/cas/ticket/Ticket.java | 32 +---------------------
4 files changed, 8 insertions(+), 115 deletions(-)
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
index d081e22..b367384 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
@@ -22,8 +22,6 @@ import java.time.Instant;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
import net.shibboleth.utilities.java.support.primitive.StringSupport;
/**
@@ -38,30 +36,6 @@ public class ProxyGrantingTicket extends Ticket {
private String parentPgTicketId;
/**
- * Deprecated.
- *
- * @param id Ticket ID.
- * @param sessionId This parameter is ignored.
- * @param service Service that requested the ticket.
- * @param expiration Expiration instant.
- * @param parentId ID of parent proxy-granting ticket or null if this is first proxy in chain.
- *
- * @see Ticket#Ticket(String, String, String, Instant)
- */
- @Deprecated
- public ProxyGrantingTicket(
- @Nonnull final String id,
- @Nullable final String sessionId,
- @Nonnull final String service,
- @Nonnull final Instant expiration,
- @Nullable final String parentId) {
- super(id, sessionId, service, expiration);
- parentPgTicketId = StringSupport.trimOrNull(parentId);
- DeprecationSupport.warnOnce(ObjectType.METHOD, "ProxyGrantingTicket constructor with sessionID",
- null, "TicketState#setSessionId(String)");
- }
-
- /**
* Creates a proxy-granting ticket with the given values.
*
* @param id Ticket ID.
@@ -100,4 +74,5 @@ public class ProxyGrantingTicket extends Ticket {
protected Ticket newInstance(final String newId) {
return new ProxyGrantingTicket(newId, getService(), getExpirationInstant(), parentPgTicketId);
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
index 25b430d..8b5eee0 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
@@ -20,11 +20,8 @@ package net.shibboleth.idp.cas.ticket;
import java.time.Instant;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* CAS proxy ticket.
@@ -38,30 +35,6 @@ public class ProxyTicket extends Ticket {
private final String pgTicketId;
/**
- * Deprecated.
- *
- * @param id Ticket ID.
- * @param sessionId This parameter is ignored.
- * @param service Service that requested the ticket.
- * @param expiration Expiration instant.
- * @param pgtId Proxy-granting ticket ID used to create ticket.
- *
- * @see Ticket#Ticket(String, String, String, Instant)
- */
- @Deprecated
- public ProxyTicket(
- @Nonnull final String id,
- @Nullable final String sessionId,
- @Nonnull final String service,
- @Nonnull final Instant expiration,
- @Nonnull final String pgtId) {
- super(id, sessionId, service, expiration);
- pgTicketId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
- DeprecationSupport.warnOnce(ObjectType.METHOD, "ProxyTicket constructor with sessionID",
- null, "TicketState#setSessionId(String)");
- }
-
- /**
* Creates a new authenticated ticket with an identifier, service, and expiration date.
*
* @param id Ticket ID.
@@ -91,4 +64,5 @@ public class ProxyTicket extends Ticket {
protected Ticket newInstance(final String newId) {
return new ProxyTicket(newId, getService(), getExpirationInstant(), pgTicketId);
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
index 47c326b..66d63b1 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
@@ -20,10 +20,6 @@ package net.shibboleth.idp.cas.ticket;
import java.time.Instant;
import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* CAS service ticket.
@@ -36,30 +32,6 @@ public class ServiceTicket extends Ticket {
private final boolean forceAuthn;
/**
- * Deprecated.
- *
- * @param id Ticket ID.
- * @param sessionId This parameter is ignored.
- * @param service Service that requested the ticket.
- * @param expiration Expiration instant.
- * @param renew True if ticket was issued from forced authentication, false otherwise.
- *
- * @see Ticket#Ticket(String, String, String, Instant)
- */
- @Deprecated
- public ServiceTicket(
- @Nonnull final String id,
- @Nullable final String sessionId,
- @Nonnull final String service,
- @Nonnull final Instant expiration,
- final boolean renew) {
- super(id, sessionId, service, expiration);
- forceAuthn = renew;
- DeprecationSupport.warnOnce(ObjectType.METHOD, "ServiceTicket constructor with sessionID",
- null, "TicketState#setSessionId(String)");
- }
-
- /**
* Creates a new authenticated ticket with an identifier, service, and expiration date.
*
* @param id Ticket ID.
@@ -85,8 +57,10 @@ public class ServiceTicket extends Ticket {
return forceAuthn;
}
+ /** {@inheritDoc} */
@Override
protected Ticket newInstance(final String newId) {
return new ServiceTicket(newId, getService(), getExpirationInstant(), forceAuthn);
}
-}
+
+}
\ No newline at end of file
diff --git a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
index 7439bcd..303e142 100644
--- a/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
+++ b/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
@@ -23,8 +23,6 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import net.shibboleth.utilities.java.support.logic.Constraint;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport;
-import net.shibboleth.utilities.java.support.primitive.DeprecationSupport.ObjectType;
/**
* Generic CAS ticket that has a natural identifier and expiration. All CAS tickets are bound to an IdP session ID
@@ -51,34 +49,6 @@ public class Ticket {
private TicketState ticketState;
/**
- * Deprecated. This constructor was formerly used to associate a ticket with an IdP session, but is no longer
- * supported. In order to associate an IdP session with a ticket, follow these steps:
- * <ol>
- * <li>Create a ticket using the {@link Ticket#Ticket(String, String, Instant)} constructor.</li>
- * <li>Create an instance of {@link TicketState}, which accepts an IdP session ID parameter.</li>
- * <li>Call {@link #setTicketState(TicketState)} on the ticket instance.</li>
- * </ol>
- *
- * @param id Ticket ID.
- * @param sessionId This parameter is ignored.
- * @param service Service that requested the ticket.
- * @param expiration Expiration instant.
- */
- @Deprecated
- public Ticket(
- @Nonnull final String id,
- @Nullable final String sessionId,
- @Nonnull final String service,
- @Nonnull final Instant expiration) {
- ticketId = Constraint.isNotNull(id, "Id cannot be null");
- ticketService = Constraint.isNotNull(service, "Service cannot be null");
- expirationInstant = Constraint.isNotNull(expiration, "Expiration cannot be null");
- DeprecationSupport.warnOnce(ObjectType.METHOD, "Ticket constructor with sessionID",
- null, "TicketState#setSessionId(String)");
-
- }
-
- /**
* Creates a new ticket with the given parameters.
*
* @param id Ticket ID.
@@ -193,4 +163,4 @@ public class Ticket {
return new Ticket(newId, ticketService, expirationInstant);
}
-}
+}
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list