From e7417dfcba2ccedbc030675a41c34ad64d30e3a0 Mon Sep 17 00:00:00 2001 From: dgridnev Date: Wed, 5 Jun 2024 12:12:32 +0300 Subject: [PATCH] [WTCH-285] Move components from outdated `we` package to actual `sdk` package --- README.md | 2 +- gradle.properties | 2 +- .../conditional/ConditionalOnJpaMode.kt | 2 +- .../conditional/ConditionalOnTracker.kt | 2 +- .../observer/common/jpa/util/EntityManager.kt | 2 +- .../tx/observer/common/jpa/util/JpaUtils.kt | 2 +- .../observer/common/tx/executor/TxExecutor.kt | 2 +- .../common/tx/executor/TxExecutorImpl.kt | 2 +- .../observer/common/tx/handler/TxHandler.kt | 2 +- .../common/tx/subscriber/TxSubscriber.kt | 2 +- .../common/tx/subscriber/TxSubscriberImpl.kt | 4 +- .../tx/observer/api/block/WeBlockInfo.kt | 2 +- .../tx/observer/api/block/WeRollbackInfo.kt | 2 +- .../api/block/subscriber/BlockSubscriber.kt | 4 +- .../block/subscriber/RollbackSubscriber.kt | 7 +++ .../{we => sdk}/tx/observer/api/exceptions.kt | 2 +- .../tx/observer/api/key/KeyEvent.kt | 4 +- .../tx/observer/api/key/KeyFilter.kt | 4 +- .../api/partition/TxQueuePartitionResolver.kt | 2 +- .../tx/observer/api/privacy/MessageFilter.kt | 4 +- .../tx/observer/api/privacy/PolicyFilter.kt | 2 +- .../api/privacy/PrivateContentResolver.kt | 2 +- .../observer/api/privacy/PrivateDataEvent.kt | 4 +- .../tx/observer/api/tx/TxEnqueuePredicate.kt | 2 +- .../tx/observer/api/tx/TxListener.kt | 10 ++-- .../block/subscriber/RollbackSubscriber.kt | 7 --- .../spring/component/AndTxEnqueuePredicate.kt | 4 +- .../component/CachingTxEnqueuePredicate.kt | 4 +- .../spring/component/HttpApiWeBlockInfo.kt | 4 +- .../component/LoggingBlockSubscriber.kt | 6 +-- .../component/MethodArgumentClassExtractor.kt | 4 +- .../core/spring/component/OffsetProvider.kt | 2 +- .../spring/component/RandomOffsetProvider.kt | 2 +- .../component/TxTypeEnqueuedPredicate.kt | 4 +- .../executor/AppContextPollingTxSubscriber.kt | 12 ++--- .../executor/EnqueueingBlockSubscriber.kt | 18 +++---- .../executor/MetricRollbackSubscriber.kt | 13 +++++ .../core/spring/executor/MetricsUtils.kt | 2 +- .../executor/PersistingRollbackSubscriber.kt | 10 ++-- .../executor/PrivacyAvailabilityChecker.kt | 16 +++--- .../spring/executor/ScheduledForkResolver.kt | 10 ++-- .../executor/ScheduledPartitionCleaner.kt | 6 +-- .../ScheduledPartitionPausedOnTxIdCleaner.kt | 4 +- .../executor/ScheduledPartitionPoller.kt | 4 +- .../executor/ScheduledPrivacyChecker.kt | 2 +- .../executor/ScheduledTxQueueCleaner.kt | 8 +-- .../spring/executor/poller/BlocksLoader.kt | 2 +- .../executor/poller/BlocksLoaderImpl.kt | 6 +-- .../poller/PositionedSourceExecutor.kt | 2 +- .../poller/ScheduledBlockInfoSynchronizer.kt | 12 ++--- .../spring/executor/poller/SourceExecutor.kt | 2 +- .../executor/poller/SourceExecutorImpl.kt | 6 +-- .../AppendedBlockHistoryWeBlockInfo.kt | 4 +- .../executor/subscriber/EventSubscriber.kt | 28 +++++----- .../subscriber/HandleRollbackFactory.kt | 8 +++ .../subscriber/HandleRollbackFactoryImpl.kt | 6 +-- .../spring/executor/subscriber/logUtil.kt | 2 +- .../strategy/AppendedBlockHistoryBuffer.kt | 2 +- .../AppendedBlockHistoryBufferImpl.kt | 2 +- .../AppendedBlockHistorySyncedBlockInfo.kt | 4 +- .../BlockAppendedEventHandlingStrategy.kt | 12 ++--- ...ockAppendedEventHandlingStrategyFactory.kt | 4 +- .../strategy/BlockAppendedSyncedBlockInfo.kt | 4 +- .../strategy/EventHandlingStrategy.kt | 8 +-- .../strategy/EventHandlingStrategyFactory.kt | 2 +- .../MicroBlockEventHandlingStrategy.kt | 12 ++--- .../MicroBlockEventHandlingStrategyFactory.kt | 4 +- .../subscriber/strategy/extensions.kt | 6 +-- .../executor/syncinfo/BlockHistoryCleaner.kt | 4 +- .../executor/syncinfo/BlockHistoryService.kt | 4 +- .../syncinfo/BlockHistoryServiceImpl.kt | 6 +-- .../executor/syncinfo/BlockSearchResult.kt | 2 +- .../ExpectedHeightMismatchException.kt | 2 +- .../core/spring/executor/syncinfo/SyncInfo.kt | 2 +- .../executor/syncinfo/SyncInfoService.kt | 2 +- .../executor/syncinfo/SyncInfoServiceImpl.kt | 16 +++--- .../executor/syncinfo/SyncedBlockInfo.kt | 2 +- .../core/spring/executor/syncinfo/consts.kt | 3 ++ .../observer/core/spring/lock/LockService.kt | 2 +- .../core/spring/lock/LockServiceImpl.kt | 6 +-- .../AbstractPrivateContentResolver.kt | 4 +- .../callback/BlockListenerHandlerBuilder.kt | 20 +++---- .../callback/BlockListenerMethodCallback.kt | 8 +-- .../callback/BlockListenerPredicateBuilder.kt | 22 ++++---- .../callback/PrivateContentResolverImpl.kt | 6 +-- .../SubscriberBeanProducerMethodCallback.kt | 4 +- .../filter/BlockListenerMethodFilter.kt | 4 +- .../metrics/AddableLongMetricsContainer.kt | 2 +- .../spring/metrics/MetricContainerData.kt | 2 +- .../core/spring/metrics/MetricsContainer.kt | 2 +- .../core/spring/metrics/MetricsSetter.kt | 4 +- .../metrics/ScheduledMetricsCollector.kt | 8 +-- .../partition/DefaultPartitionResolver.kt | 4 +- .../partition/DefaultTxPartitionPoller.kt | 14 ++--- .../ErrorHandlingTxPartitionPoller.kt | 4 +- .../partition/MetricPartitionHandler.kt | 4 +- .../core/spring/partition/PartitionHandler.kt | 2 +- .../spring/partition/PartitionHandlerJpa.kt | 6 +-- .../spring/partition/PollingTxSubscriber.kt | 2 +- .../spring/partition/TxPartitionPoller.kt | 2 +- .../TxQueuePartitionResolveService.kt | 4 +- .../TxQueuePartitionResolveServiceImpl.kt | 8 +-- .../spring/properties/ForkResolverConfig.kt | 2 +- .../properties/MetricsCollectorConfig.kt | 2 +- .../properties/PartitionCleanerConfig.kt | 2 +- .../PartitionPausedOnTxIdCleanerConfig.kt | 2 +- .../properties/PartitionPollerConfig.kt | 2 +- .../PrivacyAvailabilityCheckConfig.kt | 2 +- .../spring/properties/QueueCleanerConfig.kt | 2 +- .../spring/properties/SubscriberConfig.kt | 2 +- .../properties/TxEnqueuedPredicateConfig.kt | 2 +- .../spring/properties/TxObserverConfig.kt | 2 +- .../properties/TxObserverSchedulerConfig.kt | 5 ++ .../core/spring/properties/TxPollerConfig.kt | 5 ++ .../observer/core/spring/util/TxSpElUtils.kt | 2 +- .../core/spring/web/EnqueuedTxController.kt | 14 ++--- .../core/spring/web/ObserverController.kt | 14 ++--- .../spring/web/TxQueuePartitionController.kt | 8 +-- .../core/spring/web/WebControllers.kt | 3 ++ .../core/spring/web/dto/BlockHistoryApiDto.kt | 2 +- .../core/spring/web/dto/EnqueuedTxApiDto.kt | 4 +- .../spring/web/dto/EnqueuedTxSearchRequest.kt | 4 +- .../spring/web/dto/ObserverStatusApiDto.kt | 2 +- .../core/spring/web/dto/PatchTxApiDto.kt | 7 +++ .../web/dto/PriorityComparisonOperator.kt | 2 +- .../spring/web/dto/PrivacyStatusApiDto.kt | 2 +- .../core/spring/web/dto/QueueStatusApiDto.kt | 2 +- .../core/spring/web/dto/RollbackInfoApiDto.kt | 2 +- .../spring/web/dto/TxQueuePartitionApiDto.kt | 2 +- .../web/dto/TxQueuePartitionSearchRequest.kt | 4 +- .../web/dto/TxQueuePartitionStatusApiDto.kt | 2 +- .../tx/observer/core/spring/web/mapper.kt | 32 ++++++------ .../spring/web/service/RollbackInfoService.kt | 4 +- .../web/service/RollbackInfoServiceImpl.kt | 6 +-- .../core/spring/web/service/TxQueueService.kt | 8 +-- .../web/service/TxQueueStatusServiceImpl.kt | 24 ++++----- .../executor/MetricRollbackSubscriber.kt | 13 ----- .../subscriber/HandleRollbackFactory.kt | 8 --- .../core/spring/executor/syncinfo/consts.kt | 3 -- .../properties/TxObserverSchedulerConfig.kt | 5 -- .../core/spring/properties/TxPollerConfig.kt | 5 -- .../core/spring/web/WebControllers.kt | 3 -- .../core/spring/web/dto/PatchTxApiDto.kt | 7 --- .../tx/observer/domain/BlockHeightInfo.kt | 4 +- .../tx/observer/domain/BlockHeightReset.kt | 4 +- .../tx/observer/domain/BlockHistory.kt | 4 +- .../tx/observer/domain/EnqueuedTx.kt | 6 +-- .../tx/observer/domain/EnqueuedTxStatus.kt | 2 +- .../{we => sdk}/tx/observer/domain/Lock.kt | 4 +- .../tx/observer/domain/RollbackInfo.kt | 4 +- .../tx/observer/domain/TxQueuePartition.kt | 4 +- .../observer/jpa/TxObserverJpaAutoConfig.kt | 10 ++-- .../jpa/config/DateTimeProviderConfig.kt | 2 +- .../jpa/config/TxObserverJpaConfig.kt | 10 ++-- .../repository/BlockHeightJpaRepository.kt | 4 +- .../repository/BlockHeightResetRepository.kt | 4 +- .../jpa/repository/BlockHistoryRepository.kt | 6 +-- .../jpa/repository/EnqueuedTxJpaRepository.kt | 8 +-- .../observer/jpa/repository/LockRepository.kt | 6 +-- .../jpa/repository/RollbackInfoRepository.kt | 4 +- .../TxQueuePartitionJpaRepository.kt | 6 +-- .../main/resources/META-INF/spring.factories | 2 +- .../starter/BlockInfoSynchronizerConfig.kt | 52 +++++++++---------- .../tx/observer/starter/ForkResolverConfig.kt | 12 ++--- .../tx/observer/starter/JpaExecutorsConfig.kt | 6 +-- .../starter/MetricsCollectorConfig.kt | 24 ++++----- .../starter/PartitionCleanerConfig.kt | 12 ++--- .../starter/PartitionHandlerConfig.kt | 22 ++++---- .../PartitionPausedOnTxIdCleanerConfig.kt | 10 ++-- .../observer/starter/PartitionPollerConfig.kt | 26 +++++----- .../starter/PrivacyAvailabilityCheckConfig.kt | 24 ++++----- .../starter/TxEnqueuePredicatesSupplier.kt | 7 +++ .../observer/starter/TxObserverConfigurer.kt | 8 +-- .../starter/TxObserverConfigurerAdapter.kt | 6 +-- .../starter/TxObserverConfigurerBuilder.kt | 8 +-- .../starter/TxObserverConfigurerDsl.kt | 8 +-- .../starter/TxObserverEnablerConfig.kt | 18 +++---- .../observer/starter/TxObserverLockConfig.kt | 4 +- .../starter/TxObserverSchedulerConfig.kt | 42 +++++++-------- .../starter/TxObserverStarterConfig.kt | 8 +-- .../tx/observer/starter/TxQueueConfig.kt | 40 +++++++------- .../starter/annotation/EnableTxObserver.kt | 4 +- .../EventListenerAnnotationProcessor.kt | 8 +-- .../starter/executor/blockSourceMode.kt | 3 ++ .../poller/PollerBlockSourceConfiguration.kt | 24 ++++----- .../SubscriberBlockSourceConfiguration.kt | 34 ++++++------ .../executor/syncinfo/SyncInfoConfig.kt | 30 +++++------ .../tx/observer/starter/lock/LockConfig.kt | 10 ++-- .../metrics/TxObserverMetricsAutoConfig.kt | 8 +-- .../properties/ForkResolverProperties.kt | 4 +- .../properties/MetricsCollectorProperties.kt | 4 +- .../properties/PartitionCleanerProperties.kt | 4 +- .../PartitionPausedOnTxIdCleanerProperties.kt | 4 +- .../properties/PartitionPollerProperties.kt | 4 +- .../PrivacyAvailabilityCheckProperties.kt | 4 +- .../properties/QueueCleanerProperties.kt | 4 +- .../properties/SubscriberProperties.kt | 6 +-- .../TxEnqueuedPredicateProperties.kt | 4 +- .../properties/TxObserverProperties.kt | 4 +- .../TxObserverSchedulerProperties.kt | 4 +- .../starter/properties/TxPollerProperties.kt | 4 +- .../starter/TxEnqueuePredicatesSupplier.kt | 7 --- .../starter/executor/blockSourceMode.kt | 3 -- .../main/resources/META-INF/spring.factories | 4 +- .../EventListenerAnnotationProcessorTest.kt | 16 +++--- .../component/PartitionHandlerTest.kt | 18 +++---- .../component/PartitionTxHandlerJpaTest.kt | 26 +++++----- .../component/TxTypeEnqueuedPredicateTest.kt | 4 +- .../BlockListenerTestContextConfiguration.kt | 20 +++---- ...BlockingServiceFactoryMockConfiguration.kt | 6 +-- ...BlockingServiceFactoryTestConfiguration.kt | 2 +- .../observer/config/ObjectMapperConfig.kt | 2 +- .../starter/observer/config/TxRunnerConfig.kt | 4 +- .../TxObserverEnabledConfigurerTest.kt | 26 +++++----- ...bserverEnabledConfigurerWithBuilderTest.kt | 26 +++++----- .../TxObserverEnabledNoConfigurerTest.kt | 26 +++++----- .../TxObserverNotEnabledNoConfigurerTest.kt | 26 +++++----- .../AppContextPollingTxTxSubscriberTest.kt | 34 ++++++------ .../executor/DefaultTxPartitionPollerTest.kt | 22 ++++---- .../EnqueueingBlockTxSubscriberTest.kt | 44 ++++++++-------- ...andlingTxPartitionPollerIntegrationTest.kt | 28 +++++----- .../MetricRollbackTxSubscriberTest.kt | 6 +-- .../PersistingRollbackTxSubscriberTest.kt | 10 ++-- .../PrivacyAvailabilityCheckerTest.kt | 30 +++++------ .../executor/ScheduledForkResolverTest.kt | 28 +++++----- .../executor/ScheduledPartitionCleanerTest.kt | 22 ++++---- ...heduledPartitionPausedOnTxIdCleanerTest.kt | 24 ++++----- .../executor/ScheduledPartitionPollerTest.kt | 6 +-- .../executor/ScheduledPrivacyCheckerTest.kt | 6 +-- .../executor/ScheduledTxQueueCleanerTest.kt | 26 +++++----- .../executor/blockinfo/SyncInfoServiceTest.kt | 24 ++++----- .../executor/poller/BlocksLoaderTest.kt | 8 +-- .../ScheduledWeBlockInfoSynchronizerTest.kt | 18 +++---- .../executor/poller/SourceExecutorImplTest.kt | 18 +++---- .../syncinfo/BlockHistoryServiceImplTest.kt | 16 +++--- .../jpa/BlockHistoryRepositoryTest.kt | 16 +++--- .../jpa/EnqueuedTxJpaRepositoryTest.kt | 18 +++---- .../jpa/TxQueuePartitionJpaRepositoryTest.kt | 26 +++++----- .../observer/listener/AbstractListenerTest.kt | 30 +++++------ .../BooleanValueKeyEventBlockListenerTest.kt | 12 ++--- ...lteredByPrefixKeyEventBlockListenerTest.kt | 14 ++--- .../IntValueKeyEventBlockListenerTest.kt | 12 ++--- .../MapValueKeyEventBlockListenerTest.kt | 12 ++--- .../ObjectValueKeyEventBlockListenerTest.kt | 14 ++--- .../StringValueKeyEventBlockListenerTest.kt | 12 ++--- .../AbstractPrivateEventBlockListenerTest.kt | 10 ++-- ...eArrayPrivateDataEventBlockListenerTest.kt | 8 +-- ...ByMetaPrivateDataEventBlockListenerTest.kt | 14 ++--- ...taKeysPrivateDataEventBlockListenerTest.kt | 16 +++--- ...PolicyPrivateDataEventBlockListenerTest.kt | 14 ++--- .../MapPrivateDataEventBlockListenerTest.kt | 8 +-- ...oValuePrivateDataEventBlockListenerTest.kt | 10 ++-- ...ObjectPrivateDataEventBlockListenerTest.kt | 10 ++-- ...StringPrivateDataEventBlockListenerTest.kt | 8 +-- .../listener/tx/AllTxBlockListenerTest.kt | 8 +-- .../listener/tx/AtomicTxBlockListenerTest.kt | 10 ++-- .../tx/CreatePolicyTxBlockListenerTest.kt | 12 ++--- ...ExecutedCallContractTxBlockListenerTest.kt | 12 ++--- ...ecutedCreateContractTxBlockListenerTest.kt | 12 ++--- ...edByExpressionOnBeanTxBlockListenerTest.kt | 10 ++-- ...FilteredByExpressionTxBlockListenerTest.kt | 10 ++-- .../tx/PolicyDataHashTxBlockListenerTest.kt | 12 ++--- .../tx/UpdatePolicyTxBlockListenerTest.kt | 10 ++-- ...cardExecutedContractTxBlockListenerTest.kt | 20 +++---- .../starter/observer/lock/LockServiceTest.kt | 14 ++--- .../observer/sample/TestBlockListeners.kt | 10 ++-- .../observer/sample/TestEventListeners.kt | 6 +-- .../observer/testObjects/SimpleDataObject.kt | 2 +- .../starter/observer/util/ModelFactory.kt | 18 +++---- .../starter/observer/util/TxExecutorStub.kt | 4 +- .../starter/observer/util/TxSpElUtilsTest.kt | 6 +-- .../observer/web/EnqueuedTxControllerTest.kt | 22 ++++---- .../web/TxQueuePartitionControllerTest.kt | 24 ++++----- .../web/service/TransactionalRunner.kt | 2 +- .../web/service/TxQueueServiceTest.kt | 30 +++++------ .../service/TxQueueStatusServiceImplTest.kt | 32 ++++++------ .../tx/tracker/api/TxTrackInfoService.kt | 4 +- .../{we => sdk}/tx/tracker/api/TxTracker.kt | 10 ++-- .../tracker/api/TxTrackerActualTxResolver.kt | 2 +- .../core/spring/component/JpaTxTracker.kt | 20 +++---- .../spring/component/ScheduledTxTracker.kt | 8 +-- .../TxTrackerActualTxResolverImpl.kt | 4 +- .../spring/component/TxTrackerPredicate.kt | 6 +-- .../spring/component/TxTrackerTxHandler.kt | 10 ++-- .../properties/SuccessSubscriberConfig.kt | 5 ++ .../core/spring/properties/TxTrackerProps.kt | 2 +- .../properties/SuccessSubscriberConfig.kt | 5 -- .../core/spring/web/TxTrackInfoController.kt | 25 --------- .../spring/web/service/TxTrackInfoService.kt | 11 ---- .../tx/tracker/domain/SmartContractInfo.kt | 4 +- .../domain/TxTrackBusinessObjectInfo.kt | 4 +- .../tx/tracker/domain/TxTrackInfo.kt | 6 +-- .../tx/tracker/domain/TxTrackStatus.kt | 2 +- .../tracker/domain/SmartContractInfoTest.kt | 2 +- .../tx/tracker/jpa/TxTrackerJpaAutoConfig.kt | 12 ++--- .../jpa/config/DateTimeProviderConfig.kt | 2 +- .../JpaAuditingNonConflictingDeclaration.kt | 2 +- .../tracker/jpa/config/TxTrackerJpaConfig.kt | 6 +-- .../BusinessObjectInfoJpaRepository.kt | 4 +- .../SmartContractInfoJpaRepository.kt | 4 +- .../jpa/repository/TxTrackerJpaRepository.kt | 8 +-- .../main/resources/META-INF/spring.factories | 2 +- .../read/starter/TxTrackerReadConfig.kt | 10 ++-- .../starter/TxTrackerReadJpaAutoConfig.kt | 8 +-- .../starter/TxTrackerReadJpaRepository.kt | 4 +- .../tx/tracker/read/starter}/web/Mapping.kt | 16 +++--- .../read/starter/web/TxTrackInfoController.kt | 8 +-- .../starter}/web/dto/TxTrackInfoApiDto.kt | 4 +- .../web/dto/TxTrackInfoListRequest.kt | 4 +- .../web/service/TxTrackInfoServiceImpl.kt | 10 ++-- .../exception/NoTrackInfoFoundException.kt | 2 +- .../we/tx/tracker/read/starter/web/Mapping.kt | 52 ------------------- .../read/starter/web/dto/TxTrackInfoApiDto.kt | 18 ------- .../starter/web/dto/TxTrackInfoListRequest.kt | 9 ---- .../exception/NoTrackInfoFoundException.kt | 3 -- .../main/resources/META-INF/spring.factories | 4 +- .../tx/tracker/TxTrackerReadAutoConfigTest.kt | 8 +-- .../tx/tracker/starter/TxTrackerConfig.kt | 34 ++++++------ .../starter/TxTrackerSchedulerConfig.kt | 6 +-- .../properties/SuccessSubscriberProperties.kt | 4 +- .../starter/properties/TxTrackerProperties.kt | 4 +- .../main/resources/META-INF/spring.factories | 2 +- .../JpaTxTrackerContractTxStatusTest.kt | 20 +++---- .../tx/tracker/starter/JpaTxTrackerTest.kt | 24 ++++----- .../tracker/starter/ScheduledTxTrackerTest.kt | 10 ++-- .../tx/tracker/starter/TxTrackerConfigTest.kt | 12 ++--- .../starter/jpa/TxTrackerJpaRepositoryTest.kt | 14 ++--- 327 files changed, 1423 insertions(+), 1541 deletions(-) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/conditional/ConditionalOnJpaMode.kt (84%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/conditional/ConditionalOnTracker.kt (83%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/jpa/util/EntityManager.kt (63%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/jpa/util/JpaUtils.kt (93%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/tx/executor/TxExecutor.kt (78%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/tx/executor/TxExecutorImpl.kt (97%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/tx/handler/TxHandler.kt (61%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/tx/subscriber/TxSubscriber.kt (61%) rename we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt (71%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/block/WeBlockInfo.kt (90%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/block/WeRollbackInfo.kt (83%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/block/subscriber/BlockSubscriber.kt (72%) create mode 100644 we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/RollbackSubscriber.kt rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/exceptions.kt (92%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/key/KeyEvent.kt (82%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/key/KeyFilter.kt (73%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/partition/TxQueuePartitionResolver.kt (88%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/privacy/MessageFilter.kt (82%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/privacy/PolicyFilter.kt (84%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/privacy/PrivateContentResolver.kt (96%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/privacy/PrivateDataEvent.kt (92%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/tx/TxEnqueuePredicate.kt (86%) rename we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/api/tx/TxListener.kt (76%) delete mode 100644 we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/RollbackSubscriber.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt (66%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt (83%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt (85%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/LoggingBlockSubscriber.kt (65%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt (92%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/OffsetProvider.kt (52%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/RandomOffsetProvider.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt (86%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt (85%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/MetricsUtils.kt (92%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt (54%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt (85%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledForkResolver.kt (88%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt (78%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt (78%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt (64%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt (81%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt (80%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/BlocksLoader.kt (85%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt (85%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt (58%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt (86%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/SourceExecutor.kt (60%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt (86%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt (84%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt (84%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt (86%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/logUtil.kt (89%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt (92%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt (80%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt (88%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt (71%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt (79%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt (53%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt (87%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt (72%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt (58%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt (71%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt (96%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt (82%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt (77%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt (86%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt (93%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt (78%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/consts.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/lock/LockService.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/lock/LockServiceImpl.kt (82%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt (94%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt (91%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt (82%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt (94%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt (92%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt (81%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt (72%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt (57%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/metrics/MetricContainerData.kt (87%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/metrics/MetricsContainer.kt (57%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/metrics/MetricsSetter.kt (77%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt (82%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/DefaultPartitionResolver.kt (54%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt (79%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt (74%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/MetricPartitionHandler.kt (80%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/PartitionHandler.kt (83%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/PartitionHandlerJpa.kt (88%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/PollingTxSubscriber.kt (61%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/TxPartitionPoller.kt (50%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt (59%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt (77%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/ForkResolverConfig.kt (70%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/MetricsCollectorConfig.kt (63%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/PartitionCleanerConfig.kt (67%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt (66%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/PartitionPollerConfig.kt (72%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/QueueCleanerConfig.kt (70%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/SubscriberConfig.kt (81%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt (64%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/properties/TxObserverConfig.kt (90%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxPollerConfig.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/util/TxSpElUtils.kt (94%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/EnqueuedTxController.kt (79%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/ObserverController.kt (70%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/TxQueuePartitionController.kt (79%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/WebControllers.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt (59%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt (52%) create mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PatchTxApiDto.kt rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt (60%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt (62%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt (75%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt (71%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt (78%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt (58%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt (64%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/mapper.kt (79%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/service/RollbackInfoService.kt (60%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt (68%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/service/TxQueueService.kt (61%) rename we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt (84%) delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/consts.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxPollerConfig.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/WebControllers.kt delete mode 100644 we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PatchTxApiDto.kt rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/BlockHeightInfo.kt (89%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/BlockHeightReset.kt (64%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/BlockHistory.kt (89%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/EnqueuedTx.kt (88%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/EnqueuedTxStatus.kt (65%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/Lock.kt (58%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/RollbackInfo.kt (83%) rename we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/domain/TxQueuePartition.kt (84%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/TxObserverJpaAutoConfig.kt (72%) rename {we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker => we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer}/jpa/config/DateTimeProviderConfig.kt (90%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/config/TxObserverJpaConfig.kt (78%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/BlockHeightJpaRepository.kt (84%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/BlockHeightResetRepository.kt (61%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/BlockHistoryRepository.kt (82%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt (95%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/LockRepository.kt (80%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/RollbackInfoRepository.kt (72%) rename we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt (96%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/BlockInfoSynchronizerConfig.kt (63%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/ForkResolverConfig.kt (70%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/JpaExecutorsConfig.kt (72%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/MetricsCollectorConfig.kt (65%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/PartitionCleanerConfig.kt (61%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/PartitionHandlerConfig.kt (63%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt (62%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/PartitionPollerConfig.kt (68%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt (62%) create mode 100644 we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxEnqueuePredicatesSupplier.kt rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverConfigurer.kt (86%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverConfigurerAdapter.kt (66%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverConfigurerBuilder.kt (91%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverConfigurerDsl.kt (91%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverEnablerConfig.kt (86%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverLockConfig.kt (88%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverSchedulerConfig.kt (82%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxObserverStarterConfig.kt (87%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/TxQueueConfig.kt (66%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/annotation/EnableTxObserver.kt (59%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt (80%) create mode 100644 we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/blockSourceMode.kt rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt (63%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt (70%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt (66%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/lock/LockConfig.kt (62%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/ForkResolverProperties.kt (82%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/MetricsCollectorProperties.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/PartitionCleanerProperties.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/PartitionPollerProperties.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/QueueCleanerProperties.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/SubscriberProperties.kt (77%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt (76%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/TxObserverProperties.kt (91%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/TxObserverSchedulerProperties.kt (67%) rename we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/properties/TxPollerProperties.kt (59%) delete mode 100644 we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxEnqueuePredicatesSupplier.kt delete mode 100644 we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/blockSourceMode.kt rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt (64%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/component/PartitionHandlerTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt (87%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt (88%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt (58%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt (97%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt (97%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/config/ObjectMapperConfig.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/config/TxRunnerConfig.kt (56%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt (81%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt (73%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt (68%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt (85%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt (87%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt (87%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt (76%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt (88%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt (82%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt (77%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt (77%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt (85%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt (89%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt (89%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt (92%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt (91%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/AbstractListenerTest.kt (73%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt (77%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt (76%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt (73%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt (88%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt (84%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt (86%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt (85%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt (79%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt (76%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt (73%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt (80%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt (73%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt (76%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt (68%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/lock/LockServiceTest.kt (78%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/sample/TestBlockListeners.kt (92%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/sample/TestEventListeners.kt (88%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/testObjects/SimpleDataObject.kt (61%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/util/ModelFactory.kt (83%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/util/TxExecutorStub.kt (71%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/util/TxSpElUtilsTest.kt (86%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt (85%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt (91%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/web/service/TransactionalRunner.kt (87%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt (77%) rename we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt (81%) rename we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/api/TxTrackInfoService.kt (83%) rename we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/api/TxTracker.kt (91%) rename we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/api/TxTrackerActualTxResolver.kt (71%) rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/component/JpaTxTracker.kt (91%) rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/component/ScheduledTxTracker.kt (92%) rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt (68%) rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/component/TxTrackerPredicate.kt (64%) rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/component/TxTrackerTxHandler.kt (54%) create mode 100644 we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt rename we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/core/spring/properties/TxTrackerProps.kt (83%) delete mode 100644 we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt delete mode 100644 we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/TxTrackInfoController.kt delete mode 100644 we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/TxTrackInfoService.kt rename we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/domain/SmartContractInfo.kt (89%) rename we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/domain/TxTrackBusinessObjectInfo.kt (76%) rename we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/domain/TxTrackInfo.kt (93%) rename we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/domain/TxTrackStatus.kt (63%) rename we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/domain/SmartContractInfoTest.kt (94%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt (68%) rename {we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer => we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker}/jpa/config/DateTimeProviderConfig.kt (90%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt (89%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/config/TxTrackerJpaConfig.kt (82%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt (62%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt (62%) rename we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt (86%) rename we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/read/starter/TxTrackerReadConfig.kt (73%) rename we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt (76%) rename we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt (76%) rename we-tx-tracker-module/{we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring => we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter}/web/Mapping.kt (70%) rename we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/read/starter/web/TxTrackInfoController.kt (70%) rename we-tx-tracker-module/{we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring => we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter}/web/dto/TxTrackInfoApiDto.kt (75%) rename we-tx-tracker-module/{we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring => we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter}/web/dto/TxTrackInfoListRequest.kt (54%) rename we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt (55%) rename we-tx-tracker-module/{we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring => we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter}/web/service/exception/NoTrackInfoFoundException.kt (58%) delete mode 100644 we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/Mapping.kt delete mode 100644 we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt delete mode 100644 we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt delete mode 100644 we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt rename we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/TxTrackerReadAutoConfigTest.kt (75%) rename we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/TxTrackerConfig.kt (70%) rename we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/TxTrackerSchedulerConfig.kt (89%) rename we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/properties/SuccessSubscriberProperties.kt (61%) rename we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/properties/TxTrackerProperties.kt (87%) rename we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt (87%) rename we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/JpaTxTrackerTest.kt (96%) rename we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/ScheduledTxTrackerTest.kt (96%) rename we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/TxTrackerConfigTest.kt (88%) rename we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/{we => sdk}/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt (86%) diff --git a/README.md b/README.md index 7332744..bf43bc5 100644 --- a/README.md +++ b/README.md @@ -188,7 +188,7 @@ class UserPartitionResolver implements TxQueuePartitionResolver { ### TxObserverConfigurer Configurer for basic observer components. Allows you to define all bean-components through one bean: - TxQueuePartitionResolver; -- TxEnqueuePredicate (default implementation is `com.wavesenterprise.we.tx.observer.starter.TxObserverEnablerConfig.TxEnqueuePredicateConfigurerImpl`); +- TxEnqueuePredicate (default implementation is `com.wavesenterprise.sdk.tx.observer.starter.TxObserverEnablerConfig.TxEnqueuePredicateConfigurerImpl`); - ObjectMapper; - PrivateContentResolver; diff --git a/gradle.properties b/gradle.properties index 5bbe975..55c51b2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -31,7 +31,7 @@ kotlinModuleVersion=2.13.2 weNodeClientVersion=1.3.1 weSdkSpringVersion=1.0.3 -weFlywayStarterVersion=1.0.0 +weFlywayStarterVersion=1.1.0 feignVersion=11.9 jacksonModuleKotlin=2.13.3 junitVersion=5.3.2 diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnJpaMode.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnJpaMode.kt similarity index 84% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnJpaMode.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnJpaMode.kt index 1e6a7ff..004c963 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnJpaMode.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnJpaMode.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.conditional +package com.wavesenterprise.sdk.tx.observer.common.conditional import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnTracker.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnTracker.kt similarity index 83% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnTracker.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnTracker.kt index fd20939..3f9a0a6 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/conditional/ConditionalOnTracker.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/conditional/ConditionalOnTracker.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.conditional +package com.wavesenterprise.sdk.tx.observer.common.conditional import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/EntityManager.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/EntityManager.kt similarity index 63% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/EntityManager.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/EntityManager.kt index 5ea9b7a..ffe1570 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/EntityManager.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/EntityManager.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.jpa.util +package com.wavesenterprise.sdk.tx.observer.common.jpa.util import javax.persistence.EntityManager diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/JpaUtils.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/JpaUtils.kt similarity index 93% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/JpaUtils.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/JpaUtils.kt index 0e98735..b3a1dfe 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/jpa/util/JpaUtils.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/jpa/util/JpaUtils.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.jpa.util +package com.wavesenterprise.sdk.tx.observer.common.jpa.util import javax.persistence.criteria.CriteriaBuilder import javax.persistence.criteria.Predicate diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutor.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutor.kt similarity index 78% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutor.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutor.kt index 528ae6c..0e2fd5a 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutor.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutor.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.tx.executor +package com.wavesenterprise.sdk.tx.observer.common.tx.executor interface TxExecutor { fun required(block: () -> T): T diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutorImpl.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutorImpl.kt similarity index 97% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutorImpl.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutorImpl.kt index 72bc087..a488c22 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/executor/TxExecutorImpl.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/executor/TxExecutorImpl.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.tx.executor +package com.wavesenterprise.sdk.tx.observer.common.tx.executor import org.springframework.transaction.TransactionDefinition import org.springframework.transaction.TransactionException diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/handler/TxHandler.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/handler/TxHandler.kt similarity index 61% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/handler/TxHandler.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/handler/TxHandler.kt index 09bdd62..d0ae87b 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/handler/TxHandler.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/handler/TxHandler.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.tx.handler +package com.wavesenterprise.sdk.tx.observer.common.tx.handler import com.wavesenterprise.sdk.node.domain.tx.Tx diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriber.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriber.kt similarity index 61% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriber.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriber.kt index 688af83..d62b2ca 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriber.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriber.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.common.tx.subscriber +package com.wavesenterprise.sdk.tx.observer.common.tx.subscriber import com.wavesenterprise.sdk.node.domain.tx.Tx diff --git a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt similarity index 71% rename from we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt rename to we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt index a56ec68..06ee6b7 100644 --- a/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/we/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt +++ b/we-tx-observer-common-components/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/common/tx/subscriber/TxSubscriberImpl.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.common.tx.subscriber +package com.wavesenterprise.sdk.tx.observer.common.tx.subscriber import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.common.tx.handler.TxHandler +import com.wavesenterprise.sdk.tx.observer.common.tx.handler.TxHandler class TxSubscriberImpl( val predicate: (Tx) -> Boolean, diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeBlockInfo.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeBlockInfo.kt similarity index 90% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeBlockInfo.kt index 9b9ed64..957a6d9 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeBlockInfo.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.block +package com.wavesenterprise.sdk.tx.observer.api.block import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeRollbackInfo.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeRollbackInfo.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeRollbackInfo.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeRollbackInfo.kt index a9cfe46..c418324 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/WeRollbackInfo.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/WeRollbackInfo.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.block +package com.wavesenterprise.sdk.tx.observer.api.block import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/BlockSubscriber.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/BlockSubscriber.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/BlockSubscriber.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/BlockSubscriber.kt index 13aa3e4..016d2e6 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/BlockSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/BlockSubscriber.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.api.block.subscriber +package com.wavesenterprise.sdk.tx.observer.api.block.subscriber -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo /** * Subscriber handling a new block with transactions. Can be invoked multiple times for a liquid block. diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/RollbackSubscriber.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/RollbackSubscriber.kt new file mode 100644 index 0000000..ae05bca --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/block/subscriber/RollbackSubscriber.kt @@ -0,0 +1,7 @@ +package com.wavesenterprise.sdk.tx.observer.api.block.subscriber + +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo + +interface RollbackSubscriber { + fun onRollback(weRollbackInfo: WeRollbackInfo) +} diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/exceptions.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/exceptions.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/exceptions.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/exceptions.kt index b01d07d..13c7863 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/exceptions.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/exceptions.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api +package com.wavesenterprise.sdk.tx.observer.api open class BlockListenerException(message: String, cause: Throwable) : RuntimeException(message, cause) diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyEvent.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyEvent.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyEvent.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyEvent.kt index 2bfb249..9bf6dda 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyEvent.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyEvent.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.api.key +package com.wavesenterprise.sdk.tx.observer.api.key import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx /** * Class processed in @TxListener methods for 105 transaction. - * @see com.wavesenterprise.we.tx.observer.api.tx.TxListener + * @see com.wavesenterprise.sdk.tx.observer.api.tx.TxListener * @property payload parametrized object obtained from the results of transaction ExecutedContractTx (105) * @property tx transaction ExecutedContractTx (105) * @property key key by which filtering takes place in KeyFilter diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyFilter.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyFilter.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyFilter.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyFilter.kt index 9e45e7b..03df630 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/key/KeyFilter.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/key/KeyFilter.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.api.key +package com.wavesenterprise.sdk.tx.observer.api.key /** * Annotation filters the KeyEvent by the keys from the contract state. - * @see com.wavesenterprise.we.tx.observer.api.key.KeyEvent + * @see com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent * @property keyRegexp the key is in the form of a regular expression * @property keyPrefix the key in the form of a prefix or a full string */ diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/partition/TxQueuePartitionResolver.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/partition/TxQueuePartitionResolver.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/partition/TxQueuePartitionResolver.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/partition/TxQueuePartitionResolver.kt index 59ed6c6..5140f02 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/partition/TxQueuePartitionResolver.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/partition/TxQueuePartitionResolver.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.partition +package com.wavesenterprise.sdk.tx.observer.api.partition import com.wavesenterprise.sdk.node.domain.tx.Tx diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/MessageFilter.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/MessageFilter.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/MessageFilter.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/MessageFilter.kt index 3de0a94..e53eb8e 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/MessageFilter.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/MessageFilter.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.api.privacy +package com.wavesenterprise.sdk.tx.observer.api.privacy /** * Annotation containing an array of filters. * @property filters array of MessageFilter - * @see com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter + * @see com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter */ annotation class MessageFilters( vararg val filters: MessageFilter = [] diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PolicyFilter.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PolicyFilter.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PolicyFilter.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PolicyFilter.kt index bce15a0..bf40145 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PolicyFilter.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PolicyFilter.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.privacy +package com.wavesenterprise.sdk.tx.observer.api.privacy /** * Annotation which filters privacy data by policy name. diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateContentResolver.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateContentResolver.kt similarity index 96% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateContentResolver.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateContentResolver.kt index 8226ad0..856b2ea 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateContentResolver.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateContentResolver.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.privacy +package com.wavesenterprise.sdk.tx.observer.api.privacy import com.fasterxml.jackson.databind.JsonNode import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateDataEvent.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateDataEvent.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateDataEvent.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateDataEvent.kt index 6a85bd8..9fa8838 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/privacy/PrivateDataEvent.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/privacy/PrivateDataEvent.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.api.privacy +package com.wavesenterprise.sdk.tx.observer.api.privacy import com.fasterxml.jackson.databind.JsonNode import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx -import com.wavesenterprise.we.tx.observer.api.NoPayloadException +import com.wavesenterprise.sdk.tx.observer.api.NoPayloadException /** * Class processed in @TxListener methods for privacy transactions (112, 113, 114) diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxEnqueuePredicate.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxEnqueuePredicate.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxEnqueuePredicate.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxEnqueuePredicate.kt index dda53de..6b29842 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxEnqueuePredicate.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxEnqueuePredicate.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.tx +package com.wavesenterprise.sdk.tx.observer.api.tx import com.wavesenterprise.sdk.node.domain.tx.Tx diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxListener.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxListener.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxListener.kt rename to we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxListener.kt index 3913a2e..8137341 100644 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/tx/TxListener.kt +++ b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/api/tx/TxListener.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.api.tx +package com.wavesenterprise.sdk.tx.observer.api.tx /** * Listener for processing previously filtered transactions in TxEnqueuePredicate implementations. @@ -23,10 +23,10 @@ package com.wavesenterprise.we.tx.observer.api.tx * } * ``` * @property filterExpression filter transaction by spel expression - * @see com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate - * @see com.wavesenterprise.we.tx.observer.api.key.KeyEvent - * @see com.wavesenterprise.we.tx.observer.api.privacy.PolicyFilter - * @see com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter + * @see com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate + * @see com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent + * @see com.wavesenterprise.sdk.tx.observer.api.privacy.PolicyFilter + * @see com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter */ @Target(AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) diff --git a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/RollbackSubscriber.kt b/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/RollbackSubscriber.kt deleted file mode 100644 index af58ced..0000000 --- a/we-tx-observer-module/we-tx-observer-api/src/main/kotlin/com/wavesenterprise/we/tx/observer/api/block/subscriber/RollbackSubscriber.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.wavesenterprise.we.tx.observer.api.block.subscriber - -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo - -interface RollbackSubscriber { - fun onRollback(weRollbackInfo: WeRollbackInfo) -} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt similarity index 66% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt index 3c186c5..4324110 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/AndTxEnqueuePredicate.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate class AndTxEnqueuePredicate( private val predicates: List, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt index b8938c0..f043b13 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/CachingTxEnqueuePredicate.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import com.github.benmanes.caffeine.cache.Caffeine import com.wavesenterprise.sdk.node.client.blocking.cache.CaffeineLoadingCache import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate import java.time.Duration class CachingTxEnqueuePredicate( diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt index 3f0412d..f6b1a8e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/HttpApiWeBlockInfo.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.blocks.BlockAtHeight import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo data class HttpApiWeBlockInfo( private val blocksAtHeight: BlockAtHeight, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/LoggingBlockSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/LoggingBlockSubscriber.kt similarity index 65% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/LoggingBlockSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/LoggingBlockSubscriber.kt index 592fec5..73cd46e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/LoggingBlockSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/LoggingBlockSubscriber.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt index 123d207..6e84402 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/MethodArgumentClassExtractor.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent import java.lang.reflect.Method import java.lang.reflect.ParameterizedType import java.lang.reflect.Type diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/OffsetProvider.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/OffsetProvider.kt similarity index 52% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/OffsetProvider.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/OffsetProvider.kt index 4477a6c..4756d2e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/OffsetProvider.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/OffsetProvider.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component interface OffsetProvider { fun provideOffset(upperBound: Int): Int diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/RandomOffsetProvider.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/RandomOffsetProvider.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/RandomOffsetProvider.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/RandomOffsetProvider.kt index 76378cd..4b41909 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/RandomOffsetProvider.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/RandomOffsetProvider.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import kotlin.random.Random diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt index 793f83c..7f0c404 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/component/TxTypeEnqueuedPredicate.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.component +package com.wavesenterprise.sdk.tx.observer.core.spring.component import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate class TxTypeEnqueuedPredicate( val txTypes: List, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt index 046f0f5..a2f6624 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/AppContextPollingTxSubscriber.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.treeToValue import com.wavesenterprise.sdk.node.client.http.tx.TxDto import com.wavesenterprise.sdk.node.client.http.tx.TxDto.Companion.toDomain -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import io.micrometer.core.annotation.Timed import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt index 22f9755..c2ce8b4 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/EnqueueingBlockSubscriber.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -8,14 +8,14 @@ import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.AtomicTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxQueuePartitionResolveService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxQueuePartitionResolveService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import org.springframework.transaction.annotation.Transactional open class EnqueueingBlockSubscriber( diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt new file mode 100644 index 0000000..9f6f9f6 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt @@ -0,0 +1,13 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.executor + +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer + +class MetricRollbackSubscriber( + private val rollbackCountMetricsContainer: AddableLongMetricsContainer, +) : RollbackSubscriber { + override fun onRollback(weRollbackInfo: WeRollbackInfo) { + rollbackCountMetricsContainer.add(1) + } +} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricsUtils.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricsUtils.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricsUtils.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricsUtils.kt index 51b7c65..6310b36 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricsUtils.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/MetricsUtils.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor const val NODE_HEIGHT = "nodeHeight" const val OBSERVER_HEIGHT = "observerHeight" diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt similarity index 54% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt index 6bb936b..1d4e949 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PersistingRollbackSubscriber.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo -import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository class PersistingRollbackSubscriber( private val rollbackInfoRepository: RollbackInfoRepository, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt index ba0c4fc..7d8fc97 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/PrivacyAvailabilityChecker.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.treeToValue import com.wavesenterprise.sdk.node.client.http.tx.PolicyDataHashTxDto import com.wavesenterprise.sdk.node.client.http.tx.PolicyDataHashTxDto.Companion.toDomain import com.wavesenterprise.sdk.node.client.http.tx.TxDto -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.core.spring.component.OffsetProvider -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.properties.PrivacyAvailabilityCheckConfig -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.component.OffsetProvider +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PrivacyAvailabilityCheckConfig +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledForkResolver.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledForkResolver.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledForkResolver.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledForkResolver.kt index b5480cf..e2ddd24 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledForkResolver.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledForkResolver.kt @@ -1,13 +1,13 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.domain.TxId -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import net.javacrumbs.shedlock.spring.annotation.SchedulerLock import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt index 5921c63..3dda9b0 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionCleaner.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionCleanerConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionCleanerConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import net.javacrumbs.shedlock.spring.annotation.SchedulerLock import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt index f28ccd4..7957ce6 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPausedOnTxIdCleaner.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt similarity index 64% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt index 8842b38..19cf539 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPartitionPoller.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxPartitionPoller open class ScheduledPartitionPoller( private val errorHandlingTxPartitionPoller: TxPartitionPoller, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt similarity index 81% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt index 7f3b36f..58be3c6 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledPrivacyChecker.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor open class ScheduledPrivacyChecker( private val privacyAvailabilityChecker: PrivacyAvailabilityChecker, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt index d40790a..f88e395 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/ScheduledTxQueueCleaner.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor +package com.wavesenterprise.sdk.tx.observer.core.spring.executor -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.properties.QueueCleanerConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.QueueCleanerConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import net.javacrumbs.shedlock.spring.annotation.SchedulerLock import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoader.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoader.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoader.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoader.kt index b6532b8..a3a29f9 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoader.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoader.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller import com.wavesenterprise.sdk.node.domain.blocks.BlockAtHeight diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt index a4c6463..a09923f 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/BlocksLoaderImpl.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.blocks.BlockHeaders -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksDownloadResult.Companion.NO_BLOCKS -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.SourceExecutorImpl.Companion.BLOCKS_EXECUTOR_LOGGER_NAME +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksDownloadResult.Companion.NO_BLOCKS +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.SourceExecutorImpl.Companion.BLOCKS_EXECUTOR_LOGGER_NAME import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt similarity index 58% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt index f0fbd9b..0eb0f06 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/PositionedSourceExecutor.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller interface PositionedSourceExecutor { fun syncToBlockHeight(newBlockHeightPosition: Long): Long diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt index 775ade7..bde44e9 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/ScheduledBlockInfoSynchronizer.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.properties.TxObserverConfig -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.TxObserverConfig +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import kotlinx.coroutines.delay import kotlinx.coroutines.runBlocking import net.javacrumbs.shedlock.spring.annotation.SchedulerLock diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutor.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutor.kt similarity index 60% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutor.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutor.kt index 91a5e50..2b00b28 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutor.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutor.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller interface SourceExecutor { fun execute(blockHeightLowerBound: Long, blockHeightUpperBound: Long): Long diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt index bcd29ac..eb806a2 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/poller/SourceExecutorImpl.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.poller +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.component.HttpApiWeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.component.HttpApiWeBlockInfo import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt index 4f93c4c..53db43e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/AppendedBlockHistoryWeBlockInfo.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo class AppendedBlockHistoryWeBlockInfo( private val appendedBlockHistory: BlockchainEvent.AppendedBlockHistory, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt index 4a140e6..3d16c19 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/EventSubscriber.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber import com.wavesenterprise.sdk.node.client.blocking.event.BlockchainEventsIterator import com.wavesenterprise.sdk.node.client.blocking.event.BlockchainEventsService @@ -6,19 +6,19 @@ import com.wavesenterprise.sdk.node.client.blocking.event.fromBlock import com.wavesenterprise.sdk.node.client.blocking.event.fromGenesis import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.exception.NodeServiceUnavailableException -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategy -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategyFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.ExpectedHeightMismatchException -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.FIRST_BLOCK_HEIGHT -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo -import com.wavesenterprise.we.tx.observer.core.spring.lock.LockService +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategy +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategyFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.ExpectedHeightMismatchException +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.FIRST_BLOCK_HEIGHT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.lock.LockService import org.slf4j.debug import org.slf4j.error import org.slf4j.info diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt new file mode 100644 index 0000000..6220f2a --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt @@ -0,0 +1,8 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber + +import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback + +interface HandleRollbackFactory { + fun create(event: BlockchainEvent.RollbackCompleted): HandleRollback +} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt index 9fca1a2..a4a1d03 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/HandleRollbackFactoryImpl.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback import org.slf4j.lazyLogger import org.slf4j.warn diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/logUtil.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/logUtil.kt similarity index 89% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/logUtil.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/logUtil.kt index 7022932..c238b91 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/logUtil.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/logUtil.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber import com.wavesenterprise.sdk.node.domain.tx.Tx import org.slf4j.KLogger diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt index 3a41158..d568b7d 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBuffer.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt index 4ea94e6..8648c2e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistoryBufferImpl.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt index 375ab5c..a25071b 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/AppendedBlockHistorySyncedBlockInfo.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.Timestamp import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo class AppendedBlockHistorySyncedBlockInfo( private val appendedBlockHistory: BlockchainEvent.AppendedBlockHistory, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt index 21d065d..70d5b40 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategy.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.logIgnoredTxs -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.toWeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.logIgnoredTxs +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.toWeBlockInfo import org.slf4j.lazyLogger import org.slf4j.warn diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt similarity index 71% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt index 60af515..cfeddae 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedEventHandlingStrategyFactory.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory class BlockAppendedEventHandlingStrategyFactory( private val handleRollbackFactory: HandleRollbackFactory, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt index 30746a6..6c62b39 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/BlockAppendedSyncedBlockInfo.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.Timestamp import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo class BlockAppendedSyncedBlockInfo( private val blockAppended: BlockchainEvent.BlockAppended, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt index 51f2ee1..d757e86 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategy.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncedBlockInfo interface EventHandlingStrategy { fun actionsOn(event: BlockchainEvent): List diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt similarity index 53% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt index b509532..4f4d23d 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/EventHandlingStrategyFactory.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy interface EventHandlingStrategyFactory { fun create(height: Long): EventHandlingStrategy diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt index f45873d..fff6467 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategy.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.logIgnoredTxs -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.toWeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.logIgnoredTxs +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.toWeBlockInfo import org.slf4j.lazyLogger import org.slf4j.warn diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt index 795e450..c81fa6c 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/MicroBlockEventHandlingStrategyFactory.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory class MicroBlockEventHandlingStrategyFactory( private val handleRollbackFactory: HandleRollbackFactory, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt similarity index 58% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt index 1d8a439..837b890 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/subscriber/strategy/extensions.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.toWeBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleBlocks +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.toWeBlockInfo fun AppendedBlockHistoryBuffer.clearAndBuildHandleBlocks(): HandleBlocks = clear().toHandleBlocks() diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt similarity index 71% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt index 440ef37..20f84b3 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryCleaner.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository import org.slf4j.info import org.slf4j.lazyLogger diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt index fde3cd9..845e9e2 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryService.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.domain.Height -import com.wavesenterprise.we.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt similarity index 96% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt index 1c6fe32..a520c4d 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockHistoryServiceImpl.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.Timestamp.Companion.toDateTimeFromUTCBlockChain -import com.wavesenterprise.we.tx.observer.domain.BlockHistory -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository import org.slf4j.debug import org.slf4j.lazyLogger import org.springframework.data.domain.Page diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt index b6a8339..c23fb74 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/BlockSearchResult.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt index 53ca050..eaf5675 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/ExpectedHeightMismatchException.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import javax.persistence.OptimisticLockException diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt index 40797d1..6522563 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfo.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt index 6ec4986..081a1a0 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoService.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo interface SyncInfoService { fun observerHeight(): Long diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt similarity index 93% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt index 19aabd6..8fc8969 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncInfoServiceImpl.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockSearchResult.Found -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockSearchResult.NotFound -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsContainer -import com.wavesenterprise.we.tx.observer.domain.BlockHeightInfo -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockSearchResult.Found +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockSearchResult.NotFound +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsContainer +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightInfo +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import org.slf4j.debug import org.slf4j.info import org.slf4j.lazyLogger diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt index 02e52ea..a4571ac 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/SyncedBlockInfo.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/consts.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/consts.kt new file mode 100644 index 0000000..661b015 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/executor/syncinfo/consts.kt @@ -0,0 +1,3 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo + +const val FIRST_BLOCK_HEIGHT = 1L diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockService.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockService.kt index 4276a3e..a56eecd 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockService.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.lock +package com.wavesenterprise.sdk.tx.observer.core.spring.lock /** * Service for synchronisation using locks. diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockServiceImpl.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockServiceImpl.kt index f037066..b54ac35 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/lock/LockServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/lock/LockServiceImpl.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.lock +package com.wavesenterprise.sdk.tx.observer.core.spring.lock -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.jpa.repository.LockRepository +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.jpa.repository.LockRepository import org.slf4j.debug import org.slf4j.info import org.slf4j.lazyLogger diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt similarity index 94% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt index b2f21bb..7489829 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/AbstractPrivateContentResolver.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper @@ -9,7 +9,7 @@ import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemInfoResponse import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver import org.springframework.util.Base64Utils import java.lang.reflect.Type diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt index a2ed550..70d65eb 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerHandlerBuilder.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback import com.fasterxml.jackson.databind.JavaType import com.fasterxml.jackson.databind.ObjectMapper @@ -11,15 +11,15 @@ import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.UpdateContractTx -import com.wavesenterprise.we.tx.observer.api.BlockListenerHandlerException -import com.wavesenterprise.we.tx.observer.api.BlockListenerSingleTxHandlerException -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.common.tx.handler.TxHandler -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.BlockListenerHandlerBuilder.Companion.logger +import com.wavesenterprise.sdk.tx.observer.api.BlockListenerHandlerException +import com.wavesenterprise.sdk.tx.observer.api.BlockListenerSingleTxHandlerException +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.common.tx.handler.TxHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.BlockListenerHandlerBuilder.Companion.logger import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.beans.factory.ObjectProvider diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt index 803395c..cab4058 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerMethodCallback.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback import com.fasterxml.jackson.databind.ObjectMapper -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriberImpl +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriberImpl import org.springframework.beans.factory.ObjectProvider import org.springframework.beans.factory.config.ConfigurableBeanFactory import org.springframework.context.expression.BeanFactoryResolver diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt similarity index 94% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt index a3f294f..71928b8 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/BlockListenerPredicateBuilder.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.node.NullNode @@ -31,16 +31,16 @@ import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type import com.wavesenterprise.sdk.node.domain.tx.UpdateContractTx import com.wavesenterprise.sdk.node.domain.tx.UpdatePolicyTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter -import com.wavesenterprise.we.tx.observer.api.privacy.MessageFilters -import com.wavesenterprise.we.tx.observer.api.privacy.PolicyFilter -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.core.spring.component.MethodArgumentClassExtractor.Companion.extractClassFromMethodArgument -import com.wavesenterprise.we.tx.observer.core.spring.util.TxSpElUtils +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilters +import com.wavesenterprise.sdk.tx.observer.api.privacy.PolicyFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.core.spring.component.MethodArgumentClassExtractor.Companion.extractClassFromMethodArgument +import com.wavesenterprise.sdk.tx.observer.core.spring.util.TxSpElUtils import org.springframework.beans.factory.ObjectProvider import org.springframework.context.expression.BeanFactoryResolver import org.springframework.expression.spel.standard.SpelExpressionParser diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt index f146236..e017d98 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/PrivateContentResolverImpl.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback import com.fasterxml.jackson.core.JsonParseException import com.fasterxml.jackson.databind.JsonNode @@ -9,8 +9,8 @@ import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemInfoResponse import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx import com.wavesenterprise.sdk.node.exception.NodeBadRequestException -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent import org.slf4j.Logger import org.slf4j.LoggerFactory import java.lang.reflect.Type diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt similarity index 81% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt index 4c35894..70d77d9 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/callback/SubscriberBeanProducerMethodCallback.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.callback +package com.wavesenterprise.sdk.tx.observer.core.spring.method.callback -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber import org.springframework.beans.factory.config.ConfigurableBeanFactory import org.springframework.util.ReflectionUtils import java.lang.reflect.Method diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt index 7021bbf..444e9c4 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/method/filter/BlockListenerMethodFilter.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.method.filter +package com.wavesenterprise.sdk.tx.observer.core.spring.method.filter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener import org.springframework.core.annotation.AnnotationUtils import org.springframework.util.ReflectionUtils import java.lang.reflect.Method diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt similarity index 57% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt index b68c612..0f352d4 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/AddableLongMetricsContainer.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.metrics +package com.wavesenterprise.sdk.tx.observer.core.spring.metrics interface AddableLongMetricsContainer : MetricsContainer { fun add(delta: Long) diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricContainerData.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricContainerData.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricContainerData.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricContainerData.kt index bad5855..cfd763c 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricContainerData.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricContainerData.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.metrics +package com.wavesenterprise.sdk.tx.observer.core.spring.metrics import java.util.concurrent.atomic.AtomicLong diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsContainer.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsContainer.kt similarity index 57% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsContainer.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsContainer.kt index 7432b0d..3ecaf85 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsContainer.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsContainer.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.metrics +package com.wavesenterprise.sdk.tx.observer.core.spring.metrics interface MetricsContainer { val metricName: String diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsSetter.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsSetter.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsSetter.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsSetter.kt index b9e6c41..24fe298 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/MetricsSetter.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/MetricsSetter.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.metrics +package com.wavesenterprise.sdk.tx.observer.core.spring.metrics -import com.wavesenterprise.we.tx.observer.core.spring.executor.PREFIX +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PREFIX import io.micrometer.core.instrument.MeterRegistry class MetricsSetter( diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt index cf7cb66..d54f669 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/metrics/ScheduledMetricsCollector.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.core.spring.metrics +package com.wavesenterprise.sdk.tx.observer.core.spring.metrics -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultPartitionResolver.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultPartitionResolver.kt similarity index 54% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultPartitionResolver.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultPartitionResolver.kt index 9f99c5c..252a715 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultPartitionResolver.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultPartitionResolver.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver class DefaultPartitionResolver : TxQueuePartitionResolver { diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt index badaacf..8781fd3 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/DefaultTxPartitionPoller.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition -import com.wavesenterprise.we.tx.observer.api.BlockListenerException -import com.wavesenterprise.we.tx.observer.api.PartitionHandlingException -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionPollerConfig -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.api.BlockListenerException +import com.wavesenterprise.sdk.tx.observer.api.PartitionHandlingException +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionPollerConfig +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt similarity index 74% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt index cccf965..e7fa1af 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/ErrorHandlingTxPartitionPoller.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition -import com.wavesenterprise.we.tx.observer.api.PartitionHandlingException +import com.wavesenterprise.sdk.tx.observer.api.PartitionHandlingException class ErrorHandlingTxPartitionPoller( private val defaultTxPartitionPoller: TxPartitionPoller, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/MetricPartitionHandler.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/MetricPartitionHandler.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/MetricPartitionHandler.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/MetricPartitionHandler.kt index acc6cd9..ae186dd 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/MetricPartitionHandler.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/MetricPartitionHandler.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer class MetricPartitionHandler( private val partitionHandler: PartitionHandler, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandler.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandler.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandler.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandler.kt index a8c737b..6e1a464 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandler.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandler.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition interface PartitionHandler { diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandlerJpa.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandlerJpa.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandlerJpa.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandlerJpa.kt index bdba22d..1353ac6 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PartitionHandlerJpa.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PartitionHandlerJpa.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PollingTxSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PollingTxSubscriber.kt similarity index 61% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PollingTxSubscriber.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PollingTxSubscriber.kt index 2df29b8..65e034d 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/PollingTxSubscriber.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/PollingTxSubscriber.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition interface PollingTxSubscriber { diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxPartitionPoller.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxPartitionPoller.kt similarity index 50% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxPartitionPoller.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxPartitionPoller.kt index 9205fd4..7560b74 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxPartitionPoller.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxPartitionPoller.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition interface TxPartitionPoller { fun pollPartition(): String? diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt similarity index 59% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt index 3fdd2ad..ebe07df 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveService.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition interface TxQueuePartitionResolveService { diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt index f20c53e..c3a092b 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/partition/TxQueuePartitionResolveServiceImpl.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.partition +package com.wavesenterprise.sdk.tx.observer.core.spring.partition import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/ForkResolverConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/ForkResolverConfig.kt similarity index 70% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/ForkResolverConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/ForkResolverConfig.kt index f880d1a..c0015fc 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/ForkResolverConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/ForkResolverConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/MetricsCollectorConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/MetricsCollectorConfig.kt similarity index 63% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/MetricsCollectorConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/MetricsCollectorConfig.kt index 53763f9..00b7aa9 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/MetricsCollectorConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/MetricsCollectorConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionCleanerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionCleanerConfig.kt similarity index 67% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionCleanerConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionCleanerConfig.kt index a83f4f0..74078d1 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionCleanerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionCleanerConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt similarity index 66% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt index 2584b0b..83ef25c 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPausedOnTxIdCleanerConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPollerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPollerConfig.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPollerConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPollerConfig.kt index e7fbee3..51a8f20 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PartitionPollerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PartitionPollerConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt index cf9546f..5b9437a 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/PrivacyAvailabilityCheckConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/QueueCleanerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/QueueCleanerConfig.kt similarity index 70% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/QueueCleanerConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/QueueCleanerConfig.kt index 34b864d..e535e2c 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/QueueCleanerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/QueueCleanerConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties interface QueueCleanerConfig { var enabled: Boolean diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/SubscriberConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/SubscriberConfig.kt similarity index 81% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/SubscriberConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/SubscriberConfig.kt index 09d5748..da94282 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/SubscriberConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/SubscriberConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import org.springframework.util.unit.DataSize diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt similarity index 64% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt index 266515c..c3a2861 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxEnqueuedPredicateConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverConfig.kt similarity index 90% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverConfig.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverConfig.kt index 6252b19..23044b0 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverConfig.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties +package com.wavesenterprise.sdk.tx.observer.core.spring.properties import org.springframework.util.unit.DataSize import java.time.Duration diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt new file mode 100644 index 0000000..df1d0b9 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt @@ -0,0 +1,5 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.properties + +interface TxObserverSchedulerConfig { + var poolSize: Int +} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxPollerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxPollerConfig.kt new file mode 100644 index 0000000..58b80d2 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/properties/TxPollerConfig.kt @@ -0,0 +1,5 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.properties + +interface TxPollerConfig { + var size: Int +} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/util/TxSpElUtils.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/util/TxSpElUtils.kt similarity index 94% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/util/TxSpElUtils.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/util/TxSpElUtils.kt index f368ed8..57fca29 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/util/TxSpElUtils.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/util/TxSpElUtils.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.util +package com.wavesenterprise.sdk.tx.observer.core.spring.util import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import java.util.concurrent.ConcurrentHashMap diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/EnqueuedTxController.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/EnqueuedTxController.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/EnqueuedTxController.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/EnqueuedTxController.kt index 8bd5b41..fdf2360 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/EnqueuedTxController.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/EnqueuedTxController.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web +package com.wavesenterprise.sdk.tx.observer.core.spring.web import com.wavesenterprise.sdk.node.domain.TxId.Companion.base58TxId -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.EnqueuedTxApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.EnqueuedTxSearchRequest -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.PatchTxApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.QueueStatusApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueService -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.EnqueuedTxApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.EnqueuedTxSearchRequest +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.PatchTxApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.QueueStatusApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueService +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.web.bind.annotation.DeleteMapping diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/ObserverController.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/ObserverController.kt similarity index 70% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/ObserverController.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/ObserverController.kt index 0f2d3c9..08b0b82 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/ObserverController.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/ObserverController.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web +package com.wavesenterprise.sdk.tx.observer.core.spring.web -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryService -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.BlockHistoryApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.ObserverStatusApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.RollbackInfoApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.service.RollbackInfoService -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.BlockHistoryApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.ObserverStatusApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.RollbackInfoApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.RollbackInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueService import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.http.HttpStatus diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/TxQueuePartitionController.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/TxQueuePartitionController.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/TxQueuePartitionController.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/TxQueuePartitionController.kt index 4124129..22462cd 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/TxQueuePartitionController.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/TxQueuePartitionController.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web +package com.wavesenterprise.sdk.tx.observer.core.spring.web -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.TxQueuePartitionSearchRequest -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.TxQueuePartitionStatusApiDto -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.TxQueuePartitionSearchRequest +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.TxQueuePartitionStatusApiDto +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.springframework.data.domain.Pageable import org.springframework.data.repository.findByIdOrNull import org.springframework.http.HttpStatus diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/WebControllers.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/WebControllers.kt new file mode 100644 index 0000000..5486e39 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/WebControllers.kt @@ -0,0 +1,3 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.web + +class WebControllers diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt index efc8c37..5d2d2d1 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/BlockHistoryApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto import java.time.OffsetDateTime diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt index cceeece..f12cccb 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxApiDto.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto import com.fasterxml.jackson.databind.JsonNode -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus import java.time.OffsetDateTime data class EnqueuedTxApiDto( diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt similarity index 59% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt index 3e1d945..842e7ce 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/EnqueuedTxSearchRequest.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus data class EnqueuedTxSearchRequest( var status: List?, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt similarity index 52% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt index 5c900d6..7aaf5fc 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/ObserverStatusApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto data class ObserverStatusApiDto( val totalRollbackCount: Long, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PatchTxApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PatchTxApiDto.kt new file mode 100644 index 0000000..6bcd7e0 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PatchTxApiDto.kt @@ -0,0 +1,7 @@ +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto + +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus + +data class PatchTxApiDto( + val status: EnqueuedTxStatus, +) diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt similarity index 60% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt index 598f56a..a165890 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PriorityComparisonOperator.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto enum class PriorityComparisonOperator { EQ, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt similarity index 62% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt index 7995f36..81824ac 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/PrivacyStatusApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto data class PrivacyStatusApiDto( val totalNewPolicyDataHashes: Long, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt similarity index 75% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt index 6315f5d..f33d4e2 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/QueueStatusApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto data class QueueStatusApiDto( val nodeHeight: Long, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt similarity index 71% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt index 2253d06..335163b 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/RollbackInfoApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto import java.time.OffsetDateTime diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt index 5fdddc9..0b7fa1b 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto import java.time.OffsetDateTime diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt similarity index 58% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt index f0eb616..1cb4c48 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionSearchRequest.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus data class TxQueuePartitionSearchRequest( val priority: Int?, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt similarity index 64% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt index 76d627c..05313df 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/dto/TxQueuePartitionStatusApiDto.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto +package com.wavesenterprise.sdk.tx.observer.core.spring.web.dto data class TxQueuePartitionStatusApiDto( val errorPartitionCount: Long, diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/mapper.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/mapper.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/mapper.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/mapper.kt index 0198ffb..5e89b14 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/mapper.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/mapper.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web +package com.wavesenterprise.sdk.tx.observer.core.spring.web -import com.wavesenterprise.we.tx.observer.common.jpa.util.toIn -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.BlockHistoryApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.EnqueuedTxApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.EnqueuedTxSearchRequest -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.PriorityComparisonOperator -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.RollbackInfoApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.TxQueuePartitionApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.TxQueuePartitionSearchRequest -import com.wavesenterprise.we.tx.observer.domain.BlockHistory -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx_ -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition_ +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.toIn +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.BlockHistoryApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.EnqueuedTxApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.EnqueuedTxSearchRequest +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.PriorityComparisonOperator +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.RollbackInfoApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.TxQueuePartitionApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.TxQueuePartitionSearchRequest +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx_ +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition_ import org.springframework.data.jpa.domain.Specification import javax.persistence.criteria.CriteriaBuilder import javax.persistence.criteria.CriteriaQuery diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoService.kt similarity index 60% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoService.kt index b445bdf..bae305f 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoService.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.service +package com.wavesenterprise.sdk.tx.observer.core.spring.web.service -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt similarity index 68% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt index 1fb90d1..19c1ab6 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/RollbackInfoServiceImpl.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.service +package com.wavesenterprise.sdk.tx.observer.core.spring.web.service -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo -import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueService.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueService.kt similarity index 61% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueService.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueService.kt index 51cbf39..9d5435e 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueService.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueService.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.service +package com.wavesenterprise.sdk.tx.observer.core.spring.web.service import com.wavesenterprise.sdk.node.domain.TxId -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.PatchTxApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.QueueStatusApiDto -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.PatchTxApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.QueueStatusApiDto +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx interface TxQueueService { fun getQueueStatus(): QueueStatusApiDto diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt rename to we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt index 4975b70..47e1fe3 100644 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt +++ b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/core/spring/web/service/TxQueueStatusServiceImpl.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.service +package com.wavesenterprise.sdk.tx.observer.core.spring.web.service import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory @@ -7,17 +7,17 @@ import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.PatchTxApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.PrivacyStatusApiDto -import com.wavesenterprise.we.tx.observer.core.spring.web.dto.QueueStatusApiDto -import com.wavesenterprise.we.tx.observer.domain.BlockHeightReset -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.PatchTxApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.PrivacyStatusApiDto +import com.wavesenterprise.sdk.tx.observer.core.spring.web.dto.QueueStatusApiDto +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightReset +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository import org.slf4j.Logger import org.slf4j.LoggerFactory import org.springframework.data.repository.findByIdOrNull diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt deleted file mode 100644 index 8df4312..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/MetricRollbackSubscriber.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor - -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer - -class MetricRollbackSubscriber( - private val rollbackCountMetricsContainer: AddableLongMetricsContainer, -) : RollbackSubscriber { - override fun onRollback(weRollbackInfo: WeRollbackInfo) { - rollbackCountMetricsContainer.add(1) - } -} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt deleted file mode 100644 index 031b04a..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/subscriber/HandleRollbackFactory.kt +++ /dev/null @@ -1,8 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber - -import com.wavesenterprise.sdk.node.domain.event.BlockchainEvent -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.Action.HandleRollback - -interface HandleRollbackFactory { - fun create(event: BlockchainEvent.RollbackCompleted): HandleRollback -} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/consts.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/consts.kt deleted file mode 100644 index b79b199..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/executor/syncinfo/consts.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo - -const val FIRST_BLOCK_HEIGHT = 1L diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt deleted file mode 100644 index 89a1488..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxObserverSchedulerConfig.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties - -interface TxObserverSchedulerConfig { - var poolSize: Int -} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxPollerConfig.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxPollerConfig.kt deleted file mode 100644 index eceeab1..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/properties/TxPollerConfig.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.properties - -interface TxPollerConfig { - var size: Int -} diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/WebControllers.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/WebControllers.kt deleted file mode 100644 index 9c02cdb..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/WebControllers.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web - -class WebControllers diff --git a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PatchTxApiDto.kt b/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PatchTxApiDto.kt deleted file mode 100644 index ce0447d..0000000 --- a/we-tx-observer-module/we-tx-observer-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/observer/core/spring/web/dto/PatchTxApiDto.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.wavesenterprise.we.tx.observer.core.spring.web.dto - -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus - -data class PatchTxApiDto( - val status: EnqueuedTxStatus, -) diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightInfo.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightInfo.kt similarity index 89% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightInfo.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightInfo.kt index 0c833f1..276b49a 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightInfo.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightInfo.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import org.hibernate.annotations.SQLInsert import org.springframework.data.annotation.CreatedDate import org.springframework.data.annotation.LastModifiedDate diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightReset.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightReset.kt similarity index 64% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightReset.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightReset.kt index 802f8e8..29a49e9 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHeightReset.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHeightReset.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import javax.persistence.Entity import javax.persistence.Id import javax.persistence.Table diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHistory.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHistory.kt similarity index 89% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHistory.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHistory.kt index eb139bc..46c1b0b 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/BlockHistory.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/BlockHistory.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import org.hibernate.annotations.SQLDelete import org.hibernate.annotations.SQLInsert import org.hibernate.annotations.Where diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTx.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTx.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTx.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTx.kt index 0f8bd49..c0a21cd 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTx.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTx.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain import com.fasterxml.jackson.databind.JsonNode import com.vladmihalcea.hibernate.type.json.JsonBinaryType -import com.wavesenterprise.we.tx.observer.common.jpa.util.JSONB_TYPE -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.JSONB_TYPE +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import org.hibernate.annotations.Type import org.hibernate.annotations.TypeDef import org.hibernate.annotations.TypeDefs diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTxStatus.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTxStatus.kt similarity index 65% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTxStatus.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTxStatus.kt index a7c493f..5e7250c 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/EnqueuedTxStatus.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/EnqueuedTxStatus.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain enum class EnqueuedTxStatus { NEW, diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/Lock.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/Lock.kt similarity index 58% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/Lock.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/Lock.kt index 945a2ab..374fc30 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/Lock.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/Lock.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import javax.persistence.Entity import javax.persistence.Id import javax.persistence.Table diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/RollbackInfo.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/RollbackInfo.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/RollbackInfo.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/RollbackInfo.kt index 0ae08fb..837c658 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/RollbackInfo.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/RollbackInfo.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import org.springframework.data.annotation.CreatedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener import java.time.OffsetDateTime diff --git a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/TxQueuePartition.kt b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/TxQueuePartition.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/TxQueuePartition.kt rename to we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/TxQueuePartition.kt index a3dbc34..0bf326b 100644 --- a/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/we/tx/observer/domain/TxQueuePartition.kt +++ b/we-tx-observer-module/we-tx-observer-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/domain/TxQueuePartition.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.domain +package com.wavesenterprise.sdk.tx.observer.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import org.springframework.data.annotation.CreatedDate import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/TxObserverJpaAutoConfig.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/TxObserverJpaAutoConfig.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/TxObserverJpaAutoConfig.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/TxObserverJpaAutoConfig.kt index c256762..78c8db8 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/TxObserverJpaAutoConfig.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/TxObserverJpaAutoConfig.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.jpa +package com.wavesenterprise.sdk.tx.observer.jpa -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnJpaMode -import com.wavesenterprise.we.tx.observer.domain.BlockHeightInfo -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnJpaMode +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightInfo +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightJpaRepository import org.springframework.boot.autoconfigure.AutoConfigurationPackage import org.springframework.boot.autoconfigure.AutoConfigureBefore import org.springframework.boot.autoconfigure.AutoConfigureOrder diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/DateTimeProviderConfig.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/DateTimeProviderConfig.kt similarity index 90% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/DateTimeProviderConfig.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/DateTimeProviderConfig.kt index b3dd97f..d1b1248 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/DateTimeProviderConfig.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/DateTimeProviderConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.jpa.config +package com.wavesenterprise.sdk.tx.observer.jpa.config import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/TxObserverJpaConfig.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/TxObserverJpaConfig.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/TxObserverJpaConfig.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/TxObserverJpaConfig.kt index 4ccf945..9251320 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/TxObserverJpaConfig.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/config/TxObserverJpaConfig.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.jpa.config +package com.wavesenterprise.sdk.tx.observer.jpa.config -import com.wavesenterprise.we.flyway.starter.FlywaySchema -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutorImpl +import com.wavesenterprise.sdk.flyway.starter.FlywaySchema +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutorImpl import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightJpaRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightJpaRepository.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightJpaRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightJpaRepository.kt index 12e6635..9844337 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightJpaRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightJpaRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.domain.BlockHeightInfo +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightInfo import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Modifying import org.springframework.data.jpa.repository.Query diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightResetRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightResetRepository.kt similarity index 61% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightResetRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightResetRepository.kt index 367a9a6..e70a0be 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHeightResetRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHeightResetRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.domain.BlockHeightReset +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightReset import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHistoryRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHistoryRepository.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHistoryRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHistoryRepository.kt index f40c1d6..728c35d 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/BlockHistoryRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/BlockHistoryRepository.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory import org.springframework.data.jpa.repository.JpaSpecificationExecutor import org.springframework.data.jpa.repository.Modifying import org.springframework.data.jpa.repository.Query diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt similarity index 95% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt index 1335477..905d53c 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/EnqueuedTxJpaRepository.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus import org.springframework.data.domain.Page import org.springframework.data.domain.Pageable import org.springframework.data.jpa.domain.Specification diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/LockRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/LockRepository.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/LockRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/LockRepository.kt index bf21d66..96a7307 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/LockRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/LockRepository.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.domain.Lock +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.domain.Lock import org.springframework.data.jpa.repository.Modifying import org.springframework.data.jpa.repository.Query import org.springframework.stereotype.Repository diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/RollbackInfoRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/RollbackInfoRepository.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/RollbackInfoRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/RollbackInfoRepository.kt index c17a2e0..8657573 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/RollbackInfoRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/RollbackInfoRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo import org.springframework.data.jpa.repository.JpaSpecificationExecutor import org.springframework.data.repository.CrudRepository import org.springframework.stereotype.Repository diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt similarity index 96% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt rename to we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt index e8e2bdd..a7b9818 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/jpa/repository/TxQueuePartitionJpaRepository.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.jpa.repository +package com.wavesenterprise.sdk.tx.observer.jpa.repository -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.JpaSpecificationExecutor import org.springframework.data.jpa.repository.Modifying diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/resources/META-INF/spring.factories b/we-tx-observer-module/we-tx-observer-jpa/src/main/resources/META-INF/spring.factories index b51c14d..d8b22b3 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/resources/META-INF/spring.factories +++ b/we-tx-observer-module/we-tx-observer-jpa/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig \ No newline at end of file + com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig \ No newline at end of file diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/BlockInfoSynchronizerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/BlockInfoSynchronizerConfig.kt similarity index 63% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/BlockInfoSynchronizerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/BlockInfoSynchronizerConfig.kt index 5fb3481..1804e73 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/BlockInfoSynchronizerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/BlockInfoSynchronizerConfig.kt @@ -1,31 +1,31 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.wavesenterprise.sdk.node.domain.TxType -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.component.CachingTxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.component.LoggingBlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.component.TxTypeEnqueuedPredicate -import com.wavesenterprise.we.tx.observer.core.spring.executor.EnqueueingBlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.FILTERED_TX_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.MetricRollbackSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.PersistingRollbackSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.ROLLBACK_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.TOTAL_LOGICAL_TX_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.TOTAL_TX_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricContainerData -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxQueuePartitionResolveService -import com.wavesenterprise.we.tx.observer.core.spring.web.service.RollbackInfoService -import com.wavesenterprise.we.tx.observer.core.spring.web.service.RollbackInfoServiceImpl -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository -import com.wavesenterprise.we.tx.observer.starter.executor.poller.PollerBlockSourceConfiguration -import com.wavesenterprise.we.tx.observer.starter.executor.subscriber.SubscriberBlockSourceConfiguration -import com.wavesenterprise.we.tx.observer.starter.executor.syncinfo.SyncInfoConfig -import com.wavesenterprise.we.tx.observer.starter.properties.TxEnqueuedPredicateProperties +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.component.CachingTxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.component.LoggingBlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.component.TxTypeEnqueuedPredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.EnqueueingBlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.FILTERED_TX_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.MetricRollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PersistingRollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ROLLBACK_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.TOTAL_LOGICAL_TX_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.TOTAL_TX_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricContainerData +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxQueuePartitionResolveService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.RollbackInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.RollbackInfoServiceImpl +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository +import com.wavesenterprise.sdk.tx.observer.starter.executor.poller.PollerBlockSourceConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.executor.subscriber.SubscriberBlockSourceConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.executor.syncinfo.SyncInfoConfig +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxEnqueuedPredicateProperties import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.context.properties.EnableConfigurationProperties diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/ForkResolverConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/ForkResolverConfig.kt similarity index 70% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/ForkResolverConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/ForkResolverConfig.kt index ffbec0d..6945f83 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/ForkResolverConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/ForkResolverConfig.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledForkResolver -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.ForkResolverProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledForkResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.ForkResolverProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/JpaExecutorsConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/JpaExecutorsConfig.kt similarity index 72% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/JpaExecutorsConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/JpaExecutorsConfig.kt index 167e488..fbbd08b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/JpaExecutorsConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/JpaExecutorsConfig.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnJpaMode -import com.wavesenterprise.we.tx.observer.starter.lock.LockConfig +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnJpaMode +import com.wavesenterprise.sdk.tx.observer.starter.lock.LockConfig import org.springframework.context.annotation.Configuration import org.springframework.context.annotation.Import diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/MetricsCollectorConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/MetricsCollectorConfig.kt similarity index 65% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/MetricsCollectorConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/MetricsCollectorConfig.kt index cacd9eb..efa5f69 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/MetricsCollectorConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/MetricsCollectorConfig.kt @@ -1,16 +1,16 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.core.spring.executor.ERROR_PARTITION_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.QUEUE_HEIGHT -import com.wavesenterprise.we.tx.observer.core.spring.executor.QUEUE_SIZE -import com.wavesenterprise.we.tx.observer.core.spring.executor.TOTAL_PARTITION_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricContainerData -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.metrics.ScheduledMetricsCollector -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.MetricsCollectorProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ERROR_PARTITION_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.QUEUE_HEIGHT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.QUEUE_SIZE +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.TOTAL_PARTITION_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricContainerData +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.ScheduledMetricsCollector +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.MetricsCollectorProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionCleanerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionCleanerConfig.kt similarity index 61% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionCleanerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionCleanerConfig.kt index a5cd0c5..6a4f7f9 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionCleanerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionCleanerConfig.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionCleaner -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionCleanerConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionCleanerProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionCleanerConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionCleanerProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionHandlerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionHandlerConfig.kt similarity index 63% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionHandlerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionHandlerConfig.kt index e0911fc..28214be 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionHandlerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionHandlerConfig.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.core.spring.executor.HANDLED_TX_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.PARTITION_HANDLING_FAILURE_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricContainerData -import com.wavesenterprise.we.tx.observer.core.spring.partition.MetricPartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandlerJpa -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.HANDLED_TX_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PARTITION_HANDLING_FAILURE_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricContainerData +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.MetricPartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandlerJpa +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt similarity index 62% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt index 1d1b23b..585b39e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPausedOnTxIdCleanerConfig.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionPausedOnTxIdCleaner -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionPausedOnTxIdCleanerProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionPausedOnTxIdCleaner +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionPausedOnTxIdCleanerProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPollerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPollerConfig.kt similarity index 68% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPollerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPollerConfig.kt index fd272a3..db8ae17 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PartitionPollerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PartitionPollerConfig.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.core.spring.executor.AppContextPollingTxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultTxPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.partition.ErrorHandlingTxPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxPartitionPoller -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionPollerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.TxPollerProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.AppContextPollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultTxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.ErrorHandlingTxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionPollerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxPollerProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.ApplicationContext diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt similarity index 62% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt index 4cfa7e0..ef5cef1 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/PrivacyAvailabilityCheckConfig.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.core.spring.component.OffsetProvider -import com.wavesenterprise.we.tx.observer.core.spring.component.RandomOffsetProvider -import com.wavesenterprise.we.tx.observer.core.spring.executor.NOT_AVAILABLE_PRIVACY_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.PRIVACY_BECAME_AVAILABLE_COUNT -import com.wavesenterprise.we.tx.observer.core.spring.executor.PrivacyAvailabilityChecker -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPrivacyChecker -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricContainerData -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.PrivacyAvailabilityCheckProperties +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.component.OffsetProvider +import com.wavesenterprise.sdk.tx.observer.core.spring.component.RandomOffsetProvider +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.NOT_AVAILABLE_PRIVACY_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PRIVACY_BECAME_AVAILABLE_COUNT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PrivacyAvailabilityChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPrivacyChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricContainerData +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.PrivacyAvailabilityCheckProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxEnqueuePredicatesSupplier.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxEnqueuePredicatesSupplier.kt new file mode 100644 index 0000000..69ead22 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxEnqueuePredicatesSupplier.kt @@ -0,0 +1,7 @@ +package com.wavesenterprise.sdk.tx.observer.starter + +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate + +interface TxEnqueuePredicatesSupplier { + fun predicates(): List +} diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurer.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurer.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurer.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurer.kt index cc1b77b..bf49af1 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurer.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurer.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate /** * Configurer of the main elements of the observer. diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerAdapter.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerAdapter.kt similarity index 66% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerAdapter.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerAdapter.kt index 0f7f456..936d83b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerAdapter.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerAdapter.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver open class TxObserverConfigurerAdapter : TxObserverConfigurer { override fun partitionResolver(): TxQueuePartitionResolver? = null diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerBuilder.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerBuilder.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerBuilder.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerBuilder.kt index 8182395..fe245fa 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerBuilder.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerBuilder.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate class TxObserverConfigurerBuilder { var privateContentResolver: PrivateContentResolver? = null diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerDsl.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerDsl.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerDsl.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerDsl.kt index 76abb00..1912e06 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverConfigurerDsl.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverConfigurerDsl.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate fun observerConfigurer(init: TxObserverConfigurerContext.() -> Unit = {}): TxObserverConfigurer = TxObserverConfigurerContextImpl() diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverEnablerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverEnablerConfig.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverEnablerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverEnablerConfig.kt index e3e5598..b702474 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverEnablerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverEnablerConfig.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.component.AndTxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.component.TxTypeEnqueuedPredicate -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.PrivateContentResolverImpl -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultPartitionResolver -import com.wavesenterprise.we.tx.observer.starter.properties.TxEnqueuedPredicateProperties +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.component.AndTxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.component.TxTypeEnqueuedPredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.PrivateContentResolverImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultPartitionResolver +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxEnqueuedPredicateProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.context.properties.EnableConfigurationProperties diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverLockConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverLockConfig.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverLockConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverLockConfig.kt index 2211a6e..22689b9 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverLockConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverLockConfig.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME import net.javacrumbs.shedlock.core.LockProvider import net.javacrumbs.shedlock.provider.jdbctemplate.JdbcTemplateLockProvider import net.javacrumbs.shedlock.spring.annotation.EnableSchedulerLock diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverSchedulerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverSchedulerConfig.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverSchedulerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverSchedulerConfig.kt index 1df176a..447cf6d 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverSchedulerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverSchedulerConfig.kt @@ -1,24 +1,24 @@ -package com.wavesenterprise.we.tx.observer.starter - -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledForkResolver -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionPausedOnTxIdCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPrivacyChecker -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledTxQueueCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.EventSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryCleaner -import com.wavesenterprise.we.tx.observer.core.spring.metrics.ScheduledMetricsCollector -import com.wavesenterprise.we.tx.observer.starter.properties.ForkResolverProperties -import com.wavesenterprise.we.tx.observer.starter.properties.MetricsCollectorProperties -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionCleanerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionPausedOnTxIdCleanerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.PartitionPollerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.PrivacyAvailabilityCheckProperties -import com.wavesenterprise.we.tx.observer.starter.properties.QueueCleanerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverProperties -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverSchedulerProperties +package com.wavesenterprise.sdk.tx.observer.starter + +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledForkResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionPausedOnTxIdCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPrivacyChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledTxQueueCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.EventSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.ScheduledMetricsCollector +import com.wavesenterprise.sdk.tx.observer.starter.properties.ForkResolverProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.MetricsCollectorProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionCleanerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionPausedOnTxIdCleanerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.PartitionPollerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.PrivacyAvailabilityCheckProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.QueueCleanerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverSchedulerProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverStarterConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverStarterConfig.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverStarterConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverStarterConfig.kt index 867197c..16c8c47 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxObserverStarterConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxObserverStarterConfig.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.fasterxml.jackson.databind.ObjectMapper import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.spring.autoconfigure.node.NodeBlockingServiceFactoryAutoConfiguration -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.PrivateContentResolverImpl -import com.wavesenterprise.we.tx.observer.starter.annotation.EventListenerAnnotationProcessor +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.PrivateContentResolverImpl +import com.wavesenterprise.sdk.tx.observer.starter.annotation.EventListenerAnnotationProcessor import org.springframework.beans.factory.ObjectProvider import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.config.ConfigurableBeanFactory diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxQueueConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxQueueConfig.kt similarity index 66% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxQueueConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxQueueConfig.kt index ddb93ce..0919126 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxQueueConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/TxQueueConfig.kt @@ -1,25 +1,25 @@ -package com.wavesenterprise.we.tx.observer.starter +package com.wavesenterprise.sdk.tx.observer.starter import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledTxQueueCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultPartitionResolver -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxQueuePartitionResolveService -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxQueuePartitionResolveServiceImpl -import com.wavesenterprise.we.tx.observer.core.spring.web.EnqueuedTxController -import com.wavesenterprise.we.tx.observer.core.spring.web.ObserverController -import com.wavesenterprise.we.tx.observer.core.spring.web.TxQueuePartitionController -import com.wavesenterprise.we.tx.observer.core.spring.web.WebControllers -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueService -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueStatusServiceImpl -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.QueueCleanerProperties -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverProperties +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledTxQueueCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultPartitionResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxQueuePartitionResolveService +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxQueuePartitionResolveServiceImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.web.EnqueuedTxController +import com.wavesenterprise.sdk.tx.observer.core.spring.web.ObserverController +import com.wavesenterprise.sdk.tx.observer.core.spring.web.TxQueuePartitionController +import com.wavesenterprise.sdk.tx.observer.core.spring.web.WebControllers +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueService +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueStatusServiceImpl +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.QueueCleanerProperties +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Qualifier import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EnableTxObserver.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EnableTxObserver.kt similarity index 59% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EnableTxObserver.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EnableTxObserver.kt index e412cf1..939392e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EnableTxObserver.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EnableTxObserver.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.annotation +package com.wavesenterprise.sdk.tx.observer.starter.annotation -import com.wavesenterprise.we.tx.observer.starter.TxObserverEnablerConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverEnablerConfig import org.springframework.context.annotation.Import @Target(AnnotationTarget.CLASS) diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt index 6ad6d66..0f6e1bc 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/annotation/EventListenerAnnotationProcessor.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.starter.annotation +package com.wavesenterprise.sdk.tx.observer.starter.annotation import com.fasterxml.jackson.databind.ObjectMapper -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.BlockListenerMethodCallback -import com.wavesenterprise.we.tx.observer.core.spring.method.filter.BlockListenerMethodFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.BlockListenerMethodCallback +import com.wavesenterprise.sdk.tx.observer.core.spring.method.filter.BlockListenerMethodFilter import org.springframework.beans.factory.ObjectProvider import org.springframework.beans.factory.config.BeanPostProcessor import org.springframework.beans.factory.config.ConfigurableBeanFactory diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/blockSourceMode.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/blockSourceMode.kt new file mode 100644 index 0000000..5416e58 --- /dev/null +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/blockSourceMode.kt @@ -0,0 +1,3 @@ +package com.wavesenterprise.sdk.tx.observer.starter.executor + +internal const val BLOCK_SOURCE_MODE = "blockSourceMode" diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt similarity index 63% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt index a8a852f..2e33138 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/poller/PollerBlockSourceConfiguration.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter.executor.poller +package com.wavesenterprise.sdk.tx.observer.starter.executor.poller import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksLoader -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksLoaderImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.SourceExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.SourceExecutorImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.executor.BLOCK_SOURCE_MODE -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverProperties +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksLoader +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksLoaderImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.SourceExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.SourceExecutorImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.executor.BLOCK_SOURCE_MODE +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverProperties import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt similarity index 70% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt index 29799d6..485d8ad 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/subscriber/SubscriberBlockSourceConfiguration.kt @@ -1,26 +1,26 @@ -package com.wavesenterprise.we.tx.observer.starter.executor.subscriber +package com.wavesenterprise.sdk.tx.observer.starter.executor.subscriber import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.grpc.blocking.GrpcNodeClientParams import com.wavesenterprise.sdk.node.client.grpc.blocking.factory.GrpcNodeServiceFactoryFactory import com.wavesenterprise.sdk.spring.autoconfigure.node.NodeBlockingServiceFactoryAutoConfiguration import com.wavesenterprise.sdk.spring.autoconfigure.node.properties.NodeProperties -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.api.block.subscriber.RollbackSubscriber -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.EventSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.HandleRollbackFactoryImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.AppendedBlockHistoryBuffer -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.AppendedBlockHistoryBufferImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.BlockAppendedEventHandlingStrategyFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategyFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.subscriber.strategy.MicroBlockEventHandlingStrategyFactory -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.lock.LockService -import com.wavesenterprise.we.tx.observer.core.spring.properties.Strategy -import com.wavesenterprise.we.tx.observer.starter.executor.BLOCK_SOURCE_MODE -import com.wavesenterprise.we.tx.observer.starter.properties.SubscriberProperties +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.RollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.EventSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.HandleRollbackFactoryImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.AppendedBlockHistoryBuffer +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.AppendedBlockHistoryBufferImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.BlockAppendedEventHandlingStrategyFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.EventHandlingStrategyFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.subscriber.strategy.MicroBlockEventHandlingStrategyFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.lock.LockService +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.Strategy +import com.wavesenterprise.sdk.tx.observer.starter.executor.BLOCK_SOURCE_MODE +import com.wavesenterprise.sdk.tx.observer.starter.properties.SubscriberProperties import org.springframework.boot.autoconfigure.AutoConfigureAfter import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty import org.springframework.boot.context.properties.EnableConfigurationProperties diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt similarity index 66% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt index d978e8f..0db83f0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/executor/syncinfo/SyncInfoConfig.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.starter.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.starter.executor.syncinfo import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService -import com.wavesenterprise.we.tx.observer.core.spring.executor.NODE_HEIGHT -import com.wavesenterprise.we.tx.observer.core.spring.executor.OBSERVER_HEIGHT -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryServiceImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoServiceImpl -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricContainerData -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsContainer -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.NODE_HEIGHT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.OBSERVER_HEIGHT +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryServiceImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoServiceImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricContainerData +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsContainer +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverProperties import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/lock/LockConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/lock/LockConfig.kt similarity index 62% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/lock/LockConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/lock/LockConfig.kt index b46e5e1..25c92ef 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/lock/LockConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/lock/LockConfig.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.starter.lock +package com.wavesenterprise.sdk.tx.observer.starter.lock -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.lock.LockService -import com.wavesenterprise.we.tx.observer.core.spring.lock.LockServiceImpl -import com.wavesenterprise.we.tx.observer.jpa.repository.LockRepository +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.lock.LockService +import com.wavesenterprise.sdk.tx.observer.core.spring.lock.LockServiceImpl +import com.wavesenterprise.sdk.tx.observer.jpa.repository.LockRepository import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt index b53e479..a51906b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/metrics/TxObserverMetricsAutoConfig.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.starter.metrics +package com.wavesenterprise.sdk.tx.observer.starter.metrics -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsSetter -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsSetter +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig import io.micrometer.core.instrument.MeterRegistry import org.springframework.boot.actuate.autoconfigure.metrics.MetricsAutoConfiguration import org.springframework.boot.actuate.autoconfigure.metrics.export.simple.SimpleMetricsExportAutoConfiguration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/ForkResolverProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/ForkResolverProperties.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/ForkResolverProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/ForkResolverProperties.kt index 94d566b..23f6b55 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/ForkResolverProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/ForkResolverProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.ForkResolverConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.ForkResolverConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/MetricsCollectorProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/MetricsCollectorProperties.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/MetricsCollectorProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/MetricsCollectorProperties.kt index bf544ed..31294e6 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/MetricsCollectorProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/MetricsCollectorProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.MetricsCollectorConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.MetricsCollectorConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionCleanerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionCleanerProperties.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionCleanerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionCleanerProperties.kt index 02691ad..32bcd46 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionCleanerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionCleanerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionCleanerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionCleanerConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt index 450ae12..b705f39 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPausedOnTxIdCleanerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionPausedOnTxIdCleanerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionPausedOnTxIdCleanerConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPollerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPollerProperties.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPollerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPollerProperties.kt index 086d054..e15c240 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PartitionPollerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PartitionPollerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionPollerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionPollerConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt index 3144965..9c323e0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/PrivacyAvailabilityCheckProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.PrivacyAvailabilityCheckConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PrivacyAvailabilityCheckConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/QueueCleanerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/QueueCleanerProperties.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/QueueCleanerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/QueueCleanerProperties.kt index d294bc6..e9582c6 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/QueueCleanerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/QueueCleanerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.QueueCleanerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.QueueCleanerConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/SubscriberProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/SubscriberProperties.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/SubscriberProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/SubscriberProperties.kt index 5641e82..3047e49 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/SubscriberProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/SubscriberProperties.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.Strategy -import com.wavesenterprise.we.tx.observer.core.spring.properties.SubscriberProps +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.Strategy +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.SubscriberProps import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.convert.DataSizeUnit diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt index 89c393d..5f76867 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxEnqueuedPredicateProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.TxEnqueuedPredicateConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.TxEnqueuedPredicateConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverProperties.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverProperties.kt index 0f2fbc1..940af45 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.TxObserverConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.TxObserverConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverSchedulerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverSchedulerProperties.kt similarity index 67% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverSchedulerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverSchedulerProperties.kt index e700fc2..0e68aac 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxObserverSchedulerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxObserverSchedulerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.TxObserverSchedulerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.TxObserverSchedulerConfig import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxPollerProperties.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxPollerProperties.kt similarity index 59% rename from we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxPollerProperties.kt rename to we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxPollerProperties.kt index 90efa4a..bdaf87a 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/properties/TxPollerProperties.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/observer/starter/properties/TxPollerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.properties +package com.wavesenterprise.sdk.tx.observer.starter.properties -import com.wavesenterprise.we.tx.observer.core.spring.properties.TxPollerConfig +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.TxPollerConfig import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties("tx-observer.tx-poller") diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxEnqueuePredicatesSupplier.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxEnqueuePredicatesSupplier.kt deleted file mode 100644 index 34c8054..0000000 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/TxEnqueuePredicatesSupplier.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.wavesenterprise.we.tx.observer.starter - -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate - -interface TxEnqueuePredicatesSupplier { - fun predicates(): List -} diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/blockSourceMode.kt b/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/blockSourceMode.kt deleted file mode 100644 index 0abd651..0000000 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/kotlin/com/wavesenterprise/we/tx/observer/starter/executor/blockSourceMode.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.wavesenterprise.we.tx.observer.starter.executor - -internal const val BLOCK_SOURCE_MODE = "blockSourceMode" diff --git a/we-tx-observer-module/we-tx-observer-starter/src/main/resources/META-INF/spring.factories b/we-tx-observer-module/we-tx-observer-starter/src/main/resources/META-INF/spring.factories index 7f25c8c..c8684e6 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/main/resources/META-INF/spring.factories +++ b/we-tx-observer-module/we-tx-observer-starter/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig,\ - com.wavesenterprise.we.tx.observer.starter.metrics.TxObserverMetricsAutoConfig \ No newline at end of file + com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig,\ + com.wavesenterprise.sdk.tx.observer.starter.metrics.TxObserverMetricsAutoConfig \ No newline at end of file diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt similarity index 64% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt index db596fe..b5f1b25 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/annotation/EventListenerAnnotationProcessorTest.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.annotation +package com.wavesenterprise.sdk.tx.observer.starter.observer.annotation -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.BlockListenerTestContextConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.sample.TestBlockListeners -import com.wavesenterprise.we.tx.observer.starter.observer.sample.TestEventListeners +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.BlockListenerTestContextConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.sample.TestBlockListeners +import com.wavesenterprise.sdk.tx.observer.starter.observer.sample.TestEventListeners import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionHandlerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionHandlerTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionHandlerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionHandlerTest.kt index f20079c..4f4ac0b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionHandlerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionHandlerTest.kt @@ -1,14 +1,14 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.component +package com.wavesenterprise.sdk.tx.observer.starter.observer.component import com.ninjasquad.springmockk.MockkBean -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig import io.mockk.verify import io.mockk.verifySequence import org.junit.jupiter.api.Test diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt index b95b9ae..dd1840e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/PartitionTxHandlerJpaTest.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.component +package com.wavesenterprise.sdk.tx.observer.starter.observer.component +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandlerJpa -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandlerJpa +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNull diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt index d8ddbac..c51f795 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/component/TxTypeEnqueuedPredicateTest.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.component +package com.wavesenterprise.sdk.tx.observer.starter.observer.component import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.tx.observer.core.spring.component.TxTypeEnqueuedPredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.component.TxTypeEnqueuedPredicate import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt similarity index 58% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt index 3200872..0e7fcc7 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/BlockListenerTestContextConfiguration.kt @@ -1,13 +1,13 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.config - -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.domain.BlockHeightInfo -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.LockRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository -import com.wavesenterprise.we.tx.observer.starter.observer.util.TxExecutorStub +package com.wavesenterprise.sdk.tx.observer.starter.observer.config + +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightInfo +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.LockRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.TxExecutorStub import io.mockk.every import io.mockk.mockk import org.springframework.context.annotation.Bean diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt similarity index 97% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt index e64223e..f5569d8 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryMockConfiguration.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.config +package com.wavesenterprise.sdk.tx.observer.starter.observer.config import com.wavesenterprise.sdk.node.client.blocking.address.AddressService import com.wavesenterprise.sdk.node.client.blocking.alias.AliasService @@ -19,8 +19,8 @@ import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.atomic.AtomicBadge import com.wavesenterprise.sdk.node.domain.contract.ContractImage import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight import io.mockk.every import io.mockk.mockk import org.springframework.boot.autoconfigure.AutoConfigureOrder diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt similarity index 97% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt index c1ee425..331cd99 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/NodeBlockingServiceFactoryTestConfiguration.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.config +package com.wavesenterprise.sdk.tx.observer.starter.observer.config import com.wavesenterprise.sdk.node.client.blocking.address.AddressService import com.wavesenterprise.sdk.node.client.blocking.alias.AliasService diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/ObjectMapperConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/ObjectMapperConfig.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/ObjectMapperConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/ObjectMapperConfig.kt index d86b90b..1e956ee 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/ObjectMapperConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/ObjectMapperConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.config +package com.wavesenterprise.sdk.tx.observer.starter.observer.config import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/TxRunnerConfig.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/TxRunnerConfig.kt similarity index 56% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/TxRunnerConfig.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/TxRunnerConfig.kt index f55f5b3..66410f1 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/config/TxRunnerConfig.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/config/TxRunnerConfig.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.config +package com.wavesenterprise.sdk.tx.observer.starter.observer.config -import com.wavesenterprise.we.tx.observer.starter.observer.web.service.TransactionalRunner +import com.wavesenterprise.sdk.tx.observer.starter.observer.web.service.TransactionalRunner import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt similarity index 81% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt index 5684f7a..b39a504 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerTest.kt @@ -1,19 +1,19 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.enabler +package com.wavesenterprise.sdk.tx.observer.starter.observer.enabler +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverConfigurer -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.annotation.EnableTxObserver -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observerConfigurer +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverConfigurer +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.annotation.EnableTxObserver +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observerConfigurer import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt index 25917d7..471f8ae 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledConfigurerWithBuilderTest.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.enabler +package com.wavesenterprise.sdk.tx.observer.starter.observer.enabler +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverConfigurer -import com.wavesenterprise.we.tx.observer.starter.TxObserverConfigurerBuilder -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.annotation.EnableTxObserver -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverConfigurer +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverConfigurerBuilder +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.annotation.EnableTxObserver +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig import io.mockk.every import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt index 8798b23..036a15f 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverEnabledNoConfigurerTest.kt @@ -1,19 +1,19 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.enabler +package com.wavesenterprise.sdk.tx.observer.starter.observer.enabler +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.PrivateContentResolverImpl -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultPartitionResolver -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.annotation.EnableTxObserver -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.PrivateContentResolverImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultPartitionResolver +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.annotation.EnableTxObserver +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig import io.mockk.mockk import io.mockk.verify import org.junit.jupiter.api.Assertions.assertFalse diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt similarity index 68% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt index 9942e59..8e29816 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/enabler/TxObserverNotEnabledNoConfigurerTest.kt @@ -1,18 +1,18 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.enabler +package com.wavesenterprise.sdk.tx.observer.starter.observer.enabler +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.core.spring.method.callback.PrivateContentResolverImpl -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultPartitionResolver -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverConfigurer -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.core.spring.method.callback.PrivateContentResolverImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultPartitionResolver +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverConfigurer +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryTestConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Assertions.assertTrue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt index 2e1800a..c6ab9f2 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/AppContextPollingTxTxSubscriberTest.kt @@ -1,27 +1,27 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.client.http.tx.PolicyDataHashTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import io.mockk.verify import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt index 0139508..96a518a 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/DefaultTxPartitionPollerTest.kt @@ -1,14 +1,14 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor - -import com.wavesenterprise.we.tx.observer.api.BlockListenerException -import com.wavesenterprise.we.tx.observer.api.PartitionHandlingException -import com.wavesenterprise.we.tx.observer.core.spring.partition.DefaultTxPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.properties.PartitionPollerConfig -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor + +import com.wavesenterprise.sdk.tx.observer.api.BlockListenerException +import com.wavesenterprise.sdk.tx.observer.api.PartitionHandlingException +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.DefaultTxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.properties.PartitionPollerConfig +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository import io.mockk.confirmVerified import io.mockk.every import io.mockk.impl.annotations.InjectMockKs diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt index a4e2efe..afbd96f 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/EnqueueingBlockTxSubscriberTest.kt @@ -1,7 +1,8 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.TxDto import com.wavesenterprise.sdk.node.domain.Address import com.wavesenterprise.sdk.node.domain.Height @@ -11,27 +12,26 @@ import com.wavesenterprise.sdk.node.domain.atomic.AtomicBadge import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.partition.TxQueuePartitionResolver -import com.wavesenterprise.we.tx.observer.api.tx.TxEnqueuePredicate -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.observer.core.spring.component.HttpApiWeBlockInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.EnqueueingBlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.partition.TxQueuePartitionResolver +import com.wavesenterprise.sdk.tx.observer.api.tx.TxEnqueuePredicate +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.observer.core.spring.component.HttpApiWeBlockInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.EnqueueingBlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight import io.mockk.clearMocks import io.mockk.every import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt index dfc51dc..b06cb9c 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ErrorHandlingTxPartitionPollerIntegrationTest.kt @@ -1,21 +1,21 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.ninjasquad.springmockk.SpykBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.BlockListenerException -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxPartitionPoller -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.api.BlockListenerException +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import io.mockk.every import io.mockk.verify import org.junit.jupiter.api.AfterEach diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt index 8cb4dd7..16bf9da 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/MetricRollbackTxSubscriberTest.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor -import com.wavesenterprise.we.tx.observer.core.spring.executor.MetricRollbackSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.metrics.AddableLongMetricsContainer +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.MetricRollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.AddableLongMetricsContainer import io.mockk.confirmVerified import io.mockk.impl.annotations.InjectMockKs import io.mockk.impl.annotations.RelaxedMockK diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt index a7b2d8d..579459c 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PersistingRollbackTxSubscriberTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature -import com.wavesenterprise.we.tx.observer.api.block.WeRollbackInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.PersistingRollbackSubscriber -import com.wavesenterprise.we.tx.observer.domain.RollbackInfo -import com.wavesenterprise.we.tx.observer.jpa.repository.RollbackInfoRepository +import com.wavesenterprise.sdk.tx.observer.api.block.WeRollbackInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PersistingRollbackSubscriber +import com.wavesenterprise.sdk.tx.observer.domain.RollbackInfo +import com.wavesenterprise.sdk.tx.observer.jpa.repository.RollbackInfoRepository import io.mockk.confirmVerified import io.mockk.every import io.mockk.impl.annotations.InjectMockKs diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt index 441738c..dc7d110 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/PrivacyAvailabilityCheckerTest.kt @@ -1,6 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.http.tx.AtomicInnerTxDto.Companion.toDto @@ -8,20 +9,19 @@ import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateContentResolver -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.observer.core.spring.component.OffsetProvider -import com.wavesenterprise.we.tx.observer.core.spring.executor.PrivacyAvailabilityChecker -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateContentResolver +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.observer.core.spring.component.OffsetProvider +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PrivacyAvailabilityChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import io.mockk.every import io.mockk.verify import org.awaitility.Awaitility.await diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt similarity index 82% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt index 3f4c8f3..1a384c7 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledForkResolverTest.kt @@ -1,6 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.client.http.tx.CallContractTxDto.Companion.toDto @@ -9,19 +10,18 @@ import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.TestDataFactory.Companion.txInfo import com.wavesenterprise.sdk.node.test.data.Util -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledForkResolver -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus.CANCELLED_FORKED -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus.NEW -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledForkResolver +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus.CANCELLED_FORKED +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus.NEW +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory import io.mockk.every import io.mockk.verify import org.junit.jupiter.api.AfterEach diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt index 1453c32..028a53d 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionCleanerTest.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.AtomicInnerTxDto.Companion.toDto import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt index 7b39a01..0097044 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPausedOnTxIdCleanerTest.kt @@ -1,18 +1,18 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.AtomicInnerTxDto.Companion.toDto import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNull import org.junit.jupiter.api.Assertions.assertTrue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt index 21ef3ad..8b7f412 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPartitionPollerTest.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPartitionPoller -import com.wavesenterprise.we.tx.observer.core.spring.partition.TxPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPartitionPoller +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.TxPartitionPoller import io.mockk.confirmVerified import io.mockk.every import io.mockk.impl.annotations.InjectMockKs diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt index c21d71e..bc16bb2 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledPrivacyCheckerTest.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor -import com.wavesenterprise.we.tx.observer.core.spring.executor.PrivacyAvailabilityChecker -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledPrivacyChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.PrivacyAvailabilityChecker +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledPrivacyChecker import io.mockk.confirmVerified import io.mockk.every import io.mockk.impl.annotations.InjectMockKs diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt index 8fc66f2..457dd1e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/ScheduledTxQueueCleanerTest.kt @@ -1,21 +1,21 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CallContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.executor.ScheduledTxQueueCleaner -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.ScheduledTxQueueCleaner +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt index a2f8c8f..382bd33 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/blockinfo/SyncInfoServiceTest.kt @@ -1,19 +1,19 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor.blockinfo +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor.blockinfo import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoServiceImpl -import com.wavesenterprise.we.tx.observer.core.spring.metrics.MetricsContainer -import com.wavesenterprise.we.tx.observer.domain.BlockHeightInfo -import com.wavesenterprise.we.tx.observer.domain.BlockHeightReset -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoServiceImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.metrics.MetricsContainer +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightInfo +import com.wavesenterprise.sdk.tx.observer.domain.BlockHeightReset +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight import io.mockk.Runs import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt similarity index 89% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt index 6bd1b6c..e72ecd0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/BlocksLoaderTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor.poller +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor.poller import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Height -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksLoaderImpl -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockHeaders +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksLoaderImpl +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockHeaders import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt index c01526b..cec3d95 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/ScheduledWeBlockInfoSynchronizerTest.kt @@ -1,14 +1,14 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor.poller +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor.poller import com.wavesenterprise.sdk.node.domain.Height -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.SourceExecutor -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfo -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.SyncInfoService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.starter.observer.util.TxExecutorStub -import com.wavesenterprise.we.tx.observer.starter.properties.TxObserverProperties +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.ScheduledBlockInfoSynchronizer +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.SourceExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfo +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.SyncInfoService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.TxExecutorStub +import com.wavesenterprise.sdk.tx.observer.starter.properties.TxObserverProperties import io.mockk.called import io.mockk.every import io.mockk.impl.annotations.MockK diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt similarity index 89% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt index d2bcef9..10e46b4 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/poller/SourceExecutorImplTest.kt @@ -1,17 +1,17 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor.poller +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor.poller import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.TxId -import com.wavesenterprise.we.tx.observer.api.block.WeBlockInfo -import com.wavesenterprise.we.tx.observer.api.block.subscriber.BlockSubscriber -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksDownloadResult -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.BlocksLoader -import com.wavesenterprise.we.tx.observer.core.spring.executor.poller.SourceExecutorImpl -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.txList +import com.wavesenterprise.sdk.tx.observer.api.block.WeBlockInfo +import com.wavesenterprise.sdk.tx.observer.api.block.subscriber.BlockSubscriber +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksDownloadResult +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.BlocksLoader +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.poller.SourceExecutorImpl +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.txList import io.mockk.every import io.mockk.impl.annotations.RelaxedMockK import io.mockk.junit5.MockKExtension diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt index 671283f..4394902 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/executor/syncinfo/BlockHistoryServiceImplTest.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.executor.syncinfo +package com.wavesenterprise.sdk.tx.observer.starter.observer.executor.syncinfo import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.domain.Address @@ -6,13 +6,13 @@ import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.Signature import com.wavesenterprise.sdk.node.domain.blocks.BlockAtHeight import com.wavesenterprise.sdk.node.domain.blocks.BlockHeaders -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryService -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockHistoryServiceImpl -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.BlockSearchResult -import com.wavesenterprise.we.tx.observer.domain.BlockHistory -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockAtHeight -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockHistory +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryService +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockHistoryServiceImpl +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.BlockSearchResult +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockAtHeight +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockHistory import io.mockk.confirmVerified import io.mockk.every import io.mockk.impl.annotations.RelaxedMockK diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt index ab48a25..9014228 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/BlockHistoryRepositoryTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.jpa +package com.wavesenterprise.sdk.tx.observer.starter.observer.jpa -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHistoryRepository -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.blockHistory +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHistoryRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.blockHistory import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired @@ -26,7 +26,7 @@ import org.springframework.test.context.ContextConfiguration FlywaySchemaConfiguration::class, ] ) -@EntityScan("com.wavesenterprise.we.tx.observer") +@EntityScan("com.wavesenterprise.sdk.tx.observer") @AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) class BlockHistoryRepositoryTest { diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt index 4579b1b..ff7ae5d 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/EnqueuedTxJpaRepositoryTest.kt @@ -1,16 +1,16 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.jpa +package com.wavesenterprise.sdk.tx.observer.starter.observer.jpa +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt index 8320e4d..2e43651 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/jpa/TxQueuePartitionJpaRepositoryTest.kt @@ -1,22 +1,22 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.jpa +package com.wavesenterprise.sdk.tx.observer.starter.observer.jpa +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.Timestamp import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_OBSERVER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.hamcrest.CoreMatchers.`is` import org.hamcrest.MatcherAssert.assertThat import org.junit.jupiter.api.Assertions.assertEquals diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/AbstractListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/AbstractListenerTest.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/AbstractListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/AbstractListenerTest.kt index 648729d..cc306c0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/AbstractListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/AbstractListenerTest.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.ninjasquad.springmockk.MockkBean @@ -12,20 +12,20 @@ import com.wavesenterprise.sdk.node.client.blocking.privacy.PrivacyService import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.client.feign.tx.mapDto import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.core.spring.partition.PartitionHandler -import com.wavesenterprise.we.tx.observer.core.spring.partition.PollingTxSubscriber -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.BlockListenerTestContextConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx -import com.wavesenterprise.we.tx.observer.starter.observer.web.service.TransactionalRunner +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PartitionHandler +import com.wavesenterprise.sdk.tx.observer.core.spring.partition.PollingTxSubscriber +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.BlockListenerTestContextConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.web.service.TransactionalRunner import io.mockk.every import org.junit.jupiter.api.BeforeEach import org.springframework.beans.factory.annotation.Autowired diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt index f892d11..8cc3cf3 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/BooleanValueKeyEventBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt index 2d2c049..711546b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/FilteredByPrefixKeyEventBlockListenerTest.kt @@ -1,13 +1,13 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.DataValue import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt index ced3045..c996d43 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/IntValueKeyEventBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt index 2508eed..38f45cf 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/MapValueKeyEventBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt index 35bef61..8ca972c 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/ObjectValueKeyEventBlockListenerTest.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest -import com.wavesenterprise.we.tx.observer.starter.observer.testObjects.SimpleDataObject +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.starter.observer.testObjects.SimpleDataObject import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt index f856f28..3bfb017 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/keyevent/StringValueKeyEventBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.keyevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.keyevent import com.wavesenterprise.sdk.node.domain.tx.CallContractTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt index 66622a0..0ac64f3 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/AbstractPrivateEventBlockListenerTest.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.Height import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest import com.wavesenterprise.sdk.node.domain.tx.TxInfo -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.every import org.junit.jupiter.api.BeforeEach import java.util.Optional diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt index f61109b..d8aed8d 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ByteArrayPrivateDataEventBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.Data import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.Runs import io.mockk.every import io.mockk.just diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt similarity index 84% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt index 6f1dde6..929b98e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMetaPrivateDataEventBlockListenerTest.kt @@ -1,13 +1,13 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.DataComment import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.fileInfo -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.fileInfo +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt index 1eb1b85..16155aa 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByMultipleMetaKeysPrivateDataEventBlockListenerTest.kt @@ -1,14 +1,14 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.DataComment import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.MessageFilter -import com.wavesenterprise.we.tx.observer.api.privacy.MessageFilters -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.fileInfo -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.MessageFilters +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.fileInfo +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt index a0a4506..a4a73ff 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/FilteredByPolicyPrivateDataEventBlockListenerTest.kt @@ -1,14 +1,14 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.PolicyName import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest import com.wavesenterprise.sdk.node.test.data.TestDataFactory.Companion.txInfo -import com.wavesenterprise.we.tx.observer.api.privacy.PolicyFilter -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.PolicyFilter +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.privacyInfoResponse +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.clearMocks import io.mockk.every import io.mockk.mockk diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt index 96bea2e..081f89a 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/MapPrivateDataEventBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.Data import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.every import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt index b57c117..7c7916b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/NoValuePrivateDataEventBlockListenerTest.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent -import com.wavesenterprise.we.tx.observer.api.NoPayloadException -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.NoPayloadException +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.mockk import io.mockk.slot import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt index ba6bcd7..651d7ed 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/ObjectPrivateDataEventBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.Data.Companion.data import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.testObjects.SimpleDataObject +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.testObjects.SimpleDataObject import io.mockk.every import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt index 321886e..c5ebd78 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/privacydataevent/StringPrivateDataEventBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.privacydataevent +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.privacydataevent import com.wavesenterprise.sdk.node.domain.privacy.Data import com.wavesenterprise.sdk.node.domain.privacy.PolicyItemRequest -import com.wavesenterprise.we.tx.observer.api.privacy.PrivateDataEvent -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.api.privacy.PrivateDataEvent +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx import io.mockk.every import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt similarity index 79% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt index 8a4984e..7bf16e4 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AllTxBlockListenerTest.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.mockk import io.mockk.verify import org.hamcrest.MatcherAssert.assertThat diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt index 0850349..f3f1aa3 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/AtomicTxBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.AtomicTx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt index 95b4041..b8f5ae9 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/CreatePolicyTxBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreatePolicyTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt index 6e60bd5..8390f32 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCallContractTxBlockListenerTest.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt index 5e7d119..afa85a0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/ExecutedCreateContractTxBlockListenerTest.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxSimple -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxSimple +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt index 78d37db..2ae9bc0 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionOnBeanTxBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt similarity index 80% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt index d65d120..2312431 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/FilteredByExpressionTxBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt similarity index 73% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt index 3791da5..ea19d05 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/PolicyDataHashTxBlockListenerTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt similarity index 76% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt index 5803b73..12d3b4e 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/UpdatePolicyTxBlockListenerTest.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.UpdatePolicyTx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleUpdatePolicyTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleUpdatePolicyTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.slot diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt similarity index 68% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt index 8715f1d..ed69b6c 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/listener/tx/WildcardExecutedContractTxBlockListenerTest.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.listener.tx +package com.wavesenterprise.sdk.tx.observer.starter.observer.listener.tx import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxSimple -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx -import com.wavesenterprise.we.tx.observer.starter.observer.listener.AbstractListenerTest +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxDifferentValueTypes +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSeveralMatchingKeys +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.callContractTxSimple +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxSimple +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.createContractTxWithImageToFilter +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockTxList +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleAtomicTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.listener.AbstractListenerTest import io.mockk.clearMocks import io.mockk.mockk import io.mockk.verify diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/lock/LockServiceTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/lock/LockServiceTest.kt similarity index 78% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/lock/LockServiceTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/lock/LockServiceTest.kt index 8bd128c..27b2145 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/lock/LockServiceTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/lock/LockServiceTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.lock +package com.wavesenterprise.sdk.tx.observer.starter.observer.lock -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor -import com.wavesenterprise.we.tx.observer.core.spring.lock.LockService -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.starter.lock.LockConfig +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.core.spring.lock.LockService +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.starter.lock.LockConfig import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.springframework.beans.factory.annotation.Autowired diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestBlockListeners.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestBlockListeners.kt similarity index 92% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestBlockListeners.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestBlockListeners.kt index 64adcd6..e27e3b7 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestBlockListeners.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestBlockListeners.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.sample +package com.wavesenterprise.sdk.tx.observer.starter.observer.sample import com.wavesenterprise.sdk.node.domain.tx.AtomicTx import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx @@ -6,10 +6,10 @@ import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.UpdatePolicyTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.api.key.KeyFilter -import com.wavesenterprise.we.tx.observer.api.tx.TxListener -import com.wavesenterprise.we.tx.observer.starter.observer.testObjects.SimpleDataObject +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.api.key.KeyFilter +import com.wavesenterprise.sdk.tx.observer.api.tx.TxListener +import com.wavesenterprise.sdk.tx.observer.starter.observer.testObjects.SimpleDataObject class TestBlockListeners( val mockedTestEventListeners: TestEventListeners diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestEventListeners.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestEventListeners.kt similarity index 88% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestEventListeners.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestEventListeners.kt index 1090436..35c2f48 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/sample/TestEventListeners.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/sample/TestEventListeners.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.sample +package com.wavesenterprise.sdk.tx.observer.starter.observer.sample import com.wavesenterprise.sdk.node.domain.tx.AtomicTx import com.wavesenterprise.sdk.node.domain.tx.CreatePolicyTx @@ -6,8 +6,8 @@ import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.domain.tx.PolicyDataHashTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.UpdatePolicyTx -import com.wavesenterprise.we.tx.observer.api.key.KeyEvent -import com.wavesenterprise.we.tx.observer.starter.observer.testObjects.SimpleDataObject +import com.wavesenterprise.sdk.tx.observer.api.key.KeyEvent +import com.wavesenterprise.sdk.tx.observer.starter.observer.testObjects.SimpleDataObject /** * Interface for convenient mocking and verifying listener methods invoked via reflection diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/testObjects/SimpleDataObject.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/testObjects/SimpleDataObject.kt similarity index 61% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/testObjects/SimpleDataObject.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/testObjects/SimpleDataObject.kt index 8524441..c2fa3f4 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/testObjects/SimpleDataObject.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/testObjects/SimpleDataObject.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.testObjects +package com.wavesenterprise.sdk.tx.observer.starter.observer.testObjects data class SimpleDataObject( val someString: String, diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/ModelFactory.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/ModelFactory.kt similarity index 83% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/ModelFactory.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/ModelFactory.kt index 3dfabdf..c89b0bb 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/ModelFactory.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/ModelFactory.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.util +package com.wavesenterprise.sdk.tx.observer.starter.observer.util import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.wavesenterprise.sdk.node.client.http.tx.TxDto @@ -14,14 +14,14 @@ import com.wavesenterprise.sdk.node.domain.blocks.BlockHeaders import com.wavesenterprise.sdk.node.domain.blocks.PoaConsensus import com.wavesenterprise.sdk.node.domain.blocks.PosConsensus import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.core.spring.executor.syncinfo.FIRST_BLOCK_HEIGHT -import com.wavesenterprise.we.tx.observer.domain.BlockHistory -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTx -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleExecutedContractTx +import com.wavesenterprise.sdk.tx.observer.core.spring.executor.syncinfo.FIRST_BLOCK_HEIGHT +import com.wavesenterprise.sdk.tx.observer.domain.BlockHistory +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTx +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCallContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleExecutedContractTx import java.time.OffsetDateTime import java.util.UUID diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxExecutorStub.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxExecutorStub.kt similarity index 71% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxExecutorStub.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxExecutorStub.kt index 2bde407..18a2612 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxExecutorStub.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxExecutorStub.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.util +package com.wavesenterprise.sdk.tx.observer.starter.observer.util -import com.wavesenterprise.we.tx.observer.common.tx.executor.TxExecutor +import com.wavesenterprise.sdk.tx.observer.common.tx.executor.TxExecutor object TxExecutorStub : TxExecutor { override fun required(block: () -> T): T = diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxSpElUtilsTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxSpElUtilsTest.kt similarity index 86% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxSpElUtilsTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxSpElUtilsTest.kt index 20b17ea..cf592fa 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/util/TxSpElUtilsTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/util/TxSpElUtilsTest.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.util +package com.wavesenterprise.sdk.tx.observer.starter.observer.util import com.wavesenterprise.sdk.node.domain.DataEntry import com.wavesenterprise.sdk.node.domain.DataKey import com.wavesenterprise.sdk.node.domain.DataValue import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.tx.observer.core.spring.util.TxSpElUtils.Companion.hasKeyWithPrefix -import com.wavesenterprise.we.tx.observer.core.spring.util.TxSpElUtils.Companion.hasKeyWithRegex +import com.wavesenterprise.sdk.tx.observer.core.spring.util.TxSpElUtils.Companion.hasKeyWithPrefix +import com.wavesenterprise.sdk.tx.observer.core.spring.util.TxSpElUtils.Companion.hasKeyWithRegex import org.junit.jupiter.api.Assertions.assertFalse import org.junit.jupiter.api.Assertions.assertTrue import org.junit.jupiter.api.Test diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt similarity index 85% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt index 50de265..46734a3 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/EnqueuedTxControllerTest.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.web +package com.wavesenterprise.sdk.tx.observer.starter.observer.web +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.client.http.tx.PolicyDataHashTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.web.EnqueuedTxController -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.web.EnqueuedTxController +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.hamcrest.Matchers.hasSize import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt similarity index 91% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt index df0230d..90aedf7 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/TxQueuePartitionControllerTest.kt @@ -1,20 +1,20 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.web +package com.wavesenterprise.sdk.tx.observer.starter.observer.web +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CallContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.web.TxQueuePartitionController -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.web.TxQueuePartitionController +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.hamcrest.Matchers.equalTo import org.hamcrest.Matchers.everyItem import org.hamcrest.Matchers.greaterThan diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TransactionalRunner.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TransactionalRunner.kt similarity index 87% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TransactionalRunner.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TransactionalRunner.kt index be5c32f..c91794b 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TransactionalRunner.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TransactionalRunner.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.web.service +package com.wavesenterprise.sdk.tx.observer.starter.observer.web.service import org.springframework.transaction.annotation.Propagation import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt similarity index 77% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt index 7682e28..2ed1220 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueServiceTest.kt @@ -1,22 +1,22 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.web.service +package com.wavesenterprise.sdk.tx.observer.starter.observer.web.service +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.http.tx.CreateContractTxDto.Companion.toDto import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.test.data.TestDataFactory -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueService -import com.wavesenterprise.we.tx.observer.domain.EnqueuedTxStatus -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.BlockHeightResetRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueService +import com.wavesenterprise.sdk.tx.observer.domain.EnqueuedTxStatus +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.BlockHeightResetRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.mockPartition +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach diff --git a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt similarity index 81% rename from we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt rename to we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt index 3964f84..ae436fd 100644 --- a/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/we/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt +++ b/we-tx-observer-module/we-tx-observer-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/observer/starter/observer/web/service/TxQueueStatusServiceImplTest.kt @@ -1,7 +1,8 @@ -package com.wavesenterprise.we.tx.observer.starter.observer.web.service +package com.wavesenterprise.sdk.tx.observer.starter.observer.web.service import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.treeToValue +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.blocks.BlocksService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.blocking.tx.TxService @@ -15,21 +16,20 @@ import com.wavesenterprise.sdk.node.domain.atomic.AtomicBadge import com.wavesenterprise.sdk.node.domain.tx.AtomicTx import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.observer.core.spring.web.service.TxQueueService -import com.wavesenterprise.we.tx.observer.domain.TxQueuePartition -import com.wavesenterprise.we.tx.observer.jpa.TxObserverJpaAutoConfig -import com.wavesenterprise.we.tx.observer.jpa.config.TxObserverJpaConfig -import com.wavesenterprise.we.tx.observer.jpa.repository.EnqueuedTxJpaRepository -import com.wavesenterprise.we.tx.observer.jpa.repository.TxQueuePartitionJpaRepository -import com.wavesenterprise.we.tx.observer.starter.BlockInfoSynchronizerConfig -import com.wavesenterprise.we.tx.observer.starter.TxObserverStarterConfig -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx -import com.wavesenterprise.we.tx.observer.starter.observer.config.ObjectMapperConfig -import com.wavesenterprise.we.tx.observer.starter.observer.util.ModelFactory.enqueuedTx +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.observer.core.spring.web.service.TxQueueService +import com.wavesenterprise.sdk.tx.observer.domain.TxQueuePartition +import com.wavesenterprise.sdk.tx.observer.jpa.TxObserverJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.jpa.config.TxObserverJpaConfig +import com.wavesenterprise.sdk.tx.observer.jpa.repository.EnqueuedTxJpaRepository +import com.wavesenterprise.sdk.tx.observer.jpa.repository.TxQueuePartitionJpaRepository +import com.wavesenterprise.sdk.tx.observer.starter.BlockInfoSynchronizerConfig +import com.wavesenterprise.sdk.tx.observer.starter.TxObserverStarterConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.sampleCreateContractTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.NodeBlockingServiceFactoryMockConfiguration.Companion.samplePolicyDataHashTx +import com.wavesenterprise.sdk.tx.observer.starter.observer.config.ObjectMapperConfig +import com.wavesenterprise.sdk.tx.observer.starter.observer.util.ModelFactory.enqueuedTx import io.mockk.every import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull diff --git a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackInfoService.kt b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackInfoService.kt similarity index 83% rename from we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackInfoService.kt rename to we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackInfoService.kt index 6ca1b1c..d92e2d1 100644 --- a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackInfoService.kt +++ b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackInfoService.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.api +package com.wavesenterprise.sdk.tx.tracker.api -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo import org.springframework.data.jpa.domain.Specification /** diff --git a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTracker.kt b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTracker.kt similarity index 91% rename from we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTracker.kt rename to we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTracker.kt index 33779a0..34bc83e 100644 --- a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTracker.kt +++ b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTracker.kt @@ -1,11 +1,11 @@ -package com.wavesenterprise.we.tx.tracker.api +package com.wavesenterprise.sdk.tx.tracker.api import com.wavesenterprise.sdk.node.domain.TxId import com.wavesenterprise.sdk.node.domain.contract.ContractTxStatus import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.tracker.domain.TxTrackBusinessObjectInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackBusinessObjectInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus import org.springframework.data.domain.PageRequest import java.util.Optional @@ -21,7 +21,7 @@ interface TxTracker { * @param businessObjectInfos list of business objects for transaction * @param userId ID of the user who added the transaction to the tracking * @return TxTrackInfo - domain object about tracking transaction - * @see com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo + * @see com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo */ fun trackTx( tx: Tx, diff --git a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackerActualTxResolver.kt b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackerActualTxResolver.kt similarity index 71% rename from we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackerActualTxResolver.kt rename to we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackerActualTxResolver.kt index 7e87e21..2975700 100644 --- a/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/we/tx/tracker/api/TxTrackerActualTxResolver.kt +++ b/we-tx-tracker-module/we-tx-tracker-api/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/api/TxTrackerActualTxResolver.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.api +package com.wavesenterprise.sdk.tx.tracker.api import com.wavesenterprise.sdk.node.domain.tx.Tx diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/JpaTxTracker.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/JpaTxTracker.kt similarity index 91% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/JpaTxTracker.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/JpaTxTracker.kt index 645b631..7bb3f9c 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/JpaTxTracker.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/JpaTxTracker.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.component +package com.wavesenterprise.sdk.tx.tracker.core.spring.component import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper @@ -19,15 +19,15 @@ import com.wavesenterprise.sdk.node.domain.tx.DisableContractTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type import com.wavesenterprise.sdk.node.domain.tx.UpdateContractTx -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.core.spring.properties.TxTrackerProps -import com.wavesenterprise.we.tx.tracker.domain.SmartContractInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackBusinessObjectInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.SmartContractInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.core.spring.properties.TxTrackerProps +import com.wavesenterprise.sdk.tx.tracker.domain.SmartContractInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackBusinessObjectInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.SmartContractInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository import org.springframework.data.domain.PageRequest import org.springframework.data.repository.findByIdOrNull import org.springframework.transaction.annotation.Transactional diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/ScheduledTxTracker.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/ScheduledTxTracker.kt similarity index 92% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/ScheduledTxTracker.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/ScheduledTxTracker.kt index b0cd4fe..22bfa34 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/ScheduledTxTracker.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/ScheduledTxTracker.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.component +package com.wavesenterprise.sdk.tx.tracker.core.spring.component import com.wavesenterprise.sdk.node.client.blocking.contract.ContractService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory @@ -8,9 +8,9 @@ import com.wavesenterprise.sdk.node.domain.TxType import com.wavesenterprise.sdk.node.domain.tx.AtomicTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.Tx.Companion.type -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.core.spring.properties.TxTrackerProps -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.core.spring.properties.TxTrackerProps +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus import net.javacrumbs.shedlock.spring.annotation.SchedulerLock import org.springframework.data.domain.PageRequest import java.time.OffsetDateTime diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt similarity index 68% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt index 8604ab3..0244458 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerActualTxResolverImpl.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.component +package com.wavesenterprise.sdk.tx.tracker.core.spring.component import com.wavesenterprise.sdk.node.domain.tx.ExecutedContractTx import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.tracker.api.TxTrackerActualTxResolver +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackerActualTxResolver object TxTrackerActualTxResolverImpl : TxTrackerActualTxResolver { override fun actualTx(tx: Tx) = when (tx) { diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerPredicate.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerPredicate.kt similarity index 64% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerPredicate.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerPredicate.kt index baebf76..6a1f59c 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerPredicate.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerPredicate.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.component +package com.wavesenterprise.sdk.tx.tracker.core.spring.component import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.api.TxTrackerActualTxResolver +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackerActualTxResolver class TxTrackerPredicate( private val txTrackerActualTxResolver: TxTrackerActualTxResolver, diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerTxHandler.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerTxHandler.kt similarity index 54% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerTxHandler.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerTxHandler.kt index 7dbba69..609fec9 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/component/TxTrackerTxHandler.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/component/TxTrackerTxHandler.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.component +package com.wavesenterprise.sdk.tx.tracker.core.spring.component import com.wavesenterprise.sdk.node.domain.tx.Tx -import com.wavesenterprise.we.tx.observer.common.tx.handler.TxHandler -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.api.TxTrackerActualTxResolver -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.observer.common.tx.handler.TxHandler +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackerActualTxResolver +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus class TxTrackerTxHandler( private val txTrackerActualTxResolver: TxTrackerActualTxResolver, diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt new file mode 100644 index 0000000..94023a0 --- /dev/null +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt @@ -0,0 +1,5 @@ +package com.wavesenterprise.sdk.tx.tracker.core.spring.properties + +interface SuccessSubscriberConfig { + var enabled: Boolean +} diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/TxTrackerProps.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/TxTrackerProps.kt similarity index 83% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/TxTrackerProps.kt rename to we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/TxTrackerProps.kt index 4e9b115..45eb584 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/TxTrackerProps.kt +++ b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/core/spring/properties/TxTrackerProps.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.properties +package com.wavesenterprise.sdk.tx.tracker.core.spring.properties import java.time.Duration diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt deleted file mode 100644 index f33814e..0000000 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/properties/SuccessSubscriberConfig.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.properties - -interface SuccessSubscriberConfig { - var enabled: Boolean -} diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/TxTrackInfoController.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/TxTrackInfoController.kt deleted file mode 100644 index d950ad6..0000000 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/TxTrackInfoController.kt +++ /dev/null @@ -1,25 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web - -import com.wavesenterprise.we.tx.tracker.core.spring.web.dto.TxTrackInfoApiDto -import com.wavesenterprise.we.tx.tracker.core.spring.web.dto.TxTrackInfoListRequest -import com.wavesenterprise.we.tx.tracker.core.spring.web.service.TxTrackInfoService -import org.springframework.web.bind.annotation.GetMapping -import org.springframework.web.bind.annotation.PathVariable -import org.springframework.web.bind.annotation.RequestMapping -import org.springframework.web.bind.annotation.RestController - -@RestController -@RequestMapping("/tx-track-info") -class TxTrackInfoController( - val txTrackInfoService: TxTrackInfoService, -) { - - @GetMapping("/{id}") - fun getById(@PathVariable id: String): TxTrackInfoApiDto = - txTrackInfoService.getById(id).toApiDto() - - @GetMapping - fun list(filter: TxTrackInfoListRequest): List = - txTrackInfoService.list(filter.toSpecification()) - .map { it.toApiDto() } -} diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/TxTrackInfoService.kt b/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/TxTrackInfoService.kt deleted file mode 100644 index 7376712..0000000 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/TxTrackInfoService.kt +++ /dev/null @@ -1,11 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web.service - -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import org.springframework.data.jpa.domain.Specification - -interface TxTrackInfoService { - - fun getById(id: String): TxTrackInfo - - fun list(spec: Specification): List -} diff --git a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfo.kt b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfo.kt similarity index 89% rename from we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfo.kt rename to we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfo.kt index 3501a39..27a08f8 100644 --- a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfo.kt +++ b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfo.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.domain +package com.wavesenterprise.sdk.tx.tracker.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME import org.springframework.data.annotation.CreatedDate import org.springframework.data.annotation.LastModifiedDate import org.springframework.data.jpa.domain.support.AuditingEntityListener diff --git a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackBusinessObjectInfo.kt b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackBusinessObjectInfo.kt similarity index 76% rename from we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackBusinessObjectInfo.kt rename to we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackBusinessObjectInfo.kt index 0c7ea12..4463158 100644 --- a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackBusinessObjectInfo.kt +++ b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackBusinessObjectInfo.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.domain +package com.wavesenterprise.sdk.tx.tracker.domain -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME import org.hibernate.annotations.SQLInsert import javax.persistence.Entity import javax.persistence.Id diff --git a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackInfo.kt b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackInfo.kt similarity index 93% rename from we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackInfo.kt rename to we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackInfo.kt index 8521caa..57cea67 100644 --- a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackInfo.kt +++ b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackInfo.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.tracker.domain +package com.wavesenterprise.sdk.tx.tracker.domain import com.fasterxml.jackson.databind.JsonNode import com.vladmihalcea.hibernate.type.json.JsonBinaryType -import com.wavesenterprise.we.tx.observer.common.jpa.util.JSONB_TYPE -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.JSONB_TYPE +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME import org.hibernate.annotations.SQLInsert import org.hibernate.annotations.Type import org.hibernate.annotations.TypeDef diff --git a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackStatus.kt b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackStatus.kt similarity index 63% rename from we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackStatus.kt rename to we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackStatus.kt index a5e03a5..38ad35c 100644 --- a/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/we/tx/tracker/domain/TxTrackStatus.kt +++ b/we-tx-tracker-module/we-tx-tracker-domain/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/TxTrackStatus.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.domain +package com.wavesenterprise.sdk.tx.tracker.domain enum class TxTrackStatus { PENDING, diff --git a/we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfoTest.kt b/we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfoTest.kt similarity index 94% rename from we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfoTest.kt rename to we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfoTest.kt index 1f4ef9a..5318bfe 100644 --- a/we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/we/tx/tracker/domain/SmartContractInfoTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-domain/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/domain/SmartContractInfoTest.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.domain +package com.wavesenterprise.sdk.tx.tracker.domain import com.fasterxml.jackson.databind.node.TextNode import org.junit.jupiter.api.Test diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt similarity index 68% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt index c26a620..471439c 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/TxTrackerJpaAutoConfig.kt @@ -1,10 +1,10 @@ -package com.wavesenterprise.we.tx.tracker.jpa +package com.wavesenterprise.sdk.tx.tracker.jpa -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnJpaMode -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.jpa.config.TxTrackerJpaConfig -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnJpaMode +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.jpa.config.TxTrackerJpaConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository import org.springframework.boot.autoconfigure.AutoConfigurationPackage import org.springframework.boot.autoconfigure.AutoConfigureBefore import org.springframework.boot.autoconfigure.AutoConfigureOrder diff --git a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/DateTimeProviderConfig.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/DateTimeProviderConfig.kt similarity index 90% rename from we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/DateTimeProviderConfig.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/DateTimeProviderConfig.kt index 496ea50..c865315 100644 --- a/we-tx-observer-module/we-tx-observer-jpa/src/main/kotlin/com/wavesenterprise/we/tx/observer/jpa/config/DateTimeProviderConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/DateTimeProviderConfig.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.observer.jpa.config +package com.wavesenterprise.sdk.tx.tracker.jpa.config import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt similarity index 89% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt index e1cf4cf..250494d 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/JpaAuditingNonConflictingDeclaration.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.jpa.config +package com.wavesenterprise.sdk.tx.tracker.jpa.config import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Configuration diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/TxTrackerJpaConfig.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/TxTrackerJpaConfig.kt similarity index 82% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/TxTrackerJpaConfig.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/TxTrackerJpaConfig.kt index 3eac769..bb972d6 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/config/TxTrackerJpaConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/config/TxTrackerJpaConfig.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.tracker.jpa.config +package com.wavesenterprise.sdk.tx.tracker.jpa.config -import com.wavesenterprise.we.flyway.starter.FlywaySchema -import com.wavesenterprise.we.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME +import com.wavesenterprise.sdk.flyway.starter.FlywaySchema +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.TX_TRACKER_SCHEMA_NAME import org.springframework.boot.autoconfigure.condition.ConditionalOnBean import org.springframework.boot.autoconfigure.condition.ConditionalOnClass import org.springframework.context.annotation.Bean diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt similarity index 62% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt index 1b26710..4a9b45b 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/BusinessObjectInfoJpaRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.jpa.repository +package com.wavesenterprise.sdk.tx.tracker.jpa.repository -import com.wavesenterprise.we.tx.tracker.domain.TxTrackBusinessObjectInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackBusinessObjectInfo import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt similarity index 62% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt index cb57b4d..6d7eb23 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/SmartContractInfoJpaRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.jpa.repository +package com.wavesenterprise.sdk.tx.tracker.jpa.repository -import com.wavesenterprise.we.tx.tracker.domain.SmartContractInfo +import com.wavesenterprise.sdk.tx.tracker.domain.SmartContractInfo import org.springframework.data.jpa.repository.JpaRepository import org.springframework.stereotype.Repository diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt similarity index 86% rename from we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt rename to we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt index 128a6f4..0613ed3 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/we/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/jpa/repository/TxTrackerJpaRepository.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.tracker.jpa.repository +package com.wavesenterprise.sdk.tx.tracker.jpa.repository import com.fasterxml.jackson.databind.JsonNode -import com.wavesenterprise.we.tx.tracker.domain.TxTrackBusinessObjectInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackBusinessObjectInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus import org.springframework.data.domain.Pageable import org.springframework.data.jpa.repository.JpaRepository import org.springframework.data.jpa.repository.Query diff --git a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/resources/META-INF/spring.factories b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/resources/META-INF/spring.factories index d28286f..d10cb0f 100644 --- a/we-tx-tracker-module/we-tx-tracker-jpa/src/main/resources/META-INF/spring.factories +++ b/we-tx-tracker-module/we-tx-tracker-jpa/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.wavesenterprise.we.tx.tracker.jpa.TxTrackerJpaAutoConfig \ No newline at end of file + com.wavesenterprise.sdk.tx.tracker.jpa.TxTrackerJpaAutoConfig \ No newline at end of file diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadConfig.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadConfig.kt similarity index 73% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadConfig.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadConfig.kt index caf7050..2ca3e94 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadConfig.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.tracker.read.starter +package com.wavesenterprise.sdk.tx.tracker.read.starter -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnTracker -import com.wavesenterprise.we.tx.tracker.api.TxTrackInfoService -import com.wavesenterprise.we.tx.tracker.read.starter.web.TxTrackInfoController -import com.wavesenterprise.we.tx.tracker.read.starter.web.service.TxTrackInfoServiceImpl +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnTracker +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackInfoService +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.TxTrackInfoController +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.service.TxTrackInfoServiceImpl import org.springframework.boot.autoconfigure.AutoConfigureAfter import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.context.annotation.Bean diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt similarity index 76% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt index 3f879dc..9a81a2d 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaAutoConfig.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.tracker.read.starter +package com.wavesenterprise.sdk.tx.tracker.read.starter -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnJpaMode -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnJpaMode +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo import org.springframework.boot.autoconfigure.AutoConfigurationPackage import org.springframework.boot.autoconfigure.AutoConfigureAfter import org.springframework.boot.autoconfigure.AutoConfigureBefore diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt similarity index 76% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt index 69b28bb..5ce400e 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/TxTrackerReadJpaRepository.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.read.starter +package com.wavesenterprise.sdk.tx.tracker.read.starter -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo import org.springframework.data.jpa.repository.JpaSpecificationExecutor import org.springframework.data.repository.Repository import org.springframework.stereotype.Repository as RepositoryAnnotation diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/Mapping.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/Mapping.kt similarity index 70% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/Mapping.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/Mapping.kt index 40debe7..12251c9 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/Mapping.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/Mapping.kt @@ -1,12 +1,12 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web +package com.wavesenterprise.sdk.tx.tracker.read.starter.web -import com.wavesenterprise.we.tx.observer.common.jpa.util.toEq -import com.wavesenterprise.we.tx.observer.common.jpa.util.toIn -import com.wavesenterprise.we.tx.tracker.core.spring.web.dto.TxTrackInfoApiDto -import com.wavesenterprise.we.tx.tracker.core.spring.web.dto.TxTrackInfoListRequest -import com.wavesenterprise.we.tx.tracker.domain.SmartContractInfo_ -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo_ +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.toEq +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.toIn +import com.wavesenterprise.sdk.tx.tracker.domain.SmartContractInfo_ +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo_ +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto.TxTrackInfoApiDto +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto.TxTrackInfoListRequest import org.springframework.data.jpa.domain.Specification import javax.persistence.criteria.CriteriaBuilder import javax.persistence.criteria.CriteriaQuery diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/TxTrackInfoController.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/TxTrackInfoController.kt similarity index 70% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/TxTrackInfoController.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/TxTrackInfoController.kt index 2001a32..b5ec4c3 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/TxTrackInfoController.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/TxTrackInfoController.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web +package com.wavesenterprise.sdk.tx.tracker.read.starter.web -import com.wavesenterprise.we.tx.tracker.api.TxTrackInfoService -import com.wavesenterprise.we.tx.tracker.read.starter.web.dto.TxTrackInfoApiDto -import com.wavesenterprise.we.tx.tracker.read.starter.web.dto.TxTrackInfoListRequest +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackInfoService +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto.TxTrackInfoApiDto +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto.TxTrackInfoListRequest import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.PathVariable import org.springframework.web.bind.annotation.RequestMapping diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoApiDto.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt similarity index 75% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoApiDto.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt index 5cf15f6..aded730 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoApiDto.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web.dto +package com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto import com.fasterxml.jackson.databind.JsonNode -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus import java.time.OffsetDateTime data class TxTrackInfoApiDto( diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoListRequest.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt similarity index 54% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoListRequest.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt index fdd4506..8cce3b9 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/dto/TxTrackInfoListRequest.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web.dto +package com.wavesenterprise.sdk.tx.tracker.read.starter.web.dto -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus data class TxTrackInfoListRequest( val status: List? = null, diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt similarity index 55% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt index 2ebc576..81a1400 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/TxTrackInfoServiceImpl.kt @@ -1,9 +1,9 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web.service +package com.wavesenterprise.sdk.tx.tracker.read.starter.web.service -import com.wavesenterprise.we.tx.tracker.api.TxTrackInfoService -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.read.starter.TxTrackerReadJpaRepository -import com.wavesenterprise.we.tx.tracker.read.starter.web.service.exception.NoTrackInfoFoundException +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackInfoService +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.read.starter.TxTrackerReadJpaRepository +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.service.exception.NoTrackInfoFoundException import org.springframework.data.jpa.domain.Specification open class TxTrackInfoServiceImpl( diff --git a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/exception/NoTrackInfoFoundException.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt similarity index 58% rename from we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/exception/NoTrackInfoFoundException.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt index 5811c85..99b58a6 100644 --- a/we-tx-tracker-module/we-tx-tracker-core-spring/src/main/kotlin/com/wavesenterprise/we/tx/tracker/core/spring/web/service/exception/NoTrackInfoFoundException.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt @@ -1,3 +1,3 @@ -package com.wavesenterprise.we.tx.tracker.core.spring.web.service.exception +package com.wavesenterprise.sdk.tx.tracker.read.starter.web.service.exception class NoTrackInfoFoundException(id: String) : IllegalArgumentException("Cannot find track info by id: $id") diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/Mapping.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/Mapping.kt deleted file mode 100644 index 68fa9ec..0000000 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/Mapping.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web - -import com.wavesenterprise.we.tx.observer.common.jpa.util.toEq -import com.wavesenterprise.we.tx.observer.common.jpa.util.toIn -import com.wavesenterprise.we.tx.tracker.domain.SmartContractInfo_ -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo_ -import com.wavesenterprise.we.tx.tracker.read.starter.web.dto.TxTrackInfoApiDto -import com.wavesenterprise.we.tx.tracker.read.starter.web.dto.TxTrackInfoListRequest -import org.springframework.data.jpa.domain.Specification -import javax.persistence.criteria.CriteriaBuilder -import javax.persistence.criteria.CriteriaQuery -import javax.persistence.criteria.Predicate -import javax.persistence.criteria.Root - -fun TxTrackInfo.toApiDto() = TxTrackInfoApiDto( - id = id, - status = status, - type = type, - body = body, - errors = errors, - meta = meta, - created = created, - modified = modified, - userId = userId, - smartContractId = smartContractInfo?.id, -) - -fun TxTrackInfoListRequest.toSpecification(): Specification = - Specification { root: Root, cq: CriteriaQuery<*>, cb: CriteriaBuilder -> - - val predicates = mutableListOf() - userId?.let { - predicates += it.toEq(root, cb, TxTrackInfo_.userId) - } - contractId?.let { - predicates += cb.equal( - root.join(TxTrackInfo_.smartContractInfo).get(SmartContractInfo_.id), - it - ) - } - status?.let { - predicates += it.toIn(root, cb, TxTrackInfo_.status) - } - if (predicates.isNotEmpty()) { - predicates.reduce { p1, p2 -> - cb.and(p1, p2) - } - } else { - null - } - } diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt deleted file mode 100644 index f355f39..0000000 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoApiDto.kt +++ /dev/null @@ -1,18 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web.dto - -import com.fasterxml.jackson.databind.JsonNode -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import java.time.OffsetDateTime - -data class TxTrackInfoApiDto( - val id: String, - var smartContractId: String?, - var status: TxTrackStatus, - var type: Int, - var body: JsonNode, - var errors: JsonNode?, - val meta: Map, - var created: OffsetDateTime?, - var modified: OffsetDateTime?, - val userId: String?, -) diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt deleted file mode 100644 index ad54046..0000000 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/dto/TxTrackInfoListRequest.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web.dto - -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus - -data class TxTrackInfoListRequest( - val status: List? = null, - val userId: String? = null, - val contractId: String? = null, -) diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt deleted file mode 100644 index 2d09dce..0000000 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/read/starter/web/service/exception/NoTrackInfoFoundException.kt +++ /dev/null @@ -1,3 +0,0 @@ -package com.wavesenterprise.we.tx.tracker.read.starter.web.service.exception - -class NoTrackInfoFoundException(id: String) : IllegalArgumentException("Cannot find track info by id: $id") diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/resources/META-INF/spring.factories b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/resources/META-INF/spring.factories index 9354b51..ec4bc68 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/resources/META-INF/spring.factories +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.wavesenterprise.we.tx.tracker.read.starter.TxTrackerReadConfig,\ - com.wavesenterprise.we.tx.tracker.read.starter.TxTrackerReadJpaAutoConfig + com.wavesenterprise.sdk.tx.tracker.read.starter.TxTrackerReadConfig,\ + com.wavesenterprise.sdk.tx.tracker.read.starter.TxTrackerReadJpaAutoConfig diff --git a/we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/TxTrackerReadAutoConfigTest.kt b/we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/TxTrackerReadAutoConfigTest.kt similarity index 75% rename from we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/TxTrackerReadAutoConfigTest.kt rename to we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/TxTrackerReadAutoConfigTest.kt index 05bc4ba..792887e 100644 --- a/we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/TxTrackerReadAutoConfigTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-read-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/TxTrackerReadAutoConfigTest.kt @@ -1,8 +1,8 @@ -package com.wavesenterprise.we.tx.tracker +package com.wavesenterprise.sdk.tx.tracker -import com.wavesenterprise.we.tx.tracker.api.TxTrackInfoService -import com.wavesenterprise.we.tx.tracker.read.starter.TxTrackerReadJpaRepository -import com.wavesenterprise.we.tx.tracker.read.starter.web.TxTrackInfoController +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackInfoService +import com.wavesenterprise.sdk.tx.tracker.read.starter.TxTrackerReadJpaRepository +import com.wavesenterprise.sdk.tx.tracker.read.starter.web.TxTrackInfoController import org.junit.jupiter.api.Test import org.springframework.beans.factory.getBean import org.springframework.boot.autoconfigure.SpringBootApplication diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfig.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfig.kt similarity index 70% rename from we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfig.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfig.kt index aaa6f71..95293d5 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfig.kt @@ -1,25 +1,25 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.spring.autoconfigure.node.NodeBlockingServiceFactoryAutoConfiguration -import com.wavesenterprise.we.tx.observer.common.conditional.ConditionalOnTracker -import com.wavesenterprise.we.tx.observer.common.tx.handler.TxHandler -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriberImpl -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.api.TxTrackerActualTxResolver -import com.wavesenterprise.we.tx.tracker.core.spring.component.JpaTxTracker -import com.wavesenterprise.we.tx.tracker.core.spring.component.ScheduledTxTracker -import com.wavesenterprise.we.tx.tracker.core.spring.component.TxTrackerActualTxResolverImpl -import com.wavesenterprise.we.tx.tracker.core.spring.component.TxTrackerPredicate -import com.wavesenterprise.we.tx.tracker.core.spring.component.TxTrackerTxHandler -import com.wavesenterprise.we.tx.tracker.jpa.config.TxTrackerJpaConfig -import com.wavesenterprise.we.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.SmartContractInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository -import com.wavesenterprise.we.tx.tracker.starter.properties.SuccessSubscriberProperties -import com.wavesenterprise.we.tx.tracker.starter.properties.TxTrackerProperties +import com.wavesenterprise.sdk.tx.observer.common.conditional.ConditionalOnTracker +import com.wavesenterprise.sdk.tx.observer.common.tx.handler.TxHandler +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriberImpl +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackerActualTxResolver +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.JpaTxTracker +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.ScheduledTxTracker +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.TxTrackerActualTxResolverImpl +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.TxTrackerPredicate +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.TxTrackerTxHandler +import com.wavesenterprise.sdk.tx.tracker.jpa.config.TxTrackerJpaConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.SmartContractInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.tracker.starter.properties.SuccessSubscriberProperties +import com.wavesenterprise.sdk.tx.tracker.starter.properties.TxTrackerProperties import org.springframework.boot.autoconfigure.AutoConfigureAfter import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerSchedulerConfig.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerSchedulerConfig.kt similarity index 89% rename from we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerSchedulerConfig.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerSchedulerConfig.kt index db5b156..a885889 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerSchedulerConfig.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerSchedulerConfig.kt @@ -1,7 +1,7 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter -import com.wavesenterprise.we.tx.tracker.core.spring.component.ScheduledTxTracker -import com.wavesenterprise.we.tx.tracker.starter.properties.TxTrackerProperties +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.ScheduledTxTracker +import com.wavesenterprise.sdk.tx.tracker.starter.properties.TxTrackerProperties import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/SuccessSubscriberProperties.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/SuccessSubscriberProperties.kt similarity index 61% rename from we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/SuccessSubscriberProperties.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/SuccessSubscriberProperties.kt index 8816f7c..e048a67 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/SuccessSubscriberProperties.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/SuccessSubscriberProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.starter.properties +package com.wavesenterprise.sdk.tx.tracker.starter.properties -import com.wavesenterprise.we.tx.tracker.core.spring.properties.SuccessSubscriberConfig +import com.wavesenterprise.sdk.tx.tracker.core.spring.properties.SuccessSubscriberConfig import org.springframework.boot.context.properties.ConfigurationProperties @ConfigurationProperties("tx-tracker.success-subscriber") diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/TxTrackerProperties.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/TxTrackerProperties.kt similarity index 87% rename from we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/TxTrackerProperties.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/TxTrackerProperties.kt index 9522340..da1dd06 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/we/tx/tracker/starter/properties/TxTrackerProperties.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/main/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/properties/TxTrackerProperties.kt @@ -1,6 +1,6 @@ -package com.wavesenterprise.we.tx.tracker.starter.properties +package com.wavesenterprise.sdk.tx.tracker.starter.properties -import com.wavesenterprise.we.tx.tracker.core.spring.properties.TxTrackerProps +import com.wavesenterprise.sdk.tx.tracker.core.spring.properties.TxTrackerProps import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.boot.context.properties.ConstructorBinding import org.springframework.boot.context.properties.bind.DefaultValue diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/main/resources/META-INF/spring.factories b/we-tx-tracker-module/we-tx-tracker-starter/src/main/resources/META-INF/spring.factories index a18ed4f..9441e79 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/main/resources/META-INF/spring.factories +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/main/resources/META-INF/spring.factories @@ -1,2 +1,2 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - com.wavesenterprise.we.tx.tracker.starter.TxTrackerConfig \ No newline at end of file + com.wavesenterprise.sdk.tx.tracker.starter.TxTrackerConfig \ No newline at end of file diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt similarity index 87% rename from we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt index 5cdcac2..fb9aa13 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerContractTxStatusTest.kt @@ -1,6 +1,7 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.domain.TxId @@ -10,15 +11,14 @@ import com.wavesenterprise.sdk.node.domain.contract.TxStatus import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.jpa.TxTrackerJpaAutoConfig -import com.wavesenterprise.we.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.SmartContractInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.jpa.TxTrackerJpaAutoConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.SmartContractInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository import org.junit.jupiter.api.AfterEach import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertNotNull diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerTest.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerTest.kt similarity index 96% rename from we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerTest.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerTest.kt index 3889b5d..86f9551 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/JpaTxTrackerTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/JpaTxTrackerTest.kt @@ -1,8 +1,9 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.client.http.tx.AtomicInnerTxDto.Companion.toDto @@ -22,17 +23,16 @@ import com.wavesenterprise.sdk.node.domain.tx.TxInfo import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomStringBase58 -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackBusinessObjectInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.jpa.TxTrackerJpaAutoConfig -import com.wavesenterprise.we.tx.tracker.jpa.config.TxTrackerJpaConfig -import com.wavesenterprise.we.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.SmartContractInfoJpaRepository -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackBusinessObjectInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.jpa.TxTrackerJpaAutoConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.config.TxTrackerJpaConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.BusinessObjectInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.SmartContractInfoJpaRepository +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository import io.mockk.every import io.mockk.mockk import net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/ScheduledTxTrackerTest.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/ScheduledTxTrackerTest.kt similarity index 96% rename from we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/ScheduledTxTrackerTest.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/ScheduledTxTrackerTest.kt index 490d737..877424b 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/ScheduledTxTrackerTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/ScheduledTxTrackerTest.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter import com.wavesenterprise.sdk.node.client.blocking.contract.ContractService import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory @@ -10,10 +10,10 @@ import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.domain.tx.TxInfo import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util.Companion.randomBytesFromUUID -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.core.spring.component.ScheduledTxTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.starter.properties.TxTrackerProperties +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.core.spring.component.ScheduledTxTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.starter.properties.TxTrackerProperties import io.mockk.every import io.mockk.impl.annotations.RelaxedMockK import io.mockk.junit5.MockKExtension diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfigTest.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfigTest.kt similarity index 88% rename from we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfigTest.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfigTest.kt index 88d9595..50e7781 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/TxTrackerConfigTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/TxTrackerConfigTest.kt @@ -1,4 +1,4 @@ -package com.wavesenterprise.we.tx.tracker.starter +package com.wavesenterprise.sdk.tx.tracker.starter import com.ninjasquad.springmockk.MockkBean import com.wavesenterprise.sdk.node.client.blocking.node.NodeBlockingServiceFactory @@ -7,11 +7,11 @@ import com.wavesenterprise.sdk.node.domain.tx.ExecutableTx import com.wavesenterprise.sdk.node.domain.tx.Tx import com.wavesenterprise.sdk.node.test.data.TestDataFactory import com.wavesenterprise.sdk.node.test.data.Util -import com.wavesenterprise.we.tx.observer.common.tx.subscriber.TxSubscriber -import com.wavesenterprise.we.tx.tracker.api.TxTrackInfoService -import com.wavesenterprise.we.tx.tracker.api.TxTracker -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.jpa.TxTrackerJpaAutoConfig +import com.wavesenterprise.sdk.tx.observer.common.tx.subscriber.TxSubscriber +import com.wavesenterprise.sdk.tx.tracker.api.TxTrackInfoService +import com.wavesenterprise.sdk.tx.tracker.api.TxTracker +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.jpa.TxTrackerJpaAutoConfig import io.mockk.every import io.mockk.verify import org.junit.jupiter.api.Assertions.assertEquals diff --git a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt similarity index 86% rename from we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt rename to we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt index 99a1556..6a5eee2 100644 --- a/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/we/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt +++ b/we-tx-tracker-module/we-tx-tracker-starter/src/test/kotlin/com/wavesenterprise/sdk/tx/tracker/starter/jpa/TxTrackerJpaRepositoryTest.kt @@ -1,15 +1,15 @@ -package com.wavesenterprise.we.tx.tracker.starter.jpa +package com.wavesenterprise.sdk.tx.tracker.starter.jpa import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.ninjasquad.springmockk.MockkBean +import com.wavesenterprise.sdk.flyway.starter.FlywaySchemaConfiguration import com.wavesenterprise.sdk.node.client.blocking.tx.TxService import com.wavesenterprise.sdk.node.domain.TxType -import com.wavesenterprise.we.flyway.starter.FlywaySchemaConfiguration -import com.wavesenterprise.we.tx.observer.common.jpa.util.flushAndClear -import com.wavesenterprise.we.tx.tracker.domain.TxTrackInfo -import com.wavesenterprise.we.tx.tracker.domain.TxTrackStatus -import com.wavesenterprise.we.tx.tracker.jpa.TxTrackerJpaAutoConfig -import com.wavesenterprise.we.tx.tracker.jpa.repository.TxTrackerJpaRepository +import com.wavesenterprise.sdk.tx.observer.common.jpa.util.flushAndClear +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackInfo +import com.wavesenterprise.sdk.tx.tracker.domain.TxTrackStatus +import com.wavesenterprise.sdk.tx.tracker.jpa.TxTrackerJpaAutoConfig +import com.wavesenterprise.sdk.tx.tracker.jpa.repository.TxTrackerJpaRepository import org.hamcrest.MatcherAssert.assertThat import org.hamcrest.core.Is.`is` import org.hibernate.exception.ConstraintViolationException