Merge branch 'findreplace/ProviderNames' into implement/searchFunctio…

…nCourierRequests

src/ui/public/agg_types/buckets/filters.js

@@ -2,12 +2,12 @@ import _ from 'lodash';
 import angular from 'angular';
 import AggTypesBucketsBucketAggTypeProvider from 'ui/agg_types/buckets/_bucket_agg_type';
 import AggTypesBucketsCreateFilterFiltersProvider from 'ui/agg_types/buckets/create_filter/filters';
-import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
+import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
 import filtersTemplate from 'ui/agg_types/controls/filters.html';
 export default function FiltersAggDefinition(Private, Notifier) {
   var BucketAggType = Private(AggTypesBucketsBucketAggTypeProvider);
   var createFilter = Private(AggTypesBucketsCreateFilterFiltersProvider);
-  var decorateQuery = Private(CourierDataSourceDecorateQueryProvider);
+  var decorateQuery = Private(DecorateQueryProvider);
   var notif = new Notifier({ location: 'Filters Agg' });
 
   return new BucketAggType({

src/ui/public/config/config.js

@@ -3,7 +3,7 @@ import _ from 'lodash';
 import ConfigDefaultsProvider from 'ui/config/defaults';
 import ConfigDelayedUpdaterProvider from 'ui/config/_delayed_updater';
 import ConfigValsProvider from 'ui/config/_vals';
-import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
+import DocSourceProvider from 'ui/courier/data_source/doc_source';
 import uiRoutes from 'ui/routes';
 import uiModules from 'ui/modules';
 import Notifier from 'ui/notify/notifier';
@@ -30,7 +30,7 @@ module.service('config', function (Private, kbnVersion, kbnIndex, $rootScope, bu
   // update once it is requested by calling #set() or #clear().
   var updater;
 
-  var DocSource = Private(CourierDataSourceDocSourceProvider);
+  var DocSource = Private(DocSourceProvider);
   var doc = (new DocSource())
     .index(kbnIndex)
     .type('config')

src/ui/public/courier/courier.js

@@ -1,45 +1,48 @@
-import errors from 'ui/errors';
 import _ from 'lodash';
+
+import errors from 'ui/errors';
 import 'ui/es';
 import 'ui/promises';
 import 'ui/safe_confirm';
 import 'ui/index_patterns';
-import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
-import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source';
-import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search';
-import CourierRequestQueueProvider from 'ui/courier/_request_queue';
-import CourierErrorHandlersProvider from 'ui/courier/_error_handlers';
-import CourierFetchFetchProvider from 'ui/courier/fetch/fetch';
-import CourierLooperDocProvider from 'ui/courier/looper/doc';
-import CourierLooperSearchProvider from 'ui/courier/looper/search';
-import CourierDataSourceRootSearchSourceProvider from 'ui/courier/data_source/_root_search_source';
-import CourierSavedObjectSavedObjectProvider from 'ui/courier/saved_object/saved_object';
-import CourierRedirectWhenMissingProvider from 'ui/courier/_redirect_when_missing';
 import uiModules from 'ui/modules';
+import Notifier from 'ui/notify/notifier';
+
+import DocSourceProvider from './data_source/doc_source';
+import SearchSourceProvider from './data_source/search_source';
+import SearchStrategyProvider from './fetch/strategy/search';
+import RequestQueueProvider from './_request_queue';
+import ErrorHandlersProvider from './_error_handlers';
+import FetchProvider from './fetch';
+import DocLooperProvider from './looper/doc';
+import SearchLooperProvider from './looper/search';
+import RootSearchSourceProvider from './data_source/_root_search_source';
+import SavedObjectProvider from './saved_object';
+import RedirectWhenMissingProvider from './_redirect_when_missing';
 
 
 uiModules.get('kibana/courier')
-.service('courier', function ($rootScope, Private, Promise, indexPatterns, Notifier) {
+.service('courier', function ($rootScope, Private, Promise, indexPatterns) {
   function Courier() {
     var self = this;
 
-    var DocSource = Private(CourierDataSourceDocSourceProvider);
-    var SearchSource = Private(CourierDataSourceSearchSourceProvider);
-    var searchStrategy = Private(CourierFetchStrategySearchProvider);
+    var DocSource = Private(DocSourceProvider);
+    var SearchSource = Private(SearchSourceProvider);
+    var searchStrategy = Private(SearchStrategyProvider);
 
-    var requestQueue = Private(CourierRequestQueueProvider);
-    var errorHandlers = Private(CourierErrorHandlersProvider);
+    var requestQueue = Private(RequestQueueProvider);
+    var errorHandlers = Private(ErrorHandlersProvider);
 
-    var fetch = Private(CourierFetchFetchProvider);
-    var docLooper = self.docLooper = Private(CourierLooperDocProvider);
-    var searchLooper = self.searchLooper = Private(CourierLooperSearchProvider);
+    var fetch = Private(FetchProvider);
+    var docLooper = self.docLooper = Private(DocLooperProvider);
+    var searchLooper = self.searchLooper = Private(SearchLooperProvider);
 
     // expose some internal modules
-    self.setRootSearchSource = Private(CourierDataSourceRootSearchSourceProvider).set;
+    self.setRootSearchSource = Private(RootSearchSourceProvider).set;
 
-    self.SavedObject = Private(CourierSavedObjectSavedObjectProvider);
+    self.SavedObject = Private(SavedObjectProvider);
     self.indexPatterns = indexPatterns;
-    self.redirectWhenMissing = Private(CourierRedirectWhenMissingProvider);
+    self.redirectWhenMissing = Private(RedirectWhenMissingProvider);
 
     self.DocSource = DocSource;
     self.SearchSource = SearchSource;

src/ui/public/courier/data_source/__tests__/decorate_query.js

@@ -2,7 +2,7 @@ import moment from 'moment';
 import expect from 'expect.js';
 import ngMock from 'ngMock';
 import _ from 'lodash';
-import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
+import DecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
 
 describe('Query decorator', function () {
 
@@ -29,7 +29,7 @@ describe('Query decorator', function () {
 
   beforeEach(ngMock.inject(function (Private, $injector, _config_) {
     config = _config_;
-    fn = Private(CourierDataSourceDecorateQueryProvider);
+    fn = Private(DecorateQueryProvider);
   }));
 
   it('should be a function', function () {

src/ui/public/courier/data_source/__tests__/normalize_sort_request.js

@@ -1,19 +1,17 @@
 import 'ui/private';
 import ngMock from 'ngMock';
 import expect from 'expect.js';
-import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request';
+import NormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request';
 import FixturesStubbedLogstashIndexPatternProvider from 'fixtures/stubbed_logstash_index_pattern';
 
 describe('SearchSource#normalizeSortRequest', function () {
-
-
   var normalizeSortRequest;
   var indexPattern;
   var normalizedSort;
 
   beforeEach(ngMock.module('kibana'));
   beforeEach(ngMock.inject(function (Private) {
-    normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider);
+    normalizeSortRequest = Private(NormalizeSortRequestProvider);
     indexPattern = Private(FixturesStubbedLogstashIndexPatternProvider);
 
     normalizedSort = [{

src/ui/public/courier/data_source/_abstract.js

@@ -1,14 +1,17 @@
 import _ from 'lodash';
 import angular from 'angular';
-import CourierRequestQueueProvider from 'ui/courier/_request_queue';
-import CourierErrorHandlersProvider from 'ui/courier/_error_handlers';
-import CourierFetchFetchProvider from 'ui/courier/fetch/fetch';
-import CourierDataSourceDecorateQueryProvider from 'ui/courier/data_source/_decorate_query';
+
+import 'ui/promises';
+
+import RequestQueueProvider from '../_request_queue';
+import ErrorHandlersProvider from '../_error_handlers';
+import FetchProvider from '../fetch';
+import DecorateQueryProvider from './_decorate_query';
 
 export default function SourceAbstractFactory(Private, Promise, PromiseEmitter) {
-  var requestQueue = Private(CourierRequestQueueProvider);
-  var errorHandlers = Private(CourierErrorHandlersProvider);
-  var courierFetch = Private(CourierFetchFetchProvider);
+  var requestQueue = Private(RequestQueueProvider);
+  var errorHandlers = Private(ErrorHandlersProvider);
+  var courierFetch = Private(FetchProvider);
 
   function SourceAbstract(initialState, strategy) {
     var self = this;
@@ -268,7 +271,7 @@ export default function SourceAbstractFactory(Private, Promise, PromiseEmitter)
     .then(function () {
       if (type === 'search') {
         // This is down here to prevent the circular dependency
-        var decorateQuery = Private(CourierDataSourceDecorateQueryProvider);
+        var decorateQuery = Private(DecorateQueryProvider);
 
         flatState.body = flatState.body || {};
 

src/ui/public/courier/data_source/_decorate_query.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+
 export default function DecorateQuery(config) {
   /**
    * Decorate queries with default parameters

src/ui/public/courier/data_source/_doc_send_to_es.js

@@ -1,11 +1,12 @@
 import _ from 'lodash';
+
 import errors from 'ui/errors';
-import CourierRequestQueueProvider from 'ui/courier/_request_queue';
-import CourierFetchFetchProvider from 'ui/courier/fetch/fetch';
+import RequestQueueProvider from 'ui/courier/_request_queue';
+import FetchProvider from 'ui/courier/fetch/fetch';
 
 export default function (Promise, Private, es) {
-  var requestQueue = Private(CourierRequestQueueProvider);
-  var courierFetch = Private(CourierFetchFetchProvider);
+  var requestQueue = Private(RequestQueueProvider);
+  var courierFetch = Private(FetchProvider);
 
   /**
    * Backend for doUpdate and doIndex

src/ui/public/courier/data_source/_normalize_sort_request.js

@@ -1,4 +1,5 @@
 import _ from 'lodash';
+
 export default function normalizeSortRequest(config) {
   var defaultSortOptions = config.get('sort:options');
 
@@ -48,4 +49,3 @@ export default function normalizeSortRequest(config) {
     return normalized;
   }
 };
-

src/ui/public/courier/data_source/_root_search_source.js

@@ -1,7 +1,7 @@
-import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source';
+import SearchSourceProvider from 'ui/courier/data_source/search_source';
 
 export default function RootSearchSource(Private, $rootScope, timefilter, Notifier) {
-  var SearchSource = Private(CourierDataSourceSearchSourceProvider);
+  var SearchSource = Private(SearchSourceProvider);
 
   var notify = new Notifier({ location: 'Root Search Source' });
 

src/ui/public/courier/data_source/doc_source.js

@@ -1,16 +1,18 @@
 import _ from 'lodash';
-import CourierDataSourceDocSendToEsProvider from 'ui/courier/data_source/_doc_send_to_es';
-import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract';
-import CourierFetchRequestDocProvider from 'ui/courier/fetch/request/doc';
-import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc';
+
 import 'ui/es';
 import 'ui/storage';
 
+import DocSendToEsProvider from './_doc_send_to_es';
+import AbstractDataSourceProvider from './_abstract';
+import DocRequestProvider from '../fetch/request/doc';
+import DocStrategyProvider from '../fetch/strategy/doc';
+
 export default function DocSourceFactory(Private, Promise, es, sessionStorage) {
-  var sendToEs = Private(CourierDataSourceDocSendToEsProvider);
-  var SourceAbstract = Private(CourierDataSourceAbstractProvider);
-  var DocRequest = Private(CourierFetchRequestDocProvider);
-  var docStrategy = Private(CourierFetchStrategyDocProvider);
+  var sendToEs = Private(DocSendToEsProvider);
+  var SourceAbstract = Private(AbstractDataSourceProvider);
+  var DocRequest = Private(DocRequestProvider);
+  var docStrategy = Private(DocStrategyProvider);
 
   _.class(DocSource).inherits(SourceAbstract);
   function DocSource(initialState) {

src/ui/public/courier/data_source/search_source.js

@@ -1,16 +1,18 @@
 import _ from 'lodash';
-import rootSearchSource from 'ui/courier/data_source/_root_search_source';
-import CourierDataSourceAbstractProvider from 'ui/courier/data_source/_abstract';
-import CourierFetchRequestSearchProvider from 'ui/courier/fetch/request/search';
-import CourierFetchRequestSegmentedProvider from 'ui/courier/fetch/request/segmented';
-import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search';
-import CourierDataSourceNormalizeSortRequestProvider from 'ui/courier/data_source/_normalize_sort_request';
+
+import NormalizeSortRequestProvider from './_normalize_sort_request';
+import rootSearchSource from './_root_search_source';
+import AbstractDataSourceProvider from './_abstract';
+import SearchRequestProvider from '../fetch/request/search';
+import SegmentedRequestProvider from '../fetch/request/segmented';
+import SearchStrategyProvider from '../fetch/strategy/search';
+
 export default function SearchSourceFactory(Promise, Private) {
-  var SourceAbstract = Private(CourierDataSourceAbstractProvider);
-  var SearchRequest = Private(CourierFetchRequestSearchProvider);
-  var SegmentedRequest = Private(CourierFetchRequestSegmentedProvider);
-  var searchStrategy = Private(CourierFetchStrategySearchProvider);
-  var normalizeSortRequest = Private(CourierDataSourceNormalizeSortRequestProvider);
+  var SourceAbstract = Private(AbstractDataSourceProvider);
+  var SearchRequest = Private(SearchRequestProvider);
+  var SegmentedRequest = Private(SegmentedRequestProvider);
+  var searchStrategy = Private(SearchStrategyProvider);
+  var normalizeSortRequest = Private(NormalizeSortRequestProvider);
 
   _.class(SearchSource).inherits(SourceAbstract);
   function SearchSource(initialState) {

src/ui/public/courier/looper/_looper.js

@@ -1,5 +1,9 @@
 import _ from 'lodash';
-export default function LooperFactory($timeout, Notifier, Promise) {
+
+import 'ui/promises';
+import Notifier from 'ui/notify/notifier';
+
+export default function LooperFactory($timeout, Promise) {
   var notify = new Notifier();
 
   function Looper(ms, fn) {

src/ui/public/courier/looper/doc.js

@@ -1,18 +1,18 @@
-import CourierFetchFetchProvider from 'ui/courier/fetch/fetch';
-import CourierLooperLooperProvider from 'ui/courier/looper/_looper';
-import CourierFetchStrategyDocProvider from 'ui/courier/fetch/strategy/doc';
+import FetchProvider from '../fetch';
+import LooperProvider from './_looper';
+import DocStrategyProvider from '../fetch/strategy/doc';
 
 export default function DocLooperService(Private) {
-  var fetch = Private(CourierFetchFetchProvider);
-  var Looper = Private(CourierLooperLooperProvider);
-  var docStrategy = Private(CourierFetchStrategyDocProvider);
+  var fetch = Private(FetchProvider);
+  var Looper = Private(LooperProvider);
+  var DocStrategy = Private(DocStrategyProvider);
 
   /**
    * The Looper which will manage the doc fetch interval
    * @type {Looper}
    */
   var docLooper = new Looper(1500, function () {
-    fetch.fetchQueued(docStrategy);
+    fetch.fetchQueued(DocStrategy);
   });
 
   return docLooper;

src/ui/public/courier/looper/search.js

@@ -1,14 +1,14 @@
-import CourierFetchFetchProvider from 'ui/courier/fetch/fetch';
-import CourierFetchStrategySearchProvider from 'ui/courier/fetch/strategy/search';
-import CourierRequestQueueProvider from 'ui/courier/_request_queue';
-import CourierLooperLooperProvider from 'ui/courier/looper/_looper';
+import FetchProvider from '../fetch';
+import SearchStrategyProvider from '../fetch/strategy/search';
+import RequestQueueProvider from '../_request_queue';
+import LooperProvider from './_looper';
 
 export default function SearchLooperService(Private, Promise, Notifier, $rootScope) {
-  var fetch = Private(CourierFetchFetchProvider);
-  var searchStrategy = Private(CourierFetchStrategySearchProvider);
-  var requestQueue = Private(CourierRequestQueueProvider);
+  var fetch = Private(FetchProvider);
+  var searchStrategy = Private(SearchStrategyProvider);
+  var requestQueue = Private(RequestQueueProvider);
 
-  var Looper = Private(CourierLooperLooperProvider);
+  var Looper = Private(LooperProvider);
   var notif = new Notifier({ location: 'Search Looper' });
 
   /**

src/ui/public/courier/saved_object/saved_object.js

@@ -1,15 +1,18 @@
 import angular from 'angular';
-import errors from 'ui/errors';
 import _ from 'lodash';
+
+import errors from 'ui/errors';
 import slugifyId from 'ui/utils/slugify_id';
-import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
-import CourierDataSourceSearchSourceProvider from 'ui/courier/data_source/search_source';
-import UtilsMappingSetupProvider from 'ui/utils/mapping_setup';
+import MappingSetupProvider from 'ui/utils/mapping_setup';
+
+import DocSourceProvider from '../data_source/doc_source';
+import SearchSourceProvider from '../data_source/search_source';
+
 export default function SavedObjectFactory(es, kbnIndex, Promise, Private, Notifier, safeConfirm, indexPatterns) {
 
-  var DocSource = Private(CourierDataSourceDocSourceProvider);
-  var SearchSource = Private(CourierDataSourceSearchSourceProvider);
-  var mappingSetup = Private(UtilsMappingSetupProvider);
+  var DocSource = Private(DocSourceProvider);
+  var SearchSource = Private(SearchSourceProvider);
+  var mappingSetup = Private(MappingSetupProvider);
 
   function SavedObject(config) {
     if (!_.isObject(config)) config = {};

src/ui/public/index_patterns/__tests__/_index_pattern.js

@@ -7,7 +7,7 @@ import errors from 'ui/errors';
 import IndexedArray from 'ui/IndexedArray';
 import FixturesLogstashFieldsProvider from 'fixtures/logstash_fields';
 import FixturesStubbedDocSourceResponseProvider from 'fixtures/stubbed_doc_source_response';
-import CourierDataSourceDocSourceProvider from 'ui/courier/data_source/doc_source';
+import DocSourceProvider from 'ui/courier/data_source/doc_source';
 import IndexPatternsMapperProvider from 'ui/index_patterns/_mapper';
 import UtilsMappingSetupProvider from 'ui/utils/mapping_setup';
 import IndexPatternsIntervalsProvider from 'ui/index_patterns/_intervals';
@@ -33,7 +33,7 @@ describe('index pattern', function () {
     mockLogstashFields = Private(FixturesLogstashFieldsProvider);
     docSourceResponse = Private(FixturesStubbedDocSourceResponseProvider);
 
-    DocSource = Private(CourierDataSourceDocSourceProvider);
+    DocSource = Private(DocSourceProvider);
     sinon.stub(DocSource.prototype, 'doIndex');
     sinon.stub(DocSource.prototype, 'fetch');