diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java index 4a8523fb65b..4a2c992c105 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java @@ -81,10 +81,10 @@ public class ActionService extends BaseService { @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getActionDefinition(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(required = true) @PathParam("actionName") String actionName) { + public Response getActionDefinition(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(required = true) @PathParam("actionName") String actionName) { - return handleRequest(headers, body, ui, Request.Type.GET, createActionDefinitionResource(actionName)); + return handleRequest(headers, null, ui, Request.Type.GET, createActionDefinitionResource(actionName)); } /** @@ -117,8 +117,8 @@ public Response getActionDefinition(String body, @Context HttpHeaders headers, @ @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message = MSG_NOT_AUTHENTICATED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getActionDefinitions(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createActionDefinitionResource(null)); + public Response getActionDefinitions(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createActionDefinitionResource(null)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java index ad9259e03e3..1d1fdf38b60 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java @@ -86,8 +86,8 @@ public class BlueprintService extends BaseService { @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message = MSG_NOT_AUTHENTICATED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getBlueprints(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createBlueprintResource(null)); + public Response getBlueprints(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createBlueprintResource(null)); } /** @@ -117,9 +117,10 @@ public Response getBlueprints(String body, @Context HttpHeaders headers, @Contex @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message = MSG_NOT_AUTHENTICATED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getBlueprint(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam @PathParam("blueprintName") String blueprintName) { - return handleRequest(headers, body, ui, Request.Type.GET, createBlueprintResource(blueprintName)); + public Response getBlueprint(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("blueprintName") String blueprintName) { + + return handleRequest(headers, null, ui, Request.Type.GET, createBlueprintResource(blueprintName)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java index c0ed8a65be4..512bead5d46 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java @@ -127,11 +127,10 @@ protected ClusterService(Clusters clusters) { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(required = true) @PathParam("clusterName") String clusterName - ) { + public Response getCluster(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(required = true) @PathParam("clusterName") String clusterName) { ResourceInstance resource = createClusterResource(clusterName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** @@ -161,9 +160,9 @@ public Response getCluster(String body, @Context HttpHeaders headers, @Context U @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getClusters(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getClusters(@Context HttpHeaders headers, @Context UriInfo ui) { ResourceInstance resource = createClusterResource(null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** @@ -264,7 +263,6 @@ public Response deleteCluster(@Context HttpHeaders headers, @Context UriInfo ui, * Handles: GET /clusters/{clusterID}/artifacts * Get all artifacts associated with the cluster. * - * @param body request body * @param headers http headers * @param ui uri info * @param clusterName cluster name @@ -290,18 +288,16 @@ public Response deleteCluster(@Context HttpHeaders headers, @Context UriInfo ui, @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getClusterArtifacts(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(required = true) @PathParam("clusterName") String clusterName - ) { + public Response getClusterArtifacts(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(required = true) @PathParam("clusterName") String clusterName) { ResourceInstance resource = createArtifactResource(clusterName, null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** * Handles: GET /clusters/{clusterID}/artifacts/{artifactName} * Get an artifact resource instance. * - * @param body request body * @param headers http headers * @param ui uri info * @param clusterName cluster name @@ -326,12 +322,11 @@ public Response getClusterArtifacts(String body, @Context HttpHeaders headers, @ @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getClusterArtifact(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(required = true) @PathParam("clusterName") String clusterName, - @ApiParam(required = true) @PathParam("artifactName") String artifactName - ) { + public Response getClusterArtifact(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(required = true) @PathParam("clusterName") String clusterName, + @ApiParam(required = true) @PathParam("artifactName") String artifactName) { ResourceInstance resource = createArtifactResource(clusterName, artifactName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java index bbb9ac09d8d..27cc318ed95 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java @@ -49,18 +49,18 @@ public class ExtensionLinksService extends BaseService { @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getExtensionLinks(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getExtensionLinks(@Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createExtensionLinkResource(null)); + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionLinkResource(null)); } @GET @ApiIgnore // until documented @Path("{linkId}") @Produces("text/plain") - public Response getExtensionLink(String body, @Context HttpHeaders headers, + public Response getExtensionLink(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("linkId") String linkId) { - return handleRequest(headers, body, ui, Request.Type.GET, createExtensionLinkResource(linkId)); + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionLinkResource(linkId)); } @POST @ApiIgnore // until documented diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java index 412b7d5b370..8e7142d4110 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java @@ -47,55 +47,51 @@ public class ExtensionsService extends BaseService { @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getExtensions(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getExtensions(@Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionResource(null)); } @GET @ApiIgnore // until documented @Path("{extensionName}") @Produces("text/plain") - public Response getExtension(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @PathParam("extensionName") String extensionName) { + public Response getExtension(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("extensionName") String extensionName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionResource(extensionName)); } @GET @ApiIgnore // until documented @Path("{extensionName}/versions") @Produces("text/plain") - public Response getExtensionVersions(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, @PathParam("extensionName") String extensionName) { + public Response getExtensionVersions(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("extensionName") String extensionName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionVersionResource(extensionName, null)); } @GET @ApiIgnore // until documented @Path("{extensionName}/versions/{extensionVersion}") @Produces("text/plain") - public Response getExtensionVersion(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, @PathParam("extensionName") String extensionName, - @PathParam("extensionVersion") String extensionVersion) { + public Response getExtensionVersion(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("extensionName") String extensionName, + @PathParam("extensionVersion") String extensionVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionVersionResource(extensionName, extensionVersion)); } @GET @ApiIgnore // until documented @Path("{extensionName}/versions/{extensionVersion}/links") @Produces("text/plain") - public Response getExtensionVersionLinks(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, @PathParam("extensionName") String extensionName, - @PathParam("extensionVersion") String extensionVersion) { + public Response getExtensionVersionLinks(@Context HttpHeaders headers, + @Context UriInfo ui, @PathParam("extensionName") String extensionName, + @PathParam("extensionVersion") String extensionVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionLinkResource(null, null, extensionName, extensionVersion)); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java index 4b50cce48ab..1cce6c0a231 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java @@ -54,10 +54,10 @@ public class FeedService extends BaseService { @GET @ApiIgnore // until documented @Path("{feedName}") @Produces("text/plain") - public Response getFeed(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @PathParam("feedName") String feedName) { + public Response getFeed(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("feedName") String feedName) { - return handleRequest(headers, body, ui, Request.Type.GET, createFeedResource(feedName)); + return handleRequest(headers, null, ui, Request.Type.GET, createFeedResource(feedName)); } /** @@ -70,8 +70,8 @@ public Response getFeed(String body, @Context HttpHeaders headers, @Context UriI */ @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getFeeds(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createFeedResource(null)); + public Response getFeeds(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createFeedResource(null)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java index b8decc6a49b..9a13e72edfc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java @@ -101,11 +101,9 @@ public HostService(String clusterName) { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getHost(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName - ) { - return handleRequest(headers, body, ui, Request.Type.GET, - createHostResource(m_clusterName, hostName)); + public Response getHost(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName) { + return handleRequest(headers, null, ui, Request.Type.GET, createHostResource(m_clusterName, hostName)); } /** @@ -134,9 +132,8 @@ public Response getHost(String body, @Context HttpHeaders headers, @Context UriI @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getHosts(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, - createHostResource(m_clusterName, null)); + public Response getHosts(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createHostResource(m_clusterName, null)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java index 706f86251bd..793353a62ab 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java @@ -76,10 +76,10 @@ public InstanceService(String feedName) { @GET @ApiIgnore // until documented @Path("{instanceID}") @Produces("text/plain") - public Response getInstance(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @PathParam("instanceID") String instanceID) { + public Response getInstance(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("instanceID") String instanceID) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createInstanceResource(m_feedName, instanceID, ui)); } @@ -93,8 +93,9 @@ public Response getInstance(String body, @Context HttpHeaders headers, @Context */ @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getInstances(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, + public Response getInstances(@Context HttpHeaders headers, @Context UriInfo ui) { + + return handleRequest(headers, null, ui, Request.Type.GET, createInstanceResource(m_feedName, null, ui)); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java index 6f780379f40..b62843bc0d5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java @@ -48,16 +48,16 @@ public class KerberosDescriptorService extends BaseService { */ @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getKerberosDescriptors(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createKerberosDescriptorResource(null)); + public Response getKerberosDescriptors(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createKerberosDescriptorResource(null)); } @GET @ApiIgnore // until documented @Path("{kerberosDescriptorName}") @Produces("text/plain") - public Response getKerberosDescriptor(String body, @Context HttpHeaders headers, @Context UriInfo ui, + public Response getKerberosDescriptor(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("kerberosDescriptorName") String kerberosDescriptorName) { - return handleRequest(headers, body, ui, Request.Type.GET, createKerberosDescriptorResource(kerberosDescriptorName)); + return handleRequest(headers, null, ui, Request.Type.GET, createKerberosDescriptorResource(kerberosDescriptorName)); } @POST @ApiIgnore // until documented diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java index 581481e5129..87481fdb996 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java @@ -64,7 +64,6 @@ public MpacksService() { * * @param headers http headers * @param ui uri info - * @param body request body * @return All the existing mpack definitions * */ @@ -91,9 +90,8 @@ public MpacksService() { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getMpacks(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, - createMpackResource(null)); + public Response getMpacks(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createMpackResource(null)); } /** @@ -145,11 +143,9 @@ public Response createMpacks(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getMpack(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @PathParam("id") String id) { + public Response getMpack(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("id") String id) { - return handleRequest(headers, body, ui, Request.Type.GET, - createMpackResource(id)); + return handleRequest(headers, null, ui, Request.Type.GET, createMpackResource(id)); } @DELETE diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java index 712c9ea9c02..36d72d1da30 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java @@ -105,10 +105,10 @@ public RequestService(String clusterName) { @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getRequest(String body, @Context HttpHeaders headers, @Context UriInfo ui, + public Response getRequest(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("requestId") String requestId) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createRequestResource(m_clusterName, requestId)); } @@ -143,8 +143,8 @@ public Response getRequest(String body, @Context HttpHeaders headers, @Context U @ApiResponse(code = HttpStatus.SC_UNAUTHORIZED, message = MSG_NOT_AUTHENTICATED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getRequests(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, + public Response getRequests(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createRequestResource(m_clusterName, null)); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java index 7b95511b2da..763d61f7edc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RootServiceService.java @@ -106,9 +106,9 @@ public class RootServiceService extends BaseService { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getRootServices(@Context HttpHeaders headers, @Context UriInfo ui) { ResourceInstance resource = createServiceResource(null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -127,11 +127,10 @@ public Response getRootServices(String body, @Context HttpHeaders headers, @Cont @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootService(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName - ) { + public Response getRootService(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName) { ResourceInstance resource = createServiceResource(serviceName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -150,9 +149,9 @@ public Response getRootService(String body, @Context HttpHeaders headers, @Conte @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootHosts(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getRootHosts(@Context HttpHeaders headers, @Context UriInfo ui) { ResourceInstance resource = createHostResource(null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -170,11 +169,10 @@ public Response getRootHosts(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootHost(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName - ) { + public Response getRootHost(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName) { ResourceInstance resource = createHostResource(hostName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -193,12 +191,11 @@ public Response getRootHost(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServiceHostComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, - @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName - ) { + public Response getRootServiceHostComponents(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, + @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName) { ResourceInstance resource = createHostComponentResource(serviceName, hostName, null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -217,13 +214,13 @@ public Response getRootServiceHostComponents(String body, @Context HttpHeaders h @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServiceHostComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, - @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName, - @ApiParam(value = "component name", required = true) @PathParam("hostComponent") String hostComponent + public Response getRootServiceHostComponent(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, + @ApiParam(value = "host name", required = true) @PathParam("hostName") String hostName, + @ApiParam(value = "component name", required = true) @PathParam("hostComponent") String hostComponent ) { ResourceInstance resource = createHostComponentResource(serviceName, hostName, hostComponent); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -242,11 +239,10 @@ public Response getRootServiceHostComponent(String body, @Context HttpHeaders he @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServiceComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName - ) { + public Response getRootServiceComponents(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName) { ResourceInstance resource = createServiceComponentResource(serviceName, null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -265,12 +261,11 @@ public Response getRootServiceComponents(String body, @Context HttpHeaders heade @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServiceComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, - @ApiParam(value = "component name", required = true) @PathParam("componentName") String componentName - ) { + public Response getRootServiceComponent(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, + @ApiParam(value = "component name", required = true) @PathParam("componentName") String componentName) { ResourceInstance resource = createServiceComponentResource(serviceName, componentName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @GET @@ -289,12 +284,11 @@ public Response getRootServiceComponent(String body, @Context HttpHeaders header @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getRootServiceComponentHosts(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, - @ApiParam(value = "component name", required = true) @PathParam("componentName") String componentName - ) { + public Response getRootServiceComponentHosts(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "service name", required = true) @PathParam("serviceName") String serviceName, + @ApiParam(value = "component name", required = true) @PathParam("componentName") String componentName) { ResourceInstance resource = createHostComponentResource(serviceName, null, componentName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } @Path("{serviceName}/components/{componentName}/configurations") diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java index 7802528da8c..0fcce2265d3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/SettingService.java @@ -92,9 +92,9 @@ public SettingService() { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getSettings(String body, @Context HttpHeaders headers, @Context UriInfo ui) { + public Response getSettings(@Context HttpHeaders headers, @Context UriInfo ui) { ResourceInstance resource = createSettingResource(null); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** @@ -127,11 +127,10 @@ public Response getSettings(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getSetting(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "setting name", required = true) @PathParam("settingName") String settingName - ) { + public Response getSetting(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "setting name", required = true) @PathParam("settingName") String settingName) { ResourceInstance resource = createSettingResource(settingName); - return handleRequest(headers, body, ui, Request.Type.GET, resource); + return handleRequest(headers, null, ui, Request.Type.GET, resource); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java index d293dc4627f..cbc7191c9a1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StacksService.java @@ -79,8 +79,8 @@ public class StacksService extends BaseService { @ApiResponse(code = HttpStatus.SC_OK, message = MSG_SUCCESSFUL_OPERATION), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStacks(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, + public Response getStacks(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createStackResource(null)); } @@ -98,11 +98,11 @@ public Response getStacks(String body, @Context HttpHeaders headers, @Context Ur @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStack(String body, @Context HttpHeaders headers, + public Response getStack(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackResource(stackName)); } @@ -130,12 +130,10 @@ public Response getStack(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackVersions(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackVersions(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackVersionResource(stackName, null)); } @@ -155,13 +153,11 @@ public Response getStackVersions(String body, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackVersion(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackVersion(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackVersionResource(stackName, stackVersion)); } @@ -197,12 +193,10 @@ public Response getStackVersion(String body, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackVersionLinks(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + public Response getStackVersionLinks(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion) { + return handleRequest(headers, null, ui, Request.Type.GET, createExtensionLinkResource(stackName, stackVersion, null, null)); } @@ -235,12 +229,11 @@ public Response getStackVersionLinks(String body, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackLevelConfigurations(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion) { + public Response getStackLevelConfigurations(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackLevelConfigurationsResource(stackName, stackVersion, null)); } @@ -261,14 +254,12 @@ public Response getStackLevelConfigurations(String body, @Context HttpHeaders he @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackLevelConfiguration(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("propertyName") String propertyName) { + public Response getStackLevelConfiguration(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("propertyName") String propertyName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackLevelConfigurationsResource(stackName, stackVersion, propertyName)); } @@ -300,12 +291,11 @@ public Response getStackLevelConfiguration(String body, @Context HttpHeaders hea @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServices(String body, @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackServices(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceResource(stackName, stackVersion, null)); } @@ -326,13 +316,12 @@ public Response getStackServices(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackService(String body, @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackService(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceResource(stackName, stackVersion, serviceName)); } @@ -356,12 +345,11 @@ public Response getStackService(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackArtifacts(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion) { + public Response getStackArtifacts(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackArtifactsResource(stackName, stackVersion, null)); } @@ -382,11 +370,11 @@ public Response getStackArtifacts(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackArtifact(String body, @Context HttpHeaders headers, - @Context UriInfo ui, @PathParam("stackName") String stackName, + public Response getStackArtifact(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("artifactName") String artifactName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackArtifactsResource(stackName, stackVersion, artifactName)); } @@ -418,13 +406,12 @@ public Response getStackArtifact(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceArtifacts(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName) { + public Response getStackServiceArtifacts(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceArtifactsResource(stackName, stackVersion, serviceName, null)); } @@ -458,13 +445,12 @@ public Response getStackServiceArtifacts(String body, @Context HttpHeaders heade @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceThemes(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName) { + public Response getStackServiceThemes(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceThemesResource(stackName, stackVersion, serviceName, null)); } @@ -485,14 +471,13 @@ public Response getStackServiceThemes(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceTheme(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("themeName") String themeName) { + public Response getStackServiceTheme(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName, + @ApiParam @PathParam("themeName") String themeName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceThemesResource(stackName, stackVersion, serviceName, themeName)); } @@ -526,13 +511,12 @@ public Response getStackServiceTheme(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceQuickLinksConfigurations(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName) { + public Response getStackServiceQuickLinksConfigurations(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceQuickLinksResource(stackName, stackVersion, serviceName, null)); } @@ -554,14 +538,13 @@ public Response getStackServiceQuickLinksConfigurations(String body, @Context Ht @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceQuickLinksConfiguration(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("quickLinksConfigurationName") String quickLinksConfigurationName) { + public Response getStackServiceQuickLinksConfiguration(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName, + @ApiParam @PathParam("quickLinksConfigurationName") String quickLinksConfigurationName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceQuickLinksResource(stackName, stackVersion, serviceName, quickLinksConfigurationName)); } @@ -583,14 +566,13 @@ public Response getStackServiceQuickLinksConfiguration(String body, @Context Htt @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackServiceArtifact(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("artifactName") String artifactName) { + public Response getStackServiceArtifact(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName, + @ApiParam @PathParam("artifactName") String artifactName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceArtifactsResource(stackName, stackVersion, serviceName, artifactName)); } @@ -624,14 +606,12 @@ public Response getStackServiceArtifact(String body, @Context HttpHeaders header @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackConfigurations(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackConfigurations(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackConfigurationResource(stackName, stackVersion, serviceName, null)); } @@ -653,13 +633,12 @@ public Response getStackConfigurations(String body, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackConfiguration(String body, @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getStackConfiguration(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName, @ApiParam @PathParam("propertyName") String propertyName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackConfigurationResource(stackName, stackVersion, serviceName, propertyName)); } @@ -695,14 +674,13 @@ public Response getStackConfiguration(String body, @Context HttpHeaders headers, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getStackConfigurationDependencies(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("propertyName") String propertyName) { + public Response getStackConfigurationDependencies(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName, + @ApiParam @PathParam("propertyName") String propertyName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackConfigurationDependencyResource(stackName, stackVersion, serviceName, propertyName)); } @@ -736,14 +714,12 @@ public Response getStackConfigurationDependencies(String body, @Context HttpHead @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getServiceComponents(String body, - @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getServiceComponents(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceComponentResource(stackName, stackVersion, serviceName, null)); } @@ -779,14 +755,13 @@ public Response getServiceComponents(String body, @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getServiceComponentDependencies(String body, @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getServiceComponentDependencies(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName, @ApiParam @PathParam("componentName") String componentName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceComponentDependencyResource(stackName, stackVersion, serviceName, componentName, null)); } @@ -808,15 +783,14 @@ public Response getServiceComponentDependencies(String body, @Context HttpHeader @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getServiceComponentDependency(String body, @Context HttpHeaders headers, - @Context UriInfo ui, - @ApiParam @PathParam("stackName") String stackName, - @ApiParam @PathParam("stackVersion") String stackVersion, - @ApiParam @PathParam("serviceName") String serviceName, - @ApiParam @PathParam("componentName") String componentName, - @ApiParam @PathParam("dependencyName") String dependencyName) { + public Response getServiceComponentDependency(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam @PathParam("stackName") String stackName, + @ApiParam @PathParam("stackVersion") String stackVersion, + @ApiParam @PathParam("serviceName") String serviceName, + @ApiParam @PathParam("componentName") String componentName, + @ApiParam @PathParam("dependencyName") String dependencyName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceComponentDependencyResource(stackName, stackVersion, serviceName, componentName, dependencyName)); } @@ -837,14 +811,13 @@ public Response getServiceComponentDependency(String body, @Context HttpHeaders @ApiResponse(code = HttpStatus.SC_NOT_FOUND, message = MSG_RESOURCE_NOT_FOUND), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR) }) - public Response getServiceComponent(String body, @Context HttpHeaders headers, - @Context UriInfo ui, + public Response getServiceComponent(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam @PathParam("stackName") String stackName, @ApiParam @PathParam("stackVersion") String stackVersion, @ApiParam @PathParam("serviceName") String serviceName, @ApiParam @PathParam("componentName") String componentName) { - return handleRequest(headers, body, ui, Request.Type.GET, + return handleRequest(headers, null, ui, Request.Type.GET, createStackServiceComponentResource(stackName, stackVersion, serviceName, componentName)); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java index 27f02fe5c09..b1478009e12 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java @@ -54,10 +54,10 @@ public class TargetClusterService extends BaseService { @GET @ApiIgnore // until documented @Path("{targetName}") @Produces("text/plain") - public Response getTargetCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @PathParam("targetName") String targetName) { + public Response getTargetCluster(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("targetName") String targetName) { - return handleRequest(headers, body, ui, Request.Type.GET, createTargetClusterResource(targetName)); + return handleRequest(headers, null, ui, Request.Type.GET, createTargetClusterResource(targetName)); } /** @@ -70,8 +70,9 @@ public Response getTargetCluster(String body, @Context HttpHeaders headers, @Con */ @GET @ApiIgnore // until documented @Produces("text/plain") - public Response getTargetClusters(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createTargetClusterResource(null)); + public Response getTargetClusters(@Context HttpHeaders headers, @Context UriInfo ui) { + + return handleRequest(headers, null, ui, Request.Type.GET, createTargetClusterResource(null)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/ActiveWidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/ActiveWidgetLayoutService.java index b5ebee30495..7fffadf18fd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/ActiveWidgetLayoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/ActiveWidgetLayoutService.java @@ -72,10 +72,11 @@ public class ActiveWidgetLayoutService extends BaseService { @ApiImplicitParam(name = "from", value = "The starting page resource (inclusive). Valid values are :offset | \"start\"", defaultValue = "0", dataType = "string", paramType = "query"), @ApiImplicitParam(name = "to", value = "The ending page resource (inclusive). Valid values are :offset | \"end\"", dataType = "string", paramType = "query") }) - public Response getServices(String body, @Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "user name", required = true) + public Response getServices(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "user name", required = true) @PathParam("userName") String userName) { - return handleRequest(headers, body, ui, Request.Type.GET, createResource(userName)); + return handleRequest(headers, null, ui, Request.Type.GET, createResource(userName)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/UserService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/UserService.java index fa407c4ad51..b76e11ba3af 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/UserService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/UserService.java @@ -82,8 +82,8 @@ public class UserService extends BaseService { @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getUsers(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createUserResource(null)); + public Response getUsers(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createUserResource(null)); } /** @@ -109,9 +109,9 @@ public Response getUsers(String body, @Context HttpHeaders headers, @Context Uri @ApiResponse(code = HttpStatus.SC_FORBIDDEN, message = MSG_PERMISSION_DENIED), @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), }) - public Response getUser(String body, @Context HttpHeaders headers, @Context UriInfo ui, + public Response getUser(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "user name", required = true) @PathParam("userName") String userName) { - return handleRequest(headers, body, ui, Request.Type.GET, createUserResource(userName)); + return handleRequest(headers, null, ui, Request.Type.GET, createUserResource(userName)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java index b44091476a8..68d443d5f96 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java @@ -98,9 +98,10 @@ public class ViewInstanceService extends BaseService { @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getServices(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @PathParam("viewName") String viewName, @PathParam("version") String version) throws AuthorizationException { - return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, version, null)); + public Response getServices(@Context HttpHeaders headers, @Context UriInfo ui, + @PathParam("viewName") String viewName, + @PathParam("version") String version) throws AuthorizationException { + return handleRequest(headers, null, ui, Request.Type.GET, createResource(viewName, version, null)); } /** @@ -130,10 +131,11 @@ public Response getServices(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getService(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "view name") @PathParam("viewName") String viewName, @PathParam("version") String version, - @ApiParam(value = "instance name") @PathParam("instanceName") String instanceName) throws AuthorizationException { - return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, version, instanceName)); + public Response getService(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "view name") @PathParam("viewName") String viewName, + @PathParam("version") String version, + @ApiParam(value = "instance name") @PathParam("instanceName") String instanceName) throws AuthorizationException { + return handleRequest(headers, null, ui, Request.Type.GET, createResource(viewName, version, instanceName)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java index 3bf084c88f4..b3e03698e9a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java @@ -84,8 +84,8 @@ public class ViewService extends BaseService { @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getViews(String body, @Context HttpHeaders headers, @Context UriInfo ui) { - return handleRequest(headers, body, ui, Request.Type.GET, createViewResource(null)); + public Response getViews(@Context HttpHeaders headers, @Context UriInfo ui) { + return handleRequest(headers, null, ui, Request.Type.GET, createViewResource(null)); } /** @@ -113,10 +113,10 @@ public Response getViews(String body, @Context HttpHeaders headers, @Context Uri @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getView(String body, @Context HttpHeaders headers, @Context UriInfo ui, + public Response getView(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "view name", required = true) @PathParam("viewName") String viewName) { - return handleRequest(headers, body, ui, Request.Type.GET, createViewResource(viewName)); + return handleRequest(headers, null, ui, Request.Type.GET, createViewResource(viewName)); } /** diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java index 57f8d3693d7..fef58a222f7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java @@ -86,10 +86,10 @@ public class ViewVersionService extends BaseService { @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getVersions(String body, @Context HttpHeaders headers, @Context UriInfo ui, + public Response getVersions(@Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "view name") @PathParam("viewName") String viewName) { - return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, null)); + return handleRequest(headers, null, ui, Request.Type.GET, createResource(viewName, null)); } /** @@ -118,11 +118,11 @@ public Response getVersions(String body, @Context HttpHeaders headers, @Context @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR), @ApiResponse(code = HttpStatus.SC_BAD_REQUEST, message = MSG_INVALID_ARGUMENTS), }) - public Response getVersion(String body, @Context HttpHeaders headers, @Context UriInfo ui, - @ApiParam(value = "view name") @PathParam("viewName") String viewName, - @PathParam("version") String version) { + public Response getVersion(@Context HttpHeaders headers, @Context UriInfo ui, + @ApiParam(value = "view name") @PathParam("viewName") String viewName, + @PathParam("version") String version) { - return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, version)); + return handleRequest(headers, null, ui, Request.Type.GET, createResource(viewName, version)); } /**