pass constructor to sourceREgistry instead of factory

elastic · Mar 30, 2020 · ea74cc0 · ea74cc0
1 parent 819003a
commit ea74cc0
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 33 deletions.
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/client_file_source/geojson_file_source.js
@@ -130,9 +130,7 @@ const previewGeojsonFile = (onPreviewSource, inspectorAdapters) => {
 };
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new GeojsonFileSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: GeojsonFileSource,
   type: GEOJSON_FILE,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_file_source/ems_file_source.js
@@ -158,9 +158,7 @@ export class EMSFileSource extends AbstractVectorSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new EMSFileSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: EMSFileSource,
   type: EMS_FILE,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/ems_tms_source/ems_tms_source.js
@@ -147,9 +147,7 @@ export class EMSTMSSource extends AbstractTMSSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new EMSTMSSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: EMSTMSSource,
   type: EMS_TMS,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_geo_grid_source/es_geo_grid_source.js
@@ -413,9 +413,7 @@ export class ESGeoGridSource extends AbstractESAggSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new ESGeoGridSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: ESGeoGridSource,
   type: ES_GEO_GRID,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_pew_pew_source/es_pew_pew_source.js
@@ -231,9 +231,7 @@ export class ESPewPewSource extends AbstractESAggSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new ESPewPewSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: ESPewPewSource,
   type: ES_PEW_PEW,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/es_search_source/es_search_source.js
@@ -569,9 +569,7 @@ export class ESSearchSource extends AbstractESSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new ESSearchSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: ESSearchSource,
   type: ES_SEARCH,
 });
 

diff --git a/...acy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js b/...acy/plugins/maps/public/layers/sources/kibana_regionmap_source/kibana_regionmap_source.js
@@ -98,9 +98,7 @@ export class KibanaRegionmapSource extends AbstractVectorSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new KibanaRegionmapSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: KibanaRegionmapSource,
   type: REGIONMAP_FILE,
 });
 

diff --git a/.../legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js b/.../legacy/plugins/maps/public/layers/sources/kibana_tilemap_source/kibana_tilemap_source.js
@@ -85,9 +85,7 @@ export class KibanaTilemapSource extends AbstractTMSSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new KibanaTilemapSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: KibanaTilemapSource,
   type: KIBANA_TILEMAP,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts b/x-pack/legacy/plugins/maps/public/layers/sources/source_registry.ts
@@ -9,7 +9,10 @@ import { AbstractSourceDescriptor } from '../../../common/descriptor_types';
 import { ISource } from './source';
 
 type SourceRegistryEntry = {
-  factory: (sourceDescriptor: AbstractSourceDescriptor, inspectorAdapters: object) => ISource;
+  ConstructorFunction: new (
+    sourceDescriptor: AbstractSourceDescriptor,
+    inspectorAdapters: unknown
+  ) => ISource;
   type: string;
 };
 
@@ -26,10 +29,10 @@ function getSourceByType(sourceType: string): SourceRegistryEntry | undefined {
 export function createSourceInstance(
   sourceDescriptor: AbstractSourceDescriptor,
   inspectorAdapters: object
-) {
+): ISource {
   const source = getSourceByType(sourceDescriptor.type);
   if (!source) {
     throw new Error(`Unrecognized sourceType ${sourceDescriptor.type}`);
   }
-  return source.factory(sourceDescriptor, inspectorAdapters);
+  return new source.ConstructorFunction(sourceDescriptor, inspectorAdapters);
 }
diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/wms_source/wms_source.js
@@ -91,9 +91,7 @@ export class WMSSource extends AbstractTMSSource {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new WMSSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: WMSSource,
   type: WMS,
 });
 

diff --git a/x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.js b/x-pack/legacy/plugins/maps/public/layers/sources/xyz_tms_source.js
@@ -166,9 +166,7 @@ class XYZTMSEditor extends React.Component {
 }
 
 registerSource({
-  factory: (sourceDescriptor, inspectorAdapters) => {
-    return new XYZTMSSource(sourceDescriptor, inspectorAdapters);
-  },
+  ConstructorFunction: XYZTMSSource,
   type: EMS_XYZ,
 });