Skip to content

AMBARI-26496: Multiple HTTP GET methods incorrectly consume entity, causing warning logs #4015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

AMBARI-26496: Multiple HTTP GET methods incorrectly consume entity, causing warning logs #4015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/ActionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

/**
Expand Down Expand Up @@ -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));
}

/**
Expand Down
11 changes: 6 additions & 5 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/BlueprintService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

/**
Expand Down Expand Up @@ -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));
}

/**
Expand Down
29 changes: 12 additions & 17 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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);
}

/**
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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);
}

/**
Expand Down
8 changes: 4 additions & 4 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
36 changes: 16 additions & 20 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
10 changes: 5 additions & 5 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

/**
Expand All @@ -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));
}

/**
Expand Down
13 changes: 5 additions & 8 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/HostService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

/**
Expand Down Expand Up @@ -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));
}

/**
Expand Down
11 changes: 6 additions & 5 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand All @@ -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));
}

Expand Down
8 changes: 4 additions & 4 deletions ...server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 4 additions & 8 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/MpacksService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public MpacksService() {
*
* @param headers http headers
* @param ui uri info
* @param body request body
* @return All the existing mpack definitions
*
*/
Expand All @@ -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));
}

/**
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down Expand Up @@ -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));
}

Expand Down
Loading