diff options
author | Endi S. Dewata <edewata@redhat.com> | 2014-02-14 14:31:12 -0500 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2014-02-18 11:35:30 -0500 |
commit | 31ac1cb521f26fe51f3fea3d7791323724016ad3 (patch) | |
tree | 02f81f5c9322fa6c11902f3f037ff1e7a16df17b /base/server/cmscore/src/com/netscape/cmscore | |
parent | e4c002c7a47025ec99ee11f093749a2cc50f22d2 (diff) | |
download | pki-31ac1cb521f26fe51f3fea3d7791323724016ad3.tar.gz pki-31ac1cb521f26fe51f3fea3d7791323724016ad3.tar.xz pki-31ac1cb521f26fe51f3fea3d7791323724016ad3.zip |
Updated REST interface for self tests.
The REST interface for self tests has been modified to return Response
objects to allow better handling of server responses.
Ticket #554
Diffstat (limited to 'base/server/cmscore/src/com/netscape/cmscore')
-rw-r--r-- | base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java index bd02b6752..bc632fee1 100644 --- a/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java +++ b/base/server/cmscore/src/com/netscape/cmscore/selftests/SelfTestService.java @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Request; +import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; import org.jboss.resteasy.plugins.providers.atom.Link; @@ -93,7 +94,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { } @Override - public SelfTestCollection findSelfTests(Integer start, Integer size) { + public Response findSelfTests(Integer start, Integer size) { CMS.debug("SelfTestService.findSelfTests()"); @@ -130,7 +131,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { response.addLink(new Link("next", uri)); } - return response; + return createOKResponse(response); } catch (Exception e) { e.printStackTrace(); @@ -139,7 +140,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { } @Override - public SelfTestData getSelfTest(String selfTestID) { + public Response getSelfTest(String selfTestID) { if (selfTestID == null) throw new BadRequestException("Self test ID is null."); @@ -147,7 +148,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { try { ISelfTestSubsystem subsystem = (ISelfTestSubsystem)CMS.getSubsystem(ISelfTestSubsystem.ID); - return createSelfTestData(subsystem, selfTestID); + return createOKResponse(createSelfTestData(subsystem, selfTestID)); } catch (Exception e) { e.printStackTrace(); @@ -156,7 +157,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { } @Override - public void executeSelfTests(String action) { + public Response executeSelfTests(String action) { if (action == null) throw new BadRequestException("Action is null."); @@ -174,5 +175,7 @@ public class SelfTestService extends PKIService implements SelfTestResource { e.printStackTrace(); throw new PKIException(e.getMessage()); } + + return createNoContentResponse(); } } |