Revocable token storage

https://www.pivotaltracker.com/story/show/112688337
[#112688337]

model/src/main/java/org/cloudfoundry/identity/uaa/oauth/token/RevocableToken.java

@@ -1,5 +1,3 @@
-package org.cloudfoundry.identity.uaa.oauth.token;
-
 /*******************************************************************************
  * Cloud Foundry
  * Copyright (c) [2009-2015] Pivotal Software, Inc. All Rights Reserved.
@@ -12,10 +10,12 @@
  * subcomponents is subject to the terms and conditions of the
  * subcomponent's license, as noted in the LICENSE file.
  *******************************************************************************/
+package org.cloudfoundry.identity.uaa.oauth.token;
+
 public class RevocableToken {
 
     public enum TokenType {
-        ID_TOKEN, TOKEN, REFRESH_TOKEN
+        ID_TOKEN, ACCESS_TOKEN, REFRESH_TOKEN
     };
 
     private String tokenId;
@@ -27,76 +27,95 @@ public enum TokenType {
     private long expiresAt;
     private String scope;
     private String value;
+    private String zoneId;
 
     public String getTokenId() {
         return tokenId;
     }
 
-    public void setTokenId(String tokenId) {
+    public RevocableToken setTokenId(String tokenId) {
         this.tokenId = tokenId;
+        return this;
     }
 
     public String getClientId() {
         return clientId;
     }
 
-    public void setClientId(String clientId) {
+    public RevocableToken setClientId(String clientId) {
         this.clientId = clientId;
+        return this;
     }
 
     public String getUserId() {
         return userId;
     }
 
-    public void setUserId(String userId) {
+    public RevocableToken setUserId(String userId) {
         this.userId = userId;
+        return this;
     }
 
     public String getFormat() {
         return format;
     }
 
-    public void setFormat(String format) {
+    public RevocableToken setFormat(String format) {
         this.format = format;
+        return this;
     }
 
     public TokenType getResponseType() {
         return responseType;
     }
 
-    public void setResponseType(TokenType responseType) {
+    public RevocableToken setResponseType(TokenType responseType) {
         this.responseType = responseType;
+        return this;
     }
 
     public long getIssuedAt() {
         return issuedAt;
     }
 
-    public void setIssuedAt(long issuedAt) {
+    public RevocableToken setIssuedAt(long issuedAt) {
         this.issuedAt = issuedAt;
+        return this;
     }
 
     public long getExpiresAt() {
         return expiresAt;
     }
 
-    public void setExpiresAt(long expiresAt) {
+    public RevocableToken setExpiresAt(long expiresAt) {
         this.expiresAt = expiresAt;
+        return this;
     }
 
     public String getScope() {
         return scope;
     }
 
-    public void setScope(String scope) {
+    public RevocableToken setScope(String scope) {
         this.scope = scope;
+        return this;
     }
 
     public String getValue() {
         return value;
     }
 
-    public void setValue(String value) {
+    public RevocableToken setValue(String value) {
         this.value = value;
+        return this;
+    }
+
+    public String getZoneId() {
+        return zoneId;
+    }
+
+    public RevocableToken setZoneId(String zoneId) {
+        this.zoneId = zoneId;
+        return this;
     }
 }