From 6c4aaa849508e2a1fdf05862737bb3e3d5769e2f Mon Sep 17 00:00:00 2001 From: Johan Haals Date: Tue, 20 Apr 2021 10:56:47 +0200 Subject: [PATCH] use Default instead of Impl Signed-off-by: Johan Haals --- ...l.ts => DefaultCatalogProcessingEngine.ts} | 2 +- ...> DefaultCatalogProcessingOrchestrator.ts} | 2 +- ...onStoreImpl.ts => DefaultLocationStore.ts} | 2 +- ...pl.ts => DefaultProcessingStateManager.ts} | 2 +- ...cationServiceImpl.ts => DefaultService.ts} | 2 +- .../src/next/NextCatalogBuilder.ts | 20 +++++++++---------- plugins/catalog-backend/src/next/Stitcher.ts | 2 +- ...seImpl.ts => DefaultProcessingDatabase.ts} | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) rename plugins/catalog-backend/src/next/{CatalogProcessingEngineImpl.ts => DefaultCatalogProcessingEngine.ts} (97%) rename plugins/catalog-backend/src/next/{CatalogProcessingOrchestratorImpl.ts => DefaultCatalogProcessingOrchestrator.ts} (99%) rename plugins/catalog-backend/src/next/{LocationStoreImpl.ts => DefaultLocationStore.ts} (98%) rename plugins/catalog-backend/src/next/{ProcessingStateManagerImpl.ts => DefaultProcessingStateManager.ts} (96%) rename plugins/catalog-backend/src/next/{LocationServiceImpl.ts => DefaultService.ts} (97%) rename plugins/catalog-backend/src/next/database/{ProcessingDatabaseImpl.ts => DefaultProcessingDatabase.ts} (99%) diff --git a/plugins/catalog-backend/src/next/CatalogProcessingEngineImpl.ts b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts similarity index 97% rename from plugins/catalog-backend/src/next/CatalogProcessingEngineImpl.ts rename to plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts index 41ad2bef8e..934ab3a1cc 100644 --- a/plugins/catalog-backend/src/next/CatalogProcessingEngineImpl.ts +++ b/plugins/catalog-backend/src/next/DefaultCatalogProcessingEngine.ts @@ -27,7 +27,7 @@ import { Logger } from 'winston'; import { stringifyEntityRef } from '@backstage/catalog-model'; import { Stitcher } from './Stitcher'; -export class CatalogProcessingEngineImpl implements CatalogProcessingEngine { +export class DefaultCatalogProcessingEngine implements CatalogProcessingEngine { private subscriptions: Subscription[] = []; private running: boolean = false; diff --git a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts b/plugins/catalog-backend/src/next/DefaultCatalogProcessingOrchestrator.ts similarity index 99% rename from plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts rename to plugins/catalog-backend/src/next/DefaultCatalogProcessingOrchestrator.ts index a8e9b924d0..f97d86a75a 100644 --- a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts +++ b/plugins/catalog-backend/src/next/DefaultCatalogProcessingOrchestrator.ts @@ -82,7 +82,7 @@ function toAbsoluteUrl( } } -export class CatalogProcessingOrchestratorImpl +export class DefaultCatalogProcessingOrchestrator implements CatalogProcessingOrchestrator { constructor( private readonly options: { diff --git a/plugins/catalog-backend/src/next/LocationStoreImpl.ts b/plugins/catalog-backend/src/next/DefaultLocationStore.ts similarity index 98% rename from plugins/catalog-backend/src/next/LocationStoreImpl.ts rename to plugins/catalog-backend/src/next/DefaultLocationStore.ts index f970234f09..b21fe9da02 100644 --- a/plugins/catalog-backend/src/next/LocationStoreImpl.ts +++ b/plugins/catalog-backend/src/next/DefaultLocationStore.ts @@ -26,7 +26,7 @@ export type LocationMessage = | { all: Location[] } | { added: Location[]; removed: Location[] }; -export class LocationStoreImpl implements LocationStore { +export class DefaultLocationStore implements LocationStore { private subscribers = new Set< ZenObservable.SubscriptionObserver >(); diff --git a/plugins/catalog-backend/src/next/ProcessingStateManagerImpl.ts b/plugins/catalog-backend/src/next/DefaultProcessingStateManager.ts similarity index 96% rename from plugins/catalog-backend/src/next/ProcessingStateManagerImpl.ts rename to plugins/catalog-backend/src/next/DefaultProcessingStateManager.ts index 522a7a327c..91090bc139 100644 --- a/plugins/catalog-backend/src/next/ProcessingStateManagerImpl.ts +++ b/plugins/catalog-backend/src/next/DefaultProcessingStateManager.ts @@ -22,7 +22,7 @@ import { ProcessingStateManager, } from './types'; -export class ProcessingStateManagerImpl implements ProcessingStateManager { +export class DefaultProcessingStateManager implements ProcessingStateManager { constructor(private readonly db: ProcessingDatabase) {} async setProcessingItemResult(result: ProcessingItemResult) { diff --git a/plugins/catalog-backend/src/next/LocationServiceImpl.ts b/plugins/catalog-backend/src/next/DefaultService.ts similarity index 97% rename from plugins/catalog-backend/src/next/LocationServiceImpl.ts rename to plugins/catalog-backend/src/next/DefaultService.ts index 4125f96ed1..3935f6e4d0 100644 --- a/plugins/catalog-backend/src/next/LocationServiceImpl.ts +++ b/plugins/catalog-backend/src/next/DefaultService.ts @@ -26,7 +26,7 @@ import { CatalogProcessingOrchestrator, } from './types'; -export class LocationServiceImpl implements LocationService { +export class DefaultLocationService implements LocationService { constructor( private readonly store: LocationStore, private readonly orchestrator: CatalogProcessingOrchestrator, diff --git a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts index b196d63897..c3e0a6bd9c 100644 --- a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts +++ b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts @@ -64,12 +64,12 @@ import { } from '../ingestion/processors/PlaceholderProcessor'; import { defaultEntityDataParser } from '../ingestion/processors/util/parse'; import { LocationAnalyzer } from '../ingestion/types'; -import { CatalogProcessingEngineImpl } from '../next/CatalogProcessingEngineImpl'; -import { CatalogProcessingOrchestratorImpl } from '../next/CatalogProcessingOrchestratorImpl'; -import { ProcessingDatabaseImpl } from '../next/database/ProcessingDatabaseImpl'; +import { DefaultCatalogProcessingEngine } from './DefaultCatalogProcessingEngine'; +import { DefaultCatalogProcessingOrchestrator } from './DefaultCatalogProcessingOrchestrator'; +import { DefaultProcessingDatabase } from './database/DefaultProcessingDatabase'; import { DatabaseLocationProvider } from '../next/DatabaseLocationProvider'; -import { LocationStoreImpl } from '../next/LocationStoreImpl'; -import { ProcessingStateManagerImpl } from '../next/ProcessingStateManagerImpl'; +import { DefaultLocationStore } from './DefaultLocationStore'; +import { DefaultProcessingStateManager } from './DefaultProcessingStateManager'; import { CatalogProcessingEngine } from '../next/types'; import { NextEntitiesCatalog } from './NextEntitiesCatalog'; import { Stitcher } from './Stitcher'; @@ -259,10 +259,10 @@ export class NextCatalogBuilder { }); const db = new CommonDatabase(dbClient, logger); - const processingDatabase = new ProcessingDatabaseImpl(dbClient, logger); - const stateManager = new ProcessingStateManagerImpl(processingDatabase); + const processingDatabase = new DefaultProcessingDatabase(dbClient, logger); + const stateManager = new DefaultProcessingStateManager(processingDatabase); const integrations = ScmIntegrations.fromConfig(config); - const orchestrator = new CatalogProcessingOrchestratorImpl({ + const orchestrator = new DefaultCatalogProcessingOrchestrator({ processors, integrations, logger, @@ -271,10 +271,10 @@ export class NextCatalogBuilder { }); const entitiesCatalog = new NextEntitiesCatalog(dbClient); - const locationStore = new LocationStoreImpl(db); + const locationStore = new DefaultLocationStore(db); const dbLocationProvider = new DatabaseLocationProvider(locationStore); const stitcher = new Stitcher(dbClient, logger); - const processingEngine = new CatalogProcessingEngineImpl( + const processingEngine = new DefaultCatalogProcessingEngine( logger, [dbLocationProvider], // entityproviders stateManager, diff --git a/plugins/catalog-backend/src/next/Stitcher.ts b/plugins/catalog-backend/src/next/Stitcher.ts index fe7a378338..3e5e3ac24b 100644 --- a/plugins/catalog-backend/src/next/Stitcher.ts +++ b/plugins/catalog-backend/src/next/Stitcher.ts @@ -22,7 +22,7 @@ import { DbRefreshStateReferences, DbRefreshStateRow, DbRelationsRow, -} from './database/ProcessingDatabaseImpl'; +} from './database/DefaultProcessingDatabase'; import { Entity, parseEntityRef } from '@backstage/catalog-model'; import { createHash } from 'crypto'; import stableStringify from 'fast-json-stable-stringify'; diff --git a/plugins/catalog-backend/src/next/database/ProcessingDatabaseImpl.ts b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts similarity index 99% rename from plugins/catalog-backend/src/next/database/ProcessingDatabaseImpl.ts rename to plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts index 7e9bf78691..cf2d4e121c 100644 --- a/plugins/catalog-backend/src/next/database/ProcessingDatabaseImpl.ts +++ b/plugins/catalog-backend/src/next/database/DefaultProcessingDatabase.ts @@ -59,7 +59,7 @@ export type DbRefreshStateReferences = { // enough to get the speed benefits. const BATCH_SIZE = 50; -export class ProcessingDatabaseImpl implements ProcessingDatabase { +export class DefaultProcessingDatabase implements ProcessingDatabase { constructor( private readonly database: Knex, private readonly logger: Logger,