From ef5aaf418a36489c07be5282c3caa3724aea2f9d Mon Sep 17 00:00:00 2001 From: Mikhail Trofimov Date: Tue, 30 Jun 2026 15:18:13 +0300 Subject: [PATCH] LP: Rename PipelinePackageFabric to NpPipelinePackageFabric --- .../credit_tracker/facade/SignalFacade.java | 12 +++---- .../mode/common/StartupRestoreService.java | 12 +++---- .../mode/common/UpdatingFidAndPdService.java | 12 +++---- .../migration/CTMigrationApplication.java | 4 +-- ...bric.java => NpPipelinePackageFabric.java} | 34 +++++++++---------- 5 files changed, 37 insertions(+), 37 deletions(-) rename src/main/java/ru/nbch/credit_tracker/service/task/{PipelinePackageFabric.java => NpPipelinePackageFabric.java} (74%) diff --git a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java index d80b551..b413f1e 100644 --- a/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java +++ b/src/main/java/ru/nbch/credit_tracker/facade/SignalFacade.java @@ -30,7 +30,7 @@ import ru.nbch.credit_tracker.model.ValidationResult; import ru.nbch.credit_tracker.service.UserPackageService; import ru.nbch.credit_tracker.service.scoring.AuthorizationService; import ru.nbch.credit_tracker.service.signal.SignalRestService; -import ru.nbch.credit_tracker.service.task.PipelinePackageFabric; +import ru.nbch.credit_tracker.service.task.NpPipelinePackageFabric; import ru.nbch.credit_tracker.service.task.PipelinePackageOrchestrator; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.task.impl.PipelineMode; @@ -64,7 +64,7 @@ public class SignalFacade { private final CreditTrackerSettings config; private final UserPackageService userPackageService; private final AuthorizationService authorizationService; - private final PipelinePackageFabric pipelinePackageManager; + private final NpPipelinePackageFabric npPipelinePackageFabric; private final SignalRestService signalRestService; private final Saver saver; private final PipelinePackageOrchestrator pipelineOrchestrator; @@ -74,14 +74,14 @@ public class SignalFacade { CreditTrackerSettings config, UserPackageService userPackageService, AuthorizationService authorizationService, - PipelinePackageFabric pipelinePackageManager, + NpPipelinePackageFabric npPipelinePackageManager, SignalRestService signalRestService, Saver saver, PipelinePackageOrchestrator pipelineOrchestrator) { this.monitoringRequestValidator = monitoringRequestValidator; this.config = config; this.userPackageService = userPackageService; this.authorizationService = authorizationService; - this.pipelinePackageManager = pipelinePackageManager; + this.npPipelinePackageFabric = npPipelinePackageManager; this.signalRestService = signalRestService; this.saver = saver; this.pipelineOrchestrator = pipelineOrchestrator; @@ -153,13 +153,13 @@ public class SignalFacade { log.info("Package registered. PackageId {}. Status: {}", packageId, Status.ACCEPTED.name()); if (subjectType == 1) { - Pipeline pipeline = pipelinePackageManager.build(new SetupParam(packageId, parsedFilePath, PipelineMode.DEFAULT)); + Pipeline pipeline = npPipelinePackageFabric.build(new SetupParam(packageId, parsedFilePath, PipelineMode.DEFAULT)); pipelineOrchestrator.startOrDelay(() -> { saver.readAndSaveNpPackage(packageId, parsedFilePath); CtFileUtils.deleteQuietly(parsedFilePath); }, pipeline, packageId); } else { - Pipeline pipeline = pipelinePackageManager.build(new SetupParam(packageId, parsedFilePath, PipelineMode.DEFAULT)); + Pipeline pipeline = npPipelinePackageFabric.build(new SetupParam(packageId, parsedFilePath, PipelineMode.DEFAULT)); pipelineOrchestrator.startOrDelay(() -> { saver.readAndSaveLpPackage(packageId, parsedFilePath); CtFileUtils.deleteQuietly(parsedFilePath); diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/common/StartupRestoreService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/common/StartupRestoreService.java index 7a51ecd..009ba14 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/common/StartupRestoreService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/common/StartupRestoreService.java @@ -9,7 +9,7 @@ import ru.nbch.credit_tracker.enums.Status; import ru.nbch.credit_tracker.mapper.signal.PackagesRecordsMapper; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.MonitoringErrorProcesingService; -import ru.nbch.credit_tracker.service.task.PipelinePackageFabric; +import ru.nbch.credit_tracker.service.task.NpPipelinePackageFabric; import ru.nbch.credit_tracker.service.task.PipelinePackageOrchestrator; import ru.nbch.credit_tracker.service.task.SetupParam; import ru.nbch.credit_tracker.service.task.impl.PipelineMode; @@ -32,7 +32,7 @@ public class StartupRestoreService { private final UserPackageMapper userPackageMapper; private final PackagesRecordsMapper phoneFidMapMapper; - private final PipelinePackageFabric pipelinePackageManager; + private final NpPipelinePackageFabric npPipelinePackageManager; private final PipelinePackageOrchestrator pipelineOrchestrator; private final CreditTrackerSettings creditTrackerSettings; private final MonitoringErrorProcesingService monitoringErrorProcesingService; @@ -40,14 +40,14 @@ public class StartupRestoreService { public StartupRestoreService(UserPackageMapper userPackageMapper, PackagesRecordsMapper phoneFidMapMapper, - PipelinePackageFabric pipelinePackageManager, + NpPipelinePackageFabric npPipelinePackageManager, PipelinePackageOrchestrator pipelineOrchestrator, CreditTrackerSettings creditTrackerSettings, MonitoringErrorProcesingService monitoringErrorProcesingService, Saver saver) { this.userPackageMapper = userPackageMapper; this.phoneFidMapMapper = phoneFidMapMapper; - this.pipelinePackageManager = pipelinePackageManager; + this.npPipelinePackageManager = npPipelinePackageManager; this.pipelineOrchestrator = pipelineOrchestrator; this.creditTrackerSettings = creditTrackerSettings; this.monitoringErrorProcesingService = monitoringErrorProcesingService; @@ -76,7 +76,7 @@ public class StartupRestoreService { log.trace("Deleted {} rows", count); Path xmlReqPath = CTUtil.workingPathToReqByPackage(creditTrackerSettings.getLoadDir(), userPackage); log.debug("Try to read and build pipeline for packageId {}; req xml path: {}", userPackage.getId(), xmlReqPath); - Pipeline pipeline = pipelinePackageManager.build(new SetupParam(userPackage.getId(), xmlReqPath, PipelineMode.DEFAULT)); + Pipeline pipeline = npPipelinePackageManager.build(new SetupParam(userPackage.getId(), xmlReqPath, PipelineMode.DEFAULT)); pipelineOrchestrator.startOrDelay( () -> saver.readAndSaveNpPackage(userPackage.getId(), xmlReqPath), pipeline, userPackage.getId() @@ -93,7 +93,7 @@ public class StartupRestoreService { for (UserPackage userPackage : packages) { try { log.debug("Build pipeline for packageId {}", userPackage.getId()); - Pipeline pipeline = pipelinePackageManager.build(new SetupParam(userPackage.getId(), null, PipelineMode.DEFAULT)); + Pipeline pipeline = npPipelinePackageManager.build(new SetupParam(userPackage.getId(), null, PipelineMode.DEFAULT)); pipelineOrchestrator.startOrDelay(pipeline, userPackage.getId()); } catch (Exception e) { log.error("Error build restore pipeline for packageId {}: {}", userPackage.getId(), ExceptionUtils.getStackTrace(e)); diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/common/UpdatingFidAndPdService.java b/src/main/java/ru/nbch/credit_tracker/service/mode/common/UpdatingFidAndPdService.java index c456bc0..97d88d2 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/common/UpdatingFidAndPdService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/common/UpdatingFidAndPdService.java @@ -8,7 +8,7 @@ import ru.nbch.credit_tracker.config.settings.CreditTrackerSettings; import ru.nbch.credit_tracker.entities.app.UserPackage; import ru.nbch.credit_tracker.mapper.signal.UserPackageMapper; import ru.nbch.credit_tracker.service.signal.PhonesMapService; -import ru.nbch.credit_tracker.service.task.PipelinePackageFabric; +import ru.nbch.credit_tracker.service.task.NpPipelinePackageFabric; import ru.nbch.credit_tracker.service.task.PipelinePackageOrchestrator; import ru.nbch.credit_tracker.service.task.PipelineRecalcPDOrchestrator; import ru.nbch.credit_tracker.service.task.SetupParam; @@ -22,19 +22,19 @@ import java.util.concurrent.CompletableFuture; @Service @EnableScheduling public class UpdatingFidAndPdService { - private final PipelinePackageFabric pipelinePackageManager; + private final NpPipelinePackageFabric npPipelinePackageFabric; private final PipelineRecalcPDOrchestrator pipelineRecalcPDOrchestrator; private final PipelinePackageOrchestrator pipelinePackageOrchestrator; private final UserPackageMapper userPackageMapper; private final PhonesMapService phonesMapService; public UpdatingFidAndPdService(CreditTrackerSettings config, - PipelinePackageFabric pipelinePackageManager, + NpPipelinePackageFabric npPipelinePackageFabric, PipelineRecalcPDOrchestrator pipelineRecalcPDOrchestrator, PipelinePackageOrchestrator pipelinePackageOrchestrator, UserPackageMapper userPackageMapper, PhonesMapService phonesMapService) { - this.pipelinePackageManager = pipelinePackageManager; + this.npPipelinePackageFabric = npPipelinePackageFabric; this.pipelineRecalcPDOrchestrator = pipelineRecalcPDOrchestrator; this.pipelinePackageOrchestrator = pipelinePackageOrchestrator; this.userPackageMapper = userPackageMapper; @@ -51,7 +51,7 @@ public class UpdatingFidAndPdService { phonesMapService.deleteUnusedPhones(); log.info("Start updating fids and PD"); try { - Pipeline pipeline = pipelinePackageManager.buildRecalculationPD(new SetupParam(null, null, PipelineMode.RECALC_PERSONAL_DATA)); + Pipeline pipeline = npPipelinePackageFabric.buildRecalculationPD(new SetupParam(null, null, PipelineMode.RECALC_PERSONAL_DATA)); CompletableFuture future = pipelineRecalcPDOrchestrator.startOrReject(pipeline); future.whenComplete((o, throwable) -> { try { @@ -65,7 +65,7 @@ public class UpdatingFidAndPdService { Long packageId = userPackage.getId(); SetupParam setupParam = new SetupParam(packageId, null, PipelineMode.RESEND); try { - Pipeline makeXmlByCache = pipelinePackageManager.build(setupParam); + Pipeline makeXmlByCache = npPipelinePackageFabric.build(setupParam); pipelinePackageOrchestrator.startOrDelay(makeXmlByCache, packageId); } catch (Exception e) { log.error("Failed to build pipeline", e); diff --git a/src/main/java/ru/nbch/credit_tracker/service/mode/migration/CTMigrationApplication.java b/src/main/java/ru/nbch/credit_tracker/service/mode/migration/CTMigrationApplication.java index 4fad535..5611300 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/mode/migration/CTMigrationApplication.java +++ b/src/main/java/ru/nbch/credit_tracker/service/mode/migration/CTMigrationApplication.java @@ -21,7 +21,7 @@ import ru.nbch.credit_tracker.service.mode.monitoring.CTMonitoringApplication; import ru.nbch.credit_tracker.service.mode.monitoring.MonitoringService; import ru.nbch.credit_tracker.service.scoring.AuthorizationService; import ru.nbch.credit_tracker.service.signal.SignalRestService; -import ru.nbch.credit_tracker.service.task.PipelinePackageFabric; +import ru.nbch.credit_tracker.service.task.NpPipelinePackageFabric; import ru.nbch.credit_tracker.service.task.PipelinePackageOrchestrator; import ru.nbch.credit_tracker.service.task.impl.FlagsEnricher; import ru.nbch.credit_tracker.service.task.impl.Saver; @@ -35,7 +35,7 @@ import ru.nbch.credit_tracker.service.task.impl.Saver; classes = {CTMonitoringApplication.class, CTMainApplication.class, ScoringDataSourceConfig.class,StartupRestoreService.class, UpdatingFidAndPdService.class, UpdatingFlagsService.class, MonitoringService.class, AuthorizationService.class, - SignalFacade.class, SignalController.class, FlagsEnricher.class, PipelinePackageFabric.class, + SignalFacade.class, SignalController.class, FlagsEnricher.class, NpPipelinePackageFabric.class, RestConfig.class, SignalRestService.class, MonitoringErrorProcesingService.class, Saver.class, PipelinePackageOrchestrator.class, XmlConfig.class, MonitoringRequestValidator.class } diff --git a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java b/src/main/java/ru/nbch/credit_tracker/service/task/NpPipelinePackageFabric.java similarity index 74% rename from src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java rename to src/main/java/ru/nbch/credit_tracker/service/task/NpPipelinePackageFabric.java index f25f982..3fd766a 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/task/PipelinePackageFabric.java +++ b/src/main/java/ru/nbch/credit_tracker/service/task/NpPipelinePackageFabric.java @@ -19,7 +19,7 @@ import java.util.function.Supplier; @Component @Slf4j -public class PipelinePackageFabric implements InitializingBean { +public class NpPipelinePackageFabric implements InitializingBean { private final StageQueueFactory idEnricherQueueFactory; private final StageQueueFactory idUpdaterQueueFactory; private final StageQueueFactory nameEnricherQueueFactory; @@ -37,22 +37,22 @@ public class PipelinePackageFabric implements InitializingBean { private final CreditTrackerSettings creditTrackerSettings; private final PipelineBackoff pipelineBackoff; - public PipelinePackageFabric(@Qualifier("idEnricherQueueFactory") StageQueueFactory idEnricherQueueFactory, - @Qualifier("idUpdaterQueueFactory") StageQueueFactory idUpdaterQueueFactory, - @Qualifier("nameEnricherQueueFactory") StageQueueFactory nameEnricherQueueFactory, - @Qualifier("nameUpdaterQueueFactory") StageQueueFactory nameUpdaterQueueFactory, - @Qualifier("partFileQueueFactory") StageQueueFactory sendSignalQueueFactory, - @Qualifier("noOpQueueFactory") StageQueueFactory noOpQueueFactory, - FidIdEnricher fidIdEnricherHandler, - FidIdUpdater fidIdUpdater, - FidNameUpdater fidNameUpdater, - FidNameUpdaterMigration fidNameUpdaterMigration, - Supplier> pipelineTerminatorFactory, - Supplier> noOpTerminatorFactory, - Function> pipelineStarterFactory, - FidNameEnricher fidNameEnricher, - CreditTrackerSettings creditTrackerSettings, - PipelineBackoff pipelineBackoff) { + public NpPipelinePackageFabric(@Qualifier("idEnricherQueueFactory") StageQueueFactory idEnricherQueueFactory, + @Qualifier("idUpdaterQueueFactory") StageQueueFactory idUpdaterQueueFactory, + @Qualifier("nameEnricherQueueFactory") StageQueueFactory nameEnricherQueueFactory, + @Qualifier("nameUpdaterQueueFactory") StageQueueFactory nameUpdaterQueueFactory, + @Qualifier("partFileQueueFactory") StageQueueFactory sendSignalQueueFactory, + @Qualifier("noOpQueueFactory") StageQueueFactory noOpQueueFactory, + FidIdEnricher fidIdEnricherHandler, + FidIdUpdater fidIdUpdater, + FidNameUpdater fidNameUpdater, + FidNameUpdaterMigration fidNameUpdaterMigration, + Supplier> pipelineTerminatorFactory, + Supplier> noOpTerminatorFactory, + Function> pipelineStarterFactory, + FidNameEnricher fidNameEnricher, + CreditTrackerSettings creditTrackerSettings, + PipelineBackoff pipelineBackoff) { this.idEnricherQueueFactory = idEnricherQueueFactory; this.idUpdaterQueueFactory = idUpdaterQueueFactory; this.nameEnricherQueueFactory = nameEnricherQueueFactory;