[java-identity-provider COMMIT] in /trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket: ProxyGrantingTicke...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Sep 21 19:08:54 2016
New Revision: 8419

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8419&view=rev
Log:
IDP-865 - Checkstyle

Modified:
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/Ticket.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketContext.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketServiceEx.java
    trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/TicketState.java

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java?rev=8419&r1=8418&r2=8419&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyGrantingTicket.java	Wed Sep 21 19:08:54 2016
@@ -32,7 +32,7 @@
 
     /** The ID of the parent proxy-granting ticket. */
     @Nullable
-    private String parentId;
+    private String parentPgTicketId;
 
     /**
      * Deprecated. Session IDs are now optional and should be specified via {@link TicketState#setSessionId(String)}
@@ -52,7 +52,7 @@
             @Nonnull final Instant expiration,
             @Nullable final String parentId) {
         super(id, sessionId, service, expiration);
-        this.parentId = StringSupport.trimOrNull(parentId);
+        parentPgTicketId = StringSupport.trimOrNull(parentId);
     }
 
     /**
@@ -69,12 +69,16 @@
             @Nonnull final Instant expiration,
             @Nullable final String parentId) {
         super(id, service, expiration);
-        this.parentId = StringSupport.trimOrNull(parentId);
+        parentPgTicketId = StringSupport.trimOrNull(parentId);
     }
 
-    @Nullable
-    public String getParentId() {
-        return parentId;
+    /**
+     * Get ID of parent proxy-granting ticket.
+     * 
+     * @return ID of parent proxy-granting ticket
+     */
+    @Nullable public String getParentId() {
+        return parentPgTicketId;
     }
 
     /**
@@ -88,6 +92,6 @@
 
     @Override
     protected Ticket newInstance(final String newId) {
-        return new ProxyGrantingTicket(newId, getService(), getExpirationInstant(), parentId);
+        return new ProxyGrantingTicket(newId, getService(), getExpirationInstant(), parentPgTicketId);
     }
 }

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java?rev=8419&r1=8418&r2=8419&view=diff
==============================================================================
--- trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java	(original)
+++ trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ProxyTicket.java	Wed Sep 21 19:08:54 2016
@@ -30,9 +30,9 @@
  */
 public class ProxyTicket extends Ticket {
 
-    /** Proxy-granting ticket used to create ticket. */
+    /** Proxy-granting ticket ID used to create ticket. */
     @Nonnull
-    private final String pgtId;
+    private final String pgTicketId;
 
     /**
      * Deprecated. Session IDs are now optional and should be specified via {@link TicketState#setSessionId(String)}
@@ -52,7 +52,7 @@
             @Nonnull final Instant expiration,
             @Nonnull final String pgtId) {
         super(id, sessionId, service, expiration);
-        this.pgtId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
+        pgTicketId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
     }
 
     /**
@@ -69,16 +69,20 @@
             @Nonnull final Instant expiration,
             @Nonnull final String pgtId) {
         super(id, service, expiration);
-        this.pgtId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
+        pgTicketId = Constraint.isNotNull(pgtId, "PgtId cannot be null");
     }
 
-    @Nonnull
-    public String getPgtId() {
-        return pgtId;
+    /**
+     * Get the proxy-granting ticket ID used to create ticket.
+     * 
+     * @return proxy-granting ticket ID used to create ticket
+     */
+    @Nonnull public String getPgtId() {
+        return pgTicketId;
     }
 
     @Override
     protected Ticket newInstance(final String newId) {
-        return new ProxyTicket(newId, getService(), getExpirationInstant(), pgtId);
+        return new ProxyTicket(newId, getService(), getExpirationInstant(), pgTicketId);
     }
 }

Modified: trunk/idp-cas-api/src/main/java/net/shibboleth/idp/cas/ticket/ServiceTicket.java

[... 373 lines stripped ...]