From d9a1b9d530c9f62b37447e3780c074cbedaa5dea Mon Sep 17 00:00:00 2001 From: slhale Date: Tue, 4 Aug 2015 13:03:34 -0700 Subject: [PATCH] [Search] Moving files Moved the elasticsearch provider to platform/persistence/elastic. Then moved the search aggregator and the generic provider into a services folder within the search folder. --- platform/persistence/elastic/bundle.json | 6 ++++++ .../elastic/src/ElasticSearchProvider.js} | 6 +++--- .../elastic/test/ElasticSearchProviderSpec.js} | 4 ++-- platform/persistence/elastic/test/suite.json | 3 ++- platform/search/bundle.json | 12 +++--------- .../{providers => services}/GenericSearchProvider.js | 0 .../src/{workers => services}/GenericSearchWorker.js | 0 .../search/src/{ => services}/SearchAggregator.js | 0 .../GenericSearchProviderSpec.js | 0 .../{workers => services}/GenericSearchWorkerSpec.js | 0 .../test/{ => services}/SearchAggregatorSpec.js | 0 11 files changed, 16 insertions(+), 15 deletions(-) rename platform/{search/src/providers/ElasticsearchSearchProvider.js => persistence/elastic/src/ElasticSearchProvider.js} (97%) rename platform/{search/test/providers/ElasticsearchSearchProviderSpec.js => persistence/elastic/test/ElasticSearchProviderSpec.js} (97%) rename platform/search/src/{providers => services}/GenericSearchProvider.js (100%) rename platform/search/src/{workers => services}/GenericSearchWorker.js (100%) rename platform/search/src/{ => services}/SearchAggregator.js (100%) rename platform/search/test/{providers => services}/GenericSearchProviderSpec.js (100%) rename platform/search/test/{workers => services}/GenericSearchWorkerSpec.js (100%) rename platform/search/test/{ => services}/SearchAggregatorSpec.js (100%) diff --git a/platform/persistence/elastic/bundle.json b/platform/persistence/elastic/bundle.json index e7dfa1ab9d..5b47fc8d21 100644 --- a/platform/persistence/elastic/bundle.json +++ b/platform/persistence/elastic/bundle.json @@ -8,6 +8,12 @@ "type": "provider", "implementation": "ElasticPersistenceProvider.js", "depends": [ "$http", "$q", "PERSISTENCE_SPACE", "ELASTIC_ROOT", "ELASTIC_PATH" ] + }, + { + "provides": "searchService", + "type": "provider", + "implementation": "ElasticSearchProvider.js", + "depends": [ "$http", "objectService", "ELASTIC_ROOT" ] } ], "constants": [ diff --git a/platform/search/src/providers/ElasticsearchSearchProvider.js b/platform/persistence/elastic/src/ElasticSearchProvider.js similarity index 97% rename from platform/search/src/providers/ElasticsearchSearchProvider.js rename to platform/persistence/elastic/src/ElasticSearchProvider.js index 9ab415c671..c2bf88b991 100644 --- a/platform/search/src/providers/ElasticsearchSearchProvider.js +++ b/platform/persistence/elastic/src/ElasticSearchProvider.js @@ -22,7 +22,7 @@ /*global define*/ /** - * Module defining ElasticsearchSearchProvider. Created by shale on 07/16/2015. + * Module defining ElasticSearchProvider. Created by shale on 07/16/2015. */ define( [], @@ -46,7 +46,7 @@ define( * @param ROOT the constant ELASTIC_ROOT which allows us to * interact with ElasticSearch. */ - function ElasticsearchSearchProvider($http, objectService, ROOT) { + function ElasticSearchProvider($http, objectService, ROOT) { // Add the fuzziness operator to the search term function addFuzziness(searchTerm, editDistance) { @@ -207,6 +207,6 @@ define( } - return ElasticsearchSearchProvider; + return ElasticSearchProvider; } ); \ No newline at end of file diff --git a/platform/search/test/providers/ElasticsearchSearchProviderSpec.js b/platform/persistence/elastic/test/ElasticSearchProviderSpec.js similarity index 97% rename from platform/search/test/providers/ElasticsearchSearchProviderSpec.js rename to platform/persistence/elastic/test/ElasticSearchProviderSpec.js index 8ba25ed2be..f9135d2a23 100644 --- a/platform/search/test/providers/ElasticsearchSearchProviderSpec.js +++ b/platform/persistence/elastic/test/ElasticSearchProviderSpec.js @@ -25,8 +25,8 @@ * SearchSpec. Created by shale on 07/31/2015. */ define( - ["../../src/providers/ElasticsearchSearchProvider"], - function (ElasticsearchSearchProvider) { + ["../../src/providers/ElasticSearchProvider"], + function (ElasticSearchProvider) { "use strict"; // JSLint doesn't like underscore-prefixed properties, diff --git a/platform/persistence/elastic/test/suite.json b/platform/persistence/elastic/test/suite.json index cc8dc2ce0c..85b407eb73 100644 --- a/platform/persistence/elastic/test/suite.json +++ b/platform/persistence/elastic/test/suite.json @@ -1,4 +1,5 @@ [ "ElasticIndicator", - "ElasticPersistenceProvider" + "ElasticPersistenceProvider", + "ElasticSearchProvider" ] diff --git a/platform/search/bundle.json b/platform/search/bundle.json index 56c2b24f5b..bd6fe46225 100644 --- a/platform/search/bundle.json +++ b/platform/search/bundle.json @@ -31,26 +31,20 @@ { "provides": "searchService", "type": "provider", - "implementation": "providers/GenericSearchProvider.js", + "implementation": "services/GenericSearchProvider.js", "depends": [ "$q", "objectService", "workerService", "roots[]" ] }, - { - "provides": "searchService", - "type": "provider", - "implementation": "providers/ElasticsearchSearchProvider.js", - "depends": [ "$http", "objectService", "ELASTIC_ROOT" ] - }, { "provides": "searchService", "type": "aggregator", - "implementation": "SearchAggregator.js", + "implementation": "services/SearchAggregator.js", "depends": [ "$q" ] } ], "workers": [ { "key": "genericSearchWorker", - "scriptUrl": "workers/GenericSearchWorker.js", + "scriptUrl": "services/GenericSearchWorker.js", "depends": [ "objectService" ] } ] diff --git a/platform/search/src/providers/GenericSearchProvider.js b/platform/search/src/services/GenericSearchProvider.js similarity index 100% rename from platform/search/src/providers/GenericSearchProvider.js rename to platform/search/src/services/GenericSearchProvider.js diff --git a/platform/search/src/workers/GenericSearchWorker.js b/platform/search/src/services/GenericSearchWorker.js similarity index 100% rename from platform/search/src/workers/GenericSearchWorker.js rename to platform/search/src/services/GenericSearchWorker.js diff --git a/platform/search/src/SearchAggregator.js b/platform/search/src/services/SearchAggregator.js similarity index 100% rename from platform/search/src/SearchAggregator.js rename to platform/search/src/services/SearchAggregator.js diff --git a/platform/search/test/providers/GenericSearchProviderSpec.js b/platform/search/test/services/GenericSearchProviderSpec.js similarity index 100% rename from platform/search/test/providers/GenericSearchProviderSpec.js rename to platform/search/test/services/GenericSearchProviderSpec.js diff --git a/platform/search/test/workers/GenericSearchWorkerSpec.js b/platform/search/test/services/GenericSearchWorkerSpec.js similarity index 100% rename from platform/search/test/workers/GenericSearchWorkerSpec.js rename to platform/search/test/services/GenericSearchWorkerSpec.js diff --git a/platform/search/test/SearchAggregatorSpec.js b/platform/search/test/services/SearchAggregatorSpec.js similarity index 100% rename from platform/search/test/SearchAggregatorSpec.js rename to platform/search/test/services/SearchAggregatorSpec.js