[ambari] branch trunk updated: AMBARI-23782. Fix top audit resource request.

[ol...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new bca92e3  AMBARI-23782. Fix top audit resource request.
bca92e3 is described below

commit bca92e3fc7a1f84990fe6ee280726b55f044b587
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Tue May 8 13:21:30 2018 +0200

    AMBARI-23782. Fix top audit resource request.
---
 .../request/impl/body/TopFieldAuditLogBodyRequest.java  | 17 -----------------
 .../apache/ambari/logsearch/rest/AuditLogsResource.java |  1 +
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/body/TopFieldAuditLogBodyRequest.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/body/TopFieldAuditLogBodyRequest.java
index 4826f15..6ffbb0c 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/body/TopFieldAuditLogBodyRequest.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/body/TopFieldAuditLogBodyRequest.java
@@ -19,19 +19,12 @@
 package org.apache.ambari.logsearch.model.request.impl.body;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import org.apache.ambari.logsearch.common.LogSearchConstants;
 import org.apache.ambari.logsearch.model.request.impl.TopFieldAuditLogRequest;
 
-import javax.ws.rs.PathParam;
-
 public class TopFieldAuditLogBodyRequest extends FieldAuditLogBodyRequest implements TopFieldAuditLogRequest {
   @JsonIgnore
   private Integer top;
 
-  @JsonProperty(LogSearchConstants.REQUEST_PARAM_USERS)
-  private String userList;
-
   @Override
   public Integer getTop() {
     return top;
@@ -41,14 +34,4 @@ public class TopFieldAuditLogBodyRequest extends FieldAuditLogBodyRequest implem
   public void setTop(Integer top) {
     this.top = top;
   }
-
-  @Override
-  public String getUserList() {
-    return userList;
-  }
-
-  @Override
-  public void setUserList(String userList) {
-    this.userList = userList;
-  }
 }
diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/AuditLogsResource.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/AuditLogsResource.java
index c43f5bd..0da2706 100644
--- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/AuditLogsResource.java
+++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/AuditLogsResource.java
@@ -158,6 +158,7 @@ public class AuditLogsResource {
   @Produces({MediaType.APPLICATION_JSON})
   @ApiOperation(GET_TOP_AUDIT_RESOURCES_OD)
   public BarGraphDataListResponse getResourcesPost(TopFieldAuditLogBodyRequest request, @PathParam(LogSearchConstants.REQUEST_PARAM_TOP) Integer top) {
+    request.setTop(top); // TODO: set this in the request
     return auditLogsManager.topResources(request);
   }
 

-- 
To stop receiving notification emails like this one, please contact
oleewere@apache.org.