Fix merge

elastic · Feb 11, 2020 · a916827 · a916827
1 parent ea19f8f
commit a916827
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 52 deletions.
diff --git a/src/plugins/data/public/index.ts b/src/plugins/data/public/index.ts
@@ -20,16 +20,6 @@
 import { PluginInitializerContext } from '../../../core/public';
 
 import {
-  doesKueryExpressionHaveLuceneSyntaxError,
-  fromKueryExpression,
-  toElasticsearchQuery,
-  nodeTypes,
-  buildEsQuery,
-  getEsQueryConfig,
-  buildQueryFromFilters,
-  luceneStringToDsl,
-  decorateQuery,
-
   // filters
   FILTERS,
   buildEmptyFilter,
@@ -108,25 +98,6 @@ export const esFilters = {
   extractTimeFilter,
 };
 
-/*
- * esQuery\esKuery namespaces:
- */
-
-export const esKuery = {
-  nodeTypes,
-  doesKueryExpressionHaveLuceneSyntaxError,
-  fromKueryExpression,
-  toElasticsearchQuery,
-};
-
-export const esQuery = {
-  buildEsQuery,
-  getEsQueryConfig,
-  buildQueryFromFilters,
-  luceneStringToDsl,
-  decorateQuery,
-};
-
 /*
  * esQuery and esKuery helper namespaces:
  */

diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
@@ -24,7 +24,7 @@ export const mapSpatialFilter = (filter: Filter) => {
     filter.meta &&
     filter.meta.key &&
     filter.meta.alias &&
-    filter.meta.type === esFilters.FILTERS.SPATIAL_FILTER
+    filter.meta.type === FILTERS.SPATIAL_FILTER
   ) {
     return {
       key: filter.meta.key,

diff --git a/src/plugins/data/public/search/search_source/search_source.ts b/src/plugins/data/public/search/search_source/search_source.ts
@@ -79,7 +79,6 @@ import { fetchSoon, FetchOptions, RequestFailure } from '../fetch';
 
 import { getSearchService, getUiSettings, getInjectedMetadata } from '../../services';
 import { getEsQueryConfig, buildEsQuery, Filter } from '../../../common';
-import { getHighlightRequest } from '../../../common';
 import { getHighlightRequest } from '../../../common/field_formats';
 
 export type ISearchSource = Pick<SearchSource, keyof SearchSource>;

diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
@@ -21,11 +21,6 @@ import { PluginInitializerContext } from '../../../core/server';
 import { DataServerPlugin, DataPluginSetup, DataPluginStart } from './plugin';
 
 import {
-  nodeTypes,
-  fromKueryExpression,
-  toElasticsearchQuery,
-  buildEsQuery,
-  getEsQueryConfig,
   buildQueryFilter,
   buildCustomFilter,
   buildEmptyFilter,
@@ -37,21 +32,6 @@ import {
   isFilterDisabled,
 } from '../common';
 
-/*
- * esQuery\esKuery namespaces:
- */
-
-export const esKuery = {
-  nodeTypes,
-  fromKueryExpression,
-  toElasticsearchQuery,
-};
-
-export const esQuery = {
-  getEsQueryConfig,
-  buildEsQuery,
-};
-
 /*
  * Filter helper namespace:
  */
@@ -69,7 +49,7 @@ export const esFilters = {
 };
 
 /*
- * esQuery and esKuery helper namespaces:
+ * esQuery\esKuery namespaces:
  */
 
 import {