http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/ServiceLogsManager.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/ServiceLogsManager.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/ServiceLogsManager.java index 02309fc..1d4f91f 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/ServiceLogsManager.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/ServiceLogsManager.java @@ -21,18 +21,14 @@ package org.apache.ambari.logsearch.manager; import java.io.IOException; import java.text.ParseException; import java.util.ArrayList; -import java.util.Arrays; import java.util.Calendar; import java.util.Collection; import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Map.Entry; import java.util.TimeZone; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; @@ -40,10 +36,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import javax.inject.Inject; import javax.ws.rs.core.Response; -import org.apache.ambari.logsearch.common.ConfigHelper; import org.apache.ambari.logsearch.common.LogSearchConstants; import org.apache.ambari.logsearch.common.MessageEnums; -import org.apache.ambari.logsearch.conf.SolrServiceLogConfig; +import org.apache.ambari.logsearch.conf.SolrServiceLogPropsConfig; import org.apache.ambari.logsearch.dao.ServiceLogsSolrDao; import org.apache.ambari.logsearch.graph.GraphDataGenerator; import org.apache.ambari.logsearch.model.response.BarGraphData; @@ -67,7 +62,6 @@ import org.apache.ambari.logsearch.query.model.CommonServiceLogSearchCriteria; import org.apache.ambari.logsearch.query.model.ServiceAnyGraphSearchCriteria; import org.apache.ambari.logsearch.query.model.ServiceGraphSearchCriteria; import org.apache.ambari.logsearch.query.model.ServiceLogExportSearchCriteria; -import org.apache.ambari.logsearch.query.model.ServiceLogFileSearchCriteria; import org.apache.ambari.logsearch.query.model.ServiceLogSearchCriteria; import org.apache.ambari.logsearch.query.model.ServiceLogTruncatedSearchCriteria; import org.apache.ambari.logsearch.solr.model.SolrComponentTypeLogData; @@ -117,7 +111,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL @Inject private GraphDataGenerator graphDataGenerator; @Inject - private SolrServiceLogConfig solrServiceLogConfig; + private SolrServiceLogPropsConfig solrServiceLogPropsConfig; public ServiceLogResponse searchLogs(ServiceLogSearchCriteria searchCriteria) { String keyword = searchCriteria.getKeyword(); @@ -406,7 +400,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL return extensionTree; } - public NodeListResponse getTreeExtension(ServiceLogFileSearchCriteria searchCriteria) { + public NodeListResponse getTreeExtension(ServiceLogSearchCriteria searchCriteria) { SolrQuery solrQuery = queryGenerator.commonServiceFilterQuery(searchCriteria); solrQuery.setParam("event", "/getTreeExtension"); @@ -469,7 +463,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL return list; } - public NodeListResponse getHostListByComponent(ServiceLogFileSearchCriteria searchCriteria) { + public NodeListResponse getHostListByComponent(ServiceLogSearchCriteria searchCriteria) { SolrQuery solrQuery = queryGenerator.commonServiceFilterQuery(searchCriteria); solrQuery.setParam("event", "/service/hosts/components"); @@ -529,7 +523,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL } } - public NameValueDataListResponse getLogsLevelCount(ServiceLogFileSearchCriteria sc) { + public NameValueDataListResponse getLogsLevelCount(ServiceLogSearchCriteria sc) { NameValueDataListResponse nameValueList = new NameValueDataListResponse(); SolrQuery query = queryGenerator.commonServiceFilterQuery(sc); query.setParam("event", "/service/logs/levels/counts/namevalues"); @@ -1169,7 +1163,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL return dataList; } - extractValuesFromBuckets(jsonFacetResponse, "x", "y", histogramData); + serviceLogsSolrDao.extractValuesFromBuckets(jsonFacetResponse, "x", "y", histogramData); Collection<NameValueData> vNameValues = new ArrayList<NameValueData>(); List<BarGraphData> graphDatas = new ArrayList<BarGraphData>(); @@ -1337,19 +1331,6 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL isNormalExcluded = true; } - String globalExcludeString = (String) searchCriteria - .getParamValue("gEMessage"); - if (StringUtils.isBlank(globalExcludeString)) { - globalExcludeString = ""; - } - - String globalExclude[] = globalExcludeString - .split(LogSearchConstants.I_E_SEPRATOR); - - for (String exc : globalExclude) { - excludeString = excludeString + ",\"" + exc + "\""; - } - if (!StringUtils.isBlank(excludeString)) { if (!isNormalExcluded) { excludeString = excludeString.replaceFirst(",", ""); @@ -1387,7 +1368,7 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL } } - public NodeListResponse getComponentListWithLevelCounts(ServiceLogFileSearchCriteria searchCriteria) { + public NodeListResponse getComponentListWithLevelCounts(ServiceLogSearchCriteria searchCriteria) { SolrQuery solrQuery = queryGenerator.commonServiceFilterQuery(searchCriteria); solrQuery.setParam("event", "/service/logs/components/levels/counts"); @@ -1517,95 +1498,8 @@ public class ServiceLogsManager extends ManagerBase<SolrServiceLogData, ServiceL return nameValueList; } - public String getServiceLogsFieldsName() { - List<String> fieldsNames = solrServiceLogConfig.getFields(); - if (fieldsNames.size() > 0) { - - List<String> uiFieldNames = new ArrayList<String>(); - String temp = null; - for (String field : fieldsNames) { - temp = solrServiceLogConfig.getSolrAndUiColumns().get(field + LogSearchConstants.SOLR_SUFFIX); - if (temp == null){ - uiFieldNames.add(field); - }else{ - uiFieldNames.add(temp); - } - } - return convertObjToString(uiFieldNames); - - } - throw RESTErrorUtil.createRESTException( - "No field name found in property file", - MessageEnums.DATA_NOT_FOUND); - - } - public String getServiceLogsSchemaFieldsName() { - - List<String> fieldNames = new ArrayList<String>(); - String excludeArray[] = Arrays.copyOf(solrServiceLogConfig.getExcludeColumnList().toArray(), - solrServiceLogConfig.getExcludeColumnList().size(), String[].class); - - HashMap<String, String> uiFieldColumnMapping = new LinkedHashMap<String, String>(); - ConfigHelper.getSchemaFieldsName(excludeArray, fieldNames,serviceLogsSolrDao); - - for (String fieldName : fieldNames) { - String uiField = solrServiceLogConfig.getSolrAndUiColumns().get(fieldName + LogSearchConstants.SOLR_SUFFIX); - if (uiField != null) { - uiFieldColumnMapping.put(fieldName, uiField); - } else { - uiFieldColumnMapping.put(fieldName, fieldName); - } - } - - HashMap<String, String> uiFieldColumnMappingSorted = new LinkedHashMap<String, String>(); - uiFieldColumnMappingSorted.put(LogSearchConstants.SOLR_LOG_MESSAGE, LogSearchConstants.SOLR_LOG_MESSAGE); - - Iterator<Entry<String, String>> it = BizUtil - .sortHashMapByValues(uiFieldColumnMapping).entrySet().iterator(); - while (it.hasNext()) { - @SuppressWarnings("rawtypes") - Map.Entry pair = (Map.Entry) it.next(); - uiFieldColumnMappingSorted.put("" + pair.getKey(), "" + pair.getValue()); - } - - return convertObjToString(uiFieldColumnMappingSorted); - - } - - @SuppressWarnings("unchecked") - public void extractValuesFromBuckets( - SimpleOrderedMap<Object> jsonFacetResponse, String outerField, - String innerField, List<BarGraphData> histogramData) { - NamedList<Object> stack = (NamedList<Object>) jsonFacetResponse - .get(outerField); - ArrayList<Object> stackBuckets = (ArrayList<Object>) stack - .get("buckets"); - for (Object temp : stackBuckets) { - BarGraphData vBarGraphData = new BarGraphData(); - - SimpleOrderedMap<Object> level = (SimpleOrderedMap<Object>) temp; - String name = ((String) level.getVal(0)).toUpperCase(); - vBarGraphData.setName(name); - - Collection<NameValueData> vNameValues = new ArrayList<NameValueData>(); - vBarGraphData.setDataCount(vNameValues); - ArrayList<Object> levelBuckets = (ArrayList<Object>) ((NamedList<Object>) level - .get(innerField)).get("buckets"); - for (Object temp1 : levelBuckets) { - SimpleOrderedMap<Object> countValue = (SimpleOrderedMap<Object>) temp1; - String value = DateUtil - .convertDateWithMillisecondsToSolrDate((Date) countValue - .getVal(0)); - - String count = "" + countValue.getVal(1); - NameValueData vNameValue = new NameValueData(); - vNameValue.setName(value); - vNameValue.setValue(count); - vNameValues.add(vNameValue); - } - histogramData.add(vBarGraphData); - } + return convertObjToString(serviceLogsSolrDao.schemaFieldNameMap); } public BarGraphDataListResponse getAnyGraphData(ServiceAnyGraphSearchCriteria searchCriteria) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigManager.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigManager.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigManager.java index 7430770..6772138 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigManager.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/manager/UserConfigManager.java @@ -53,7 +53,6 @@ import javax.inject.Inject; public class UserConfigManager extends JsonManagerBase { private static final Logger logger = Logger.getLogger(UserConfigManager.class); - @Inject private UserConfigSolrDao userConfigSolrDao; @Inject http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileParamDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileParamDefinition.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileParamDefinition.java deleted file mode 100644 index c355989..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileParamDefinition.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request; - -import io.swagger.annotations.ApiParam; -import org.apache.ambari.logsearch.common.LogSearchConstants; - -import static org.apache.ambari.logsearch.doc.DocConstants.LogFileDescriptions.COMPONENT_D; -import static org.apache.ambari.logsearch.doc.DocConstants.LogFileDescriptions.HOST_D; -import static org.apache.ambari.logsearch.doc.DocConstants.LogFileDescriptions.LOG_TYPE_D; - - -public interface LogFileParamDefinition { - - String getComponent(); - - @ApiParam(value = COMPONENT_D, name = LogSearchConstants.REQUEST_PARAM_COMPONENT) - void setComponent(String component); - - String getHost(); - - @ApiParam(value = HOST_D, name = LogSearchConstants.REQUEST_PARAM_HOST) - void setHost(String host); - - String getLogType(); - - @ApiParam(value = LOG_TYPE_D, name = LogSearchConstants.REQUEST_PARAM_LOG_TYPE) - void setLogType(String logType); -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileTailParamDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileTailParamDefinition.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileTailParamDefinition.java deleted file mode 100644 index a527c48..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogFileTailParamDefinition.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request; - -import io.swagger.annotations.ApiParam; -import org.apache.ambari.logsearch.common.LogSearchConstants; - -import static org.apache.ambari.logsearch.doc.DocConstants.LogFileDescriptions.TAIL_SIZE_D; - -public interface LogFileTailParamDefinition { - - String getTailSize(); - - @ApiParam(value = TAIL_SIZE_D, name = LogSearchConstants.REQUEST_PARAM_TAIL_SIZE) - void setTailSize(String tailSize); -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogParamDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogParamDefinition.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogParamDefinition.java index e503ff5..e44de35 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogParamDefinition.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/LogParamDefinition.java @@ -20,10 +20,7 @@ package org.apache.ambari.logsearch.model.request; import io.swagger.annotations.ApiParam; import org.apache.ambari.logsearch.common.LogSearchConstants; - -import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.COLUMN_QUERY_D; import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.I_MESSAGE_D; -import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.G_E_MESSAGE_D; import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.MUST_BE_D; import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.MUST_NOT_D; import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.INCLUDE_QUERY_D; @@ -31,21 +28,11 @@ import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.EX public interface LogParamDefinition { - String getColumnQuery(); - - @ApiParam(value = COLUMN_QUERY_D, name = LogSearchConstants.REQUEST_PARAM_COLUMN_QUERY) - void setColumnQuery(String columnQuery); - String getiMessage(); @ApiParam(value = I_MESSAGE_D, name = LogSearchConstants.REQUEST_PARAM_I_MESSAGE) void setiMessage(String iMessage); - String getgEMessage(); - - @ApiParam(value = G_E_MESSAGE_D, name = LogSearchConstants.REQUEST_PARAM_G_E_MESSAGE) - void setgEMessage(String gEMessage); - String getMustBe(); @ApiParam(value = MUST_BE_D, name = LogSearchConstants.REQUEST_PARAM_MUST_BE) http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogFileParamDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogFileParamDefinition.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogFileParamDefinition.java deleted file mode 100644 index a266b3e..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogFileParamDefinition.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request; - -import io.swagger.annotations.ApiParam; -import org.apache.ambari.logsearch.common.LogSearchConstants; - -import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.HOST_D; -import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.COMPONENT_D; - -public interface ServiceLogFileParamDefinition { - - String getHostLogFile(); - - @ApiParam(value = HOST_D, name = LogSearchConstants.REQUEST_PARAM_HOST_LOG_FILE) - void setHostLogFile(String hostLogFile); - - String getComponentLogFile(); - - @ApiParam(value = COMPONENT_D, name = LogSearchConstants.REQUEST_PARAM_COMPONENT_LOG_FILE) - void setComponentLogFile(String componentLogFile); -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogParamDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogParamDefinition.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogParamDefinition.java index f280ac2..abc1f08 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogParamDefinition.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/ServiceLogParamDefinition.java @@ -22,8 +22,6 @@ import io.swagger.annotations.ApiParam; import org.apache.ambari.logsearch.common.LogSearchConstants; import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.LEVEL_D; -import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.ADVANCED_SEARCH_D; -import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.TREE_PARAMS_D; import static org.apache.ambari.logsearch.doc.DocConstants.CommonDescriptions.E_MESSAGE_D; import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.G_MUST_NOT_D; import static org.apache.ambari.logsearch.doc.DocConstants.ServiceDescriptions.HOST_NAME_D; @@ -38,26 +36,11 @@ public interface ServiceLogParamDefinition { @ApiParam(value = LEVEL_D, name = LogSearchConstants.REQUEST_PARAM_LEVEL) void setLevel(String level); - String getAdvancedSearch(); - - @ApiParam(value = ADVANCED_SEARCH_D, name = LogSearchConstants.REQUEST_PARAM_ADVANCED_SEARCH) - void setAdvancedSearch(String advancedSearch); - - String getTreeParams(); - - @ApiParam(value = TREE_PARAMS_D, name = LogSearchConstants.REQUEST_PARAM_TREE_PARAMS) - void setTreeParams(String treeParams); - String geteMessage(); @ApiParam(value = E_MESSAGE_D, name = LogSearchConstants.REQUEST_PARAM_E_MESSAGE) void seteMessage(String eMessage); - String getgMustNot(); - - @ApiParam(value = G_MUST_NOT_D, name = LogSearchConstants.REQUEST_PARAM_G_MUST_NOT) - void setgMustNot(String gMustNot); - String getHostName(); @ApiParam(value = HOST_NAME_D, name = LogSearchConstants.REQUEST_PARAM_HOST_NAME) http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseLogRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseLogRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseLogRequest.java index 5a96991..1371350 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseLogRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseLogRequest.java @@ -25,15 +25,10 @@ import org.apache.ambari.logsearch.model.request.LogParamDefinition; import javax.ws.rs.QueryParam; public class BaseLogRequest extends QueryRequest implements LogParamDefinition { - @QueryParam(LogSearchConstants.REQUEST_PARAM_COLUMN_QUERY) - private String columnQuery; @QueryParam(LogSearchConstants.REQUEST_PARAM_I_MESSAGE) private String iMessage; - @QueryParam(LogSearchConstants.REQUEST_PARAM_G_E_MESSAGE) - private String gEMessage; - @QueryParam(LogSearchConstants.REQUEST_PARAM_MUST_BE) private String mustBe; @@ -47,16 +42,6 @@ public class BaseLogRequest extends QueryRequest implements LogParamDefinition { private String includeQuery; @Override - public String getColumnQuery() { - return columnQuery; - } - - @Override - public void setColumnQuery(String columnQuery) { - this.columnQuery = columnQuery; - } - - @Override public String getiMessage() { return iMessage; } @@ -67,16 +52,6 @@ public class BaseLogRequest extends QueryRequest implements LogParamDefinition { } @Override - public String getgEMessage() { - return gEMessage; - } - - @Override - public void setgEMessage(String gEMessage) { - this.gEMessage = gEMessage; - } - - @Override public String getMustBe() { return mustBe; } http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseServiceLogRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseServiceLogRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseServiceLogRequest.java index ba4f4a8..5770ba6 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseServiceLogRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/BaseServiceLogRequest.java @@ -31,18 +31,9 @@ public class BaseServiceLogRequest extends BaseLogRequest @QueryParam(LogSearchConstants.REQUEST_PARAM_LEVEL) private String level; - @QueryParam(LogSearchConstants.REQUEST_PARAM_ADVANCED_SEARCH) - private String advancedSearch; - - @QueryParam(LogSearchConstants.REQUEST_PARAM_TREE_PARAMS) - private String treeParams; - @QueryParam(LogSearchConstants.REQUEST_PARAM_E_MESSAGE) private String eMessage; - @QueryParam(LogSearchConstants.REQUEST_PARAM_G_MUST_NOT) - private String gMustNot; - @QueryParam(LogSearchConstants.REQUEST_PARAM_HOST_NAME) private String hostName; @@ -75,26 +66,6 @@ public class BaseServiceLogRequest extends BaseLogRequest } @Override - public String getAdvancedSearch() { - return advancedSearch; - } - - @Override - public void setAdvancedSearch(String advancedSearch) { - this.advancedSearch = advancedSearch; - } - - @Override - public String getTreeParams() { - return treeParams; - } - - @Override - public void setTreeParams(String treeParams) { - this.treeParams = treeParams; - } - - @Override public String geteMessage() { return eMessage; } @@ -105,16 +76,6 @@ public class BaseServiceLogRequest extends BaseLogRequest } @Override - public String getgMustNot() { - return gMustNot; - } - - @Override - public void setgMustNot(String gMustNot) { - this.gMustNot = gMustNot; - } - - @Override public String getHostName() { return hostName; } http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileRequest.java deleted file mode 100644 index 78c5b33..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request.impl; - -import org.apache.ambari.logsearch.common.LogSearchConstants; -import org.apache.ambari.logsearch.model.request.LogFileParamDefinition; -import org.apache.ambari.logsearch.model.request.SearchRequest; - -import javax.ws.rs.QueryParam; - -public class LogFileRequest implements SearchRequest, LogFileParamDefinition { - - @QueryParam(LogSearchConstants.REQUEST_PARAM_COMPONENT) - private String component; - - @QueryParam(LogSearchConstants.REQUEST_PARAM_HOST) - private String host; - - @QueryParam(LogSearchConstants.REQUEST_PARAM_LOG_TYPE) - private String logType; - - @Override - public String getComponent() { - return component; - } - - @Override - public void setComponent(String component) { - this.component = component; - } - - @Override - public String getHost() { - return host; - } - - @Override - public void setHost(String host) { - this.host = host; - } - - @Override - public String getLogType() { - return logType; - } - - @Override - public void setLogType(String logType) { - this.logType = logType; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileTailRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileTailRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileTailRequest.java deleted file mode 100644 index d5b91ab..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/LogFileTailRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request.impl; - -import org.apache.ambari.logsearch.common.LogSearchConstants; -import org.apache.ambari.logsearch.model.request.LogFileTailParamDefinition; - -import javax.ws.rs.QueryParam; - -public class LogFileTailRequest extends LogFileRequest implements LogFileTailParamDefinition { - - @QueryParam(LogSearchConstants.REQUEST_PARAM_TAIL_SIZE) - private String tailSize; - - @Override - public String getTailSize() { - return tailSize; - } - - @Override - public void setTailSize(String tailSize) { - this.tailSize = tailSize; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceGraphRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceGraphRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceGraphRequest.java index 1618aa1..57884b7 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceGraphRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceGraphRequest.java @@ -23,7 +23,7 @@ import org.apache.ambari.logsearch.model.request.UnitParamDefinition; import javax.ws.rs.QueryParam; -public class ServiceGraphRequest extends ServiceLogFileRequest implements UnitParamDefinition { +public class ServiceGraphRequest extends ServiceLogRequest implements UnitParamDefinition { @QueryParam(LogSearchConstants.REQUEST_PARAM_UNIT) private String unit; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogExportRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogExportRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogExportRequest.java index 6ae0dc9..16300ce 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogExportRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogExportRequest.java @@ -24,7 +24,7 @@ import org.apache.ambari.logsearch.model.request.UtcOffsetParamDefinition; import javax.ws.rs.QueryParam; -public class ServiceLogExportRequest extends ServiceLogFileRequest implements FormatParamDefinition, UtcOffsetParamDefinition { +public class ServiceLogExportRequest extends ServiceLogRequest implements FormatParamDefinition, UtcOffsetParamDefinition { @QueryParam(LogSearchConstants.REQUEST_PARAM_FORMAT) private String format; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogFileRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogFileRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogFileRequest.java deleted file mode 100644 index 6c7078a..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogFileRequest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.model.request.impl; - -import io.swagger.annotations.ApiParam; -import org.apache.ambari.logsearch.common.LogSearchConstants; -import org.apache.ambari.logsearch.model.request.ServiceLogFileParamDefinition; - -import javax.ws.rs.QueryParam; - -public class ServiceLogFileRequest extends BaseServiceLogRequest implements ServiceLogFileParamDefinition { - - @QueryParam(LogSearchConstants.REQUEST_PARAM_HOST_LOG_FILE) - private String hostLogFile; - - @QueryParam(LogSearchConstants.REQUEST_PARAM_COMPONENT_LOG_FILE) - private String componentLogFile; - - @Override - public String getHostLogFile() { - return hostLogFile; - } - - @Override - public void setHostLogFile(String hostLogFile) { - this.hostLogFile = hostLogFile; - } - - @Override - public String getComponentLogFile() { - return componentLogFile; - } - - @Override - public void setComponentLogFile(String componentLogFile) { - this.componentLogFile = componentLogFile; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogRequest.java index 9a46de3..fe36ad8 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogRequest.java @@ -24,7 +24,7 @@ import org.apache.ambari.logsearch.model.request.ServiceLogSearchParamDefinition import javax.ws.rs.QueryParam; -public class ServiceLogRequest extends ServiceLogFileRequest implements ServiceLogSearchParamDefinition, LastPageParamDefinition { +public class ServiceLogRequest extends BaseServiceLogRequest implements ServiceLogSearchParamDefinition, LastPageParamDefinition { @QueryParam(LogSearchConstants.REQUEST_PARAM_KEYWORD) private String keyWord; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogTruncatedRequest.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogTruncatedRequest.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogTruncatedRequest.java index 516c328..8067896 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogTruncatedRequest.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/model/request/impl/ServiceLogTruncatedRequest.java @@ -23,7 +23,7 @@ import org.apache.ambari.logsearch.model.request.LogTruncatedParamDefinition; import javax.ws.rs.QueryParam; -public class ServiceLogTruncatedRequest extends ServiceLogFileRequest implements LogTruncatedParamDefinition { +public class ServiceLogTruncatedRequest extends ServiceLogRequest implements LogTruncatedParamDefinition { @QueryParam(LogSearchConstants.REQUEST_PARAM_ID) private String id; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java index 9ea29c2..8095faf 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGeneration.java @@ -23,14 +23,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Locale; -import java.util.regex.Pattern; -import org.apache.ambari.logsearch.common.ConfigHelper; import org.apache.ambari.logsearch.common.LogSearchConstants; import org.apache.ambari.logsearch.common.PropertiesHelper; -import org.apache.ambari.logsearch.conf.SolrAuditLogConfig; -import org.apache.ambari.logsearch.conf.SolrServiceLogConfig; -import org.apache.ambari.logsearch.query.model.AuditLogSearchCriteria; +import org.apache.ambari.logsearch.conf.SolrAuditLogPropsConfig; +import org.apache.ambari.logsearch.conf.SolrServiceLogPropsConfig; import org.apache.ambari.logsearch.query.model.CommonSearchCriteria; import org.apache.ambari.logsearch.query.model.CommonServiceLogSearchCriteria; import org.apache.ambari.logsearch.query.model.SearchCriteria; @@ -57,20 +54,18 @@ public class QueryGeneration extends QueryGenerationBase { private static Logger logger = Logger.getLogger(QueryGeneration.class); @Inject - private SolrServiceLogConfig solrServiceLogConfig; + private SolrServiceLogPropsConfig solrServiceLogPropsConfig; @Inject - private SolrAuditLogConfig solrAuditLogConfig; + private SolrAuditLogPropsConfig solrAuditLogPropsConfig; public SolrQuery commonServiceFilterQuery(CommonServiceLogSearchCriteria searchCriteria) { LogType logType = LogType.SERVICE; SolrQuery solrQuery = new SolrQuery(); - String advQuery = (String) searchCriteria.getParamValue("advanceSearch"); // TODO: check these are used from the UI or not - String gEmessage = (String) searchCriteria.getParamValue("gEMessage"); + // TODO: check these are used from the UI or not String globalExcludeComp = (String) searchCriteria.getParamValue("gMustNot"); String unselectedComp = (String) searchCriteria.getParamValue("unselectComp"); - String treeParams = searchCriteria.getTreeParams(); String givenQuery = (String) searchCriteria.getParamValue("q"); String level = searchCriteria.getLevel(); String startTime = searchCriteria.getFrom(); @@ -82,37 +77,15 @@ public class QueryGeneration extends QueryGenerationBase { String urlHostName = searchCriteria.getHostName(); String urlComponentName = searchCriteria.getComponentName(); String file_name = searchCriteria.getFileName(); - // build advance query - if (!StringUtils.isBlank(advQuery)) { - String advQueryParameters[] = advQuery.split(Pattern.quote("}{")); - SolrQuery advSolrQuery = new SolrQuery(); - for (String queryParam : advQueryParameters) { - String params[] = queryParam.split(Pattern.quote("=")); - if (params.length > 1) - advSolrQuery.setParam(params[0], params[1]); - } - setFilterClauseWithFieldName(advSolrQuery, level, LogSearchConstants.SOLR_LEVEL, "", Condition.OR); - setSingleRangeFilter(advSolrQuery, LogSearchConstants.LOGTIME, startTime, endTime); - setFilterClauseWithFieldName(advSolrQuery, unselectedComp, LogSearchConstants.SOLR_COMPONENT, LogSearchConstants.MINUS_OPERATOR, - Condition.AND); - setFilterClauseWithFieldName(advSolrQuery, selectedComp, LogSearchConstants.SOLR_COMPONENT, LogSearchConstants.NO_OPERATOR, - Condition.OR); - - setPagination(advSolrQuery, searchCriteria); - - return advSolrQuery; - } SolrUtil.setMainQuery(solrQuery, givenQuery); setSingleRangeFilter(solrQuery, LogSearchConstants.LOGTIME, startTime, endTime); addFilter(solrQuery, selectedComp, LogSearchConstants.SOLR_COMPONENT, Condition.OR); - addFilterQueryFromArray(solrQuery, treeParams, LogSearchConstants.SOLR_HOST, Condition.OR); setFilterClauseWithFieldName(solrQuery, level, LogSearchConstants.SOLR_LEVEL, LogSearchConstants.NO_OPERATOR, Condition.OR); setFilterClauseForSolrSearchableString(solrQuery, iMessage, Condition.OR, LogSearchConstants.NO_OPERATOR, LogSearchConstants.SOLR_KEY_LOG_MESSAGE); - setFilterClauseForSolrSearchableString(solrQuery, gEmessage, Condition.AND, LogSearchConstants.MINUS_OPERATOR, LogSearchConstants.SOLR_KEY_LOG_MESSAGE); setFilterClauseForSolrSearchableString(solrQuery, eMessage, Condition.AND, LogSearchConstants.MINUS_OPERATOR, LogSearchConstants.SOLR_KEY_LOG_MESSAGE); applyLogFileFilter(solrQuery, searchCriteria); @@ -156,35 +129,24 @@ public class QueryGeneration extends QueryGenerationBase { private void setUserSpecificFilter(SearchCriteria searchCriteria, SolrQuery solrQuery, String paramName, String operation, LogType logType) { String queryString = (String) searchCriteria.getParamValue(paramName); - String columnQuery = (String) searchCriteria.getParamValue(LogSearchConstants.COLUMN_QUERY); if (StringUtils.isBlank(queryString)) { queryString = null; } - if (!StringUtils.isBlank(columnQuery) && StringUtils.isBlank(queryString) && !paramName.equals(LogSearchConstants.EXCLUDE_QUERY)) { - queryString = columnQuery; - } List<String> conditionQuries = new ArrayList<String>(); List<String> referalConditionQuries = new ArrayList<String>(); List<String> elments = new ArrayList<String>(); List<HashMap<String, Object>> queryList = JSONUtil.jsonToMapObjectList(queryString); if (queryList != null && queryList.size() > 0) { - if (!StringUtils.isBlank(columnQuery) && !columnQuery.equals(queryString) && !paramName.equals(LogSearchConstants.EXCLUDE_QUERY)) { - List<HashMap<String, Object>> columnQueryList = JSONUtil.jsonToMapObjectList(columnQuery); - if (columnQueryList != null && columnQueryList.size() > 0) { - queryList.addAll(columnQueryList); - } - } for (HashMap<String, Object> columnListMap : queryList) { String orQuery = ""; StringBuilder field = new StringBuilder(); if (columnListMap != null) { for (String key : columnListMap.keySet()) { - if (!StringUtils.isBlank(key)) { - String originalKey = getOriginalKey(key, logType); - String value = getOriginalValue(originalKey, "" + columnListMap.get(key)); - orQuery = putWildCardByType(value, originalKey, logType); + if (!StringUtils.isBlank(key)) {; + String value = getOriginalValue(key, "" + columnListMap.get(key)); + orQuery = putWildCardByType(value, key, logType); if (StringUtils.isBlank(orQuery)) { - logger.debug("Removing invalid filter for key :"+originalKey +" and value :" +value ); + logger.debug("Removing invalid filter for key :"+key +" and value :" +value ); continue; } boolean isSame = false; @@ -193,17 +155,17 @@ public class QueryGeneration extends QueryGenerationBase { } if (isSame && !operation.equals(LogSearchConstants.EXCLUDE_QUERY)) { for (String tempCondition : conditionQuries) { - if (tempCondition.contains(originalKey)) { + if (tempCondition.contains(key)) { String newCondtion = tempCondition + " " + Condition.OR.name() + " " + orQuery; referalConditionQuries.remove(tempCondition); referalConditionQuries.add(newCondtion); } } - conditionQuries.removeAll(conditionQuries); + conditionQuries.clear(); conditionQuries.addAll(referalConditionQuries); } else { - conditionQuries.add(orQuery.toString()); - referalConditionQuries.add(orQuery.toString()); + conditionQuries.add(orQuery); + referalConditionQuries.add(orQuery); } field.append(key); elments.add(field.toString()); @@ -213,7 +175,7 @@ public class QueryGeneration extends QueryGenerationBase { } } if (!referalConditionQuries.isEmpty() && !StringUtils.isBlank(operation)) { - if (operation.equals(LogSearchConstants.INCLUDE_QUERY) || operation.equals(LogSearchConstants.COLUMN_QUERY)) { + if (operation.equals(LogSearchConstants.INCLUDE_QUERY)) { for (String filter : referalConditionQuries) { if (!StringUtils.isBlank(filter)) { solrQuery.addFilterQuery(filter); @@ -235,17 +197,12 @@ public class QueryGeneration extends QueryGenerationBase { SolrQuery solrQuery = new SolrQuery(); solrQuery.setQuery("*:*"); - String globalExcludeComp = (String) searchCriteria.getParamValue("gMustNot"); // TODO: check this are used from UI or not - String unselectedComp = (String) searchCriteria.getParamValue("unselectComp"); - String startTime = searchCriteria.getStartTime(); String endTime = searchCriteria.getEndTime(); String selectedComp = searchCriteria.getMustBe(); setFilterClauseWithFieldName(solrQuery, selectedComp, LogSearchConstants.AUDIT_COMPONENT, LogSearchConstants.NO_OPERATOR, Condition.OR); setUserSpecificFilter(searchCriteria, solrQuery, LogSearchConstants.INCLUDE_QUERY, LogSearchConstants.INCLUDE_QUERY, logType); setUserSpecificFilter(searchCriteria, solrQuery, LogSearchConstants.EXCLUDE_QUERY, LogSearchConstants.EXCLUDE_QUERY, logType); - setFilterClauseWithFieldName(solrQuery, globalExcludeComp, LogSearchConstants.AUDIT_COMPONENT, LogSearchConstants.MINUS_OPERATOR, Condition.AND); - setFilterClauseWithFieldName(solrQuery, unselectedComp, LogSearchConstants.AUDIT_COMPONENT, LogSearchConstants.MINUS_OPERATOR, Condition.AND); setSingleRangeFilter(solrQuery, LogSearchConstants.AUDIT_EVTTIME, startTime, endTime); setPagination(solrQuery, searchCriteria); try { @@ -266,11 +223,11 @@ public class QueryGeneration extends QueryGenerationBase { SolrDaoBase solrDaoBase = null; switch (logType) { case AUDIT: - fieldType = auditSolrDao.schemaFieldsNameMap.get(key); + fieldType = auditSolrDao.schemaFieldNameMap.get(key); solrDaoBase = auditSolrDao; break; case SERVICE: - fieldType = serviceLogsSolrDao.schemaFieldsNameMap.get(key); + fieldType = serviceLogsSolrDao.schemaFieldNameMap.get(key); solrDaoBase = serviceLogsSolrDao; if (key.equalsIgnoreCase(LogSearchConstants.SOLR_LOG_MESSAGE)) { return SolrUtil.escapeForLogMessage(key, str); @@ -338,7 +295,7 @@ public class QueryGeneration extends QueryGenerationBase { } try { String propertyFieldMappings[] = solrValue.split(LogSearchConstants.LIST_SEPARATOR); - if (propertyFieldMappings != null && propertyFieldMappings.length > 0) { + if (propertyFieldMappings.length > 0) { HashMap<String, String> propertyFieldValue = new HashMap<String, String>(); for (String temp : propertyFieldMappings) { if (!StringUtils.isBlank(temp)) { @@ -361,24 +318,7 @@ public class QueryGeneration extends QueryGenerationBase { return value; } - private String getOriginalKey(String key, LogType logType) { - String originalKey; - switch (logType) { - case AUDIT: - originalKey = solrAuditLogConfig.getSolrAndUiColumns().get(key + LogSearchConstants.UI_SUFFIX); - break; - case SERVICE: - originalKey = solrServiceLogConfig.getSolrAndUiColumns().get(key + LogSearchConstants.UI_SUFFIX); - break; - default: - originalKey = null; - } - if (StringUtils.isBlank(originalKey)) { - return key; - } - return originalKey; - } - + private boolean checkTokenizer(String fieldType, Class tokenizerFactoryClass, SolrDaoBase solrDaoBase) { HashMap<String, Object> fieldTypeMap = SolrUtil.getFieldTypeInfoMap(fieldType,solrDaoBase); HashMap<String, Object> analyzer = (HashMap<String, Object>) fieldTypeMap.get("analyzer"); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGenerationBase.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGenerationBase.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGenerationBase.java index d7d30d7..536f41c 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGenerationBase.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/QueryGenerationBase.java @@ -271,34 +271,6 @@ public abstract class QueryGenerationBase { return ""; } - protected void addFilterQueryFromArray(SolrQuery solrQuery, String jsonArrStr, String solrFieldName, Condition condition) { - if (!StringUtils.isBlank(jsonArrStr) && condition != null && solrQuery != null) { - Gson gson = new Gson(); - String[] arr = null; - try { - arr = gson.fromJson(jsonArrStr, String[].class); - } catch (Exception exception) { - logger.error("Invaild json array:" + jsonArrStr); - return; - } - String query;; - switch (condition) { - case OR: - query = SolrUtil.orList(solrFieldName, arr,""); - break; - case AND: - query = SolrUtil.andList(solrFieldName, arr, ""); - break; - default: - query=null; - logger.error("Invalid condition :" + condition.name()); - } - if (!StringUtils.isBlank(query)) { - solrQuery.addFilterQuery(query); - } - } - } - protected void addFilter(SolrQuery solrQuery, String paramValue, String solrFieldName, Condition condition) { String filterQuery = buildListQuery(paramValue, solrFieldName, condition); if (!StringUtils.isBlank(filterQuery)) { http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/SearchCriteriaConstants.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/SearchCriteriaConstants.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/SearchCriteriaConstants.java index c67d3cd..3c4df76 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/SearchCriteriaConstants.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/SearchCriteriaConstants.java @@ -45,21 +45,13 @@ public class SearchCriteriaConstants { public static final String PARAM_FROM = "from"; public static final String PARAM_TO = "to"; - public static final String PARAM_LOG_FILE_COMPONENT = "component"; - public static final String PARAM_LOG_FILE_HOST = "host"; - public static final String PARAM_LOG_FILE_TYPE = "logType"; - public static final String PARAM_LOG_TAIL_SIZE = "tailSize"; - public static final String PARAM_COMPONENT_NAME = "component_name"; public static final String PARAM_HOST_NAME = "host_name"; public static final String PARAM_FILE_NAME = "file_name"; public static final String PARAM_BUNDLE_ID = "bundle_id"; public static final String PARAM_SELECT_COMP = "selectComp"; public static final String PARAM_LEVEL = "level"; - public static final String PARAM_TREE_PARAMS = "treeParams"; - public static final String PARAM_HOST_LOG_FILE = "hostLogFile"; - public static final String PARAM_COMPONENT_LOG_FILE = "compLogFile"; public static final String PARAM_ID = "id"; public static final String PARAM_SCROLL_TYPE = "scrollType"; public static final String PARAM_NUMBER_ROWS = "numberRows"; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonAuditLogRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonAuditLogRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonAuditLogRequestConverter.java index e25eb51..d40c5a1 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonAuditLogRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonAuditLogRequestConverter.java @@ -31,10 +31,6 @@ public abstract class AbstractCommonAuditLogRequestConverter<SOURCE extends Base public RESULT convertToSearchCriteria(SOURCE request) { RESULT criteria = createCriteria(request); criteria.addParam("q", request.getQuery()); - criteria.addParam("columnQuery", StringEscapeUtils.unescapeXml(request.getColumnQuery())); - criteria.addParam("gEMessage", StringEscapeUtils.unescapeXml(request.getgEMessage())); - criteria.setIncludeMessage(StringEscapeUtils.unescapeXml(request.getiMessage())); - criteria.setExcludeMessage(StringEscapeUtils.unescapeXml(request.getgEMessage())); criteria.setMustBe(request.getMustBe()); criteria.setMustNot(request.getMustNot()); criteria.setExcludeQuery(StringEscapeUtils.unescapeXml(request.getExcludeQuery())); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonServiceLogRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonServiceLogRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonServiceLogRequestConverter.java index 2282c11..8e91584 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonServiceLogRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/AbstractCommonServiceLogRequestConverter.java @@ -29,13 +29,9 @@ public abstract class AbstractCommonServiceLogRequestConverter<SOURCE extends Ba public RESULT convertToSearchCriteria(SOURCE request) { RESULT criteria = createCriteria(request); // TODO: check are these used from the UI or not? - criteria.addParam("advanceSearch", StringEscapeUtils.unescapeXml(request.getAdvancedSearch())); criteria.addParam("q", request.getQuery()); - criteria.addParam("gMustNot", request.getgMustNot()); - criteria.addParam("gEMessage", StringEscapeUtils.unescapeXml(request.getgEMessage())); criteria.addParam("unselectComp", request.getMustNot()); - criteria.setTreeParams(StringEscapeUtils.unescapeHtml(request.getTreeParams())); criteria.setLevel(request.getLevel()); criteria.setFrom(request.getFrom()); criteria.setTo(request.getTo()); @@ -44,8 +40,6 @@ public abstract class AbstractCommonServiceLogRequestConverter<SOURCE extends Ba criteria.setHostName(request.getHostName()); criteria.setComponentName(request.getComponentName()); criteria.setFileName(request.getFileName()); - criteria.setIncludeMessage(StringEscapeUtils.unescapeXml(request.getiMessage())); - criteria.setExcludeMessage(StringEscapeUtils.unescapeXml(request.getgEMessage())); criteria.setStartTime(request.getStartTime()); criteria.setEndTime(request.getEndTime()); criteria.setExcludeQuery(StringEscapeUtils.unescapeXml(request.getExcludeQuery())); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileRequestConverter.java deleted file mode 100644 index 62c2fbe..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileRequestConverter.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.converter; - -import org.apache.ambari.logsearch.model.request.impl.LogFileRequest; -import org.apache.ambari.logsearch.query.model.LogFileSearchCriteria; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; - -@Component -public class LogFileRequestConverter implements Converter<LogFileRequest, LogFileSearchCriteria> { - - @Override - public LogFileSearchCriteria convert(LogFileRequest request) { - LogFileSearchCriteria criteria = new LogFileSearchCriteria(); - criteria.setLogFileComponent(request.getComponent()); - criteria.setLogFileHost(request.getHost()); - criteria.setLogType(request.getLogType()); - return criteria; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileTailRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileTailRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileTailRequestConverter.java deleted file mode 100644 index 08c6ecc..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/LogFileTailRequestConverter.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.converter; - -import org.apache.ambari.logsearch.model.request.impl.LogFileTailRequest; -import org.apache.ambari.logsearch.query.model.LogFileTailSearchCriteria; -import org.springframework.core.convert.converter.Converter; -import org.springframework.stereotype.Component; - -@Component -public class LogFileTailRequestConverter implements Converter<LogFileTailRequest, LogFileTailSearchCriteria> { - - @Override - public LogFileTailSearchCriteria convert(LogFileTailRequest request) { - LogFileTailSearchCriteria criteria = new LogFileTailSearchCriteria(); - criteria.setLogFileComponent(request.getComponent()); - criteria.setLogFileHost(request.getHost()); - criteria.setLogType(request.getLogType()); - criteria.setLogTailSize(request.getTailSize()); - return criteria; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceGraphRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceGraphRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceGraphRequestConverter.java index 6c501ae..37ec7dc 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceGraphRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceGraphRequestConverter.java @@ -28,8 +28,6 @@ public class ServiceGraphRequestConverter extends AbstractCommonServiceLogReques @Override public ServiceGraphSearchCriteria createCriteria(ServiceGraphRequest request) { ServiceGraphSearchCriteria criteria = new ServiceGraphSearchCriteria(); - criteria.setLogFileHostName(request.getHostLogFile()); - criteria.setLogFileComponentName(request.getComponentLogFile()); criteria.setUnit(request.getUnit()); return criteria; } http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogExportRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogExportRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogExportRequestConverter.java index bd06546..783b0e0 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogExportRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogExportRequestConverter.java @@ -28,8 +28,6 @@ public class ServiceLogExportRequestConverter extends AbstractCommonServiceLogRe @Override public ServiceLogExportSearchCriteria createCriteria(ServiceLogExportRequest request) { ServiceLogExportSearchCriteria criteria = new ServiceLogExportSearchCriteria(); - criteria.setLogFileHostName(request.getHostLogFile()); - criteria.setLogFileComponentName(request.getComponentLogFile()); criteria.setFormat(request.getFormat()); criteria.setUtcOffset(request.getUtcOffset()); return criteria; http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogFileRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogFileRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogFileRequestConverter.java deleted file mode 100644 index 392c9d3..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogFileRequestConverter.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.converter; - -import org.apache.ambari.logsearch.model.request.impl.ServiceLogFileRequest; -import org.apache.ambari.logsearch.query.model.ServiceLogFileSearchCriteria; -import org.springframework.stereotype.Component; - -@Component -public class ServiceLogFileRequestConverter - extends AbstractCommonServiceLogRequestConverter<ServiceLogFileRequest, ServiceLogFileSearchCriteria> { - - @Override - public ServiceLogFileSearchCriteria createCriteria(ServiceLogFileRequest request) { - ServiceLogFileSearchCriteria criteria = new ServiceLogFileSearchCriteria(); - criteria.setLogFileHostName(request.getHostLogFile()); - criteria.setLogFileComponentName(request.getComponentLogFile()); - return criteria; - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogRequestConverter.java index aa93c6a..86d055d 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogRequestConverter.java @@ -29,8 +29,6 @@ public class ServiceLogRequestConverter extends AbstractCommonServiceLogRequestC @Override public ServiceLogSearchCriteria createCriteria(ServiceLogRequest request) { ServiceLogSearchCriteria criteria = new ServiceLogSearchCriteria(); - criteria.setLogFileComponentName(request.getHostLogFile()); - criteria.setLogFileComponentName(request.getComponentLogFile()); criteria.setKeyword(StringEscapeUtils.unescapeXml(request.getKeyWord())); criteria.setKeywordType(request.getKeywordType()); criteria.setSourceLogId(request.getSourceLogId()); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogTruncatedRequestConverter.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogTruncatedRequestConverter.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogTruncatedRequestConverter.java index 1e58b79..2154357 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogTruncatedRequestConverter.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/converter/ServiceLogTruncatedRequestConverter.java @@ -28,8 +28,6 @@ public class ServiceLogTruncatedRequestConverter extends AbstractCommonServiceLo @Override public ServiceLogTruncatedSearchCriteria createCriteria(ServiceLogTruncatedRequest request) { ServiceLogTruncatedSearchCriteria criteria = new ServiceLogTruncatedSearchCriteria(); - criteria.setLogFileHostName(request.getHostLogFile()); - criteria.setLogFileComponentName(request.getComponentLogFile()); criteria.setId(request.getId()); criteria.setScrollType(request.getScrollType()); criteria.setNumberRows(request.getNumberRows()); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/CommonServiceLogSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/CommonServiceLogSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/CommonServiceLogSearchCriteria.java index 4c79c69..b02c234 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/CommonServiceLogSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/CommonServiceLogSearchCriteria.java @@ -22,14 +22,6 @@ import org.apache.ambari.logsearch.query.SearchCriteriaConstants; public class CommonServiceLogSearchCriteria extends CommonSearchCriteria { - public String getTreeParams() { - return getParam(SearchCriteriaConstants.PARAM_TREE_PARAMS, String.class); - } - - public void setTreeParams(String treeParams) { - addParam(SearchCriteriaConstants.PARAM_TREE_PARAMS, treeParams); - } - public String getLevel() { return getParam(SearchCriteriaConstants.PARAM_LEVEL, String.class); } http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileSearchCriteria.java deleted file mode 100644 index e33e5eb..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileSearchCriteria.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.model; - -import org.apache.ambari.logsearch.common.Marker; - -import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_LOG_FILE_COMPONENT; -import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_LOG_FILE_HOST; -import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_LOG_FILE_TYPE; - -public class LogFileSearchCriteria extends SearchCriteria { - - public String getLogFileComponent() { - return getParam(PARAM_LOG_FILE_COMPONENT, String.class); - } - - public void setLogFileComponent(String logFileComponent) { - addParam(PARAM_LOG_FILE_COMPONENT, logFileComponent); - } - - public String getLogFileHost() { - return getParam(PARAM_LOG_FILE_HOST, String.class); - } - - public void setLogFileHost(String logFileHost) { - addParam(PARAM_LOG_FILE_HOST, logFileHost); - } - - public String getLogType() { - return getParam(PARAM_LOG_FILE_TYPE, String.class); - } - - public void setLogType(String logType) { - addParam(PARAM_LOG_FILE_TYPE, logType); - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileTailSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileTailSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileTailSearchCriteria.java deleted file mode 100644 index ccea4ab..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/LogFileTailSearchCriteria.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.model; - -import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_LOG_TAIL_SIZE; - -public class LogFileTailSearchCriteria extends LogFileSearchCriteria { - - public String getLogTailSize() { - return getParam(PARAM_LOG_TAIL_SIZE, String.class); - } - - public void setLogTailSize(String logTailSize) { - addParam(PARAM_LOG_TAIL_SIZE, logTailSize); - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/SearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/SearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/SearchCriteria.java index 661337f..8e397ac 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/SearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/SearchCriteria.java @@ -123,4 +123,13 @@ public class SearchCriteria { this.globalEndTime = globalEndTime; } + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + for (Map.Entry<String, Object> entry : paramList.entrySet()) { + sb.append(entry.getKey() + " : " + entry.getValue() + ";"); + } + return sb.toString(); + } + } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceAnyGraphSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceAnyGraphSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceAnyGraphSearchCriteria.java index cd852b5..0f4bb5a 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceAnyGraphSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceAnyGraphSearchCriteria.java @@ -25,7 +25,7 @@ import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_UN import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_X_AXIS; import static org.apache.ambari.logsearch.query.SearchCriteriaConstants.PARAM_Y_AXIS; -public class ServiceAnyGraphSearchCriteria extends ServiceLogFileSearchCriteria { +public class ServiceAnyGraphSearchCriteria extends ServiceLogSearchCriteria { public String getxAxis() { return getParam(PARAM_X_AXIS, String.class); } http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceGraphSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceGraphSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceGraphSearchCriteria.java index 8988af1..4173bac 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceGraphSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceGraphSearchCriteria.java @@ -20,7 +20,7 @@ package org.apache.ambari.logsearch.query.model; import org.apache.ambari.logsearch.query.SearchCriteriaConstants; -public class ServiceGraphSearchCriteria extends ServiceLogFileSearchCriteria { +public class ServiceGraphSearchCriteria extends ServiceLogSearchCriteria { public String getUnit() { return getParam(SearchCriteriaConstants.PARAM_UNIT, String.class); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogExportSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogExportSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogExportSearchCriteria.java index c7b7a39..6c757af 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogExportSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogExportSearchCriteria.java @@ -20,7 +20,7 @@ package org.apache.ambari.logsearch.query.model; import org.apache.ambari.logsearch.query.SearchCriteriaConstants; -public class ServiceLogExportSearchCriteria extends ServiceLogFileSearchCriteria { +public class ServiceLogExportSearchCriteria extends ServiceLogSearchCriteria { public void setFormat(String format) { addParam(SearchCriteriaConstants.PARAM_FORMAT, format); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogFileSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogFileSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogFileSearchCriteria.java deleted file mode 100644 index a80a3ce..0000000 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogFileSearchCriteria.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.ambari.logsearch.query.model; - -import org.apache.ambari.logsearch.query.SearchCriteriaConstants; - -public class ServiceLogFileSearchCriteria extends CommonServiceLogSearchCriteria { - - public void setLogFileHostName(String logFileHostName) { - addParam(SearchCriteriaConstants.PARAM_HOST_LOG_FILE, logFileHostName); - } - - public String getLogFileHostName() { - return getParam(SearchCriteriaConstants.PARAM_HOST_LOG_FILE, String.class); - } - - public void setLogFileComponentName(String logFileComponentName) { - addParam(SearchCriteriaConstants.PARAM_COMPONENT_LOG_FILE, logFileComponentName); - } - - public String getLogFileComponentName() { - return getParam(SearchCriteriaConstants.PARAM_COMPONENT_LOG_FILE, String.class); - } -} http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogSearchCriteria.java index b3a6bf7..e469367 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogSearchCriteria.java @@ -20,7 +20,7 @@ package org.apache.ambari.logsearch.query.model; import org.apache.ambari.logsearch.query.SearchCriteriaConstants; -public class ServiceLogSearchCriteria extends ServiceLogFileSearchCriteria { +public class ServiceLogSearchCriteria extends CommonServiceLogSearchCriteria { public void setKeyword(String keyword) { addParam(SearchCriteriaConstants.PARAM_KEYWORD, keyword); http://git-wip-us.apache.org/repos/asf/ambari/blob/6fa4abfe/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogTruncatedSearchCriteria.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogTruncatedSearchCriteria.java b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogTruncatedSearchCriteria.java index bcdac5b..277aeb9 100644 --- a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogTruncatedSearchCriteria.java +++ b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/query/model/ServiceLogTruncatedSearchCriteria.java @@ -20,7 +20,7 @@ package org.apache.ambari.logsearch.query.model; import org.apache.ambari.logsearch.query.SearchCriteriaConstants; -public class ServiceLogTruncatedSearchCriteria extends ServiceLogFileSearchCriteria { +public class ServiceLogTruncatedSearchCriteria extends ServiceLogSearchCriteria { public String getId() { return getParam(SearchCriteriaConstants.PARAM_ID, String.class);
