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 86beb8e AMBARI-22869. Log Search: use default page and pageSize to
log requests (+ rename shipper config api key name)
86beb8e is described below
commit 86beb8ed1d8a8ff9bba6cd5c93f2747e8e7b0dd7
Author: Oliver Szabo <[email protected]>
AuthorDate: Mon Jan 29 18:42:32 2018 +0100
AMBARI-22869. Log Search: use default page and pageSize to log requests (+
rename shipper config api key name)
---
.../java/org/apache/ambari/logsearch/common/LogSearchConstants.java | 6 ++++++
.../main/java/org/apache/ambari/logsearch/manager/InfoManager.java | 5 +++--
.../ambari/logsearch/model/request/impl/CommonSearchRequest.java | 3 +++
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java
index afb6a39..d25d689 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/common/LogSearchConstants.java
@@ -60,6 +60,10 @@ public class LogSearchConstants {
public static final String LOGFEEDER_FILTER_NAME = "log_feeder_config";
public static final String SORT = "sort";
+
+ // info features constants
+ public static final String SHIPPER_CONFIG_API_KEY = "metadata_patterns";
+ public static final String AUTH_FEATURE_KEY = "auth";
//Facet Constant
public static final String FACET_FIELD = "facet.field";
@@ -110,5 +114,7 @@ public class LogSearchConstants {
public static final String REQUEST_PARAM_HOSTS = "hostList";
public static final String REQUEST_PARAM_USERS = "userList";
+ public static final String REQUEST_PARAM_PAGE_DEFAULT_VALUE = "0";
+ public static final String REQUEST_PARAM_PAGE_SIZE_DEFAULT_VALUE = "1000";
}
\ No newline at end of file
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/InfoManager.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/InfoManager.java
index 26907fa..3aabdbf 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/InfoManager.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/manager/InfoManager.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.ambari.logsearch.common.LogSearchConstants;
import org.apache.ambari.logsearch.conf.AuthPropsConfig;
import org.apache.ambari.logsearch.common.PropertyDescriptionStorage;
import org.apache.ambari.logsearch.common.ShipperConfigDescriptionStorage;
@@ -78,8 +79,8 @@ public class InfoManager extends JsonManagerBase {
public Map<String, Object> getFeaturesMap() {
Map<String, Object> featuresMap = new HashMap<>();
- featuresMap.put("auth", getAuthMap());
- featuresMap.put("config_api",
logSearchConfigApiConfig.isConfigApiEnabled());
+ featuresMap.put(LogSearchConstants.AUTH_FEATURE_KEY, getAuthMap());
+ featuresMap.put(LogSearchConstants.SHIPPER_CONFIG_API_KEY,
logSearchConfigApiConfig.isConfigApiEnabled());
return featuresMap;
}
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/CommonSearchRequest.java
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/CommonSearchRequest.java
index b763830..738c24e 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/CommonSearchRequest.java
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/CommonSearchRequest.java
@@ -25,6 +25,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import javax.annotation.Nullable;
+import javax.ws.rs.DefaultValue;
import javax.ws.rs.QueryParam;
public class CommonSearchRequest implements SearchRequest,
CommonSearchParamDefinition {
@@ -33,9 +34,11 @@ public class CommonSearchRequest implements SearchRequest,
CommonSearchParamDefi
private String startIndex;
@QueryParam(LogSearchConstants.REQUEST_PARAM_PAGE)
+ @DefaultValue(LogSearchConstants.REQUEST_PARAM_PAGE_DEFAULT_VALUE)
private String page;
@QueryParam(LogSearchConstants.REQUEST_PARAM_PAGE_SIZE)
+ @DefaultValue(LogSearchConstants.REQUEST_PARAM_PAGE_SIZE_DEFAULT_VALUE)
private String pageSize;
@QueryParam(LogSearchConstants.REQUEST_PARAM_SORT_BY)
--
To stop receiving notification emails like this one, please contact
[email protected].
