Repository: ambari Updated Branches: refs/heads/trunk e0d5f4094 -> 965e4bd0f
http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java index 2921cc4..93cfc47 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RemoteClustersService.java @@ -32,10 +32,10 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; - /** * Service responsible for Remote Cluster resource requests. */ @@ -48,13 +48,12 @@ public class RemoteClustersService extends BaseService { * @param ui * @return collections of all remote clusters */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getRemoteClusters(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createRemoteClusterResource(null)); } - /** * Create a new RemoteAmbariCluster * @param body @@ -63,7 +62,7 @@ public class RemoteClustersService extends BaseService { * @param clusterName * @return */ - @POST + @POST @ApiIgnore // until documented @Path("{clusterName}") @Produces("text/plain") public Response createRemoteCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -71,7 +70,6 @@ public class RemoteClustersService extends BaseService { return handleRequest(headers, body, ui, Request.Type.POST, createRemoteClusterResource(clusterName)); } - /** * Update a Remote Cluster * @param body @@ -80,7 +78,7 @@ public class RemoteClustersService extends BaseService { * @param clusterName * @return */ - @PUT + @PUT @ApiIgnore // until documented @Path("{clusterName}") @Produces("text/plain") public Response updateRemoteCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -96,7 +94,7 @@ public class RemoteClustersService extends BaseService { * @param clusterName * @return */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{clusterName}") @Produces("text/plain") public Response deleteRemoteCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -104,7 +102,6 @@ public class RemoteClustersService extends BaseService { return handleRequest(headers, body, ui, Request.Type.DELETE, createRemoteClusterResource(clusterName)); } - /** * Get information about a Remote Cluster * @param headers @@ -112,7 +109,7 @@ public class RemoteClustersService extends BaseService { * @param clusterName * @return */ - @GET + @GET @ApiIgnore // until documented @Path("{clusterName}") @Produces("text/plain") public Response getRemoteCluster(@Context HttpHeaders headers, @Context UriInfo ui, @@ -120,9 +117,6 @@ public class RemoteClustersService extends BaseService { return handleRequest(headers, null, ui, Request.Type.GET, createRemoteClusterResource(clusterName)); } - - - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java index 4dc07f3..467cee0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryService.java @@ -31,6 +31,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -61,7 +62,7 @@ public class RepositoryService extends BaseService { * @param headers http headers * @param ui uri info */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createRepository(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createResource(null)); @@ -76,7 +77,7 @@ public class RepositoryService extends BaseService { * @param repoId repository id * @param ui uri info */ - @POST + @POST @ApiIgnore // until documented @Path("{repoId}") @Produces("text/plain") public Response createRepository(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("repoId") String repoId) { @@ -90,7 +91,7 @@ public class RepositoryService extends BaseService { * @param headers http headers * @param ui uri info */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getRepositories(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(null)); @@ -105,7 +106,7 @@ public class RepositoryService extends BaseService { * @param repoId repository id * @return information regarding the specified repository */ - @GET + @GET @ApiIgnore // until documented @Path("{repoId}") @Produces("text/plain") public Response getRepository(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("repoId") String repoId) { @@ -121,7 +122,7 @@ public class RepositoryService extends BaseService { * @param repoId repository id * @return information regarding the specified repository */ - @PUT + @PUT @ApiIgnore // until documented @Path("{repoId}") @Produces("text/plain") public Response updateRepository(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("repoId") String repoId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java index c6d8935..c282b7b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RepositoryVersionService.java @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -61,7 +62,7 @@ public class RepositoryVersionService extends BaseService { * @param headers http headers * @param ui uri info */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getRepositoryVersions(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(null)); @@ -76,7 +77,7 @@ public class RepositoryVersionService extends BaseService { * @param repositoryVersionId the repository version id * @return information regarding the specified repository */ - @GET + @GET @ApiIgnore // until documented @Path("{repositoryVersionId}") @Produces("text/plain") public Response getRepositoryVersion(@Context HttpHeaders headers, @Context UriInfo ui, @@ -92,7 +93,7 @@ public class RepositoryVersionService extends BaseService { * @param ui uri info * @return information regarding the created repository */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createRepositoryVersion(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createResource(null)); @@ -106,7 +107,7 @@ public class RepositoryVersionService extends BaseService { * @param repositoryVersionId the repository version id * @return information regarding the deleted repository */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{repositoryVersionId}") @Produces("text/plain") public Response deleteRepositoryVersion(@Context HttpHeaders headers, @Context UriInfo ui, @@ -122,7 +123,7 @@ public class RepositoryVersionService extends BaseService { * @param repositoryVersionId the repository version id * @return information regarding the updated repository */ - @PUT + @PUT @ApiIgnore // until documented @Path("{repositoryVersionId}") @Produces("text/plain") public Response updateRepositoryVersion(String body, @Context HttpHeaders headers, @Context UriInfo ui, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java index 5c48175..a734167 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RequestScheduleService.java @@ -31,6 +31,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -60,7 +61,7 @@ public class RequestScheduleService extends BaseService { * @param ui * @return */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getRequestSchedules(String body, @Context HttpHeaders headers, @@ -75,7 +76,7 @@ public class RequestScheduleService extends BaseService { * * @return */ - @GET + @GET @ApiIgnore // until documented @Path("{requestScheduleId}") @Produces("text/plain") public Response getRequestSchedule(String body, @@ -95,7 +96,7 @@ public class RequestScheduleService extends BaseService { * @param ui * @return */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createRequestSchedule(String body, @Context HttpHeaders headers, @@ -113,7 +114,7 @@ public class RequestScheduleService extends BaseService { * @param requestScheduleId * @return */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{requestScheduleId}") @Produces("text/plain") public Response deleteRequestSchedule(@Context HttpHeaders headers, @@ -123,8 +124,6 @@ public class RequestScheduleService extends BaseService { createRequestSchedule(m_clusterName, requestScheduleId)); } - - /** * Create a request schedule resource instance * @param clusterName http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java index f7365a1..4fe3613 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RoleAuthorizationService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -68,7 +69,7 @@ public class RoleAuthorizationService extends BaseService { * @param ui uri info * @return authorizations collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getAuthorizations(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createAuthorizationResource(null)); @@ -84,7 +85,7 @@ public class RoleAuthorizationService extends BaseService { * @param authorizationId authorization ID * @return authorization instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{authorization_id}") @Produces("text/plain") public Response getAuthorization(@Context HttpHeaders headers, @Context UriInfo ui, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java index 43eabdc..c6e3201 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceConfigVersionService.java @@ -28,6 +28,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -41,13 +42,12 @@ public class ServiceConfigVersionService extends BaseService { this.m_clusterName = m_clusterName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getServiceConfigVersions(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, createServiceConfigResource(m_clusterName)); } - ResourceInstance createServiceConfigResource(String clusterName) { Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.Cluster, clusterName); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java index 7516379..349b270 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/StageService.java @@ -18,7 +18,6 @@ package org.apache.ambari.server.api.services; - import java.util.HashMap; import java.util.Map; @@ -33,10 +32,10 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; - /** * Service responsible for stage resource requests. */ @@ -51,7 +50,6 @@ public class StageService extends BaseService { */ private String m_requestId; - // ----- Constructors ------------------------------------------------------ /** @@ -65,7 +63,6 @@ public class StageService extends BaseService { m_requestId = requestId; } - // ----- StageService ------------------------------------------------------ /** @@ -79,7 +76,7 @@ public class StageService extends BaseService { * * @return stage resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{stageId}") @Produces("text/plain") public Response getStage(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -98,7 +95,7 @@ public class StageService extends BaseService { * * @return stage collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getStages(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, @@ -122,7 +119,7 @@ public class StageService extends BaseService { * @param ui uri info * @return information regarding the created services */ - @PUT + @PUT @ApiIgnore // until documented @Path("{stageId}") @Produces("text/plain") public Response updateStages(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -139,7 +136,7 @@ public class StageService extends BaseService { * @param ui uri info * @return information regarding the created services */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createStages(String body, @Context HttpHeaders headers, @Context UriInfo ui) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TargetClusterService.java ---------------------------------------------------------------------- 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 88a27f2..cb6eb39 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 @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -50,7 +51,7 @@ public class TargetClusterService extends BaseService { * @param targetName target id * @return target instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{targetName}") @Produces("text/plain") public Response getTargetCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -67,7 +68,7 @@ public class TargetClusterService extends BaseService { * @param ui uri info * @return target collection resource representation */ - @GET + @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)); @@ -82,7 +83,7 @@ public class TargetClusterService extends BaseService { * @param targetName target id * @return information regarding the created target */ - @POST + @POST @ApiIgnore // until documented @Path("{targetName}") @Produces("text/plain") public Response createTargetCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -100,7 +101,7 @@ public class TargetClusterService extends BaseService { * @param targetName target id * @return information regarding the updated target */ - @PUT + @PUT @ApiIgnore // until documented @Path("{targetName}") @Produces("text/plain") public Response updateTargetCluster(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -118,7 +119,7 @@ public class TargetClusterService extends BaseService { * @param targetName target id * @return information regarding the deleted target */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{targetName}") @Produces("text/plain") public Response deleteTargetCluster(@Context HttpHeaders headers, @Context UriInfo ui, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java index 55ff1ce..a1dcf2f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskAttemptService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -71,7 +72,7 @@ public class TaskAttemptService extends BaseService { * * @return task attempt instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{taskAttemptId}") @Produces("text/plain") public Response getTaskAttempt(String body, @Context HttpHeaders headers, @@ -95,7 +96,7 @@ public class TaskAttemptService extends BaseService { * * @return task attempt collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getTaskAttempts(String body, @Context HttpHeaders headers, @Context UriInfo ui) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java index 8441f7e..cc5491b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/TaskService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -74,7 +75,7 @@ public class TaskService extends BaseService { * * @return a task resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{taskId}") @Produces("text/plain") public Response getTask(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -93,7 +94,7 @@ public class TaskService extends BaseService { * * @return task collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java index 004cd92..bc9aad1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeGroupService.java @@ -29,6 +29,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -45,7 +46,7 @@ public class UpgradeGroupService extends BaseService { m_upgradeId = upgradeId; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getGroups(String body, @Context HttpHeaders headers, @@ -54,7 +55,7 @@ public class UpgradeGroupService extends BaseService { createResourceInstance(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{upgradeGroupId}") @Produces("text/plain") public Response getGroup(String body, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java index 4e83de9..9fc68df 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeItemService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -48,7 +49,7 @@ public class UpgradeItemService extends BaseService { m_upgradeGroupId = upgradeGroupId; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getUpgrades( @Context HttpHeaders headers, @@ -57,7 +58,7 @@ public class UpgradeItemService extends BaseService { createResourceInstance(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{upgradeItemId}") @Produces("text/plain") public Response getUpgradeItem(String body, @@ -80,7 +81,7 @@ public class UpgradeItemService extends BaseService { * * @return information regarding the created services */ - @PUT + @PUT @ApiIgnore // until documented @Path("{upgradeItemId}") @Produces("text/plain") public Response updateUpgradeItem(String body, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java index dd21a7d..0e0df10 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeService.java @@ -31,6 +31,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -50,7 +51,7 @@ public class UpgradeService extends BaseService { m_clusterName = clusterName; } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createUpgrade(String body, @Context HttpHeaders headers, @@ -59,7 +60,7 @@ public class UpgradeService extends BaseService { createResourceInstance(null)); } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getUpgrades( @Context HttpHeaders headers, @Context UriInfo ui) { @@ -67,7 +68,7 @@ public class UpgradeService extends BaseService { createResourceInstance(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{upgradeId}") @Produces("text/plain") public Response getUpgradeItem(@Context HttpHeaders headers, @@ -76,7 +77,7 @@ public class UpgradeService extends BaseService { createResourceInstance(id)); } - @PUT + @PUT @ApiIgnore // until documented @Path("{upgradeId}") @Produces("text/plain") public Response updateUpgradeItem(String body, @Context HttpHeaders headers, @@ -93,8 +94,6 @@ public class UpgradeService extends BaseService { return new UpgradeGroupService(m_clusterName, upgradeId); } - - /** * @param upgradeId the upgrade id * @return the resource instance http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java index 9ed9e32..ccd626f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/UpgradeSummaryService.java @@ -29,10 +29,10 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; - /** * Endpoint for a detailed summary of the cluster upgrades. */ @@ -49,7 +49,7 @@ public class UpgradeSummaryService extends BaseService { m_clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getUpgradeSummaries(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -57,7 +57,7 @@ public class UpgradeSummaryService extends BaseService { createResourceInstance(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{requestId}") @Produces("text/plain") public Response getUpgradeSummary(@Context HttpHeaders headers, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java index 64cca7f..6b6f643 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ValidationService.java @@ -31,6 +31,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -50,7 +51,7 @@ public class ValidationService extends BaseService { * @param stackVersion stack version * @return validation items if any */ - @POST + @POST @ApiIgnore // until documented @Produces(MediaType.TEXT_PLAIN) public Response getValidation(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java index ce32003..9d0f32b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/VersionDefinitionService.java @@ -34,6 +34,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.internal.VersionDefinitionResourceProvider; import org.apache.ambari.server.controller.spi.Resource; @@ -44,7 +45,7 @@ import com.google.gson.JsonObject; @Path("/version_definitions/") public class VersionDefinitionService extends BaseService { - @GET + @GET @ApiIgnore // until documented @Produces(MediaType.TEXT_PLAIN) public Response getServices(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -52,7 +53,7 @@ public class VersionDefinitionService extends BaseService { createResource(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{versionId}") @Produces(MediaType.TEXT_PLAIN) public Response getService(@Context HttpHeaders headers, @Context UriInfo ui, @@ -75,9 +76,7 @@ public class VersionDefinitionService extends BaseService { return new OperatingSystemService(mapIds); } - - - @POST + @POST @ApiIgnore // until documented @Produces(MediaType.TEXT_PLAIN) public Response createVersion(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, @@ -91,7 +90,7 @@ public class VersionDefinitionService extends BaseService { * @param headers the headers * @param ui the URI info */ - @POST + @POST @ApiIgnore // until documented @Consumes({MediaType.TEXT_XML}) @Produces(MediaType.TEXT_PLAIN) public Response createVersionByXml(String body, @Context HttpHeaders headers, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java index 6bdf66d..fadcc72 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ViewUrlsService.java @@ -32,13 +32,13 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; import org.apache.ambari.server.security.authorization.AuthorizationException; import com.google.common.base.Optional; - /** * Service responsible for view resource requests. */ @@ -52,13 +52,12 @@ public class ViewUrlsService extends BaseService { * @return collections of all view urls and any instances registered against them */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getViewUrls(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createViewUrlResource(Optional.<String>absent())); } - /** * Create a new View URL * @param body @@ -68,7 +67,7 @@ public class ViewUrlsService extends BaseService { * @return * @throws AuthorizationException */ - @POST + @POST @ApiIgnore // until documented @Path("{urlName}") @Produces("text/plain") public Response createUrl(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -76,7 +75,6 @@ public class ViewUrlsService extends BaseService { return handleRequest(headers, body, ui, Request.Type.POST, createViewUrlResource(Optional.of(urlName))); } - /** * Update a view URL * @param body @@ -86,7 +84,7 @@ public class ViewUrlsService extends BaseService { * @return * @throws AuthorizationException */ - @PUT + @PUT @ApiIgnore // until documented @Path("{urlName}") @Produces("text/plain") public Response updateUrl(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -103,7 +101,7 @@ public class ViewUrlsService extends BaseService { * @return * @throws AuthorizationException */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{urlName}") @Produces("text/plain") public Response deleteUrl(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -111,7 +109,6 @@ public class ViewUrlsService extends BaseService { return handleRequest(headers, body, ui, Request.Type.DELETE, createViewUrlResource(Optional.of(urlName))); } - /** * Get information about a single view URL * @param headers @@ -120,7 +117,7 @@ public class ViewUrlsService extends BaseService { * @return * @throws AuthorizationException */ - @GET + @GET @ApiIgnore // until documented @Path("{urlName}") @Produces("text/plain") public Response getUrl(@Context HttpHeaders headers, @Context UriInfo ui, @@ -128,9 +125,6 @@ public class ViewUrlsService extends BaseService { return handleRequest(headers, null, ui, Request.Type.GET, createViewUrlResource(Optional.of(urlName))); } - - - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java index b22ff4f..61167d6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -46,7 +47,7 @@ public class WidgetLayoutService extends BaseService { this.clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Path("{widgetLayoutId}") @Produces("text/plain") public Response getService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -65,7 +66,7 @@ public class WidgetLayoutService extends BaseService { * * @return instance collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { System.out.println("###########"); @@ -73,7 +74,7 @@ public class WidgetLayoutService extends BaseService { createResource(null)); } - @POST + @POST @ApiIgnore // until documented @Path("{widgetLayoutId}") @Produces("text/plain") public Response createService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -82,7 +83,7 @@ public class WidgetLayoutService extends BaseService { createResource(widgetLayoutId)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -90,7 +91,7 @@ public class WidgetLayoutService extends BaseService { createResource(null)); } - @PUT + @PUT @ApiIgnore // until documented @Path("{widgetLayoutId}") @Produces("text/plain") public Response updateService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -99,14 +100,14 @@ public class WidgetLayoutService extends BaseService { return handleRequest(headers, body, ui, Request.Type.PUT, createResource(widgetLayoutId)); } - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.PUT, createResource(null)); } - @DELETE + @DELETE @ApiIgnore // until documented @Path("{widgetLayoutId}") @Produces("text/plain") public Response deleteService(@Context HttpHeaders headers, @Context UriInfo ui, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java index 32a9857..d4586e4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetService.java @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -46,7 +47,7 @@ public class WidgetService extends BaseService { this.clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Path("{widgetId}") @Produces("text/plain") public Response getService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -65,7 +66,7 @@ public class WidgetService extends BaseService { * * @return instance collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -73,7 +74,7 @@ public class WidgetService extends BaseService { createResource(null)); } - @POST + @POST @ApiIgnore // until documented @Path("{widgetId}") @Produces("text/plain") public Response createService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -82,7 +83,7 @@ public class WidgetService extends BaseService { createResource(widgetId)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -90,7 +91,7 @@ public class WidgetService extends BaseService { createResource(null)); } - @PUT + @PUT @ApiIgnore // until documented @Path("{widgetId}") @Produces("text/plain") public Response updateService(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -99,14 +100,14 @@ public class WidgetService extends BaseService { return handleRequest(headers, body, ui, Request.Type.PUT, createResource(widgetId)); } - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateServices(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.PUT, createResource(null)); } - @DELETE + @DELETE @ApiIgnore // until documented @Path("{widgetId}") @Produces("text/plain") public Response deleteService(@Context HttpHeaders headers, @Context UriInfo ui, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java index b7e257a..6151e89 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WorkflowService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.controller.spi.Resource; @@ -60,7 +61,7 @@ public class WorkflowService extends BaseService { * workflow id * @return workflow instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{workflowId}") @Produces("text/plain") public Response getWorkflow(String body, @Context HttpHeaders headers, @@ -78,7 +79,7 @@ public class WorkflowService extends BaseService { * uri info * @return workflow collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getWorkflows(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupService.java index ede59b4..40bcf82 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/GroupService.java @@ -30,6 +30,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -131,7 +132,7 @@ public class GroupService extends BaseService { * * @deprecated Use requests to /groups instead. */ - @POST + @POST @ApiIgnore // deprecated @Deprecated @Path("{groupName}") @Produces("text/plain") @@ -162,7 +163,6 @@ public class GroupService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createGroupResource(groupName)); } - /** * Create a group resource instance. * http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/MemberService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/MemberService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/MemberService.java index 765d0d3..09e4050 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/MemberService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/groups/MemberService.java @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -61,7 +62,7 @@ public class MemberService extends BaseService { * @param groupName group name * @return information regarding the created member */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createMember(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("groupName") String groupName) { return handleRequest(headers, body, ui, Request.Type.POST, createMemberResource(groupName, null)); @@ -77,7 +78,7 @@ public class MemberService extends BaseService { * @param userName the user name * @return information regarding the created member */ - @POST + @POST @ApiIgnore // until documented @Path("{userName}") @Produces("text/plain") public Response createMember(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("groupName") String groupName, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/users/UserService.java ---------------------------------------------------------------------- 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 ac6a055..a69ed4e 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 @@ -31,6 +31,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -105,7 +106,7 @@ public class UserService extends BaseService { * @param ui uri info * @return information regarding the created user */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createUser(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createUserResource(null)); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewExternalSubResourceService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewExternalSubResourceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewExternalSubResourceService.java index 9ce93bc..c2f61f9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewExternalSubResourceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewExternalSubResourceService.java @@ -31,6 +31,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -68,7 +69,6 @@ public class ViewExternalSubResourceService extends BaseService { */ private final Map<String, Object> resourceServiceMap = new HashMap<>(); - // ----- Constructors ------------------------------------------------------ public ViewExternalSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) { @@ -89,7 +89,7 @@ public class ViewExternalSubResourceService extends BaseService { * * @return instance collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getResources(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, @@ -117,7 +117,6 @@ public class ViewExternalSubResourceService extends BaseService { return service; } - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewInstanceService.java ---------------------------------------------------------------------- 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 08e0e9f..e4ebedb 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 @@ -34,6 +34,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -91,7 +92,6 @@ public class ViewInstanceService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, version, null)); } - /** * Handles URL: /views/{viewName}/versions/{version}/instances/{instanceID} * Get a specific instance. @@ -120,7 +120,6 @@ public class ViewInstanceService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, version, instanceName)); } - /** * Handles: POST /views/{viewName}/versions/{version}/instances/{instanceId} * Create a specific instance. @@ -163,7 +162,7 @@ public class ViewInstanceService extends BaseService { * * @return information regarding the created instances */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createServices(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("viewName") String viewName, @PathParam("version") String version) throws AuthorizationException { @@ -212,7 +211,7 @@ public class ViewInstanceService extends BaseService { * * @return information regarding the updated instance */ - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateServices(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("viewName") String viewName, @PathParam("version") String version) throws AuthorizationException { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java index bdb6742..4f30f9f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPermissionService.java @@ -33,6 +33,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -47,7 +48,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; - /** * Service responsible for custom view permission resource requests. */ @@ -128,7 +128,7 @@ public class ViewPermissionService extends BaseService { * * @return information regarding the created permission */ - @POST + @POST @ApiIgnore // until documented @Path("{permissionId}") @Produces("text/plain") public Response createPermission(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -151,7 +151,7 @@ public class ViewPermissionService extends BaseService { * @param permissionId permission id * @return information regarding the updated permission */ - @PUT + @PUT @ApiIgnore // until documented @Path("{permissionId}") @Produces("text/plain") public Response updatePermission(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -175,7 +175,7 @@ public class ViewPermissionService extends BaseService { * * @return information regarding the deleted permission */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{permissionId}") @Produces("text/plain") public Response deletePermission(@Context HttpHeaders headers, @Context UriInfo ui, @@ -187,7 +187,6 @@ public class ViewPermissionService extends BaseService { viewName, version, permissionId)); } - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java index a2e8952..9b1430f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewPrivilegeService.java @@ -33,6 +33,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -158,7 +159,7 @@ public class ViewPrivilegeService extends BaseService { * * @return information regarding the updated privilege */ - @PUT + @PUT @ApiIgnore // until documented // Remove comments when the below API call is fixed /*@Path("{privilegeId}") @Produces("text/plain") @@ -192,7 +193,7 @@ public class ViewPrivilegeService extends BaseService { * * @return information regarding the updated privileges */ - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updatePrivileges(String body, @Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "view name") @PathParam("viewName") String viewName, @@ -214,7 +215,7 @@ public class ViewPrivilegeService extends BaseService { * * @return information regarding the deleted privileges */ - @DELETE + @DELETE @ApiIgnore // until documented @Produces("text/plain") public Response deletePrivileges(String body, @Context HttpHeaders headers, @Context UriInfo ui, @ApiParam(value = "view name") @PathParam("viewName") String viewName, @@ -254,7 +255,6 @@ public class ViewPrivilegeService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createPrivilegeResource(viewName, version, instanceName, privilegeId)); } - protected ResourceInstance createPrivilegeResource(String viewName, String viewVersion, String instanceName, String privilegeId) { Map<Resource.Type,String> mapIds = new HashMap<>(); mapIds.put(Resource.Type.View, viewName); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewService.java ---------------------------------------------------------------------- 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 a3da212..0806a01 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 @@ -32,6 +32,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -46,7 +47,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; - /** * Service responsible for view resource requests. */ @@ -106,7 +106,6 @@ public class ViewService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createViewResource(viewName)); } - /** * Handles: POST /views/{viewID} * Create a specific view. @@ -117,7 +116,7 @@ public class ViewService extends BaseService { * * @return information regarding the created view */ - @POST + @POST @ApiIgnore // until documented @Path("{viewName}") @Produces("text/plain") public Response createView(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -136,7 +135,7 @@ public class ViewService extends BaseService { * * @return information regarding the updated view */ - @PUT + @PUT @ApiIgnore // until documented @Path("{viewName}") @Produces("text/plain") public Response updateView(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -155,7 +154,7 @@ public class ViewService extends BaseService { * * @return information regarding the deleted view */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{viewName}") @Produces("text/plain") public Response deleteView(@Context HttpHeaders headers, @Context UriInfo ui, @@ -164,7 +163,6 @@ public class ViewService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createViewResource(viewName)); } - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/views/ViewVersionService.java ---------------------------------------------------------------------- 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 90d5031..580b4bd 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 @@ -33,6 +33,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.api.resources.ResourceInstance; import org.apache.ambari.server.api.services.BaseService; import org.apache.ambari.server.api.services.Request; @@ -47,7 +48,6 @@ import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ApiResponses; - /** * Service responsible for view version resource requests. */ @@ -84,7 +84,6 @@ public class ViewVersionService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createResource(viewName, null)); } - /** * Handles: GET /views/{viewName}/versions/{version} * Get a specific view version. @@ -124,7 +123,7 @@ public class ViewVersionService extends BaseService { * * @return information regarding the created view */ - @POST + @POST @ApiIgnore // until documented @Path("{version}") @Produces("text/plain") public Response createVersions(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -145,7 +144,7 @@ public class ViewVersionService extends BaseService { * * @return information regarding the updated view */ - @PUT + @PUT @ApiIgnore // until documented @Path("{version}") @Produces("text/plain") public Response updateVersions(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -166,7 +165,7 @@ public class ViewVersionService extends BaseService { * * @return information regarding the deleted view version */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{version}") @Produces("text/plain") public Response deleteVersions(@Context HttpHeaders headers, @Context UriInfo ui, @@ -175,7 +174,6 @@ public class ViewVersionService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createResource(viewName, version)); } - /** * Get the permissions sub-resource * @@ -189,7 +187,6 @@ public class ViewVersionService extends BaseService { return new ViewPermissionService(viewName, version); } - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java b/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java index 3237b36..f1994ce 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/proxy/ProxyService.java @@ -41,6 +41,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.controller.internal.URLStreamProvider; import org.apache.ambari.server.view.ImpersonatorSettingImpl; import org.slf4j.Logger; @@ -66,24 +67,24 @@ public class ProxyService { private final static Logger LOG = LoggerFactory.getLogger(ProxyService.class); - @GET + @GET @ApiIgnore // until documented public Response processGetRequestForwarding(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(REQUEST_TYPE_GET, ui, null, headers); } - @POST + @POST @ApiIgnore // until documented @Consumes({MediaType.WILDCARD, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON}) public Response processPostRequestForwarding(InputStream body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(REQUEST_TYPE_POST, ui, body, headers); } - @PUT + @PUT @ApiIgnore // until documented @Consumes({MediaType.WILDCARD, MediaType.TEXT_PLAIN, MediaType.TEXT_XML, MediaType.APPLICATION_FORM_URLENCODED, MediaType.APPLICATION_JSON}) public Response processPutRequestForwarding(InputStream body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(REQUEST_TYPE_PUT, ui, body, headers); } - @DELETE + @DELETE @ApiIgnore // until documented public Response processDeleteRequestForwarding(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(REQUEST_TYPE_DELETE, ui, null, headers); } http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java index f81c13a..0e00c2f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/resources/api/rest/GetResource.java @@ -17,7 +17,6 @@ */ package org.apache.ambari.server.resources.api.rest; - import java.io.File; import javax.servlet.http.HttpServletRequest; @@ -31,6 +30,7 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.resources.ResourceManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,8 +51,7 @@ public class GetResource { resourceManager = instance; } - - @GET + @GET @ApiIgnore // until documented @Path("{resourcePath:.*}") @Consumes(MediaType.TEXT_PLAIN) @Produces(MediaType.APPLICATION_OCTET_STREAM) http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java index eddc6bb..881e614 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateDownload.java @@ -17,12 +17,12 @@ */ package org.apache.ambari.server.security.unsecured.rest; - import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.security.CertificateManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,11 +39,10 @@ public class CertificateDownload { certMan = instance; } - @GET + @GET @ApiIgnore // until documented @Produces({MediaType.TEXT_PLAIN}) public String downloadSrvrCrt() { return certMan.getServerCert(); } - } http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java index 5e2d45a..bfc3f3a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/CertificateSign.java @@ -17,7 +17,6 @@ */ package org.apache.ambari.server.security.unsecured.rest; - import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; import javax.ws.rs.POST; @@ -27,6 +26,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.security.CertificateManager; import org.apache.ambari.server.security.SignCertResponse; import org.apache.ambari.server.security.SignMessage; @@ -55,7 +55,7 @@ public class CertificateSign { * @throws Exception */ @Path("{hostName}") - @POST + @POST @ApiIgnore // until documented @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public SignCertResponse signAgentCrt(@PathParam("hostName") String hostname, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java index ac2e536..2ab4639 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/unsecured/rest/ConnectionInfo.java @@ -25,27 +25,26 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.configuration.Configuration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.inject.Inject; - @Path("/connection_info") public class ConnectionInfo { private static final Logger LOG = LoggerFactory.getLogger(ConnectionInfo.class); private static HashMap<String,String> response= new HashMap<>(); private static Configuration conf; - @Inject public static void init(Configuration instance){ conf = instance; response.put(Configuration.SRVR_TWO_WAY_SSL.getKey(),String.valueOf(conf.isTwoWaySsl())); } - @GET + @GET @ApiIgnore // until documented @Produces({MediaType.APPLICATION_JSON}) public Map<String,String> connectionType() { return response;
