AMBARI-21295. Enable Swagger checkstyle rule for endpoints documented so far
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/965e4bd0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/965e4bd0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/965e4bd0 Branch: refs/heads/trunk Commit: 965e4bd0f834f009988f771a85e81dca55f0d235 Parents: e0d5f40 Author: Attila Doroszlai <[email protected]> Authored: Wed Jun 21 14:52:50 2017 +0200 Committer: Attila Doroszlai <[email protected]> Committed: Thu Jun 22 08:29:25 2017 +0200 ---------------------------------------------------------------------- ambari-server/checkstyle.xml | 2 +- .../ambari/server/agent/rest/AgentResource.java | 7 ++++--- .../server/api/rest/BootStrapResource.java | 10 +++++----- .../ambari/server/api/rest/HealthCheck.java | 8 +++++--- .../api/rest/KdcServerReachabilityCheck.java | 10 ++++------ .../api/services/AlertDefinitionService.java | 13 ++++++------- .../server/api/services/AlertGroupService.java | 11 ++++++----- .../api/services/AlertHistoryService.java | 5 +++-- .../server/api/services/AlertNoticeService.java | 5 +++-- .../server/api/services/AlertService.java | 7 +++---- .../server/api/services/AlertTargetService.java | 11 ++++++----- .../ClusterKerberosDescriptorService.java | 6 +++--- .../services/ClusterStackVersionService.java | 12 +++++------- .../CompatibleRepositoryVersionService.java | 5 +++-- .../server/api/services/ComponentService.java | 15 ++++++++------- .../server/api/services/ConfigGroupService.java | 12 ++++++------ .../api/services/ConfigurationService.java | 5 +++-- .../server/api/services/CredentialService.java | 11 ++++++----- .../api/services/ExtensionLinksService.java | 13 +++++++------ .../server/api/services/ExtensionsService.java | 11 ++++++----- .../ambari/server/api/services/FeedService.java | 11 ++++++----- .../api/services/HostComponentService.java | 20 ++++++++++---------- .../services/HostKerberosIdentityService.java | 5 +++-- .../api/services/HostStackVersionService.java | 7 ++++--- .../server/api/services/InstanceService.java | 11 ++++++----- .../ambari/server/api/services/JobService.java | 5 +++-- .../api/services/KerberosDescriptorService.java | 9 +++++---- .../ambari/server/api/services/KeyService.java | 3 ++- .../api/services/LdapSyncEventService.java | 12 ++++++------ .../server/api/services/LoggingService.java | 6 ++---- .../server/api/services/LogoutService.java | 3 ++- .../api/services/OperatingSystemService.java | 5 +++-- .../server/api/services/PermissionService.java | 12 ++++++------ .../api/services/PersistKeyValueService.java | 9 +++++---- .../api/services/PreUpgradeCheckService.java | 3 ++- .../server/api/services/PrivilegeService.java | 17 ++++++++--------- .../api/services/RecommendationService.java | 3 ++- .../api/services/RemoteClustersService.java | 18 ++++++------------ .../server/api/services/RepositoryService.java | 11 ++++++----- .../api/services/RepositoryVersionService.java | 11 ++++++----- .../api/services/RequestScheduleService.java | 11 +++++------ .../api/services/RoleAuthorizationService.java | 5 +++-- .../services/ServiceConfigVersionService.java | 4 ++-- .../server/api/services/StageService.java | 13 +++++-------- .../api/services/TargetClusterService.java | 11 ++++++----- .../server/api/services/TaskAttemptService.java | 5 +++-- .../ambari/server/api/services/TaskService.java | 5 +++-- .../api/services/UpgradeGroupService.java | 5 +++-- .../server/api/services/UpgradeItemService.java | 7 ++++--- .../server/api/services/UpgradeService.java | 11 +++++------ .../api/services/UpgradeSummaryService.java | 6 +++--- .../server/api/services/ValidationService.java | 3 ++- .../api/services/VersionDefinitionService.java | 11 +++++------ .../server/api/services/ViewUrlsService.java | 18 ++++++------------ .../api/services/WidgetLayoutService.java | 15 ++++++++------- .../server/api/services/WidgetService.java | 15 ++++++++------- .../server/api/services/WorkflowService.java | 5 +++-- .../api/services/groups/GroupService.java | 4 ++-- .../api/services/groups/MemberService.java | 5 +++-- .../server/api/services/users/UserService.java | 3 ++- .../views/ViewExternalSubResourceService.java | 5 ++--- .../api/services/views/ViewInstanceService.java | 7 +++---- .../services/views/ViewPermissionService.java | 9 ++++----- .../services/views/ViewPrivilegeService.java | 8 ++++---- .../server/api/services/views/ViewService.java | 10 ++++------ .../api/services/views/ViewVersionService.java | 11 ++++------- .../ambari/server/proxy/ProxyService.java | 9 +++++---- .../server/resources/api/rest/GetResource.java | 5 ++--- .../unsecured/rest/CertificateDownload.java | 5 ++--- .../unsecured/rest/CertificateSign.java | 4 ++-- .../security/unsecured/rest/ConnectionInfo.java | 5 ++--- 71 files changed, 301 insertions(+), 299 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/checkstyle.xml ---------------------------------------------------------------------- diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml index 97fdc2a..fb314bc 100644 --- a/ambari-server/checkstyle.xml +++ b/ambari-server/checkstyle.xml @@ -17,7 +17,7 @@ --> <module name="TreeWalker"> <module name="AvoidTransactionalOnPrivateMethodsCheck"/> - <!-- <module name="UndocumentedRestApiOperationCheck"/> Swagger - uncomment when API documentation is done --> + <module name="UndocumentedRestApiOperationCheck"/> <!-- Swagger --> <module name="FallThrough"/> http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java index a332459..4f63df9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java @@ -29,6 +29,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.agent.ComponentsResponse; import org.apache.ambari.server.agent.HeartBeat; @@ -81,7 +82,7 @@ public class AgentResource { * @throws Exception */ @Path("register/{hostName}") - @POST + @POST @ApiIgnore // until documented @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON}) public RegistrationResponse register(Register message, @@ -116,7 +117,7 @@ public class AgentResource { * @throws Exception */ @Path("heartbeat/{hostName}") - @POST + @POST @ApiIgnore // until documented @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON}) public HeartBeatResponse heartbeat(HeartBeat message) @@ -150,7 +151,7 @@ public class AgentResource { * @throws Exception */ @Path("components/{clusterName}") - @GET + @GET @ApiIgnore // until documented @Produces({MediaType.APPLICATION_JSON}) public ComponentsResponse components( @PathParam("clusterName") String clusterName) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java index 1bf22b1..d9852d8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java @@ -35,6 +35,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.bootstrap.BSHostStatus; import org.apache.ambari.server.bootstrap.BSResponse; import org.apache.ambari.server.bootstrap.BootStrapImpl; @@ -64,7 +65,7 @@ public class BootStrapResource { * @response.representation.408.doc Request Timed out * @throws Exception */ - @POST + @POST @ApiIgnore // until documented @Consumes(MediaType.APPLICATION_JSON) @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public BSResponse bootStrap(SshHostInfo sshInfo, @Context UriInfo uriInfo) { @@ -85,7 +86,7 @@ public class BootStrapResource { * @response.representation.408.doc Request Timed out * @throws Exception */ - @GET + @GET @ApiIgnore // until documented @Path("/{requestId}") @Produces({MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public BootStrapStatus getBootStrapStatus(@PathParam("requestId") @@ -96,13 +97,12 @@ public class BootStrapResource { return status; } - /** * Gets a list of bootstrapped hosts. * * @param uriInfo the host info, with no SSL key information */ - @GET + @GET @ApiIgnore // until documented @Path("/hosts") @Produces(MediaType.APPLICATION_JSON) public List<BSHostStatus> getBootStrapHosts(@Context UriInfo uriInfo) { @@ -118,7 +118,7 @@ public class BootStrapResource { * * @param info the host info, with no SSL key information required */ - @POST + @POST @ApiIgnore // until documented @Path("/hosts") @Produces(MediaType.APPLICATION_JSON) public List<BSHostStatus> getBootStrapHosts(SshHostInfo info, @Context UriInfo uriInfo) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java index 4c7c5e8..b884b03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/HealthCheck.java @@ -23,6 +23,8 @@ import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; +import org.apache.ambari.annotations.ApiIgnore; + /** * A simple POJO to do a health check on the server to see if its running * or not @@ -33,21 +35,21 @@ public class HealthCheck { private static final String status = "RUNNING"; // This method is called if TEXT_PLAIN is request - @GET + @GET @ApiIgnore // until documented @Produces(MediaType.TEXT_PLAIN) public String plainTextCheck() { return status; } // This method is called if XML is request - @GET + @GET @ApiIgnore // until documented @Produces(MediaType.TEXT_XML) public String xmlCheck() { return "<?xml version=\"1.0\"?>" + "<status> " + status + "</status>"; } // This method is called if HTML is request - @GET + @GET @ApiIgnore // until documented @Produces(MediaType.TEXT_HTML) public String htmlCheck() { return "<html> " + "<title>" + "Status" + "</title>" http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java index b4f1fe1..5143a0c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/KdcServerReachabilityCheck.java @@ -27,6 +27,7 @@ import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.UriInfo; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.KdcServerConnectionVerification; import org.apache.ambari.server.StaticallyInject; @@ -44,7 +45,6 @@ public class KdcServerReachabilityCheck { @Inject private static KdcServerConnectionVerification kdcConnectionChecker; - /** * Handles: GET /kdc_check/{hosts} * Checks the reachability of the given KDC server(s). If a list of hosts is sent, checks will be @@ -56,7 +56,7 @@ public class KdcServerReachabilityCheck { * Each entry may contain port separate by a colon (:) * @return status whether KDC server is reachable or not */ - @GET + @GET @ApiIgnore // until documented @Path("{hosts}") @Produces(MediaType.TEXT_PLAIN) public String plainTextCheck(@Context HttpHeaders headers, @Context UriInfo ui, @@ -81,9 +81,8 @@ public class KdcServerReachabilityCheck { return status; } - // This method is called if XML is request - @GET + @GET @ApiIgnore // until documented @Path("{hostname}") @Produces(MediaType.TEXT_XML) public String xmlCheck(@Context HttpHeaders headers, @Context UriInfo ui, @@ -99,7 +98,7 @@ public class KdcServerReachabilityCheck { } // This method is called if HTML is request - @GET + @GET @ApiIgnore // until documented @Path("{hostname}") @Produces(MediaType.TEXT_HTML) public String htmlCheck(@Context HttpHeaders headers, @Context UriInfo ui, @@ -116,5 +115,4 @@ public class KdcServerReachabilityCheck { .toString(); } - } http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java index bf9741a..7e78c7b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.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 AlertDefinitionService extends BaseService { this.clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getDefinitions(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -54,7 +55,7 @@ public class AlertDefinitionService extends BaseService { createResourceInstance(clusterName, null)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createDefinition(String body, @Context HttpHeaders headers, @@ -63,7 +64,7 @@ public class AlertDefinitionService extends BaseService { createResourceInstance(clusterName, null)); } - @PUT + @PUT @ApiIgnore // until documented @Path("{alertDefinitionId}") @Produces("text/plain") public Response updateDefinition(String body, @@ -74,7 +75,7 @@ public class AlertDefinitionService extends BaseService { createResourceInstance(clusterName, id)); } - @DELETE + @DELETE @ApiIgnore // until documented @Path("{alertDefinitionId}") @Produces("text/plain") public Response deleteDefinition(String body, @@ -85,8 +86,7 @@ public class AlertDefinitionService extends BaseService { createResourceInstance(clusterName, id)); } - - @GET + @GET @ApiIgnore // until documented @Path("{alertDefinitionId}") @Produces("text/plain") public Response getDefinitions(@Context HttpHeaders headers, @@ -96,7 +96,6 @@ public class AlertDefinitionService extends BaseService { createResourceInstance(clusterName, id)); } - /** * Create a request schedule resource instance */ http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java index be1c65c..de04cf7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertGroupService.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; @@ -55,7 +56,7 @@ public class AlertGroupService extends BaseService { m_clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getGroups(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -63,7 +64,7 @@ public class AlertGroupService extends BaseService { createAlertGroupResource(m_clusterName, null)); } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") @Path("{groupId}") public Response getGroup(@Context HttpHeaders headers, @@ -72,7 +73,7 @@ public class AlertGroupService extends BaseService { createAlertGroupResource(m_clusterName, groupId)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createGroup(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -80,7 +81,7 @@ public class AlertGroupService extends BaseService { createAlertGroupResource(m_clusterName, null)); } - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") @Path("{groupId}") public Response updateGroup(String body, @Context HttpHeaders headers, @@ -89,7 +90,7 @@ public class AlertGroupService extends BaseService { createAlertGroupResource(m_clusterName, groupId)); } - @DELETE + @DELETE @ApiIgnore // until documented @Produces("text/plain") @Path("{groupId}") public Response deleteGroup(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/AlertHistoryService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java index 17733a2..0c6afc9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertHistoryService.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; @@ -58,7 +59,7 @@ public class AlertHistoryService extends BaseService { this.hostName = hostName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getHistories(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -66,7 +67,7 @@ public class AlertHistoryService extends BaseService { createResourceInstance(clusterName, null)); } - @GET + @GET @ApiIgnore // until documented @Path("{alertHistoryId}") @Produces("text/plain") public Response getHistory( http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java index 2bbc51f..afa0098 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertNoticeService.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; @@ -49,7 +50,7 @@ public class AlertNoticeService extends BaseService { this.clusterName = clusterName; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getNotices( @Context HttpHeaders headers, @@ -58,7 +59,7 @@ public class AlertNoticeService extends BaseService { createResourceInstance(clusterName, null)); } - @GET + @GET @ApiIgnore // until documented @Path("{alertNoticeId}") @Produces("text/plain") public Response getNotice( http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java index 9922359..5abe059 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertService.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; @@ -50,7 +51,7 @@ public class AlertService extends BaseService { /** * Gets all the definitions for the target */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getAlerts( @Context HttpHeaders headers, @@ -59,11 +60,10 @@ public class AlertService extends BaseService { createResourceInstance(null)); } - /** * Gets a specific alert's instance */ - @GET + @GET @ApiIgnore // until documented @Path("{alertId}") @Produces("text/plain") public Response getAlert( @@ -74,7 +74,6 @@ public class AlertService extends BaseService { createResourceInstance(id)); } - /** * Create an alert resource instance * @param alertId the alert id, if requesting a specific one http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java index f00dfbb..69ef5ee 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertTargetService.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; import org.apache.ambari.server.state.alert.AlertTarget; @@ -43,7 +44,7 @@ import org.apache.ambari.server.state.alert.AlertTarget; @Path("/alert_targets/") public class AlertTargetService extends BaseService { - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getTargets(@Context HttpHeaders headers, @Context UriInfo ui) { @@ -51,7 +52,7 @@ public class AlertTargetService extends BaseService { createAlertTargetResource(null)); } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") @Path("{targetId}") public Response getTargets(@Context HttpHeaders headers, @@ -60,7 +61,7 @@ public class AlertTargetService extends BaseService { createAlertTargetResource(targetId)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createTarget(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -68,7 +69,7 @@ public class AlertTargetService extends BaseService { createAlertTargetResource(null)); } - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") @Path("{targetId}") public Response updateGroup(String body, @Context HttpHeaders headers, @@ -77,7 +78,7 @@ public class AlertTargetService extends BaseService { createAlertTargetResource(targetId)); } - @DELETE + @DELETE @ApiIgnore // until documented @Produces("text/plain") @Path("{targetId}") public Response deleteTarget(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/ClusterKerberosDescriptorService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java index 0aeb52b..3895f87 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorService.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; @@ -66,7 +67,7 @@ public class ClusterKerberosDescriptorService extends BaseService { * @param ui uri info * @return Kerberos descriptor resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getKerberosDescriptors(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(null)); @@ -81,7 +82,7 @@ public class ClusterKerberosDescriptorService extends BaseService { * @param type Kerberos descriptor type (COMPOSITE, STACK, USER) * @return Kerberos descriptor instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{type}") @Produces("text/plain") public Response getKerberosDescriptor(@Context HttpHeaders headers, @Context UriInfo ui, @@ -89,7 +90,6 @@ public class ClusterKerberosDescriptorService extends BaseService { return handleRequest(headers, null, ui, Request.Type.GET, createResource(type)); } - /** * Create a composite Kerberos Descriptor resource instance. * http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java index eafc076..9d85d80 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ClusterStackVersionService.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 ClusterStackVersionService extends BaseService { * * @return information regarding all cluster stack versions */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getClusterStackVersions(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(null)); @@ -77,7 +78,7 @@ public class ClusterStackVersionService extends BaseService { * * @return information regarding the specific cluster stack version */ - @GET + @GET @ApiIgnore // until documented @Path("{stackVersionId}") @Produces("text/plain") public Response getClusterStackVersion(@Context HttpHeaders headers, @Context UriInfo ui, @@ -85,7 +86,6 @@ public class ClusterStackVersionService extends BaseService { return handleRequest(headers, null, ui, Request.Type.GET, createResource(stackVersionId)); } - /** * Gets the cluster stack versions service. * @@ -105,7 +105,6 @@ public class ClusterStackVersionService extends BaseService { return new RepositoryVersionService(mapIds); } - /** * Handles: POST /{clustername}/stack_versions requests * Distribute repositories/install packages. @@ -115,13 +114,12 @@ public class ClusterStackVersionService extends BaseService { * @param ui uri info * @return information regarding the created services */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createRequests(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createResource(null)); } - /** * Handles: POST /{clustername}/stack_versions requests * triggering Finalize during manual Stack Upgrade @@ -131,7 +129,7 @@ public class ClusterStackVersionService extends BaseService { * @param ui uri info * @return information regarding the created services */ - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateRequests(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.PUT, createResource(null)); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java index 5927f8b..813013b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CompatibleRepositoryVersionService.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; @@ -58,7 +59,7 @@ public class CompatibleRepositoryVersionService 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)); @@ -73,7 +74,7 @@ public class CompatibleRepositoryVersionService 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, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java index 800e011..b489a15 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java @@ -38,6 +38,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.configuration.Configuration; import org.apache.ambari.server.controller.spi.Resource; @@ -78,7 +79,7 @@ public class ComponentService extends BaseService { * @param componentName component id * @return a component resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{componentName}") @Produces("text/plain") public Response getComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -99,7 +100,7 @@ public class ComponentService extends BaseService { * @param ui uri info * @return component collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui, @QueryParam("format") String format) { @@ -122,7 +123,7 @@ public class ComponentService extends BaseService { * * @return status code only, 201 if successful */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -141,7 +142,7 @@ public class ComponentService extends BaseService { * * @return information regarding the created component */ - @POST + @POST @ApiIgnore // until documented @Path("{componentName}") @Produces("text/plain") public Response createComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -162,7 +163,7 @@ public class ComponentService extends BaseService { * * @return information regarding the updated component */ - @PUT + @PUT @ApiIgnore // until documented @Path("{componentName}") @Produces("text/plain") public Response updateComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -182,7 +183,7 @@ public class ComponentService extends BaseService { * * @return information regarding the updated component */ - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -199,7 +200,7 @@ public class ComponentService extends BaseService { * @param componentName cluster id * @return information regarding the deleted cluster */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{componentName}") @Produces("text/plain") public Response deleteComponent(@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/ConfigGroupService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java index 5c52718..c758b7a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigGroupService.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; @@ -60,7 +61,7 @@ public class ConfigGroupService extends BaseService { * @param ui * @return */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getConfigGroups(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -74,7 +75,7 @@ public class ConfigGroupService extends BaseService { * * @return */ - @GET + @GET @ApiIgnore // until documented @Path("{groupId}") @Produces("text/plain") public Response getConfigGroup(String body, @Context HttpHeaders headers, @@ -92,7 +93,7 @@ public class ConfigGroupService extends BaseService { * @param ui * @return */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createConfigGroup(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -110,7 +111,7 @@ public class ConfigGroupService extends BaseService { * @param groupId * @return */ - @PUT + @PUT @ApiIgnore // until documented @Path("{groupId}") @Produces("text/plain") public Response updateConfigGroup(String body, @Context HttpHeaders @@ -128,7 +129,7 @@ public class ConfigGroupService extends BaseService { * @param groupId * @return */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{groupId}") @Produces("text/plain") public Response deleteConfigGroup(@Context HttpHeaders headers, @@ -138,7 +139,6 @@ public class ConfigGroupService extends BaseService { createConfigGroupResource(m_clusterName, groupId)); } - /** * Create a request resource instance. * http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java index c256eca..0eb8bd6 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ConfigurationService.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; @@ -64,7 +65,7 @@ public class ConfigurationService extends BaseService { * @param ui uri info * @return service collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getConfigurations(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, createConfigurationResource(m_clusterName)); @@ -92,7 +93,7 @@ public class ConfigurationService extends BaseService { * @param ui uri info * @return status code only, 201 if successful */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createConfigurations(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/CredentialService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java index 449c292..40f1252 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/CredentialService.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.controller.spi.Resource; @@ -55,7 +56,7 @@ public class CredentialService extends BaseService { * @param ui uri info * @return credential collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getCredentials(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createCredentialResource(null)); @@ -70,7 +71,7 @@ public class CredentialService extends BaseService { * @param alias alias (or credential ID) * @return credential instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{alias}") @Produces("text/plain") public Response getCredential(@Context HttpHeaders headers, @Context UriInfo ui, @@ -87,7 +88,7 @@ public class CredentialService extends BaseService { * @param alias alias (or credential ID) * @return information regarding the created credential */ - @POST + @POST @ApiIgnore // until documented @Path("{alias}") @Produces("text/plain") public Response createCredential(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -104,7 +105,7 @@ public class CredentialService extends BaseService { * @param alias alias (or credential ID) * @return information regarding the created credential */ - @PUT + @PUT @ApiIgnore // until documented @Path("{alias}") @Produces("text/plain") public Response updateCredential(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -121,7 +122,7 @@ public class CredentialService extends BaseService { * @param alias alias (or credential ID) * @return information regarding the deleted credential */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{alias}") @Produces("text/plain") public Response deleteCredential(@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/ExtensionLinksService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java index 1acccd8..145b552 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionLinksService.java @@ -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.controller.spi.Resource; @@ -46,14 +47,14 @@ import org.apache.ambari.server.controller.spi.Resource; @Path("/links/") public class ExtensionLinksService extends BaseService { - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getExtensionLinks(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.GET, createExtensionLinkResource(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{linkId}") @Produces("text/plain") public Response getExtensionLink(String body, @Context HttpHeaders headers, @@ -62,13 +63,13 @@ public class ExtensionLinksService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createExtensionLinkResource(linkId)); } - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createExtensionLink(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createExtensionLinkResource(null)); } - @DELETE + @DELETE @ApiIgnore // until documented @Path("{linkId}") @Produces("text/plain") public Response deleteExtensionLink(@Context HttpHeaders headers, @Context UriInfo ui, @@ -77,13 +78,13 @@ public class ExtensionLinksService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createExtensionLinkResource(linkId)); } - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateExtensionLink(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.PUT, createExtensionLinkResource(null)); } - @PUT + @PUT @ApiIgnore // until documented @Path("{linkId}") @Produces("text/plain") public Response updateExtensionLink(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/ExtensionsService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java index 2fedd54..f0c2aea 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ExtensionsService.java @@ -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; @@ -44,7 +45,7 @@ import org.apache.ambari.server.controller.spi.Resource; @Path("/extensions/") public class ExtensionsService extends BaseService { - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getExtensions(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -52,7 +53,7 @@ public class ExtensionsService extends BaseService { createExtensionResource(null)); } - @GET + @GET @ApiIgnore // until documented @Path("{extensionName}") @Produces("text/plain") public Response getExtension(String body, @Context HttpHeaders headers, @@ -63,7 +64,7 @@ public class ExtensionsService extends BaseService { createExtensionResource(extensionName)); } - @GET + @GET @ApiIgnore // until documented @Path("{extensionName}/versions") @Produces("text/plain") public Response getExtensionVersions(String body, @@ -74,7 +75,7 @@ public class ExtensionsService extends BaseService { createExtensionVersionResource(extensionName, null)); } - @GET + @GET @ApiIgnore // until documented @Path("{extensionName}/versions/{extensionVersion}") @Produces("text/plain") public Response getExtensionVersion(String body, @@ -86,7 +87,7 @@ public class ExtensionsService extends BaseService { createExtensionVersionResource(extensionName, extensionVersion)); } - @GET + @GET @ApiIgnore // until documented @Path("{extensionName}/versions/{extensionVersion}/links") @Produces("text/plain") public Response getExtensionVersionLinks(String body, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java index 73b9960..341bdef 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/FeedService.java @@ -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 FeedService extends BaseService { * @param feedName feed id * @return feed instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{feedName}") @Produces("text/plain") public Response getFeed(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -67,7 +68,7 @@ public class FeedService extends BaseService { * @param ui uri info * @return feed collection resource representation */ - @GET + @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)); @@ -82,7 +83,7 @@ public class FeedService extends BaseService { * @param feedName feed id * @return information regarding the created feed */ - @POST + @POST @ApiIgnore // until documented @Path("{feedName}") @Produces("text/plain") public Response createFeed(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -100,7 +101,7 @@ public class FeedService extends BaseService { * @param feedName feed id * @return information regarding the updated feed */ - @PUT + @PUT @ApiIgnore // until documented @Path("{feedName}") @Produces("text/plain") public Response updateFeed(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -118,7 +119,7 @@ public class FeedService extends BaseService { * @param feedName feed id * @return information regarding the deleted feed */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{feedName}") @Produces("text/plain") public Response deleteFeed(@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/HostComponentService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java index 6288972..a5e9aec 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostComponentService.java @@ -38,6 +38,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.configuration.Configuration; import org.apache.ambari.server.controller.spi.Resource; @@ -78,7 +79,7 @@ public class HostComponentService extends BaseService { * @param hostComponentName host_component id * @return host_component resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{hostComponentName}") @Produces("text/plain") public Response getHostComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -107,7 +108,7 @@ public class HostComponentService extends BaseService { * @param ui uri info * @return host_component collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getHostComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui, @QueryParam("format") String format) { if (format != null && format.equals("client_config_tar")) { @@ -128,7 +129,7 @@ public class HostComponentService extends BaseService { * * @return status code only, 201 if successful */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createHostComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -147,7 +148,7 @@ public class HostComponentService extends BaseService { * * @return host_component resource representation */ - @POST + @POST @ApiIgnore // until documented @Path("{hostComponentName}") @Produces("text/plain") public Response createHostComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -168,7 +169,7 @@ public class HostComponentService extends BaseService { * * @return information regarding updated host_component */ - @PUT + @PUT @ApiIgnore // until documented @Path("{hostComponentName}") @Produces("text/plain") public Response updateHostComponent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -188,7 +189,7 @@ public class HostComponentService extends BaseService { * * @return information regarding updated host_component resources */ - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public Response updateHostComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -206,7 +207,7 @@ public class HostComponentService extends BaseService { * * @return host_component resource representation */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{hostComponentName}") @Produces("text/plain") public Response deleteHostComponent(@Context HttpHeaders headers, @Context UriInfo ui, @@ -225,7 +226,7 @@ public class HostComponentService extends BaseService { * * @return host_component resource representation */ - @DELETE + @DELETE @ApiIgnore // until documented @Produces("text/plain") public Response deleteHostComponents(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -233,7 +234,7 @@ public class HostComponentService extends BaseService { createHostComponentResource(m_clusterName, m_hostName, null)); } - @GET + @GET @ApiIgnore // until documented @Path("{hostComponentName}/processes") @Produces("text/plain") public Response getProcesses(@Context HttpHeaders headers, @Context UriInfo ui, @@ -273,7 +274,6 @@ public class HostComponentService extends BaseService { mapIds.put(Resource.Type.Host, m_hostName); mapIds.put(Resource.Type.Component, hostComponentName); - Response response = handleRequest(headers, body, ui, Request.Type.GET, createResource(Resource.Type.ClientConfig, mapIds)); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java index a99d269..3907fc3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostKerberosIdentityService.java @@ -32,6 +32,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; @@ -71,7 +72,7 @@ public class HostKerberosIdentityService extends BaseService { * @param format output format * @return a component resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{kerberosIdentityID}") @Produces("text/plain") public Response getKerberosIdentity(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -96,7 +97,7 @@ public class HostKerberosIdentityService extends BaseService { * @param ui uri info * @return component collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getKerberosIdentities(String body, @Context HttpHeaders headers, @Context UriInfo ui, @QueryParam("format") String format) { return getKerberosIdentity(body, headers, ui, null, format); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java index bce51c4..29566ed 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/HostStackVersionService.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; @@ -66,7 +67,7 @@ public class HostStackVersionService extends BaseService { * * @return information regarding all host stack versions */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getHostStackVersions(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(ui, clusterName, hostName, null)); @@ -82,7 +83,7 @@ public class HostStackVersionService extends BaseService { * * @return information regarding the specific host stack version */ - @GET + @GET @ApiIgnore // until documented @Path("{stackVersionId}") @Produces("text/plain") public Response getHostStackVersion(@Context HttpHeaders headers, @Context UriInfo ui, @@ -99,7 +100,7 @@ public class HostStackVersionService extends BaseService { * @param ui uri info * @return information regarding the created services */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createRequests(String body, @Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, body, ui, Request.Type.POST, createResource(ui, clusterName, hostName, null)); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java index 760ee24..292e38d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/InstanceService.java @@ -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.controller.spi.Resource; @@ -72,7 +73,7 @@ public class InstanceService extends BaseService { * * @return instance resource representation */ - @GET + @GET @ApiIgnore // until documented @Path("{instanceID}") @Produces("text/plain") public Response getInstance(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -90,7 +91,7 @@ public class InstanceService extends BaseService { * @param ui uri info * @return instance collection resource representation */ - @GET + @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, @@ -108,7 +109,7 @@ public class InstanceService extends BaseService { * * @return instance resource representation */ - @POST + @POST @ApiIgnore // until documented @Path("{instanceID}") @Produces("text/plain") public Response createInstance(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -129,7 +130,7 @@ public class InstanceService extends BaseService { * * @return information regarding updated instance */ - @PUT + @PUT @ApiIgnore // until documented @Path("{instanceID}") @Produces("text/plain") public Response updateInstance(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -149,7 +150,7 @@ public class InstanceService extends BaseService { * * @return instance resource representation */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{instanceID}") @Produces("text/plain") public Response deleteInstance(@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/JobService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java index bb882f1..51022a7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/JobService.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; @@ -64,7 +65,7 @@ public class JobService extends BaseService { * job id * @return job instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{jobId}") @Produces("text/plain") public Response getJob(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -82,7 +83,7 @@ public class JobService extends BaseService { * uri info * @return job collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getJobs(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/KerberosDescriptorService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java index 5f20c4f..6500514 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KerberosDescriptorService.java @@ -13,6 +13,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,13 +46,13 @@ public class KerberosDescriptorService extends BaseService { * @param ui uri info * @return a collection of kerberos descriptors */ - @GET + @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)); } - @GET + @GET @ApiIgnore // until documented @Path("{kerberosDescriptorName}") @Produces("text/plain") public Response getKerberosDescriptor(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -59,7 +60,7 @@ public class KerberosDescriptorService extends BaseService { return handleRequest(headers, body, ui, Request.Type.GET, createKerberosDescriptorResource(kerberosDescriptorName)); } - @POST + @POST @ApiIgnore // until documented @Path("{kerberosDescriptorName}") @Produces("text/plain") public Response createKerberosDescriptor(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -76,7 +77,7 @@ public class KerberosDescriptorService extends BaseService { * @param kerberosDescriptorName kerebros descriptor name * @return information regarding the deleted kerberos descriptor */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{kerberosDescriptorName}") @Produces("text/plain") public Response deleteKerberosDescriptor(@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/KeyService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java index 9ddcc79..9cfa2a9 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/KeyService.java @@ -26,6 +26,7 @@ import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.xml.bind.JAXBException; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.utils.StageUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +44,7 @@ public class KeyService { } @Path("{number}") - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public String getKeys(@PathParam("number") int number) throws IOException, JAXBException { Collection<String> keys = persistKeyVal.generateKeys(number); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java index cef4a60..723e8df 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LdapSyncEventService.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 LdapSyncEventService extends BaseService { * * @return view instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{eventId}") @Produces("text/plain") public Response getEvent(@Context HttpHeaders headers, @Context UriInfo ui, @@ -68,7 +69,7 @@ public class LdapSyncEventService extends BaseService { * * @return view collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getEvents(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createEventResource(null)); @@ -83,7 +84,7 @@ public class LdapSyncEventService extends BaseService { * * @return information regarding the created view */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createEvent(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -100,7 +101,7 @@ public class LdapSyncEventService extends BaseService { * * @return information regarding the updated event */ - @PUT + @PUT @ApiIgnore // until documented @Path("{eventId}") @Produces("text/plain") public Response updateEvent(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -119,7 +120,7 @@ public class LdapSyncEventService extends BaseService { * * @return information regarding the deleted event */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{eventId}") @Produces("text/plain") public Response deleteEvent(@Context HttpHeaders headers, @Context UriInfo ui, @@ -128,7 +129,6 @@ public class LdapSyncEventService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createEventResource(eventId)); } - // ----- helper methods ---------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java index a95aed8..c86b9a0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LoggingService.java @@ -34,6 +34,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.AmbariException; import org.apache.ambari.server.api.services.serializers.ResultSerializer; import org.apache.ambari.server.controller.AmbariManagementController; @@ -72,7 +73,6 @@ public class LoggingService extends BaseService { @Inject private LoggingRequestHelperFactory helperFactory; - private final String clusterName; public LoggingService(String clusterName) { @@ -84,7 +84,7 @@ public class LoggingService extends BaseService { this.controllerFactory = controllerFactory; } - @GET + @GET @ApiIgnore // until documented @Path("searchEngine") @Produces("text/plain") public Response getSearchEngine(String body, @Context HttpHeaders headers, @Context UriInfo uri) throws AuthorizationException { @@ -149,7 +149,6 @@ public class LoggingService extends BaseService { Map<String, String> enumeratedQueryParameters = new HashMap<>(); - for (String queryName : queryParameters.keySet()) { List<String> queryValue = queryParameters.get(queryName); for (String value : queryValue) { @@ -188,7 +187,6 @@ public class LoggingService extends BaseService { Response.ResponseBuilder builder = Response.status(result.getStatus().getStatusCode()).entity( serializer.serialize(result)); - if (mediaType != null) { builder.type(mediaType); } http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java index f2f5e0e..28c21e8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/LogoutService.java @@ -24,6 +24,7 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.Context; import javax.ws.rs.core.Response; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.StaticallyInject; import org.apache.ambari.server.audit.AuditLogger; import org.apache.ambari.server.audit.event.LogoutAuditEvent; @@ -43,7 +44,7 @@ public class LogoutService { @Inject private static AuditLogger auditLogger; - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response performLogout(@Context HttpServletRequest servletRequest) { auditLog(servletRequest); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java index d6d786e..4a6032e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/OperatingSystemService.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; @@ -58,7 +59,7 @@ public class OperatingSystemService extends BaseService { * @param headers http headers * @param ui uri info */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getOperatingSystems(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource(null)); @@ -73,7 +74,7 @@ public class OperatingSystemService extends BaseService { * @param osType os type * @return information regarding the specified operating system */ - @GET + @GET @ApiIgnore // until documented @Path("{osType}") @Produces("text/plain") public Response getOperatingSystem(@Context HttpHeaders headers, @Context UriInfo ui, @PathParam("osType") String osType) { http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java index 18a32a1..27bcafb 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PermissionService.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 permission resource requests. */ @@ -52,7 +52,7 @@ public class PermissionService extends BaseService { * * @return permission instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{permissionId}") @Produces("text/plain") public Response getPermission(@Context HttpHeaders headers, @Context UriInfo ui, @@ -70,7 +70,7 @@ public class PermissionService extends BaseService { * * @return permission collection resource representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getPermissions(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createPermissionResource(null)); @@ -86,7 +86,7 @@ public class PermissionService 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, @@ -105,7 +105,7 @@ public class PermissionService extends BaseService { * * @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, @@ -124,7 +124,7 @@ public class PermissionService 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, http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java index 59b1d4e..e068bb7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PersistKeyValueService.java @@ -33,6 +33,7 @@ import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.Response; import javax.xml.bind.JAXBException; +import org.apache.ambari.annotations.ApiIgnore; import org.apache.ambari.server.state.fsm.InvalidStateTransitionException; import org.apache.ambari.server.utils.StageUtils; import org.slf4j.Logger; @@ -51,7 +52,7 @@ public class PersistKeyValueService { } @SuppressWarnings("unchecked") - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response update(String keyValues) throws WebApplicationException, InvalidStateTransitionException, @@ -67,7 +68,7 @@ public class PersistKeyValueService { } @SuppressWarnings("unchecked") - @PUT + @PUT @ApiIgnore // until documented @Produces("text/plain") public String store(String values) throws IOException, JAXBException { LOG.debug("Received message from UI {}", values); @@ -81,7 +82,7 @@ public class PersistKeyValueService { return stringRet; } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") @Path("{keyName}") public String getKey( @PathParam("keyName") String keyName) { @@ -89,7 +90,7 @@ public class PersistKeyValueService { return persistKeyVal.getValue(keyName); } - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public String getAllKeyValues() throws JAXBException, IOException { Map<String, String> ret = persistKeyVal.getAllKeyValues(); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java index c4127a8..c7e23ac 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PreUpgradeCheckService.java @@ -26,6 +26,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; @@ -55,7 +56,7 @@ public class PreUpgradeCheckService extends BaseService { * @param ui uri info * @return information about upgrade checks */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getPreUpgradeChecks(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createResource()); http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java index f16d24c..84075ab 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/PrivilegeService.java @@ -30,9 +30,9 @@ 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; - /** * Service responsible for privilege requests. */ @@ -48,7 +48,7 @@ public abstract class PrivilegeService extends BaseService { * * @return privilege instance representation */ - @GET + @GET @ApiIgnore // until documented @Path("{privilegeId}") @Produces("text/plain") public Response getPrivilege(@Context HttpHeaders headers, @Context UriInfo ui, @@ -66,7 +66,7 @@ public abstract class PrivilegeService extends BaseService { * * @return privilege collection representation */ - @GET + @GET @ApiIgnore // until documented @Produces("text/plain") public Response getPrivileges(@Context HttpHeaders headers, @Context UriInfo ui) { return handleRequest(headers, null, ui, Request.Type.GET, createPrivilegeResource(null)); @@ -82,7 +82,7 @@ public abstract class PrivilegeService extends BaseService { * * @return information regarding the created privilege */ - @POST + @POST @ApiIgnore // until documented @Produces("text/plain") public Response createPrivilege(String body, @Context HttpHeaders headers, @Context UriInfo ui) { @@ -99,7 +99,7 @@ public abstract class PrivilegeService extends BaseService { * * @return information regarding the updated privilege */ - @PUT + @PUT @ApiIgnore // until documented @Path("{privilegeId}") @Produces("text/plain") public Response updatePrivilege(String body, @Context HttpHeaders headers, @Context UriInfo ui, @@ -118,7 +118,7 @@ public abstract class PrivilegeService 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) { return handleRequest(headers, body, ui, Request.Type.PUT, createPrivilegeResource(null)); @@ -134,7 +134,7 @@ public abstract class PrivilegeService 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) { @@ -151,7 +151,7 @@ public abstract class PrivilegeService extends BaseService { * * @return information regarding the deleted privilege */ - @DELETE + @DELETE @ApiIgnore // until documented @Path("{privilegeId}") @Produces("text/plain") public Response deletePrivilege(@Context HttpHeaders headers, @Context UriInfo ui, @@ -160,7 +160,6 @@ public abstract class PrivilegeService extends BaseService { return handleRequest(headers, null, ui, Request.Type.DELETE, createPrivilegeResource(privilegeId)); } - // ----- PrivilegeService -------------------------------------------------- /** http://git-wip-us.apache.org/repos/asf/ambari/blob/965e4bd0/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java index ce317b6..37f4a99 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/RecommendationService.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; @@ -51,7 +52,7 @@ public class RecommendationService extends BaseService { * @param stackVersion stack version * @return recommendations for host-layout */ - @POST + @POST @ApiIgnore // until documented @Produces(MediaType.TEXT_PLAIN) public Response getRecommendation(String body, @Context HttpHeaders headers, @Context UriInfo ui, @PathParam("stackName") String stackName, @PathParam("stackVersion") String stackVersion) {
