1 files changed, 5 insertions, 7 deletions
diff --git a/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
index e349acd1e..35f6e1675 100644
--- a/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
+++ b/base/common/src/com/netscape/certsrv/tps/token/TokenClient.java
@@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.token;
 
 import java.net.URISyntaxException;
 
-import org.jboss.resteasy.client.ClientResponse;
+import javax.ws.rs.core.Response;
 
 import com.netscape.certsrv.client.Client;
 import com.netscape.certsrv.client.PKIClient;
@@ -49,15 +49,13 @@ public class TokenClient extends Client {
     }
 
     public TokenData addToken(TokenData tokenData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<TokenData> response = (ClientResponse<TokenData>)resource.addToken(tokenData);
-        return client.getEntity(response);
+        Response response = resource.addToken(tokenData);
+        return client.getEntity(response, TokenData.class);
     }
 
     public TokenData updateToken(String tokenID, TokenData tokenData) {
-        @SuppressWarnings("unchecked")
-        ClientResponse<TokenData> response = (ClientResponse<TokenData>)resource.replaceToken(tokenID, tokenData);
-        return client.getEntity(response);
+        Response response = resource.replaceToken(tokenID, tokenData);
+        return client.getEntity(response, TokenData.class);
     }
 
     public void removeToken(String tokenID) {