From 064fa79e9e7d7e23b1846d3d332814dcd9ed445e Mon Sep 17 00:00:00 2001 From: "Endi S. Dewata" Date: Fri, 7 Feb 2014 13:44:34 -0500 Subject: Replaced deprecated ClientResponse class. The ClientResponse class has been deprecated in RESTEasy 3.0, so most of the code using the class has been modified to use the Response class instead. There are a few remaining references to ClientResponse. They will be removed separately later. --- .../src/com/netscape/certsrv/client/PKIClient.java | 6 ++-- .../com/netscape/certsrv/client/PKIConnection.java | 5 ++-- .../com/netscape/certsrv/group/GroupClient.java | 17 +++++------- .../src/com/netscape/certsrv/key/KeyClient.java | 7 ++--- .../src/com/netscape/certsrv/kra/KRAClient.java | 32 ++++++++-------------- .../com/netscape/certsrv/logging/AuditClient.java | 7 ++--- .../netscape/certsrv/profile/ProfileClient.java | 14 ++++------ .../certsrv/system/TPSConnectorClient.java | 14 ++++------ .../tps/authenticator/AuthenticatorClient.java | 17 +++++------- .../netscape/certsrv/tps/config/ConfigClient.java | 7 ++--- .../certsrv/tps/connection/ConnectionClient.java | 17 +++++------- .../certsrv/tps/profile/ProfileClient.java | 17 +++++------- .../certsrv/tps/profile/ProfileMappingClient.java | 17 +++++------- .../netscape/certsrv/tps/token/TokenClient.java | 12 ++++---- .../src/com/netscape/certsrv/user/UserClient.java | 22 ++++++--------- 15 files changed, 85 insertions(+), 126 deletions(-) diff --git a/base/common/src/com/netscape/certsrv/client/PKIClient.java b/base/common/src/com/netscape/certsrv/client/PKIClient.java index 65a1b93ea..2b455fa8c 100644 --- a/base/common/src/com/netscape/certsrv/client/PKIClient.java +++ b/base/common/src/com/netscape/certsrv/client/PKIClient.java @@ -6,11 +6,11 @@ import java.net.URISyntaxException; import java.net.URL; import java.security.cert.CertificateEncodingException; +import javax.ws.rs.core.Response; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import org.jboss.resteasy.client.ClientResponse; import org.mozilla.jss.CryptoManager; import org.mozilla.jss.CryptoManager.NicknameConflictException; import org.mozilla.jss.CryptoManager.NotInitializedException; @@ -72,8 +72,8 @@ public class PKIClient { return config.getSubsystem(); } - public T getEntity(ClientResponse response) { - return connection.getEntity(response); + public T getEntity(Response response, Class clazz) { + return connection.getEntity(response, clazz); } public ClientConfig getConfig() { diff --git a/base/common/src/com/netscape/certsrv/client/PKIConnection.java b/base/common/src/com/netscape/certsrv/client/PKIConnection.java index cf103a9f8..6e281dd5a 100644 --- a/base/common/src/com/netscape/certsrv/client/PKIConnection.java +++ b/base/common/src/com/netscape/certsrv/client/PKIConnection.java @@ -22,6 +22,7 @@ import java.util.HashSet; import java.util.List; import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; import org.apache.commons.httpclient.ConnectTimeoutException; import org.apache.http.Header; @@ -514,7 +515,7 @@ public class PKIConnection { } @SuppressWarnings("unchecked") - public T getEntity(ClientResponse response) { + public T getEntity(Response response, Class clazz) { BaseClientResponse clientResponse = (BaseClientResponse)response; try { clientResponse.checkFailureStatus(); @@ -526,7 +527,7 @@ public class PKIConnection { errorHandler.clientErrorHandling(clientResponse, e); } - return response.getEntity(); + return clientResponse.getEntity(); } public ClientResponse post(String content) throws Exception { diff --git a/base/common/src/com/netscape/certsrv/group/GroupClient.java b/base/common/src/com/netscape/certsrv/group/GroupClient.java index 7470349f4..c5ff9796a 100644 --- a/base/common/src/com/netscape/certsrv/group/GroupClient.java +++ b/base/common/src/com/netscape/certsrv/group/GroupClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.group; 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 GroupClient extends Client { } public GroupData addGroup(GroupData groupData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)groupClient.addGroup(groupData); - return client.getEntity(response); + Response response = groupClient.addGroup(groupData); + return client.getEntity(response, GroupData.class); } public GroupData modifyGroup(String groupID, GroupData groupData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)groupClient.modifyGroup(groupID, groupData); - return client.getEntity(response); + Response response = groupClient.modifyGroup(groupID, groupData); + return client.getEntity(response, GroupData.class); } public void removeGroup(String groupID) { @@ -73,9 +71,8 @@ public class GroupClient extends Client { } public GroupMemberData addGroupMember(String groupID, String memberID) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)groupClient.addGroupMember(groupID, memberID); - return client.getEntity(response); + Response response = groupClient.addGroupMember(groupID, memberID); + return client.getEntity(response, GroupMemberData.class); } public void removeGroupMember(String groupID, String memberID) { diff --git a/base/common/src/com/netscape/certsrv/key/KeyClient.java b/base/common/src/com/netscape/certsrv/key/KeyClient.java index 1a5dd50aa..7ab87fe09 100644 --- a/base/common/src/com/netscape/certsrv/key/KeyClient.java +++ b/base/common/src/com/netscape/certsrv/key/KeyClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.key; import java.net.URISyntaxException; -import org.jboss.resteasy.client.ClientResponse; +import javax.ws.rs.core.Response; import com.netscape.certsrv.base.ResourceMessage; import com.netscape.certsrv.client.Client; @@ -72,9 +72,8 @@ public class KeyClient extends Client { } public KeyRequestResponse createRequest(ResourceMessage data) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) keyRequestClient.createRequest(data); - return response.getEntity(); + Response response = keyRequestClient.createRequest(data); + return client.getEntity(response, KeyRequestResponse.class); } public KeyRequestInfo getRequestInfo(RequestId id) { diff --git a/base/common/src/com/netscape/certsrv/kra/KRAClient.java b/base/common/src/com/netscape/certsrv/kra/KRAClient.java index 4ff9a3115..b2bced319 100644 --- a/base/common/src/com/netscape/certsrv/kra/KRAClient.java +++ b/base/common/src/com/netscape/certsrv/kra/KRAClient.java @@ -5,7 +5,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.jboss.resteasy.client.ClientResponse; +import javax.ws.rs.core.Response; import com.netscape.certsrv.cert.CertData; import com.netscape.certsrv.client.PKIClient; @@ -54,10 +54,8 @@ public class KRAClient extends SubsystemClient { } public String getTransportCert() { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) systemCertClient - .getTransportCert(); - CertData certData = client.getEntity(response); + Response response = systemCertClient.getTransportCert(); + CertData certData = client.getEntity(response, CertData.class); String transportCert = certData.getEncoded(); return transportCert; } @@ -80,10 +78,8 @@ public class KRAClient extends SubsystemClient { data.setKeyAlgorithm(algorithm); data.setKeySize(strength); - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - keyRequestClient.createRequest(data); - return client.getEntity(response); + Response response = keyRequestClient.createRequest(data); + return client.getEntity(response, KeyRequestResponse.class); } public KeyInfo getKeyData(String clientId, String status) { @@ -116,10 +112,8 @@ public class KRAClient extends SubsystemClient { data.setNonceData(Utils.base64encode(nonceData)); } - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - keyRequestClient.createRequest(data); - return client.getEntity(response); + Response response = keyRequestClient.createRequest(data); + return client.getEntity(response, KeyRequestResponse.class); } public void approveRecovery(RequestId recoveryId) { @@ -156,10 +150,8 @@ public class KRAClient extends SubsystemClient { data.setKeyId(new KeyId(keyId)); data.setCertificate(b64Certificate); - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - keyRequestClient.createRequest(data); - return client.getEntity(response); + Response response = keyRequestClient.createRequest(data); + return client.getEntity(response, KeyRequestResponse.class); } public KeyData recoverKey(RequestId requestId, String passphrase) { @@ -179,9 +171,7 @@ public class KRAClient extends SubsystemClient { data.setKeySize(new Integer(keySize)); data.setUsages(usages); - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - keyRequestClient.createRequest(data); - return response.getEntity(); + Response response = keyRequestClient.createRequest(data); + return client.getEntity(response, KeyRequestResponse.class); } } diff --git a/base/common/src/com/netscape/certsrv/logging/AuditClient.java b/base/common/src/com/netscape/certsrv/logging/AuditClient.java index 5892a20cb..959304d92 100644 --- a/base/common/src/com/netscape/certsrv/logging/AuditClient.java +++ b/base/common/src/com/netscape/certsrv/logging/AuditClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.logging; 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; @@ -45,8 +45,7 @@ public class AuditClient extends Client { } public AuditConfig updateAuditConfig(AuditConfig auditConfig) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateAuditConfig(auditConfig); - return client.getEntity(response); + Response response = resource.updateAuditConfig(auditConfig); + return client.getEntity(response, AuditConfig.class); } } diff --git a/base/common/src/com/netscape/certsrv/profile/ProfileClient.java b/base/common/src/com/netscape/certsrv/profile/ProfileClient.java index 2ea6d8698..94ff487bb 100644 --- a/base/common/src/com/netscape/certsrv/profile/ProfileClient.java +++ b/base/common/src/com/netscape/certsrv/profile/ProfileClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.profile; 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; @@ -57,17 +57,13 @@ public class ProfileClient extends Client { } public ProfileData createProfile(ProfileData data) { - @SuppressWarnings("unchecked") - ClientResponse response = - (ClientResponse) profileClient.createProfile(data); - return client.getEntity(response); + Response response = profileClient.createProfile(data); + return client.getEntity(response, ProfileData.class); } public ProfileData modifyProfile(ProfileData data) { - @SuppressWarnings("unchecked") - ClientResponse response = - (ClientResponse) profileClient.modifyProfile(data.getId(), data); - return client.getEntity(response); + Response response = profileClient.modifyProfile(data.getId(), data); + return client.getEntity(response, ProfileData.class); } public void deleteProfile(String id) { diff --git a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java index 0d5cff91b..8662159ff 100644 --- a/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java +++ b/base/common/src/com/netscape/certsrv/system/TPSConnectorClient.java @@ -2,7 +2,7 @@ package com.netscape.certsrv.system; 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; @@ -34,17 +34,13 @@ public class TPSConnectorClient extends Client { } public TPSConnectorData createConnector(String tpsHost, String tpsPort) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - tpsConnectorClient.createConnector(tpsHost, tpsPort); - return client.getEntity(response); + Response response = tpsConnectorClient.createConnector(tpsHost, tpsPort); + return client.getEntity(response, TPSConnectorData.class); } public TPSConnectorData modifyConnector(String id, TPSConnectorData data) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse) - tpsConnectorClient.modifyConnector(id, data); - return client.getEntity(response); + Response response = tpsConnectorClient.modifyConnector(id, data); + return client.getEntity(response, TPSConnectorData.class); } public void deleteConnector(String id) { diff --git a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java index c4468e5cf..427cbf110 100644 --- a/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java +++ b/base/common/src/com/netscape/certsrv/tps/authenticator/AuthenticatorClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.authenticator; 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,21 +49,18 @@ public class AuthenticatorClient extends Client { } public AuthenticatorData addAuthenticator(AuthenticatorData authenticatorData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.addAuthenticator(authenticatorData); - return client.getEntity(response); + Response response = resource.addAuthenticator(authenticatorData); + return client.getEntity(response, AuthenticatorData.class); } public AuthenticatorData updateAuthenticator(String authenticatorID, AuthenticatorData authenticatorData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateAuthenticator(authenticatorID, authenticatorData); - return client.getEntity(response); + Response response = resource.updateAuthenticator(authenticatorID, authenticatorData); + return client.getEntity(response, AuthenticatorData.class); } public AuthenticatorData changeAuthenticatorStatus(String authenticatorID, String action) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.changeAuthenticatorStatus(authenticatorID, action); - return client.getEntity(response); + Response response = resource.changeAuthenticatorStatus(authenticatorID, action); + return client.getEntity(response, AuthenticatorData.class); } public void removeAuthenticator(String authenticatorID) { diff --git a/base/common/src/com/netscape/certsrv/tps/config/ConfigClient.java b/base/common/src/com/netscape/certsrv/tps/config/ConfigClient.java index 98699035a..a9821c6ba 100644 --- a/base/common/src/com/netscape/certsrv/tps/config/ConfigClient.java +++ b/base/common/src/com/netscape/certsrv/tps/config/ConfigClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.config; 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; @@ -45,8 +45,7 @@ public class ConfigClient extends Client { } public ConfigData updateConfig(ConfigData configData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateConfig(configData); - return client.getEntity(response); + Response response = resource.updateConfig(configData); + return client.getEntity(response, ConfigData.class); } } diff --git a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java index d7e1252d3..8014e56b1 100644 --- a/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java +++ b/base/common/src/com/netscape/certsrv/tps/connection/ConnectionClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.connection; 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,21 +49,18 @@ public class ConnectionClient extends Client { } public ConnectionData addConnection(ConnectionData connectionData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.addConnection(connectionData); - return client.getEntity(response); + Response response = resource.addConnection(connectionData); + return client.getEntity(response, ConnectionData.class); } public ConnectionData updateConnection(String connectionID, ConnectionData connectionData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateConnection(connectionID, connectionData); - return client.getEntity(response); + Response response = resource.updateConnection(connectionID, connectionData); + return client.getEntity(response, ConnectionData.class); } public ConnectionData changeConnectionStatus(String connectionID, String action) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.changeConnectionStatus(connectionID, action); - return client.getEntity(response); + Response response = resource.changeConnectionStatus(connectionID, action); + return client.getEntity(response, ConnectionData.class); } public void removeConnection(String connectionID) { diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java index 6f262e95a..bf06f1566 100644 --- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java +++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.profile; 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; @@ -53,21 +53,18 @@ public class ProfileClient extends Client { } public ProfileData addProfile(ProfileData profileData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.addProfile(profileData); - return client.getEntity(response); + Response response = resource.addProfile(profileData); + return client.getEntity(response, ProfileData.class); } public ProfileData updateProfile(String profileID, ProfileData profileData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateProfile(profileID, profileData); - return client.getEntity(response); + Response response = resource.updateProfile(profileID, profileData); + return client.getEntity(response, ProfileData.class); } public ProfileData changeProfileStatus(String profileID, String action) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.changeProfileStatus(profileID, action); - return client.getEntity(response); + Response response = resource.changeProfileStatus(profileID, action); + return client.getEntity(response, ProfileData.class); } public void removeProfile(String profileID) { diff --git a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java index cd1d82270..dcb35132e 100644 --- a/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java +++ b/base/common/src/com/netscape/certsrv/tps/profile/ProfileMappingClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.tps.profile; 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,21 +49,18 @@ public class ProfileMappingClient extends Client { } public ProfileMappingData addProfileMapping(ProfileMappingData profileMappingData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.addProfileMapping(profileMappingData); - return client.getEntity(response); + Response response = resource.addProfileMapping(profileMappingData); + return client.getEntity(response, ProfileMappingData.class); } public ProfileMappingData updateProfileMapping(String profileMappingID, ProfileMappingData profileMappingData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.updateProfileMapping(profileMappingID, profileMappingData); - return client.getEntity(response); + Response response = resource.updateProfileMapping(profileMappingID, profileMappingData); + return client.getEntity(response, ProfileMappingData.class); } public ProfileMappingData changeProfileMappingStatus(String profileMappingID, String action) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)resource.changeProfileMappingStatus(profileMappingID, action); - return client.getEntity(response); + Response response = resource.changeProfileMappingStatus(profileMappingID, action); + return client.getEntity(response, ProfileMappingData.class); } public void removeProfileMapping(String profileMappingID) { 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 response = (ClientResponse)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 response = (ClientResponse)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) { diff --git a/base/common/src/com/netscape/certsrv/user/UserClient.java b/base/common/src/com/netscape/certsrv/user/UserClient.java index 59de64652..33ed61d2a 100644 --- a/base/common/src/com/netscape/certsrv/user/UserClient.java +++ b/base/common/src/com/netscape/certsrv/user/UserClient.java @@ -19,7 +19,7 @@ package com.netscape.certsrv.user; 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 UserClient extends Client { } public UserData addUser(UserData userData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.addUser(userData); - return client.getEntity(response); + Response response = userClient.addUser(userData); + return client.getEntity(response, UserData.class); } public UserData modifyUser(String userID, UserData userData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.modifyUser(userID, userData); - return client.getEntity(response); + Response response = userClient.modifyUser(userID, userData); + return client.getEntity(response, UserData.class); } public void removeUser(String userID) { @@ -73,9 +71,8 @@ public class UserClient extends Client { } public UserCertData addUserCert(String userID, UserCertData userCertData) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.addUserCert(userID, userCertData); - return client.getEntity(response); + Response response = userClient.addUserCert(userID, userCertData); + return client.getEntity(response, UserCertData.class); } public void removeUserCert(String userID, String certID) { @@ -87,9 +84,8 @@ public class UserClient extends Client { } public UserMembershipData addUserMembership(String userID, String groupID) { - @SuppressWarnings("unchecked") - ClientResponse response = (ClientResponse)userClient.addUserMembership(userID, groupID); - return client.getEntity(response); + Response response = userClient.addUserMembership(userID, groupID); + return client.getEntity(response, UserMembershipData.class); } public void removeUserMembership(String userD, String groupID) { -- cgit