diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2012-06-07 03:16:37 -0500 |
---|---|---|
committer | Endi Sukma Dewata <edewata@redhat.com> | 2012-06-27 17:25:10 -0500 |
commit | 1eba8264adbe42115caac4db655d450a99791ceb (patch) | |
tree | b7c564a54e5235affadf55c233afc52f6e17fa5a /base/common/src/com/netscape/cms/servlet/csadmin | |
parent | 4ccfcebe532b97607cfab406a1fa900070573f24 (diff) | |
download | pki-1eba8264adbe42115caac4db655d450a99791ceb.tar.gz pki-1eba8264adbe42115caac4db655d450a99791ceb.tar.xz pki-1eba8264adbe42115caac4db655d450a99791ceb.zip |
Added REST error handler.
A new getEntity() method has been added to obtain the entity from
a Response object and also map HTTP errors into exceptions.
Ticket #161
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/csadmin')
-rw-r--r-- | base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java index ff028660a..7f2c75007 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java @@ -17,8 +17,12 @@ import org.apache.http.conn.scheme.SchemeSocketFactory; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.params.HttpParams; import org.jboss.resteasy.client.ClientExecutor; +import org.jboss.resteasy.client.ClientResponse; +import org.jboss.resteasy.client.ClientResponseFailure; import org.jboss.resteasy.client.ProxyFactory; +import org.jboss.resteasy.client.core.BaseClientResponse; import org.jboss.resteasy.client.core.executors.ApacheHttpClient4Executor; +import org.jboss.resteasy.client.core.extractors.ClientErrorHandler; import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.mozilla.jss.ssl.SSLCertificateApprovalCallback; import org.mozilla.jss.ssl.SSLSocket; @@ -27,6 +31,7 @@ public abstract class CMSRestClient { protected String clientCertNickname; protected ResteasyProviderFactory providerFactory; + protected ClientErrorHandler errorHandler; protected ClientExecutor executor; protected URI uri; @@ -59,6 +64,7 @@ public abstract class CMSRestClient { executor = new ApacheHttpClient4Executor(httpclient); providerFactory = ResteasyProviderFactory.getInstance(); providerFactory.addClientErrorInterceptor(new CMSErrorInterceptor()); + errorHandler = new ClientErrorHandler(providerFactory.getClientErrorInterceptors()); } private class ServerCertApprovalCB implements SSLCertificateApprovalCallback { @@ -168,4 +174,20 @@ public abstract class CMSRestClient { public <T> T createProxy(Class<T> clazz) { return ProxyFactory.create(clazz, uri, executor, providerFactory); } + + @SuppressWarnings("unchecked") + public <T> T getEntity(ClientResponse<T> response) { + BaseClientResponse<T> clientResponse = (BaseClientResponse<T>)response; + try { + clientResponse.checkFailureStatus(); + + } catch (ClientResponseFailure e) { + errorHandler.clientErrorHandling((BaseClientResponse<T>) e.getResponse(), e); + + } catch (RuntimeException e) { + errorHandler.clientErrorHandling(clientResponse, e); + } + + return response.getEntity(); + } } |