diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2016-04-23 05:28:10 +0200 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2016-05-03 01:57:34 +0200 |
| commit | 1b8f5230d01499d97b874d4912c5c1a13e389c5f (patch) | |
| tree | 761b0f7d2b2de2e58862fe81af1bee219e078f47 /base/common/src/com/netscape/certsrv | |
| parent | 0b779ffe4d29474b4f75370e4da9d7723d9bfec5 (diff) | |
| download | pki-1b8f5230d01499d97b874d4912c5c1a13e389c5f.tar.gz pki-1b8f5230d01499d97b874d4912c5c1a13e389c5f.tar.xz pki-1b8f5230d01499d97b874d4912c5c1a13e389c5f.zip | |
Renamed token status UNINITIALIZED to READY.
The token status UNINITIALIZED has been renamed to READY for
clarity.
To simplify the transition, the CLIs and the REST API will continue
to accept UNINITIALIZED but it will be converted internally into
READY and a deprecation warning will be generated.
https://fedorahosted.org/pki/ticket/2288
Diffstat (limited to 'base/common/src/com/netscape/certsrv')
| -rw-r--r-- | base/common/src/com/netscape/certsrv/tps/token/TokenStatus.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/base/common/src/com/netscape/certsrv/tps/token/TokenStatus.java b/base/common/src/com/netscape/certsrv/tps/token/TokenStatus.java index f3dd73e38..f570c125d 100644 --- a/base/common/src/com/netscape/certsrv/tps/token/TokenStatus.java +++ b/base/common/src/com/netscape/certsrv/tps/token/TokenStatus.java @@ -48,7 +48,7 @@ public class TokenStatus { static Map<String, TokenStatus> instancesByName = new HashMap<String, TokenStatus>(); static Map<Integer, TokenStatus> instancesByValue = new HashMap<Integer, TokenStatus>(); - public final static int TOKEN_UNINITIALIZED = 0; + public final static int TOKEN_READY = 0; public final static int TOKEN_DAMAGED = 1; public final static int TOKEN_PERM_LOST = 2; public final static int TOKEN_SUSPENDED = 3; @@ -56,7 +56,7 @@ public class TokenStatus { public final static int TOKEN_TEMP_LOST_PERM_LOST = 5; public final static int TOKEN_TERMINATED = 6; - public final static TokenStatus UNINITIALIZED = new TokenStatus("UNINITIALIZED", TOKEN_UNINITIALIZED); + public final static TokenStatus READY = new TokenStatus("READY", TOKEN_READY); public final static TokenStatus DAMAGED = new TokenStatus("DAMAGED", TOKEN_DAMAGED); public final static TokenStatus PERM_LOST = new TokenStatus("PERM_LOST", TOKEN_PERM_LOST); public final static TokenStatus SUSPENDED = new TokenStatus("SUSPENDED", TOKEN_SUSPENDED); @@ -136,6 +136,11 @@ public class TokenStatus { public static TokenStatus valueOf(String name) { + if ("UNINITIALIZED".equals(name)) { + System.err.println("WARNING: The token status " + name + " has been deprecated. Please use READY instead."); + return READY; + } + if ("TEMP_LOST".equals(name)) { System.err.println("WARNING: The token status " + name + " has been deprecated. Please use SUSPENDED instead."); return SUSPENDED; |