From 29758bc4e077fa2cc53ed302348ce98a103a27e9 Mon Sep 17 00:00:00 2001 From: marko-bekhta Date: Mon, 25 Sep 2023 16:58:23 +0200 Subject: [PATCH] HSEARCH-4928 Rename outbox polling module --- CONTRIBUTING.md | 2 +- Jenkinsfile | 2 +- bom/public/pom.xml | 2 +- .../collector/impl/ConfigurationRules.java | 2 +- build/jqassistant/rules/rules.xml | 2 +- build/parents/build/pom.xml | 6 +- build/reports/pom.xml | 6 +- distribution/pom.xml | 2 +- .../_configuration-properties-aggregated.adoc | 2 +- .../public/reference/_architecture.adoc | 2 +- .../_configuration-properties-aggregated.adoc | 2 +- .../public/reference/_coordination.adoc | 2 +- .../pom.xml | 4 +- .../src/main/java/module-info.java | 10 +- .../MyElasticsearchAnalysisConfigurer.java | 2 +- .../outboxpolling/entity/Author.java | 4 +- .../AuthorWithSlightlyDifferentIndex.java | 2 +- .../outboxpolling/service/AuthorService.java | 6 +- .../src/main/resources/hibernate.properties | 2 +- .../outboxpolling/JavaModulePathIT.java | 4 +- ...rationtest.mapper.orm.OrmSetupHelperConfig | 1 - .../pom.xml | 4 +- .../OutboxPollingDisabledIT.java | 6 +- .../OutboxPollingStrategyPropertyValueIT.java | 14 +-- ...lingAutomaticIndexingBackendFailureIT.java | 10 +- ...PollingAutomaticIndexingConcurrencyIT.java | 8 +- ...cIndexingDynamicShardingRebalancingIT.java | 14 +-- ...oxPollingAutomaticIndexingEdgeCasesIT.java | 8 +- ...ollingAutomaticIndexingEventSendingIT.java | 12 +-- ...tomaticIndexingInvalidConfigurationIT.java | 2 +- ...oxPollingAutomaticIndexingLifecycleIT.java | 22 ++-- ...ollingAutomaticIndexingMultiTenancyIT.java | 12 +-- ...llingAutomaticIndexingOutOfOrderIdsIT.java | 10 +- ...ingAutomaticIndexingProcessingOrderIT.java | 4 +- ...tboxPollingAutomaticIndexingRoutingIT.java | 8 +- ...ollingAutomaticIndexingShardingBaseIT.java | 9 +- ...icShardingIncompatibleConfigurationIT.java | 4 +- ...gStaticShardingInvalidConfigurationIT.java | 2 +- ...cIndexingStaticShardingUnevenShardsIT.java | 4 +- ...gAutomaticIndexingWhileMassIndexingIT.java | 2 +- .../OutboxPollingIndexingPlanFilterIT.java | 2 +- .../RoutedIndexedEntity.java | 2 +- .../StatusRoutingBridge.java | 2 +- .../mapping/AbortedEventsGenerator.java | 2 +- .../outboxpolling/mapping/IndexedEntity.java | 2 +- .../mapping/IndexedMultiTenantEntity.java | 2 +- .../mapping/OutboxPollingSearchMappingIT.java | 6 +- ...boxPollingSearchMappingMultiTenancyIT.java | 6 +- ...tomEntityMappingDatabaseColumnTypesIT.java | 6 +- .../OutboxPollingCustomEntityMappingIT.java | 20 ++-- .../OutboxAgentDisconnectionSimulator.java | 4 +- .../testsupport/util/OutboxEventFilter.java | 16 +-- .../OutboxPollingOrmSetupHelperConfig.java | 4 +- .../util/OutboxPollingOrmTestRunner.java | 2 +- .../util/OutboxPollingTestUtils.java | 8 +- .../PerSessionFactoryIndexingCountHelper.java | 4 +- .../testsupport/util/TestFailureHandler.java | 2 +- ...estingOutboxPollingInternalConfigurer.java | 12 +-- ...rationtest.mapper.orm.OrmSetupHelperConfig | 1 + .../mapper/orm-realbackend/pom.xml | 2 +- .../ConcurrentEmbeddedUpdateLimitationIT.java | 4 +- integrationtest/mapper/orm-spring/pom.xml | 2 +- .../timeout/TimeoutSessionEventListener.java | 2 +- integrationtest/pom.xml | 4 +- ...ibernateOrmMapperOutboxPollingClasses.java | 51 --------- ...engine.environment.bean.spi.BeanConfigurer | 1 - .../pom.xml | 10 +- .../impl/DirtinessDescriptorDto.java | 42 ++++---- .../impl/DocumentRouteDescriptorDto.java | 30 +++--- .../impl/DocumentRoutesDescriptorDto.java | 102 +++++++++--------- .../PojoIndexingQueueEventPayloadDto.java | 96 ++++++++--------- .../src/main/avro/schema/schema.avsc | 16 +-- .../outboxpolling/OutboxPollingExtension.java | 8 +- .../EventPayloadFromDtoConverterUtils.java | 10 +- .../impl/EventPayloadSerializationUtils.java | 6 +- .../impl/EventPayloadToDtoConverterUtils.java | 10 +- ...bernateOrmMapperOutboxPollingSettings.java | 2 +- .../cfg/OutboxEventProcessingOrder.java | 4 +- .../orm}/outboxpolling/cfg/PayloadType.java | 4 +- .../cfg/UuidGenerationStrategy.java | 4 +- ...ateOrmMapperOutboxPollingImplSettings.java | 4 +- .../cfg/impl/UuidDataTypeUtils.java | 4 +- ...nateOrmMapperOutboxPollingSpiSettings.java | 8 +- .../outboxpolling/cluster/impl/Agent.java | 2 +- .../cluster/impl/AgentPayload.java | 2 +- .../cluster/impl/AgentPersister.java | 4 +- .../cluster/impl/AgentReference.java | 2 +- .../cluster/impl/AgentRepository.java | 2 +- .../cluster/impl/AgentRepositoryProvider.java | 2 +- .../cluster/impl/AgentState.java | 2 +- .../outboxpolling/cluster/impl/AgentType.java | 2 +- .../cluster/impl/ClusterDescriptor.java | 2 +- .../cluster/impl/DefaultAgentRepository.java | 9 +- ...ingAgentAdditionalJaxbMappingProducer.java | 26 +++-- .../impl/ShardAssignmentDescriptor.java | 2 +- .../event/impl/AbstractAgentClusterLink.java | 10 +- .../event/impl/AgentClusterLinkContext.java | 6 +- .../impl/AgentClusterLinkContextProvider.java | 4 +- .../event/impl/ClusterTarget.java | 12 +-- .../event/impl/DefaultOutboxEventFinder.java | 6 +- ...EntityIdHashRangeOutboxEventPredicate.java | 2 +- .../event/impl/OutboxConfigUtils.java | 4 +- .../outboxpolling/event/impl/OutboxEvent.java | 2 +- .../event/impl/OutboxEventAndPredicate.java | 2 +- .../event/impl/OutboxEventFinder.java | 2 +- .../event/impl/OutboxEventFinderProvider.java | 2 +- .../event/impl/OutboxEventLoader.java | 6 +- .../event/impl/OutboxEventOrder.java | 6 +- .../event/impl/OutboxEventPredicate.java | 2 +- .../event/impl/OutboxEventProcessingPlan.java | 4 +- .../event/impl/OutboxEventReference.java | 2 +- .../event/impl/OutboxEventUpdater.java | 4 +- ...boxPollingEventProcessingInstructions.java | 2 +- .../impl/OutboxPollingEventProcessor.java | 12 +-- ...utboxPollingEventProcessorClusterLink.java | 16 +-- .../impl/OutboxPollingMassIndexerAgent.java | 8 +- ...boxPollingMassIndexerAgentClusterLink.java | 16 +-- ...OutboxPollingMassIndexingInstructions.java | 2 +- ...boxEventAdditionalJaxbMappingProducer.java | 24 ++--- .../OutboxPollingOutboxEventSendingPlan.java | 6 +- .../event/impl/ShardAssignment.java | 4 +- .../outboxpolling/impl/HibernateOrmUtils.java | 2 +- .../impl/OutboxPollingBeanConfigurer.java | 4 +- .../OutboxPollingCoordinationStrategy.java | 36 +++---- .../impl/OutboxPollingInternalConfigurer.java | 8 +- .../impl/JaxbEntityMappingsFormatter.java | 4 +- .../orm}/outboxpolling/logging/impl/Log.java | 8 +- .../mapping/OutboxPollingSearchMapping.java | 2 +- .../impl/AdditionalMappingBuilder.java | 2 +- .../mapping/impl/JaxbMappingHelper.java | 4 +- .../impl/OutboxPollingSearchMappingImpl.java | 10 +- ...ibernateOrmMapperOutboxPollingClasses.java | 51 +++++++++ ...engine.environment.bean.spi.BeanConfigurer | 1 + ...ateOrmMapperOutboxPollingSettingsTest.java | 2 +- ...ractEventProcessorClusterLinkBaseTest.java | 8 +- ...AbstractEventProcessorClusterLinkTest.java | 16 +-- ...ctMassIndexerAgentClusterLinkBaseTest.java | 10 +- ...stractMassIndexerAgentClusterLinkTest.java | 17 ++- .../impl/AgentRepositoryMockingHelper.java | 12 +-- ...sorClusterLinkDynamicShardingBaseTest.java | 14 +-- ...tProcessorClusterLinkLeaveClusterTest.java | 2 +- ...ixedSharding4ShardSelfDynamicBaseTest.java | 12 +-- ...MixedSharding4ShardSelfStaticBaseTest.java | 6 +- ...ProcessorClusterLinkPulseExpectations.java | 14 +-- ...usterLinkStaticSharding4ShardBaseTest.java | 12 +-- ...lusterLinkStaticShardingEdgeCasesTest.java | 8 +- ...entClusterLinkDynamicShardingBaseTest.java | 14 +-- ...dexerAgentClusterLinkLeaveClusterTest.java | 2 +- ...exerAgentClusterLinkPulseExpectations.java | 15 ++- ...usterLinkStaticSharding3ShardBaseTest.java | 8 +- ...nateOrmMapperOutboxPollingClassesTest.java | 16 +-- pom.xml | 2 +- util/common/pom.xml | 2 +- 153 files changed, 647 insertions(+), 651 deletions(-) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch => orm-outbox-polling-elasticsearch}/pom.xml (96%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch => orm-outbox-polling-elasticsearch}/src/main/java/module-info.java (84%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination => orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch}/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java (95%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination => orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch}/outboxpolling/entity/Author.java (88%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination => orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch}/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java (95%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination => orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch}/outboxpolling/service/AuthorService.java (94%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch => orm-outbox-polling-elasticsearch}/src/main/resources/hibernate.properties (85%) rename integrationtest/java/modules/{orm-coordination-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/coordination => orm-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch}/outboxpolling/JavaModulePathIT.java (94%) delete mode 100644 integrationtest/mapper/orm-coordination-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig rename integrationtest/mapper/{orm-coordination-outbox-polling => orm-outbox-polling}/pom.xml (97%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/OutboxPollingDisabledIT.java (93%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/OutboxPollingStrategyPropertyValueIT.java (86%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java (95%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java (91%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java (92%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java (94%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java (97%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java (98%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java (86%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java (91%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java (96%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java (97%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java (90%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java (95%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java (96%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java (98%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java (96%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java (98%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java (98%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/RoutedIndexedEntity.java (93%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/automaticindexing/StatusRoutingBridge.java (94%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/mapping/AbortedEventsGenerator.java (97%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/mapping/IndexedEntity.java (92%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/mapping/IndexedMultiTenantEntity.java (93%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/mapping/OutboxPollingSearchMappingIT.java (93%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java (96%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java (95%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java (94%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java (83%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/OutboxEventFilter.java (87%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java (85%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java (87%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/OutboxPollingTestUtils.java (82%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java (97%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/TestFailureHandler.java (94%) rename integrationtest/mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm}/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java (74%) create mode 100644 integrationtest/mapper/orm-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig delete mode 100644 mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java delete mode 100644 mapper/orm-coordination-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer rename mapper/{orm-coordination-outbox-polling => orm-outbox-polling}/pom.xml (93%) rename mapper/{orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm}/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java (84%) rename mapper/{orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm}/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java (81%) rename mapper/{orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm}/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java (63%) rename mapper/{orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm}/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java (62%) rename mapper/{orm-coordination-outbox-polling => orm-outbox-polling}/src/main/avro/schema/schema.avsc (59%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/OutboxPollingExtension.java (85%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java (80%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/avro/impl/EventPayloadSerializationUtils.java (88%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java (80%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java (99%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/OutboxEventProcessingOrder.java (95%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/PayloadType.java (90%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/UuidGenerationStrategy.java (92%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java (82%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/impl/UuidDataTypeUtils.java (95%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java (90%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/Agent.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentPayload.java (87%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentPersister.java (95%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentReference.java (88%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentRepository.java (84%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentRepositoryProvider.java (81%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentState.java (86%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/AgentType.java (88%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/ClusterDescriptor.java (92%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/DefaultAgentRepository.java (75%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java (84%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java (95%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AbstractAgentClusterLink.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AgentClusterLinkContext.java (87%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AgentClusterLinkContextProvider.java (89%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/ClusterTarget.java (88%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/DefaultOutboxEventFinder.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxConfigUtils.java (87%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEvent.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventAndPredicate.java (92%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventFinder.java (83%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventFinderProvider.java (87%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventLoader.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventOrder.java (83%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventPredicate.java (83%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventProcessingPlan.java (96%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventReference.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxEventUpdater.java (96%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java (91%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingEventProcessor.java (96%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java (96%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java (86%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java (91%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java (85%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java (93%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/ShardAssignment.java (92%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/impl/HibernateOrmUtils.java (89%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/impl/OutboxPollingBeanConfigurer.java (82%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/impl/OutboxPollingCoordinationStrategy.java (86%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/impl/OutboxPollingInternalConfigurer.java (68%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java (80%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/logging/impl/Log.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/mapping/OutboxPollingSearchMapping.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/mapping/impl/AdditionalMappingBuilder.java (97%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/mapping/impl/JaxbMappingHelper.java (92%) rename mapper/{orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm}/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java (91%) create mode 100644 mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java create mode 100644 mapper/orm-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java (92%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java (97%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java (86%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java (97%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java (80%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/AgentRepositoryMockingHelper.java (88%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java (93%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java (96%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java (89%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java (94%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java (89%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java (89%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java (97%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java (84%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java (96%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java (86%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java (90%) rename mapper/{orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination => orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm}/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java (87%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 63f41aeb387..4f3ee01a2ba 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -203,7 +203,7 @@ Here are some notable sub-directories: and do the work of converting between user entities and documents to be indexed. * `pojo-base`: Contains base classes and APIs that are re-used in other POJO-based mapper. * `orm`: A mapper for [Hibernate ORM](http://hibernate.org/orm/) entities. - * `orm-coordination-outbox-polling`: An implementation of indexing coordination between nodes + * `orm-outbox-polling`: An implementation of indexing coordination between nodes in the orm mapper (see above) using an outbox, i.e. an event table in the database. * `pojo-standalone`: A mapper for POJOs in standalone mode, i.e. without Hibernate ORM. Currently incubating, i.e. backwards-incompatible changes in APIs may happen. diff --git a/Jenkinsfile b/Jenkinsfile index ff14109e8cf..0f1bbdc5770 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -536,7 +536,7 @@ stage('Non-default environments') { -pl !integrationtest/v5migrationhelper/orm \ -pl !integrationtest/java/modules/orm-lucene \ -pl !integrationtest/java/modules/orm-elasticsearch \ - -pl !integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch \ + -pl !integrationtest/java/modules/orm-outbox-polling-elasticsearch \ ''' String mavenDockerArgs = "" def startedContainers = false diff --git a/bom/public/pom.xml b/bom/public/pom.xml index 40023f06aed..2195245d1fc 100644 --- a/bom/public/pom.xml +++ b/bom/public/pom.xml @@ -84,7 +84,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling ${project.version} diff --git a/build/configuration-properties-collector/src/main/java/org/hibernate/search/configuration/properties/collector/impl/ConfigurationRules.java b/build/configuration-properties-collector/src/main/java/org/hibernate/search/configuration/properties/collector/impl/ConfigurationRules.java index 31daad49b6e..acaee391778 100644 --- a/build/configuration-properties-collector/src/main/java/org/hibernate/search/configuration/properties/collector/impl/ConfigurationRules.java +++ b/build/configuration-properties-collector/src/main/java/org/hibernate/search/configuration/properties/collector/impl/ConfigurationRules.java @@ -25,7 +25,7 @@ public final class ConfigurationRules { "org.hibernate.search.backend.lucene.cfg.LuceneBackendSettings#TYPE_NAME", "org.hibernate.search.backend.lucene.cfg.LuceneIndexSettings#SHARDS", "org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings#COORDINATION", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings#COORDINATION_STRATEGY_NAME", + "org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings#COORDINATION_STRATEGY_NAME", "org.hibernate.search.engine.cfg.EngineSettings#BACKEND", "org.hibernate.search.engine.cfg.EngineSettings#BACKENDS", "org.hibernate.search.engine.cfg.BackendSettings#INDEXES" diff --git a/build/jqassistant/rules/rules.xml b/build/jqassistant/rules/rules.xml index 798490ae8ee..5c931a42743 100644 --- a/build/jqassistant/rules/rules.xml +++ b/build/jqassistant/rules/rules.xml @@ -279,7 +279,7 @@ WHEN 'hibernate-search-mapper-pojo-base' THEN 'Pojo' WHEN 'hibernate-search-mapper-pojo-standalone' THEN 'StandalonePojo' WHEN 'hibernate-search-mapper-orm' THEN 'HibernateOrm' - WHEN 'hibernate-search-mapper-orm-coordination-outbox-polling' THEN 'OutboxPolling' + WHEN 'hibernate-search-mapper-orm-outbox-polling' THEN 'OutboxPolling' WHEN 'hibernate-search-mapper-orm-jakarta-batch-jberet' THEN 'JBeret' ELSE 'UNKNOWN-MODULE-SPECIFIC-KEYWORD-PLEASE-UPDATE-JQASSISTANT-RULES' END diff --git a/build/parents/build/pom.xml b/build/parents/build/pom.xml index 29133f388ff..534a458c82d 100644 --- a/build/parents/build/pom.xml +++ b/build/parents/build/pom.xml @@ -323,7 +323,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling ${project.version} @@ -628,7 +628,7 @@ org.hibernate.search - hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling + hibernate-search-integrationtest-mapper-orm-outbox-polling ${project.version} @@ -643,7 +643,7 @@ org.hibernate.search - hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch + hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch ${project.version} diff --git a/build/reports/pom.xml b/build/reports/pom.xml index 222250b5c0c..a0f0473ad22 100644 --- a/build/reports/pom.xml +++ b/build/reports/pom.xml @@ -68,7 +68,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling org.hibernate.search @@ -140,7 +140,7 @@ org.hibernate.search - hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling + hibernate-search-integrationtest-mapper-orm-outbox-polling test @@ -292,7 +292,7 @@ org.hibernate.search - hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch + hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch test diff --git a/distribution/pom.xml b/distribution/pom.xml index 69e270695bf..8881a67e54e 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -99,7 +99,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling compile diff --git a/documentation/src/main/asciidoc/internals/_configuration-properties-aggregated.adoc b/documentation/src/main/asciidoc/internals/_configuration-properties-aggregated.adoc index 1cbaa7be672..4a49eaf2315 100644 --- a/documentation/src/main/asciidoc/internals/_configuration-properties-aggregated.adoc +++ b/documentation/src/main/asciidoc/internals/_configuration-properties-aggregated.adoc @@ -6,5 +6,5 @@ include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backen include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backend-elasticsearch-spi.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backend-elasticsearch-aws-spi.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm-spi.adoc[opts=optional] -include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm-coordination-outbox-polling-spi.adoc[opts=optional] +include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm-outbox-polling-spi.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-pojo-standalone-spi.adoc[opts=optional] diff --git a/documentation/src/main/asciidoc/public/reference/_architecture.adoc b/documentation/src/main/asciidoc/public/reference/_architecture.adoc index db87924298d..f8c2fe3e1e8 100644 --- a/documentation/src/main/asciidoc/public/reference/_architecture.adoc +++ b/documentation/src/main/asciidoc/public/reference/_architecture.adoc @@ -366,7 +366,7 @@ When <>:: org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling {hibernateSearchVersion} diff --git a/documentation/src/main/asciidoc/public/reference/_configuration-properties-aggregated.adoc b/documentation/src/main/asciidoc/public/reference/_configuration-properties-aggregated.adoc index d17d5e0a9e0..90ec9a2bd96 100644 --- a/documentation/src/main/asciidoc/public/reference/_configuration-properties-aggregated.adoc +++ b/documentation/src/main/asciidoc/public/reference/_configuration-properties-aggregated.adoc @@ -7,5 +7,5 @@ include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backen include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backend-elasticsearch.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-backend-elasticsearch-aws.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm.adoc[opts=optional] -include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm-coordination-outbox-polling.adoc[opts=optional] +include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-orm-outbox-polling.adoc[opts=optional] include::{documentationConfigPropertiesOutputDirectory}/_hibernate-search-mapper-pojo-standalone.adoc[opts=optional] diff --git a/documentation/src/main/asciidoc/public/reference/_coordination.adoc b/documentation/src/main/asciidoc/public/reference/_coordination.adoc index 12241471423..b75f26631c1 100644 --- a/documentation/src/main/asciidoc/public/reference/_coordination.adoc +++ b/documentation/src/main/asciidoc/public/reference/_coordination.adoc @@ -184,7 +184,7 @@ You will also need to add this dependency: ---- org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling {hibernateSearchVersion} ---- diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml similarity index 96% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml index 7bce2dd9dc4..feb1563d6da 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/pom.xml +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/pom.xml @@ -10,7 +10,7 @@ 7.0.0-SNAPSHOT ../../.. - hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch + hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch jar Hibernate Search ITs - Java - Modules - ORM/Elasticsearch outbox polling @@ -41,7 +41,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/module-info.java similarity index 84% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/module-info.java index 47a5e2599ee..3d360ac9eab 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/module-info.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/module-info.java @@ -1,6 +1,6 @@ -module org.hibernate.search.integrationtest.java.module.orm.elasticsearch.coordination.outboxpolling { - exports org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.service; - opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity to +module org.hibernate.search.integrationtest.java.module.orm.elasticsearch.outboxpolling { + exports org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.service; + opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.entity to org.hibernate.orm.core, /* * TODO HSEARCH-4302 This part of the "opens" directive ideally should not be necessary. @@ -8,14 +8,14 @@ * and take advantage of the fact the package is already open to Hibernate ORM? */ org.hibernate.search.mapper.orm; - opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config to + opens org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.config to org.hibernate.search.engine; // For reflective instantiation of the analysis configurer requires jakarta.persistence; requires org.hibernate.orm.core; requires org.hibernate.search.mapper.orm; requires org.hibernate.search.backend.elasticsearch; - requires org.hibernate.search.mapper.orm.coordination.outboxpolling; + requires org.hibernate.search.mapper.orm.outboxpolling; /* * This is necessary in order to use SessionFactory, diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java similarity index 95% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java index 769612622b5..65006dc2011 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/config/MyElasticsearchAnalysisConfigurer.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config; +package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.config; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurationContext; import org.hibernate.search.backend.elasticsearch.analysis.ElasticsearchAnalysisConfigurer; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/Author.java similarity index 88% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/Author.java index da214272ed6..b3fac5bc3ac 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/Author.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/Author.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity; +package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.entity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.Id; -import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config.MyElasticsearchAnalysisConfigurer; +import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.config.MyElasticsearchAnalysisConfigurer; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java similarity index 95% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java index 0b375caa40e..9ffc14e37a2 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/entity/AuthorWithSlightlyDifferentIndex.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity; +package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.entity; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/service/AuthorService.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/service/AuthorService.java similarity index 94% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/service/AuthorService.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/service/AuthorService.java index eca5b16c2ff..3fd2646b3e7 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/coordination/outboxpolling/service/AuthorService.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/java/org/hibernate/search/integrationtest/java/modules/orm/elasticsearch/outboxpolling/service/AuthorService.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.service; +package org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.service; import java.util.List; @@ -15,8 +15,8 @@ import org.hibernate.boot.SessionFactoryBuilder; import org.hibernate.boot.registry.StandardServiceRegistryBuilder; import org.hibernate.search.engine.search.query.SearchQuery; -import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity.Author; -import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.entity.AuthorWithSlightlyDifferentIndex; +import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.entity.Author; +import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.entity.AuthorWithSlightlyDifferentIndex; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; import org.hibernate.search.mapper.orm.session.SearchSession; diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/resources/hibernate.properties b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/resources/hibernate.properties similarity index 85% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/resources/hibernate.properties rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/resources/hibernate.properties index 802330df095..0bdd1605c5a 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/main/resources/hibernate.properties +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/main/resources/hibernate.properties @@ -12,4 +12,4 @@ hibernate.max_fetch_depth = 5 ## Connection info: see POM hibernate.search.backend.log.json_pretty_printing = true hibernate.search.coordination.strategy = outbox-polling -hibernate.search.backend.analysis.configurer = org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.config.MyElasticsearchAnalysisConfigurer +hibernate.search.backend.analysis.configurer = org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.config.MyElasticsearchAnalysisConfigurer diff --git a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/coordination/outboxpolling/JavaModulePathIT.java b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/outboxpolling/JavaModulePathIT.java similarity index 94% rename from integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/coordination/outboxpolling/JavaModulePathIT.java rename to integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/outboxpolling/JavaModulePathIT.java index a0184cf8da9..65e2ada1bf1 100644 --- a/integrationtest/java/modules/orm-coordination-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/coordination/outboxpolling/JavaModulePathIT.java +++ b/integrationtest/java/modules/orm-outbox-polling-elasticsearch/src/test/java/org/hibernate/search/integrationtest/java/modules/service/orm/elasticsearch/outboxpolling/JavaModulePathIT.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.java.modules.service.orm.elasticsearch.coordination.outboxpolling; +package org.hibernate.search.integrationtest.java.modules.service.orm.elasticsearch.outboxpolling; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.awaitility.Awaitility.await; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.coordination.outboxpolling.service.AuthorService; +import org.hibernate.search.integrationtest.java.modules.orm.elasticsearch.outboxpolling.service.AuthorService; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.util.common.SearchException; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig b/integrationtest/mapper/orm-coordination-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig deleted file mode 100644 index 5c9b0b23417..00000000000 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig +++ /dev/null @@ -1 +0,0 @@ -org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxPollingOrmSetupHelperConfig \ No newline at end of file diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml b/integrationtest/mapper/orm-outbox-polling/pom.xml similarity index 97% rename from integrationtest/mapper/orm-coordination-outbox-polling/pom.xml rename to integrationtest/mapper/orm-outbox-polling/pom.xml index 11af0318c9a..bd516db1b86 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/pom.xml +++ b/integrationtest/mapper/orm-outbox-polling/pom.xml @@ -7,7 +7,7 @@ 7.0.0-SNAPSHOT ../.. - hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling + hibernate-search-integrationtest-mapper-orm-outbox-polling Hibernate Search ITs - ORM - Coordination - Outbox Polling Hibernate Search integration tests for the Hibernate ORM integration using outbox polling as coordination strategy @@ -26,7 +26,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling test diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingDisabledIT.java similarity index 93% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingDisabledIT.java index d263811c50c..a3f5315acd9 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingDisabledIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingDisabledIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -18,8 +18,8 @@ import jakarta.persistence.metamodel.EntityType; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingStrategyPropertyValueIT.java similarity index 86% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingStrategyPropertyValueIT.java index 72806b93cd0..5069084590c 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/OutboxPollingStrategyPropertyValueIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/OutboxPollingStrategyPropertyValueIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling; import static org.assertj.core.api.Assertions.assertThat; @@ -19,14 +19,14 @@ import org.hibernate.search.engine.backend.analysis.AnalyzerNames; import org.hibernate.search.engine.environment.bean.BeanReference; import org.hibernate.search.engine.environment.bean.BeanRetrieval; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java similarity index 95% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java index 393bf489c75..117b22b5aed 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingBackendFailureIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -22,10 +22,10 @@ import org.hibernate.SessionFactory; import org.hibernate.search.engine.common.EntityReference; import org.hibernate.search.engine.reporting.EntityIndexingFailureContext; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestFailureHandler; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestFailureHandler; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.common.SearchException; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java similarity index 91% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java index b86e3b7244c..10dde09e95f 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingConcurrencyIT.java @@ -4,10 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.ArrayList; @@ -22,7 +21,8 @@ import org.hibernate.dialect.Dialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestFailureHandler; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxPollingTestUtils; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestFailureHandler; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; @@ -73,7 +73,7 @@ public void setup() { backendMock.verifyExpectationsMet(); - awaitAllAgentsRunningInOneCluster( with( sessionFactories.get( 0 ) ), TOTAL_SHARD_COUNT ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( sessionFactories.get( 0 ) ), TOTAL_SHARD_COUNT ); } private SessionFactory setup(String hbm2ddlAction) { diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java similarity index 92% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java index 2fd3f45f59b..249ca0ca95c 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingDynamicShardingRebalancingIT.java @@ -4,12 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.withinPercentage; import static org.awaitility.Awaitility.await; -import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.ArrayList; @@ -22,10 +21,11 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxAgentDisconnectionSimulator; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxAgentDisconnectionSimulator; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxPollingTestUtils; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; @@ -75,7 +75,7 @@ public void setup() { backendMock.verifyExpectationsMet(); - awaitAllAgentsRunningInOneCluster( with( indexingCountHelper.sessionFactory( 0 ) ), 3 ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( indexingCountHelper.sessionFactory( 0 ) ), 3 ); } private void setup(String hbm2ddlAction) { diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java similarity index 94% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java index 2ab81f03b29..54ed3927c86 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEdgeCasesIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; @@ -17,9 +17,9 @@ import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.KeywordField; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java similarity index 97% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java index 5be27a36e44..4aa610eaf6f 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingEventSendingIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.SoftAssertions.assertSoftly; @@ -20,11 +20,11 @@ import jakarta.persistence.OneToOne; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl.EventPayloadSerializationUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.avro.impl.EventPayloadSerializationUtils; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java similarity index 98% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java index 8476583479c..02cf6cf90a0 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingInvalidConfigurationIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java similarity index 86% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java index 1a3f1bacf25..1ecfaab9f6e 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingLifecycleIT.java @@ -4,10 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing.OutboxPollingAutomaticIndexingEventSendingIT.verifyOutboxEntry; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.List; @@ -17,11 +16,11 @@ import jakarta.persistence.Id; import org.hibernate.SessionFactory; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; @@ -138,11 +137,14 @@ public void processCreateUpdateDelete() { List events = eventFilter.findOutboxEventsNoFilter( session ); assertThat( events ).hasSize( 3 ); // add - verifyOutboxEntry( events.get( 0 ), OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); + OutboxPollingAutomaticIndexingEventSendingIT.verifyOutboxEntry( events.get( 0 ), + OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); // update - verifyOutboxEntry( events.get( 1 ), OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); + OutboxPollingAutomaticIndexingEventSendingIT.verifyOutboxEntry( events.get( 1 ), + OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); // delete - verifyOutboxEntry( events.get( 2 ), OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); + OutboxPollingAutomaticIndexingEventSendingIT.verifyOutboxEntry( events.get( 2 ), + OutboxPollingAutomaticIndexingOutOfOrderIdsIT.IndexedEntity.INDEX, "1", null ); } ); // Only a delete work is expected to be executed by the time the outbox events are processed; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java similarity index 91% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java index 1229ab7a706..b5082f1cdb5 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingMultiTenancyIT.java @@ -4,9 +4,8 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; -import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.concurrent.atomic.AtomicReference; @@ -18,7 +17,8 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxPollingTestUtils; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; @@ -87,9 +87,9 @@ public void perTenantEventProcessorConfiguration() { backendMock.verifyExpectationsMet(); SessionFactory sessionFactory = indexingCountHelper.sessionFactory( 0 ); - awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_1_ID ), 2 ); - awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_2_ID ), 2 ); - awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_3_ID ), 2 ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_1_ID ), 2 ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_2_ID ), 2 ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( sessionFactory, TENANT_3_ID ), 2 ); SessionFactory sessionFactoryForAllTenants = indexingCountHelper.sessionFactory( 0 ); diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java similarity index 96% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java index 0a2496f51f2..3e9ba4bf42f 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingOutOfOrderIdsIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; @@ -25,10 +25,10 @@ import org.hibernate.SessionFactory; import org.hibernate.engine.jdbc.spi.JdbcCoordinator; import org.hibernate.engine.spi.SharedSessionContractImplementor; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java similarity index 97% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java index 3fb5046421a..7a1cc6060b0 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingProcessingOrderIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -22,7 +22,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.jdbc.spi.StatementInspector; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.common.SearchException; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java similarity index 90% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java index e23a6aaf7a1..e006afc9174 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingRoutingIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; @@ -13,9 +13,9 @@ import java.util.UUID; import org.hibernate.SessionFactory; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; import org.hibernate.search.util.impl.integrationtest.common.stub.backend.document.StubDocumentNode; import org.hibernate.search.util.impl.integrationtest.mapper.orm.CoordinationStrategyExpectations; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java similarity index 95% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java index 5ca8685cf50..94a69daeacf 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingShardingBaseIT.java @@ -4,10 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import jakarta.persistence.Entity; @@ -16,7 +15,8 @@ import org.hibernate.SessionFactory; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxPollingTestUtils; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexedEmbedded; @@ -84,7 +84,8 @@ public void setup() { backendMock.verifyExpectationsMet(); - awaitAllAgentsRunningInOneCluster( with( indexingCountHelper.sessionFactory( 0 ) ), totalShardCount ); + OutboxPollingTestUtils.awaitAllAgentsRunningInOneCluster( with( indexingCountHelper.sessionFactory( 0 ) ), + totalShardCount ); } private void setup(String hbm2ddlAction, int assignedShardIndex) { diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java similarity index 96% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java index d569927d2f0..01ed1ebe9c5 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingIncompatibleConfigurationIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -17,7 +17,7 @@ import org.hibernate.cfg.Environment; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestFailureHandler; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestFailureHandler; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java similarity index 98% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java index 4d30685cba2..13a32cc6d9c 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingInvalidConfigurationIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.Assertions.assertThatThrownBy; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java similarity index 96% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java index 663e19c0dfa..6af06494201 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingStaticShardingUnevenShardsIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; @@ -18,7 +18,7 @@ import org.hibernate.SessionFactory; import org.hibernate.cfg.Environment; import org.hibernate.search.engine.backend.analysis.AnalyzerNames; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.PerSessionFactoryIndexingCountHelper; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java similarity index 98% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java index ba423a83ae7..bd1d1d5879a 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingAutomaticIndexingWhileMassIndexingIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java similarity index 98% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java index 5d47a44dca0..0e656bc7530 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/OutboxPollingIndexingPlanFilterIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/RoutedIndexedEntity.java similarity index 93% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/RoutedIndexedEntity.java index 3fa1283ce3b..5b9448c6e09 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/RoutedIndexedEntity.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/RoutedIndexedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import jakarta.persistence.Entity; import jakarta.persistence.Id; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/StatusRoutingBridge.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/StatusRoutingBridge.java similarity index 94% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/StatusRoutingBridge.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/StatusRoutingBridge.java index f2c66953e15..c4a7d39b857 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/automaticindexing/StatusRoutingBridge.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/automaticindexing/StatusRoutingBridge.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.automaticindexing; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.automaticindexing; import org.hibernate.search.mapper.pojo.bridge.RoutingBridge; import org.hibernate.search.mapper.pojo.bridge.binding.RoutingBindingContext; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/AbortedEventsGenerator.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/AbortedEventsGenerator.java similarity index 97% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/AbortedEventsGenerator.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/AbortedEventsGenerator.java index 585f8150497..0c4142d910e 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/AbortedEventsGenerator.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/AbortedEventsGenerator.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.mapping; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedEntity.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedEntity.java similarity index 92% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedEntity.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedEntity.java index b772e35f95d..04bd24c6301 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedEntity.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.mapping; import jakarta.persistence.Basic; import jakarta.persistence.Entity; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedMultiTenantEntity.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedMultiTenantEntity.java similarity index 93% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedMultiTenantEntity.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedMultiTenantEntity.java index 57d7deac7fe..5d049d741ed 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/IndexedMultiTenantEntity.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/IndexedMultiTenantEntity.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.mapping; import jakarta.persistence.Basic; import jakarta.persistence.Entity; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingIT.java similarity index 93% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingIT.java index 4058ed40a8a..670c760fb9b 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.mapping; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -13,8 +13,8 @@ import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.Search; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.OutboxPollingExtension; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.OutboxPollingSearchMapping; +import org.hibernate.search.mapper.orm.outboxpolling.OutboxPollingExtension; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.OutboxPollingSearchMapping; import org.hibernate.search.util.common.SearchException; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; import org.hibernate.search.util.impl.integrationtest.mapper.orm.CoordinationStrategyExpectations; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java similarity index 96% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java index bbae3c604e9..c1a22aefb6c 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMappingMultiTenancyIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.mapping; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -16,8 +16,8 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.search.mapper.orm.Search; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.OutboxPollingExtension; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.OutboxPollingSearchMapping; +import org.hibernate.search.mapper.orm.outboxpolling.OutboxPollingExtension; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.OutboxPollingSearchMapping; import org.hibernate.search.util.common.SearchException; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; import org.hibernate.search.util.impl.integrationtest.mapper.orm.CoordinationStrategyExpectations; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java similarity index 95% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java index 0d99f137e58..66074e75ba0 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingDatabaseColumnTypesIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.schema; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.schema; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.fail; @@ -29,8 +29,8 @@ import org.hibernate.metamodel.MappingMetamodel; import org.hibernate.metamodel.mapping.AttributeMapping; import org.hibernate.persister.entity.EntityPersister; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.util.impl.integrationtest.common.rule.BackendMock; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java similarity index 94% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java index d28b39d1ab4..6cd3063f8ed 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/schema/OutboxPollingCustomEntityMappingIT.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.schema; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.schema; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -29,15 +29,15 @@ import org.hibernate.engine.jdbc.env.spi.NameQualifierSupport; import org.hibernate.engine.spi.SessionFactoryImplementor; import org.hibernate.resource.jdbc.spi.StatementInspector; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.OutboxEventFilter; -import org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl.EventPayloadSerializationUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxEventFilter; +import org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.TestingOutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.avro.impl.EventPayloadSerializationUtils; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingQueueEventPayload; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java similarity index 83% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java index 650d7b18e24..48291317a29 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxAgentDisconnectionSimulator.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; public class OutboxAgentDisconnectionSimulator { private volatile boolean preventPulse = true; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxEventFilter.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxEventFilter.java similarity index 87% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxEventFilter.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxEventFilter.java index b1904e9ee42..eee966b706a 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxEventFilter.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxEventFilter.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -20,13 +20,13 @@ import org.hibernate.Session; import org.hibernate.SessionFactory; import org.hibernate.query.Query; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.DefaultOutboxEventFinder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventAndPredicate; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventFinder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventFinderProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventOrder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventPredicate; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.DefaultOutboxEventFinder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventAndPredicate; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventFinder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventFinderProvider; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventOrder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventPredicate; import org.hibernate.search.util.common.spi.ToStringTreeAppender; public class OutboxEventFilter { diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java similarity index 85% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java index 0d4fa716e44..8769caa8009 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmSetupHelperConfig.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import java.util.function.BiConsumer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; import org.hibernate.search.util.impl.integrationtest.mapper.orm.CoordinationStrategyExpectations; import org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java similarity index 87% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java index 4aa023e3f39..cc3ec7d3f08 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingOrmTestRunner.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import org.junit.extensions.cpsuite.ClasspathSuite; import org.junit.runner.RunWith; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingTestUtils.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingTestUtils.java similarity index 82% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingTestUtils.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingTestUtils.java index 80fdda61351..ea2bc882819 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/OutboxPollingTestUtils.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/OutboxPollingTestUtils.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; @@ -15,9 +15,9 @@ import org.hibernate.Session; import org.hibernate.Transaction; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; import org.hibernate.search.util.impl.integrationtest.mapper.orm.PersistenceRunner; public class OutboxPollingTestUtils { diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java similarity index 97% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java index 3e2a95fd4fd..c1c77ebc525 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/PerSessionFactoryIndexingCountHelper.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import static org.assertj.core.api.Assertions.assertThat; @@ -21,9 +21,9 @@ import org.hibernate.search.engine.backend.document.DocumentElement; import org.hibernate.search.mapper.orm.HibernateOrmExtension; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; import org.hibernate.search.mapper.orm.mapping.HibernateOrmMappingConfigurationContext; import org.hibernate.search.mapper.orm.mapping.HibernateOrmSearchMappingConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.mapper.pojo.bridge.TypeBridge; import org.hibernate.search.mapper.pojo.bridge.binding.TypeBindingContext; import org.hibernate.search.mapper.pojo.bridge.mapping.programmatic.TypeBinder; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestFailureHandler.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestFailureHandler.java similarity index 94% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestFailureHandler.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestFailureHandler.java index 7b90dc9990f..2b99e188a91 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestFailureHandler.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestFailureHandler.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import java.util.ArrayList; import java.util.Collections; diff --git a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java similarity index 74% rename from integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java rename to integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java index 646f97bd82a..8b161432319 100644 --- a/integrationtest/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/coordination/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java +++ b/integrationtest/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/integrationtest/mapper/orm/outboxpolling/testsupport/util/TestingOutboxPollingInternalConfigurer.java @@ -4,15 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.integrationtest.mapper.orm.coordination.outboxpolling.testsupport.util; +package org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util; import java.lang.invoke.MethodHandles; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.DefaultOutboxEventFinder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventFinderProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.OutboxPollingInternalConfigurer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.DefaultOutboxEventFinder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventFinderProvider; +import org.hibernate.search.mapper.orm.outboxpolling.impl.OutboxPollingInternalConfigurer; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; public class TestingOutboxPollingInternalConfigurer implements OutboxPollingInternalConfigurer { diff --git a/integrationtest/mapper/orm-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig b/integrationtest/mapper/orm-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig new file mode 100644 index 00000000000..53f28e97f7d --- /dev/null +++ b/integrationtest/mapper/orm-outbox-polling/src/test/resources/META-INF/services/org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmSetupHelperConfig @@ -0,0 +1 @@ +org.hibernate.search.integrationtest.mapper.orm.outboxpolling.testsupport.util.OutboxPollingOrmSetupHelperConfig \ No newline at end of file diff --git a/integrationtest/mapper/orm-realbackend/pom.xml b/integrationtest/mapper/orm-realbackend/pom.xml index 8b09f9a6ec4..ae01e7d0c53 100644 --- a/integrationtest/mapper/orm-realbackend/pom.xml +++ b/integrationtest/mapper/orm-realbackend/pom.xml @@ -28,7 +28,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling test diff --git a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java index 80eab33e56e..2456f9f1561 100644 --- a/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java +++ b/integrationtest/mapper/orm-realbackend/src/test/java/org/hibernate/search/integrationtest/mapper/orm/realbackend/limitations/ConcurrentEmbeddedUpdateLimitationIT.java @@ -7,7 +7,7 @@ package org.hibernate.search.integrationtest.mapper.orm.realbackend.limitations; import static org.assertj.core.api.Assertions.assertThat; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; import static org.hibernate.search.util.impl.integrationtest.mapper.orm.OrmUtils.with; import java.util.ArrayList; @@ -31,7 +31,7 @@ import org.hibernate.search.integrationtest.mapper.orm.realbackend.testsupport.BackendConfigurations; import org.hibernate.search.mapper.orm.Search; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.mapper.orm.session.SearchSession; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField; import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed; diff --git a/integrationtest/mapper/orm-spring/pom.xml b/integrationtest/mapper/orm-spring/pom.xml index 31204a5e584..e3cd63de2e5 100644 --- a/integrationtest/mapper/orm-spring/pom.xml +++ b/integrationtest/mapper/orm-spring/pom.xml @@ -58,7 +58,7 @@ org.hibernate.search - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling diff --git a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TimeoutSessionEventListener.java b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TimeoutSessionEventListener.java index 91493678cc2..282f40289a1 100644 --- a/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TimeoutSessionEventListener.java +++ b/integrationtest/mapper/orm-spring/src/test/java/org/hibernate/search/integrationtest/spring/jta/timeout/TimeoutSessionEventListener.java @@ -7,7 +7,7 @@ package org.hibernate.search.integrationtest.spring.jta.timeout; import org.hibernate.BaseSessionEventListener; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingEventProcessor; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingEventProcessor; public class TimeoutSessionEventListener extends BaseSessionEventListener { diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml index 252c0c1ae1f..989b0314fe6 100644 --- a/integrationtest/pom.xml +++ b/integrationtest/pom.xml @@ -23,7 +23,7 @@ mapper/orm-cdi mapper/orm-envers mapper/orm-realbackend - mapper/orm-coordination-outbox-polling + mapper/orm-outbox-polling mapper/orm-jakarta-batch performance v5migrationhelper/engine @@ -59,7 +59,7 @@ java/modules/orm-elasticsearch java/modules/orm-lucene - java/modules/orm-coordination-outbox-polling-elasticsearch + java/modules/orm-outbox-polling-elasticsearch java/modules/pojo-standalone-elasticsearch java/modules/pojo-standalone-lucene diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java b/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java deleted file mode 100644 index 0cd7a337e24..00000000000 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Hibernate Search, full-text search for your domain model - * - * License: GNU Lesser General Public License (LGPL), version 2.1 or later - * See the lgpl.txt file in the root directory or . - */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.spi; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -public final class HibernateOrmMapperOutboxPollingClasses { - - private HibernateOrmMapperOutboxPollingClasses() { - } - - /** - * @return A set of names of all classes that will be involved in Avro serialization - * and thus will require reflection support. - * Useful to enable reflection for these classes in GraalVM-based native images. - */ - public static Set avroTypes() { - return new HashSet<>( Arrays.asList( - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto$Builder", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto$Builder", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto$Builder", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto$Builder" - ) ); - } - - /** - * @return A set of names of all classes that will be involved in Hibernate ORM mapping - * and thus will require reflection support. - * Useful to enable reflection for these classes in GraalVM-based native images. - */ - public static Set hibernateOrmTypes() { - return new HashSet<>( Arrays.asList( - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent$Status", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState" - ) ); - } - -} diff --git a/mapper/orm-coordination-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer b/mapper/orm-coordination-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer deleted file mode 100644 index f81953585c6..00000000000 --- a/mapper/orm-coordination-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer +++ /dev/null @@ -1 +0,0 @@ -org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.OutboxPollingBeanConfigurer diff --git a/mapper/orm-coordination-outbox-polling/pom.xml b/mapper/orm-outbox-polling/pom.xml similarity index 93% rename from mapper/orm-coordination-outbox-polling/pom.xml rename to mapper/orm-outbox-polling/pom.xml index 5920f28fbdd..e8f88ba9a0c 100644 --- a/mapper/orm-coordination-outbox-polling/pom.xml +++ b/mapper/orm-outbox-polling/pom.xml @@ -9,7 +9,7 @@ 7.0.0-SNAPSHOT ../../build/parents/public - hibernate-search-mapper-orm-coordination-outbox-polling + hibernate-search-mapper-orm-outbox-polling Hibernate Search ORM Integration - Coordination - Outbox Polling Hibernate ORM integration using outbox polling as coordination strategy @@ -17,7 +17,7 @@ false - org.hibernate.search.mapper.orm.coordination.outboxpolling + org.hibernate.search.mapper.orm.outboxpolling @@ -132,9 +132,9 @@ - org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl to org.apache.avro; - org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl to org.hibernate.orm.core, net.bytebuddy; - org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl to org.hibernate.orm.core, net.bytebuddy; + org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl to org.apache.avro; + org.hibernate.search.mapper.orm.outboxpolling.cluster.impl to org.hibernate.orm.core, net.bytebuddy; + org.hibernate.search.mapper.orm.outboxpolling.event.impl to org.hibernate.orm.core, net.bytebuddy; diff --git a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java similarity index 84% rename from mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java rename to mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java index 20967402c32..a97394576c4 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java +++ b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DirtinessDescriptorDto.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl; import org.apache.avro.generic.GenericArray; import org.apache.avro.specific.SpecificData; @@ -14,10 +14,10 @@ @org.apache.avro.specific.AvroGenerated public class DirtinessDescriptorDto extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = 908077749791457060L; + private static final long serialVersionUID = -7710265205062761472L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DirtinessDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"forceSelfDirty\",\"type\":\"boolean\"},{\"name\":\"forceContainingDirty\",\"type\":\"boolean\"},{\"name\":\"dirtyPaths\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"updateBecauseOfContained\",\"type\":\"boolean\"}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DirtinessDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"forceSelfDirty\",\"type\":\"boolean\"},{\"name\":\"forceContainingDirty\",\"type\":\"boolean\"},{\"name\":\"dirtyPaths\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"updateBecauseOfContained\",\"type\":\"boolean\"}]}"); public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } private static final SpecificData MODEL$ = new SpecificData(); @@ -202,8 +202,8 @@ public void setUpdateBecauseOfContained(boolean value) { * Creates a new DirtinessDescriptorDto RecordBuilder. * @return A new DirtinessDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder() { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder() { + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); } /** @@ -211,11 +211,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing builder to copy. * @return A new DirtinessDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(other); } } @@ -224,11 +224,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing instance to copy. * @return A new DirtinessDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder(other); } } @@ -253,7 +253,7 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder other) { super(other); if (isValidValue(fields()[0], other.forceSelfDirty)) { this.forceSelfDirty = data().deepCopy(fields()[0].schema(), other.forceSelfDirty); @@ -277,7 +277,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Creates a Builder by copying an existing DirtinessDescriptorDto instance * @param other The existing instance to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto other) { super(SCHEMA$, MODEL$); if (isValidValue(fields()[0], other.forceSelfDirty)) { this.forceSelfDirty = data().deepCopy(fields()[0].schema(), other.forceSelfDirty); @@ -311,7 +311,7 @@ public boolean getForceSelfDirty() { * @param value The value of 'forceSelfDirty'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setForceSelfDirty(boolean value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setForceSelfDirty(boolean value) { validate(fields()[0], value); this.forceSelfDirty = value; fieldSetFlags()[0] = true; @@ -331,7 +331,7 @@ public boolean hasForceSelfDirty() { * Clears the value of the 'forceSelfDirty' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearForceSelfDirty() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearForceSelfDirty() { fieldSetFlags()[0] = false; return this; } @@ -350,7 +350,7 @@ public boolean getForceContainingDirty() { * @param value The value of 'forceContainingDirty'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setForceContainingDirty(boolean value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setForceContainingDirty(boolean value) { validate(fields()[1], value); this.forceContainingDirty = value; fieldSetFlags()[1] = true; @@ -370,7 +370,7 @@ public boolean hasForceContainingDirty() { * Clears the value of the 'forceContainingDirty' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearForceContainingDirty() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearForceContainingDirty() { fieldSetFlags()[1] = false; return this; } @@ -389,7 +389,7 @@ public java.util.List getDirtyPaths() { * @param value The value of 'dirtyPaths'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setDirtyPaths(java.util.List value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setDirtyPaths(java.util.List value) { validate(fields()[2], value); this.dirtyPaths = value; fieldSetFlags()[2] = true; @@ -409,7 +409,7 @@ public boolean hasDirtyPaths() { * Clears the value of the 'dirtyPaths' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearDirtyPaths() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearDirtyPaths() { dirtyPaths = null; fieldSetFlags()[2] = false; return this; @@ -429,7 +429,7 @@ public boolean getUpdateBecauseOfContained() { * @param value The value of 'updateBecauseOfContained'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setUpdateBecauseOfContained(boolean value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder setUpdateBecauseOfContained(boolean value) { validate(fields()[3], value); this.updateBecauseOfContained = value; fieldSetFlags()[3] = true; @@ -449,7 +449,7 @@ public boolean hasUpdateBecauseOfContained() { * Clears the value of the 'updateBecauseOfContained' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearUpdateBecauseOfContained() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder clearUpdateBecauseOfContained() { fieldSetFlags()[3] = false; return this; } diff --git a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java similarity index 81% rename from mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java rename to mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java index e8f1638f1b7..feb9eb8d9a9 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java +++ b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRouteDescriptorDto.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl; import org.apache.avro.generic.GenericArray; import org.apache.avro.specific.SpecificData; @@ -14,10 +14,10 @@ @org.apache.avro.specific.AvroGenerated public class DocumentRouteDescriptorDto extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = -5385941162360690024L; + private static final long serialVersionUID = 2357993799192335234L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]}"); public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } private static final SpecificData MODEL$ = new SpecificData(); @@ -136,8 +136,8 @@ public void setRoutingKey(java.lang.CharSequence value) { * Creates a new DocumentRouteDescriptorDto RecordBuilder. * @return A new DocumentRouteDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder() { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder() { + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); } /** @@ -145,11 +145,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing builder to copy. * @return A new DocumentRouteDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(other); } } @@ -158,11 +158,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing instance to copy. * @return A new DocumentRouteDescriptorDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder(other); } } @@ -184,7 +184,7 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder other) { super(other); if (isValidValue(fields()[0], other.routingKey)) { this.routingKey = data().deepCopy(fields()[0].schema(), other.routingKey); @@ -196,7 +196,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Creates a Builder by copying an existing DocumentRouteDescriptorDto instance * @param other The existing instance to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto other) { super(SCHEMA$, MODEL$); if (isValidValue(fields()[0], other.routingKey)) { this.routingKey = data().deepCopy(fields()[0].schema(), other.routingKey); @@ -218,7 +218,7 @@ public java.lang.CharSequence getRoutingKey() { * @param value The value of 'routingKey'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder setRoutingKey(java.lang.CharSequence value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder setRoutingKey(java.lang.CharSequence value) { validate(fields()[0], value); this.routingKey = value; fieldSetFlags()[0] = true; @@ -238,7 +238,7 @@ public boolean hasRoutingKey() { * Clears the value of the 'routingKey' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder clearRoutingKey() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder clearRoutingKey() { routingKey = null; fieldSetFlags()[0] = false; return this; diff --git a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java similarity index 63% rename from mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java rename to mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java index 54417f2bec8..008fe5bbb58 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java +++ b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/DocumentRoutesDescriptorDto.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl; import org.apache.avro.generic.GenericArray; import org.apache.avro.specific.SpecificData; @@ -14,10 +14,10 @@ @org.apache.avro.specific.AvroGenerated public class DocumentRoutesDescriptorDto extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = -8449087571134405721L; + private static final long serialVersionUID = -6728432513893267771L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DocumentRoutesDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"currentRoute\",\"type\":[{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]},\"null\"]},{\"name\":\"previousRoutes\",\"type\":{\"type\":\"array\",\"items\":\"DocumentRouteDescriptorDto\"}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"DocumentRoutesDescriptorDto\",\"namespace\":\"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"currentRoute\",\"type\":[{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]},\"null\"]},{\"name\":\"previousRoutes\",\"type\":{\"type\":\"array\",\"items\":\"DocumentRouteDescriptorDto\"}}]}"); public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } private static final SpecificData MODEL$ = new SpecificData(); @@ -73,8 +73,8 @@ public static DocumentRoutesDescriptorDto fromByteBuffer( return DECODER.decode(b); } - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute; - private java.util.List previousRoutes; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute; + private java.util.List previousRoutes; /** * Default constructor. Note that this does not initialize fields @@ -88,7 +88,7 @@ public DocumentRoutesDescriptorDto() {} * @param currentRoute The new value for currentRoute * @param previousRoutes The new value for previousRoutes */ - public DocumentRoutesDescriptorDto(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute, java.util.List previousRoutes) { + public DocumentRoutesDescriptorDto(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute, java.util.List previousRoutes) { this.currentRoute = currentRoute; this.previousRoutes = previousRoutes; } @@ -114,8 +114,8 @@ public java.lang.Object get(int field$) { @SuppressWarnings(value="unchecked") public void put(int field$, java.lang.Object value$) { switch (field$) { - case 0: currentRoute = (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto)value$; break; - case 1: previousRoutes = (java.util.List)value$; break; + case 0: currentRoute = (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto)value$; break; + case 1: previousRoutes = (java.util.List)value$; break; default: throw new IndexOutOfBoundsException("Invalid index: " + field$); } } @@ -124,7 +124,7 @@ public void put(int field$, java.lang.Object value$) { * Gets the value of the 'currentRoute' field. * @return The value of the 'currentRoute' field. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto getCurrentRoute() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto getCurrentRoute() { return currentRoute; } @@ -133,7 +133,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * Sets the value of the 'currentRoute' field. * @param value the value to set. */ - public void setCurrentRoute(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto value) { + public void setCurrentRoute(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto value) { this.currentRoute = value; } @@ -141,7 +141,7 @@ public void setCurrentRoute(org.hibernate.search.mapper.orm.coordination.outboxp * Gets the value of the 'previousRoutes' field. * @return The value of the 'previousRoutes' field. */ - public java.util.List getPreviousRoutes() { + public java.util.List getPreviousRoutes() { return previousRoutes; } @@ -150,7 +150,7 @@ public java.util.List value) { + public void setPreviousRoutes(java.util.List value) { this.previousRoutes = value; } @@ -158,8 +158,8 @@ public void setPreviousRoutes(java.util.List implements org.apache.avro.data.RecordBuilder { - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute; - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder currentRouteBuilder; - private java.util.List previousRoutes; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto currentRoute; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder currentRouteBuilder; + private java.util.List previousRoutes; /** Creates a new Builder */ private Builder() { @@ -208,14 +208,14 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder other) { super(other); if (isValidValue(fields()[0], other.currentRoute)) { this.currentRoute = data().deepCopy(fields()[0].schema(), other.currentRoute); fieldSetFlags()[0] = other.fieldSetFlags()[0]; } if (other.hasCurrentRouteBuilder()) { - this.currentRouteBuilder = org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder(other.getCurrentRouteBuilder()); + this.currentRouteBuilder = org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder(other.getCurrentRouteBuilder()); } if (isValidValue(fields()[1], other.previousRoutes)) { this.previousRoutes = data().deepCopy(fields()[1].schema(), other.previousRoutes); @@ -227,7 +227,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Creates a Builder by copying an existing DocumentRoutesDescriptorDto instance * @param other The existing instance to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto other) { super(SCHEMA$, MODEL$); if (isValidValue(fields()[0], other.currentRoute)) { this.currentRoute = data().deepCopy(fields()[0].schema(), other.currentRoute); @@ -244,7 +244,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Gets the value of the 'currentRoute' field. * @return The value. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto getCurrentRoute() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto getCurrentRoute() { return currentRoute; } @@ -254,7 +254,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @param value The value of 'currentRoute'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder setCurrentRoute(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder setCurrentRoute(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto value) { validate(fields()[0], value); this.currentRouteBuilder = null; this.currentRoute = value; @@ -274,12 +274,12 @@ public boolean hasCurrentRoute() { * Gets the Builder instance for the 'currentRoute' field and creates one if it doesn't exist yet. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder getCurrentRouteBuilder() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder getCurrentRouteBuilder() { if (currentRouteBuilder == null) { if (hasCurrentRoute()) { - setCurrentRouteBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder(currentRoute)); + setCurrentRouteBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder(currentRoute)); } else { - setCurrentRouteBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder()); + setCurrentRouteBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.newBuilder()); } } return currentRouteBuilder; @@ -291,7 +291,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder setCurrentRouteBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder setCurrentRouteBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto.Builder value) { clearCurrentRoute(); currentRouteBuilder = value; return this; @@ -309,7 +309,7 @@ public boolean hasCurrentRouteBuilder() { * Clears the value of the 'currentRoute' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder clearCurrentRoute() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder clearCurrentRoute() { currentRoute = null; currentRouteBuilder = null; fieldSetFlags()[0] = false; @@ -320,7 +320,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * Gets the value of the 'previousRoutes' field. * @return The value. */ - public java.util.List getPreviousRoutes() { + public java.util.List getPreviousRoutes() { return previousRoutes; } @@ -330,7 +330,7 @@ public java.util.List value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder setPreviousRoutes(java.util.List value) { validate(fields()[1], value); this.previousRoutes = value; fieldSetFlags()[1] = true; @@ -350,7 +350,7 @@ public boolean hasPreviousRoutes() { * Clears the value of the 'previousRoutes' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder clearPreviousRoutes() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder clearPreviousRoutes() { previousRoutes = null; fieldSetFlags()[1] = false; return this; @@ -369,9 +369,9 @@ public DocumentRoutesDescriptorDto build() { throw e; } } else { - record.currentRoute = fieldSetFlags()[0] ? this.currentRoute : (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto) defaultValue(fields()[0]); + record.currentRoute = fieldSetFlags()[0] ? this.currentRoute : (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto) defaultValue(fields()[0]); } - record.previousRoutes = fieldSetFlags()[1] ? this.previousRoutes : (java.util.List) defaultValue(fields()[1]); + record.previousRoutes = fieldSetFlags()[1] ? this.previousRoutes : (java.util.List) defaultValue(fields()[1]); return record; } catch (org.apache.avro.AvroMissingFieldException e) { throw e; @@ -416,7 +416,7 @@ public DocumentRoutesDescriptorDto build() { out.writeArrayStart(); out.setItemCount(size0); long actualSize0 = 0; - for (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0: this.previousRoutes) { + for (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0: this.previousRoutes) { actualSize0++; out.startItem(); e0.customEncode(out); @@ -437,23 +437,23 @@ public DocumentRoutesDescriptorDto build() { this.currentRoute = null; } else { if (this.currentRoute == null) { - this.currentRoute = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); + this.currentRoute = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); } this.currentRoute.customDecode(in); } long size0 = in.readArrayStart(); - java.util.List a0 = this.previousRoutes; + java.util.List a0 = this.previousRoutes; if (a0 == null) { - a0 = new SpecificData.Array((int)size0, SCHEMA$.getField("previousRoutes").schema()); + a0 = new SpecificData.Array((int)size0, SCHEMA$.getField("previousRoutes").schema()); this.previousRoutes = a0; } else a0.clear(); - SpecificData.Array ga0 = (a0 instanceof SpecificData.Array ? (SpecificData.Array)a0 : null); + SpecificData.Array ga0 = (a0 instanceof SpecificData.Array ? (SpecificData.Array)a0 : null); for ( ; 0 < size0; size0 = in.arrayNext()) { for ( ; size0 != 0; size0--) { - org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0 = (ga0 != null ? ga0.peek() : null); + org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0 = (ga0 != null ? ga0.peek() : null); if (e0 == null) { - e0 = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); + e0 = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); } e0.customDecode(in); a0.add(e0); @@ -469,7 +469,7 @@ public DocumentRoutesDescriptorDto build() { this.currentRoute = null; } else { if (this.currentRoute == null) { - this.currentRoute = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); + this.currentRoute = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); } this.currentRoute.customDecode(in); } @@ -477,17 +477,17 @@ public DocumentRoutesDescriptorDto build() { case 1: long size0 = in.readArrayStart(); - java.util.List a0 = this.previousRoutes; + java.util.List a0 = this.previousRoutes; if (a0 == null) { - a0 = new SpecificData.Array((int)size0, SCHEMA$.getField("previousRoutes").schema()); + a0 = new SpecificData.Array((int)size0, SCHEMA$.getField("previousRoutes").schema()); this.previousRoutes = a0; } else a0.clear(); - SpecificData.Array ga0 = (a0 instanceof SpecificData.Array ? (SpecificData.Array)a0 : null); + SpecificData.Array ga0 = (a0 instanceof SpecificData.Array ? (SpecificData.Array)a0 : null); for ( ; 0 < size0; size0 = in.arrayNext()) { for ( ; size0 != 0; size0--) { - org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0 = (ga0 != null ? ga0.peek() : null); + org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto e0 = (ga0 != null ? ga0.peek() : null); if (e0 == null) { - e0 = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); + e0 = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto(); } e0.customDecode(in); a0.add(e0); diff --git a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java similarity index 62% rename from mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java rename to mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java index ee286ca8226..99da290f057 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java +++ b/mapper/orm-outbox-polling/src/main/avro/generated/org/hibernate/search/mapper/orm/outboxpolling/avro/generated/impl/PojoIndexingQueueEventPayloadDto.java @@ -3,7 +3,7 @@ * * DO NOT EDIT DIRECTLY */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl; import org.apache.avro.generic.GenericArray; import org.apache.avro.specific.SpecificData; @@ -14,10 +14,10 @@ @org.apache.avro.specific.AvroGenerated public class PojoIndexingQueueEventPayloadDto extends org.apache.avro.specific.SpecificRecordBase implements org.apache.avro.specific.SpecificRecord { - private static final long serialVersionUID = -2218456874397064735L; + private static final long serialVersionUID = 5862163703280173834L; - public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"PojoIndexingQueueEventPayloadDto\",\"namespace\":\"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"routes\",\"type\":{\"type\":\"record\",\"name\":\"DocumentRoutesDescriptorDto\",\"fields\":[{\"name\":\"currentRoute\",\"type\":[{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]},\"null\"]},{\"name\":\"previousRoutes\",\"type\":{\"type\":\"array\",\"items\":\"DocumentRouteDescriptorDto\"}}]}},{\"name\":\"dirtiness\",\"type\":{\"type\":\"record\",\"name\":\"DirtinessDescriptorDto\",\"fields\":[{\"name\":\"forceSelfDirty\",\"type\":\"boolean\"},{\"name\":\"forceContainingDirty\",\"type\":\"boolean\"},{\"name\":\"dirtyPaths\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"updateBecauseOfContained\",\"type\":\"boolean\"}]}}]}"); + public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse("{\"type\":\"record\",\"name\":\"PojoIndexingQueueEventPayloadDto\",\"namespace\":\"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl\",\"fields\":[{\"name\":\"routes\",\"type\":{\"type\":\"record\",\"name\":\"DocumentRoutesDescriptorDto\",\"fields\":[{\"name\":\"currentRoute\",\"type\":[{\"type\":\"record\",\"name\":\"DocumentRouteDescriptorDto\",\"fields\":[{\"name\":\"routingKey\",\"type\":[\"string\",\"null\"]}]},\"null\"]},{\"name\":\"previousRoutes\",\"type\":{\"type\":\"array\",\"items\":\"DocumentRouteDescriptorDto\"}}]}},{\"name\":\"dirtiness\",\"type\":{\"type\":\"record\",\"name\":\"DirtinessDescriptorDto\",\"fields\":[{\"name\":\"forceSelfDirty\",\"type\":\"boolean\"},{\"name\":\"forceContainingDirty\",\"type\":\"boolean\"},{\"name\":\"dirtyPaths\",\"type\":{\"type\":\"array\",\"items\":\"string\"}},{\"name\":\"updateBecauseOfContained\",\"type\":\"boolean\"}]}}]}"); public static org.apache.avro.Schema getClassSchema() { return SCHEMA$; } private static final SpecificData MODEL$ = new SpecificData(); @@ -73,8 +73,8 @@ public static PojoIndexingQueueEventPayloadDto fromByteBuffer( return DECODER.decode(b); } - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes; - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness; /** * Default constructor. Note that this does not initialize fields @@ -88,7 +88,7 @@ public PojoIndexingQueueEventPayloadDto() {} * @param routes The new value for routes * @param dirtiness The new value for dirtiness */ - public PojoIndexingQueueEventPayloadDto(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes, org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness) { + public PojoIndexingQueueEventPayloadDto(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes, org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness) { this.routes = routes; this.dirtiness = dirtiness; } @@ -114,8 +114,8 @@ public java.lang.Object get(int field$) { @SuppressWarnings(value="unchecked") public void put(int field$, java.lang.Object value$) { switch (field$) { - case 0: routes = (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto)value$; break; - case 1: dirtiness = (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto)value$; break; + case 0: routes = (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto)value$; break; + case 1: dirtiness = (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto)value$; break; default: throw new IndexOutOfBoundsException("Invalid index: " + field$); } } @@ -124,7 +124,7 @@ public void put(int field$, java.lang.Object value$) { * Gets the value of the 'routes' field. * @return The value of the 'routes' field. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto getRoutes() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto getRoutes() { return routes; } @@ -133,7 +133,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * Sets the value of the 'routes' field. * @param value the value to set. */ - public void setRoutes(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto value) { + public void setRoutes(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto value) { this.routes = value; } @@ -141,7 +141,7 @@ public void setRoutes(org.hibernate.search.mapper.orm.coordination.outboxpolling * Gets the value of the 'dirtiness' field. * @return The value of the 'dirtiness' field. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto getDirtiness() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto getDirtiness() { return dirtiness; } @@ -150,7 +150,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * Sets the value of the 'dirtiness' field. * @param value the value to set. */ - public void setDirtiness(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto value) { + public void setDirtiness(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto value) { this.dirtiness = value; } @@ -158,8 +158,8 @@ public void setDirtiness(org.hibernate.search.mapper.orm.coordination.outboxpoll * Creates a new PojoIndexingQueueEventPayloadDto RecordBuilder. * @return A new PojoIndexingQueueEventPayloadDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder() { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder() { + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); } /** @@ -167,11 +167,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing builder to copy. * @return A new PojoIndexingQueueEventPayloadDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(other); } } @@ -180,11 +180,11 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge * @param other The existing instance to copy. * @return A new PojoIndexingQueueEventPayloadDto RecordBuilder */ - public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto other) { + public static org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder newBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto other) { if (other == null) { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(); } else { - return new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(other); + return new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder(other); } } @@ -195,10 +195,10 @@ public static org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.ge public static class Builder extends org.apache.avro.specific.SpecificRecordBuilderBase implements org.apache.avro.data.RecordBuilder { - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes; - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder routesBuilder; - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness; - private org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder dirtinessBuilder; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto routes; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder routesBuilder; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto dirtiness; + private org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder dirtinessBuilder; /** Creates a new Builder */ private Builder() { @@ -209,21 +209,21 @@ private Builder() { * Creates a Builder by copying an existing Builder. * @param other The existing Builder to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder other) { super(other); if (isValidValue(fields()[0], other.routes)) { this.routes = data().deepCopy(fields()[0].schema(), other.routes); fieldSetFlags()[0] = other.fieldSetFlags()[0]; } if (other.hasRoutesBuilder()) { - this.routesBuilder = org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder(other.getRoutesBuilder()); + this.routesBuilder = org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder(other.getRoutesBuilder()); } if (isValidValue(fields()[1], other.dirtiness)) { this.dirtiness = data().deepCopy(fields()[1].schema(), other.dirtiness); fieldSetFlags()[1] = other.fieldSetFlags()[1]; } if (other.hasDirtinessBuilder()) { - this.dirtinessBuilder = org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder(other.getDirtinessBuilder()); + this.dirtinessBuilder = org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder(other.getDirtinessBuilder()); } } @@ -231,7 +231,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Creates a Builder by copying an existing PojoIndexingQueueEventPayloadDto instance * @param other The existing instance to copy. */ - private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto other) { + private Builder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto other) { super(SCHEMA$, MODEL$); if (isValidValue(fields()[0], other.routes)) { this.routes = data().deepCopy(fields()[0].schema(), other.routes); @@ -249,7 +249,7 @@ private Builder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro. * Gets the value of the 'routes' field. * @return The value. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto getRoutes() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto getRoutes() { return routes; } @@ -259,7 +259,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @param value The value of 'routes'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setRoutes(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setRoutes(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto value) { validate(fields()[0], value); this.routesBuilder = null; this.routes = value; @@ -279,12 +279,12 @@ public boolean hasRoutes() { * Gets the Builder instance for the 'routes' field and creates one if it doesn't exist yet. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder getRoutesBuilder() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder getRoutesBuilder() { if (routesBuilder == null) { if (hasRoutes()) { - setRoutesBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder(routes)); + setRoutesBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder(routes)); } else { - setRoutesBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder()); + setRoutesBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.newBuilder()); } } return routesBuilder; @@ -296,7 +296,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setRoutesBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setRoutesBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto.Builder value) { clearRoutes(); routesBuilder = value; return this; @@ -314,7 +314,7 @@ public boolean hasRoutesBuilder() { * Clears the value of the 'routes' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder clearRoutes() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder clearRoutes() { routes = null; routesBuilder = null; fieldSetFlags()[0] = false; @@ -325,7 +325,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * Gets the value of the 'dirtiness' field. * @return The value. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto getDirtiness() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto getDirtiness() { return dirtiness; } @@ -335,7 +335,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @param value The value of 'dirtiness'. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setDirtiness(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setDirtiness(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto value) { validate(fields()[1], value); this.dirtinessBuilder = null; this.dirtiness = value; @@ -355,12 +355,12 @@ public boolean hasDirtiness() { * Gets the Builder instance for the 'dirtiness' field and creates one if it doesn't exist yet. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder getDirtinessBuilder() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder getDirtinessBuilder() { if (dirtinessBuilder == null) { if (hasDirtiness()) { - setDirtinessBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder(dirtiness)); + setDirtinessBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder(dirtiness)); } else { - setDirtinessBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder()); + setDirtinessBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.newBuilder()); } } return dirtinessBuilder; @@ -372,7 +372,7 @@ public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setDirtinessBuilder(org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder value) { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder setDirtinessBuilder(org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto.Builder value) { clearDirtiness(); dirtinessBuilder = value; return this; @@ -390,7 +390,7 @@ public boolean hasDirtinessBuilder() { * Clears the value of the 'dirtiness' field. * @return This builder. */ - public org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder clearDirtiness() { + public org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto.Builder clearDirtiness() { dirtiness = null; dirtinessBuilder = null; fieldSetFlags()[1] = false; @@ -410,7 +410,7 @@ public PojoIndexingQueueEventPayloadDto build() { throw e; } } else { - record.routes = fieldSetFlags()[0] ? this.routes : (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto) defaultValue(fields()[0]); + record.routes = fieldSetFlags()[0] ? this.routes : (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto) defaultValue(fields()[0]); } if (dirtinessBuilder != null) { try { @@ -420,7 +420,7 @@ public PojoIndexingQueueEventPayloadDto build() { throw e; } } else { - record.dirtiness = fieldSetFlags()[1] ? this.dirtiness : (org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto) defaultValue(fields()[1]); + record.dirtiness = fieldSetFlags()[1] ? this.dirtiness : (org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto) defaultValue(fields()[1]); } return record; } catch (org.apache.avro.AvroMissingFieldException e) { @@ -466,12 +466,12 @@ public PojoIndexingQueueEventPayloadDto build() { org.apache.avro.Schema.Field[] fieldOrder = in.readFieldOrderIfDiff(); if (fieldOrder == null) { if (this.routes == null) { - this.routes = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto(); + this.routes = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto(); } this.routes.customDecode(in); if (this.dirtiness == null) { - this.dirtiness = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto(); + this.dirtiness = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto(); } this.dirtiness.customDecode(in); @@ -480,14 +480,14 @@ public PojoIndexingQueueEventPayloadDto build() { switch (fieldOrder[i].pos()) { case 0: if (this.routes == null) { - this.routes = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto(); + this.routes = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto(); } this.routes.customDecode(in); break; case 1: if (this.dirtiness == null) { - this.dirtiness = new org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto(); + this.dirtiness = new org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto(); } this.dirtiness.customDecode(in); break; diff --git a/mapper/orm-coordination-outbox-polling/src/main/avro/schema/schema.avsc b/mapper/orm-outbox-polling/src/main/avro/schema/schema.avsc similarity index 59% rename from mapper/orm-coordination-outbox-polling/src/main/avro/schema/schema.avsc rename to mapper/orm-outbox-polling/src/main/avro/schema/schema.avsc index b5fa90bb2cb..e0274c26c11 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/avro/schema/schema.avsc +++ b/mapper/orm-outbox-polling/src/main/avro/schema/schema.avsc @@ -1,6 +1,6 @@ [ { - "namespace":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl", + "namespace":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl", "type":"record", "name":"DocumentRouteDescriptorDto", "fields":[ @@ -14,14 +14,14 @@ ] }, { - "namespace":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl", + "namespace":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl", "type":"record", "name":"DocumentRoutesDescriptorDto", "fields":[ { "name":"currentRoute", "type":[ - "org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto", "null" ] }, @@ -29,13 +29,13 @@ "name":"previousRoutes", "type":{ "type":"array", - "items":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto" + "items":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto" } } ] }, { - "namespace":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl", + "namespace":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl", "type":"record", "name":"DirtinessDescriptorDto", "fields":[ @@ -61,17 +61,17 @@ ] }, { - "namespace":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl", + "namespace":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl", "type":"record", "name":"PojoIndexingQueueEventPayloadDto", "fields":[ { "name":"routes", - "type":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto" + "type":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto" }, { "name":"dirtiness", - "type":"org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto" + "type":"org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto" } ] } diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/OutboxPollingExtension.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/OutboxPollingExtension.java similarity index 85% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/OutboxPollingExtension.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/OutboxPollingExtension.java index 2f9384b0211..9f8007748b4 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/OutboxPollingExtension.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/OutboxPollingExtension.java @@ -4,17 +4,17 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling; +package org.hibernate.search.mapper.orm.outboxpolling; import java.lang.invoke.MethodHandles; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.OutboxPollingCoordinationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.OutboxPollingSearchMapping; import org.hibernate.search.mapper.orm.mapping.SearchMapping; import org.hibernate.search.mapper.orm.mapping.SearchMappingExtension; import org.hibernate.search.mapper.orm.mapping.spi.CoordinationStrategyContext; +import org.hibernate.search.mapper.orm.outboxpolling.impl.OutboxPollingCoordinationStrategy; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.OutboxPollingSearchMapping; import org.hibernate.search.util.common.annotation.Incubating; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java similarity index 80% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java index 88e8d15dd15..db68ddf4d0c 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadFromDtoConverterUtils.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.impl; import java.util.Collection; import java.util.LinkedHashSet; @@ -12,10 +12,10 @@ import java.util.Set; import java.util.stream.Collectors; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; import org.hibernate.search.mapper.pojo.route.DocumentRouteDescriptor; import org.hibernate.search.mapper.pojo.route.DocumentRoutesDescriptor; import org.hibernate.search.mapper.pojo.work.spi.DirtinessDescriptor; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadSerializationUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadSerializationUtils.java similarity index 88% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadSerializationUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadSerializationUtils.java index d3ba9c0981c..2c56fe4360e 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadSerializationUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadSerializationUtils.java @@ -4,15 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.lang.invoke.MethodHandles; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingQueueEventPayload; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java similarity index 80% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java index 97281d7cdef..a2f9ba86610 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/avro/impl/EventPayloadToDtoConverterUtils.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl; +package org.hibernate.search.mapper.orm.outboxpolling.avro.impl; import java.util.ArrayList; import java.util.Collection; @@ -12,10 +12,10 @@ import java.util.Set; import java.util.stream.Collectors; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DirtinessDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto; +import org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto; import org.hibernate.search.mapper.pojo.route.DocumentRouteDescriptor; import org.hibernate.search.mapper.pojo.route.DocumentRoutesDescriptor; import org.hibernate.search.mapper.pojo.work.spi.DirtinessDescriptor; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java similarity index 99% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java index 8619b2d84b3..e58ad529bdb 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettings.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg; +package org.hibernate.search.mapper.orm.outboxpolling.cfg; import static java.lang.String.join; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/OutboxEventProcessingOrder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/OutboxEventProcessingOrder.java similarity index 95% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/OutboxEventProcessingOrder.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/OutboxEventProcessingOrder.java index 8b23da75e03..80f59ae9f0b 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/OutboxEventProcessingOrder.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/OutboxEventProcessingOrder.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg; +package org.hibernate.search.mapper.orm.outboxpolling.cfg; import java.lang.invoke.MethodHandles; import org.hibernate.search.engine.cfg.spi.ParseUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.annotation.Incubating; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/PayloadType.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/PayloadType.java similarity index 90% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/PayloadType.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/PayloadType.java index e0270e9cd8b..72e70dd76fb 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/PayloadType.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/PayloadType.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg; +package org.hibernate.search.mapper.orm.outboxpolling.cfg; import java.lang.invoke.MethodHandles; import org.hibernate.search.engine.cfg.spi.ParseUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.annotation.Incubating; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/UuidGenerationStrategy.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/UuidGenerationStrategy.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/UuidGenerationStrategy.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/UuidGenerationStrategy.java index cf84240498b..769fa1bd3ca 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/UuidGenerationStrategy.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/UuidGenerationStrategy.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg; +package org.hibernate.search.mapper.orm.outboxpolling.cfg; import java.lang.invoke.MethodHandles; import java.util.UUID; import org.hibernate.annotations.UuidGenerator; import org.hibernate.search.engine.cfg.spi.ParseUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.annotation.Incubating; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java similarity index 82% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java index 313f4fba256..923587abbc8 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/HibernateOrmMapperOutboxPollingImplSettings.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cfg.impl; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; /** * Implementation-related settings, used for testing only. diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/UuidDataTypeUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/UuidDataTypeUtils.java similarity index 95% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/UuidDataTypeUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/UuidDataTypeUtils.java index 79b78ebbbdc..e8005f2d9c5 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/impl/UuidDataTypeUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/impl/UuidDataTypeUtils.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cfg.impl; import java.lang.invoke.MethodHandles; import java.util.Locale; @@ -13,7 +13,7 @@ import org.hibernate.dialect.SQLServerDialect; import org.hibernate.search.engine.cfg.ConfigurationPropertySource; import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.type.SqlTypes; import org.hibernate.type.descriptor.JdbcTypeNameMapper; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java similarity index 90% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java index 80a26df23b0..e0bfaf42b2d 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/spi/HibernateOrmMapperOutboxPollingSpiSettings.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.spi; +package org.hibernate.search.mapper.orm.outboxpolling.cfg.spi; import org.hibernate.search.mapper.orm.cfg.HibernateOrmMapperSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; import org.hibernate.search.util.common.annotation.Incubating; /** diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/Agent.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/Agent.java index b98d1e02446..8e0191934be 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/Agent.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/Agent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.time.Instant; import java.util.UUID; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPayload.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPayload.java similarity index 87% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPayload.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPayload.java index bd4976dae4f..b5ac64f1b61 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPayload.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPayload.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; public class AgentPayload { public final ShardAssignmentDescriptor staticShardAssignment; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPersister.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPersister.java similarity index 95% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPersister.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPersister.java index 51bb7d5daba..64e63ecbe96 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentPersister.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentPersister.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.lang.invoke.MethodHandles; import java.time.Instant; import java.util.Collections; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.search.util.common.spi.ToStringTreeAppendable; import org.hibernate.search.util.common.spi.ToStringTreeAppender; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentReference.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentReference.java similarity index 88% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentReference.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentReference.java index 9832546cc98..179f8f5c228 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentReference.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentReference.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.UUID; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepository.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepository.java similarity index 84% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepository.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepository.java index 698b7596b3c..0678c6af068 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepository.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepository.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.List; import java.util.UUID; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepositoryProvider.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepositoryProvider.java similarity index 81% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepositoryProvider.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepositoryProvider.java index c616bea3533..14b48c9141c 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentRepositoryProvider.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentRepositoryProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import org.hibernate.Session; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentState.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentState.java similarity index 86% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentState.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentState.java index 04d83760680..bd28a67bbdf 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentState.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentState.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.Collections; import java.util.EnumSet; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentType.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentType.java similarity index 88% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentType.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentType.java index 8b349d44c7a..f0fc006d22a 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/AgentType.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/AgentType.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.Collections; import java.util.EnumSet; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ClusterDescriptor.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ClusterDescriptor.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ClusterDescriptor.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ClusterDescriptor.java index e7e44327917..ef8eda6f4e1 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ClusterDescriptor.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ClusterDescriptor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.List; import java.util.Objects; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/DefaultAgentRepository.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/DefaultAgentRepository.java similarity index 75% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/DefaultAgentRepository.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/DefaultAgentRepository.java index 898670435e8..b6cb1db3ba9 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/DefaultAgentRepository.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/DefaultAgentRepository.java @@ -4,9 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; - -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer.ENTITY_NAME; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.List; import java.util.UUID; @@ -34,7 +32,10 @@ public Agent find(UUID id) { @Override public List findAllOrderById() { - return session.createQuery( "select a from " + ENTITY_NAME + " a order by id", Agent.class ).list(); + return session + .createQuery( "select a from " + OutboxPollingAgentAdditionalJaxbMappingProducer.ENTITY_NAME + " a order by id", + Agent.class ) + .list(); } @Override diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java similarity index 84% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java index 6b52e760a9e..9f7acd67eb1 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/OutboxPollingAgentAdditionalJaxbMappingProducer.java @@ -4,11 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; - -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.HibernateOrmUtils.isDiscriminatorMultiTenancyEnabled; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.JaxbMappingHelper.marshall; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.JaxbMappingHelper.unmarshall; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.lang.invoke.MethodHandles; import java.util.Map; @@ -22,12 +18,14 @@ import org.hibernate.search.engine.cfg.spi.ConfigurationProperty; import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty; import org.hibernate.search.mapper.orm.bootstrap.spi.HibernateSearchOrmMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.UuidGenerationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.UuidDataTypeUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.spi.HibernateOrmMapperOutboxPollingSpiSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.AdditionalMappingBuilder; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.UuidGenerationStrategy; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.UuidDataTypeUtils; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.spi.HibernateOrmMapperOutboxPollingSpiSettings; +import org.hibernate.search.mapper.orm.outboxpolling.impl.HibernateOrmUtils; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.AdditionalMappingBuilder; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.JaxbMappingHelper; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.type.SqlTypes; @@ -45,7 +43,7 @@ public class OutboxPollingAgentAdditionalJaxbMappingProducer implements Hibernat public static final String ENTITY_NAME = CLASS_NAME; @SuppressWarnings("deprecation") - public static final String ENTITY_DEFINITION = marshall( createMappings( "", "", + public static final String ENTITY_DEFINITION = JaxbMappingHelper.marshall( createMappings( "", "", HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_AGENT_TABLE, SqlTypes.CHAR, HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_AGENT_UUID_GEN_STRATEGY.strategy(), @@ -123,7 +121,7 @@ public Map, JaxbEntityMappings> produceMappings(ConfigurationPropertySo JaxbEntityMappings mappings; if ( mapping.isPresent() ) { - mappings = unmarshall( mapping.get() ); + mappings = JaxbMappingHelper.unmarshall( mapping.get() ); } else { int resolvedUuidType = uuidType.orElseGet( () -> UuidDataTypeUtils.defaultUuidType( dialect ) ); @@ -136,7 +134,7 @@ public Map, JaxbEntityMappings> produceMappings(ConfigurationPropertySo catalog.orElse( "" ), table.orElse( HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_AGENT_TABLE ), resolvedUuidType, resolvedUuidStrategy, - isDiscriminatorMultiTenancyEnabled( buildingContext ) + HibernateOrmUtils.isDiscriminatorMultiTenancyEnabled( buildingContext ) ); } diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java similarity index 95% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java index 2596ac65553..c61893c9749 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/cluster/impl/ShardAssignmentDescriptor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl; +package org.hibernate.search.mapper.orm.outboxpolling.cluster.impl; import java.util.List; import java.util.Objects; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractAgentClusterLink.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractAgentClusterLink.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractAgentClusterLink.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractAgentClusterLink.java index 73ada595b3c..48d28461aeb 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractAgentClusterLink.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractAgentClusterLink.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Clock; @@ -15,10 +15,10 @@ import java.util.stream.Collectors; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentPersister; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentPersister; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentReference; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.search.util.common.spi.ToStringTreeAppendable; import org.hibernate.search.util.common.spi.ToStringTreeAppender; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContext.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContext.java similarity index 87% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContext.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContext.java index 74012c40b26..0c30b2272c7 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContext.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContext.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.search.mapper.orm.common.spi.SessionHelper; import org.hibernate.search.mapper.orm.common.spi.TransactionHelper; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepository; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepository; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; import org.hibernate.search.util.common.impl.Closer; import org.hibernate.search.util.common.impl.SuppressingCloser; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContextProvider.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContextProvider.java similarity index 89% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContextProvider.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContextProvider.java index 3a4758064f3..4cd54e65dc0 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentClusterLinkContextProvider.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentClusterLinkContextProvider.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.function.Consumer; import java.util.function.Function; import org.hibernate.search.mapper.orm.common.spi.SessionHelper; import org.hibernate.search.mapper.orm.common.spi.TransactionHelper; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; public class AgentClusterLinkContextProvider { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ClusterTarget.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ClusterTarget.java similarity index 88% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ClusterTarget.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ClusterTarget.java index c1f8feaaf47..371fa93ca2d 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ClusterTarget.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ClusterTarget.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -12,11 +12,11 @@ import java.util.List; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ClusterDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ClusterDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; class ClusterTarget { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/DefaultOutboxEventFinder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/DefaultOutboxEventFinder.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/DefaultOutboxEventFinder.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/DefaultOutboxEventFinder.java index af3dbba1373..85bac12bca7 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/DefaultOutboxEventFinder.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/DefaultOutboxEventFinder.java @@ -4,9 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; - -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.time.Instant; import java.util.List; @@ -87,7 +85,7 @@ public Query createOutboxEventQueryForTests(Session session, private String createQueryString(Optional predicate, Function selectClauseFunction, OutboxEventOrder order) { return "select " + selectClauseFunction.apply( "e" ) - + " from " + ENTITY_NAME + " e " + + " from " + OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME + " e " + ( predicate.isPresent() ? " where " + predicate.get().queryPart( "e" ) : "" ) + order.queryPart( "e" ); } diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java index 2fbe67bec4f..e6fbef353f8 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EntityIdHashRangeOutboxEventPredicate.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.Optional; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxConfigUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxConfigUtils.java similarity index 87% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxConfigUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxConfigUtils.java index ba94fb71d00..493932192bd 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxConfigUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxConfigUtils.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Duration; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; final class OutboxConfigUtils { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEvent.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEvent.java index e1ed5aa6fc7..260200330f8 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEvent.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEvent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.time.Instant; import java.util.UUID; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventAndPredicate.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventAndPredicate.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventAndPredicate.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventAndPredicate.java index 938f6a43761..e1789bf1960 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventAndPredicate.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventAndPredicate.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import org.hibernate.query.Query; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinder.java similarity index 83% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinder.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinder.java index 37230b4a0d9..fd4780402a8 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinder.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinder.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.List; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinderProvider.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinderProvider.java similarity index 87% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinderProvider.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinderProvider.java index 54938b3e154..0e96444549a 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventFinderProvider.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventFinderProvider.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.Optional; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventLoader.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventLoader.java index a133b1cd5bb..3a69dc3101e 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventLoader.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventLoader.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; import java.lang.invoke.MethodHandles; import java.util.Collections; @@ -22,7 +22,7 @@ import org.hibernate.Session; import org.hibernate.dialect.Dialect; import org.hibernate.query.Query; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.search.util.common.spi.ToStringTreeAppendable; import org.hibernate.search.util.common.spi.ToStringTreeAppender; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventOrder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventOrder.java similarity index 83% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventOrder.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventOrder.java index 503908d0a0d..8f33b80b7d1 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventOrder.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventOrder.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.SQLServerDialect; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.OutboxEventProcessingOrder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.UuidGenerationStrategy; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.OutboxEventProcessingOrder; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.UuidGenerationStrategy; import org.hibernate.search.util.common.AssertionFailure; public enum OutboxEventOrder { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventPredicate.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventPredicate.java similarity index 83% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventPredicate.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventPredicate.java index de487b4c020..2d088a5894f 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventPredicate.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventPredicate.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import org.hibernate.query.Query; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventProcessingPlan.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventProcessingPlan.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventProcessingPlan.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventProcessingPlan.java index e619a368e5f..31844ba4edd 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventProcessingPlan.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventProcessingPlan.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.ArrayList; import java.util.HashMap; @@ -21,7 +21,7 @@ import org.hibernate.search.engine.reporting.FailureHandler; import org.hibernate.search.mapper.orm.automaticindexing.spi.AutomaticIndexingMappingContext; import org.hibernate.search.mapper.orm.automaticindexing.spi.AutomaticIndexingQueueEventProcessingPlan; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl.EventPayloadSerializationUtils; +import org.hibernate.search.mapper.orm.outboxpolling.avro.impl.EventPayloadSerializationUtils; import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingQueueEventPayload; import org.hibernate.search.util.common.impl.Futures; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventReference.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventReference.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventReference.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventReference.java index 9b8fbc18686..11fd62b916c 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventReference.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventReference.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.Objects; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventUpdater.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventUpdater.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventUpdater.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventUpdater.java index ab4d0cdef0b..432c0116050 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxEventUpdater.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxEventUpdater.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Instant; @@ -17,7 +17,7 @@ import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.search.engine.reporting.EntityIndexingFailureContext; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.SearchException; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java similarity index 91% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java index cc7b5344103..68cadf1c643 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessingInstructions.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.time.Clock; import java.time.Instant; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessor.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessor.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessor.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessor.java index 90fcdc405e9..dead2c91a69 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessor.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessor.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Clock; @@ -29,10 +29,10 @@ import org.hibernate.search.mapper.orm.automaticindexing.spi.AutomaticIndexingMappingContext; import org.hibernate.search.mapper.orm.common.spi.SessionHelper; import org.hibernate.search.mapper.orm.common.spi.TransactionHelper; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.impl.Closer; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.search.util.common.spi.ToStringTreeAppendable; @@ -322,7 +322,7 @@ public CompletableFuture work() { // where another processor could be locking on our own events because // it locked a page instead of just a row. // For more information, see - // org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.OutboxEventLoader.tryLoadLocking + // org.hibernate.search.mapper.orm.outboxpolling.impl.OutboxEventLoader.tryLoadLocking while ( eventUpdater.thereAreStillEventsToProcess() ) { transactionHelper.inTransaction( session, eventUpdater::process ); } diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java index 58b637fc5f3..ae11dbe5363 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingEventProcessorClusterLink.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Clock; @@ -16,13 +16,13 @@ import org.hibernate.search.engine.reporting.FailureContext; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentPersister; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ClusterDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentPersister; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ClusterDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.AssertionFailure; import org.hibernate.search.util.common.SearchException; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java index 905aa238edd..39f64324913 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgent.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Clock; @@ -21,9 +21,9 @@ import org.hibernate.search.mapper.orm.automaticindexing.spi.AutomaticIndexingMappingContext; import org.hibernate.search.mapper.orm.common.spi.SessionHelper; import org.hibernate.search.mapper.orm.common.spi.TransactionHelper; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.mapper.pojo.massindexing.spi.PojoMassIndexerAgent; import org.hibernate.search.mapper.pojo.massindexing.spi.PojoMassIndexerAgentStartContext; import org.hibernate.search.util.common.impl.Closer; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java similarity index 86% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java index fd8184b032c..0ce8c7d174b 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexerAgentClusterLink.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.time.Clock; @@ -14,13 +14,13 @@ import java.util.stream.Collectors; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentPersister; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ClusterDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentPersister; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ClusterDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; public final class OutboxPollingMassIndexerAgentClusterLink diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java similarity index 91% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java index 55e173f335d..77030a89c8d 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingMassIndexingInstructions.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.time.Clock; import java.time.Instant; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java similarity index 85% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java index a49e902eea4..a05749d5d39 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventAdditionalJaxbMappingProducer.java @@ -4,10 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; - -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.impl.HibernateOrmUtils.isDiscriminatorMultiTenancyEnabled; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.JaxbMappingHelper.marshall; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.util.Map; @@ -21,13 +18,14 @@ import org.hibernate.search.engine.cfg.spi.ConfigurationProperty; import org.hibernate.search.engine.cfg.spi.OptionalConfigurationProperty; import org.hibernate.search.mapper.orm.bootstrap.spi.HibernateSearchOrmMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.UuidGenerationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.UuidDataTypeUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.spi.HibernateOrmMapperOutboxPollingSpiSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.AdditionalMappingBuilder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.JaxbMappingHelper; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.UuidGenerationStrategy; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.UuidDataTypeUtils; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.spi.HibernateOrmMapperOutboxPollingSpiSettings; +import org.hibernate.search.mapper.orm.outboxpolling.impl.HibernateOrmUtils; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.AdditionalMappingBuilder; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.JaxbMappingHelper; import org.hibernate.search.util.common.logging.impl.LoggerFactory; import org.hibernate.type.SqlTypes; @@ -45,7 +43,7 @@ public final class OutboxPollingOutboxEventAdditionalJaxbMappingProducer // because our override actually matches the default for the native entity name. public static final String ENTITY_NAME = CLASS_NAME; - public static final String ENTITY_DEFINITION = marshall( createMappings( "", "", + public static final String ENTITY_DEFINITION = JaxbMappingHelper.marshall( createMappings( "", "", HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_OUTBOX_EVENT_TABLE, SqlTypes.CHAR, HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_OUTBOX_EVENT_UUID_GEN_STRATEGY @@ -138,7 +136,7 @@ public Map, JaxbEntityMappings> produceMappings(ConfigurationPropertySo table.orElse( HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_ENTITY_MAPPING_OUTBOX_EVENT_TABLE ), resolvedUuidType, resolvedUuidStrategy, - isDiscriminatorMultiTenancyEnabled( buildingContext ) + HibernateOrmUtils.isDiscriminatorMultiTenancyEnabled( buildingContext ) ); } diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java index 7ece756dcd5..712eebcaa23 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/OutboxPollingOutboxEventSendingPlan.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -17,8 +17,8 @@ import org.hibernate.search.engine.backend.common.spi.MultiEntityOperationExecutionReport; import org.hibernate.search.engine.backend.work.execution.OperationSubmitter; import org.hibernate.search.mapper.orm.automaticindexing.spi.AutomaticIndexingQueueEventSendingPlan; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.avro.impl.EventPayloadSerializationUtils; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.avro.impl.EventPayloadSerializationUtils; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.mapper.pojo.work.spi.PojoIndexingQueueEventPayload; import org.hibernate.search.util.common.data.impl.RangeCompatibleHashFunction; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ShardAssignment.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ShardAssignment.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ShardAssignment.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ShardAssignment.java index e6d13711df5..850eabadb01 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/ShardAssignment.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/ShardAssignment.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.Optional; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.hibernate.search.util.common.data.Range; import org.hibernate.search.util.common.data.impl.Murmur3HashFunction; import org.hibernate.search.util.common.data.impl.RangeCompatibleHashFunction; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/HibernateOrmUtils.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/HibernateOrmUtils.java similarity index 89% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/HibernateOrmUtils.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/HibernateOrmUtils.java index 27f9b8fd2f3..54512ac767a 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/HibernateOrmUtils.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/HibernateOrmUtils.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.impl; +package org.hibernate.search.mapper.orm.outboxpolling.impl; import org.hibernate.binder.internal.TenantIdBinder; import org.hibernate.boot.spi.MetadataBuildingContext; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingBeanConfigurer.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingBeanConfigurer.java similarity index 82% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingBeanConfigurer.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingBeanConfigurer.java index 3ef54b0e17a..a5ee6e02c1b 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingBeanConfigurer.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingBeanConfigurer.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.impl; +package org.hibernate.search.mapper.orm.outboxpolling.impl; import org.hibernate.search.engine.environment.bean.BeanReference; import org.hibernate.search.engine.environment.bean.spi.BeanConfigurationContext; import org.hibernate.search.engine.environment.bean.spi.BeanConfigurer; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; public class OutboxPollingBeanConfigurer implements BeanConfigurer { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingCoordinationStrategy.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingCoordinationStrategy.java similarity index 86% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingCoordinationStrategy.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingCoordinationStrategy.java index cc975eb74a8..26f73367a0f 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingCoordinationStrategy.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingCoordinationStrategy.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.impl; +package org.hibernate.search.mapper.orm.outboxpolling.impl; import java.lang.invoke.MethodHandles; import java.util.ArrayList; @@ -26,23 +26,23 @@ import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategy; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategyPreStopContext; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategyStartContext; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.OutboxEventProcessingOrder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.UuidGenerationStrategy; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.DefaultAgentRepository; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.DefaultOutboxEventFinder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventFinderProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventOrder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingEventProcessor; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingMassIndexerAgent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventSendingPlan; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.OutboxPollingSearchMappingImpl; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.OutboxEventProcessingOrder; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.UuidGenerationStrategy; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.impl.HibernateOrmMapperOutboxPollingImplSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.DefaultAgentRepository; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.OutboxPollingAgentAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.DefaultOutboxEventFinder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventFinderProvider; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventOrder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingEventProcessor; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingMassIndexerAgent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventSendingPlan; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.OutboxPollingSearchMappingImpl; import org.hibernate.search.mapper.orm.tenancy.spi.TenancyConfiguration; import org.hibernate.search.mapper.pojo.massindexing.spi.PojoMassIndexerAgent; import org.hibernate.search.mapper.pojo.massindexing.spi.PojoMassIndexerAgentCreateContext; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingInternalConfigurer.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingInternalConfigurer.java similarity index 68% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingInternalConfigurer.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingInternalConfigurer.java index d9c33342d0e..953a66cc128 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/impl/OutboxPollingInternalConfigurer.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/impl/OutboxPollingInternalConfigurer.java @@ -4,11 +4,11 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.impl; +package org.hibernate.search.mapper.orm.outboxpolling.impl; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepositoryProvider; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.DefaultOutboxEventFinder; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventFinderProvider; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepositoryProvider; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.DefaultOutboxEventFinder; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventFinderProvider; /** * An internal configurer, used for tests. diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java similarity index 80% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java index b2247e62e3b..8daa2bcf6aa 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/JaxbEntityMappingsFormatter.java @@ -4,10 +4,10 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl; +package org.hibernate.search.mapper.orm.outboxpolling.logging.impl; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl.JaxbMappingHelper; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.impl.JaxbMappingHelper; /** * Used with JBoss Logging's {@link org.jboss.logging.annotations.FormatWith} to format diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/Log.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/Log.java index 5829b1b0938..3d8dc674808 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/logging/impl/Log.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/logging/impl/Log.java @@ -5,7 +5,7 @@ * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl; +package org.hibernate.search.mapper.orm.outboxpolling.logging.impl; import static org.jboss.logging.Logger.Level.DEBUG; import static org.jboss.logging.Logger.Level.WARN; @@ -18,9 +18,9 @@ import jakarta.persistence.PersistenceException; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentReference; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.hibernate.search.util.common.SearchException; import org.hibernate.search.util.common.logging.impl.MessageConstants; import org.hibernate.search.util.common.logging.impl.ToStringTreeMultilineFormatter; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMapping.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMapping.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMapping.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMapping.java index 5020a64468e..e60e3703585 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/OutboxPollingSearchMapping.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/OutboxPollingSearchMapping.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping; +package org.hibernate.search.mapper.orm.outboxpolling.mapping; import org.hibernate.search.util.common.annotation.Incubating; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/AdditionalMappingBuilder.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/AdditionalMappingBuilder.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/AdditionalMappingBuilder.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/AdditionalMappingBuilder.java index a7d96232088..1df593cb258 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/AdditionalMappingBuilder.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/AdditionalMappingBuilder.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl; +package org.hibernate.search.mapper.orm.outboxpolling.mapping.impl; import java.util.Locale; diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/JaxbMappingHelper.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/JaxbMappingHelper.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/JaxbMappingHelper.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/JaxbMappingHelper.java index 738d600ad2e..dc10a06737c 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/JaxbMappingHelper.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/JaxbMappingHelper.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl; +package org.hibernate.search.mapper.orm.outboxpolling.mapping.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -18,7 +18,7 @@ import jakarta.xml.bind.Unmarshaller; import org.hibernate.boot.jaxb.mapping.JaxbEntityMappings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; import org.hibernate.search.util.common.logging.impl.LoggerFactory; public class JaxbMappingHelper { diff --git a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java similarity index 91% rename from mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java rename to mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java index 5155d3f5ba6..3825e61e9ce 100644 --- a/mapper/orm-coordination-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/impl/OutboxPollingSearchMappingImpl.java @@ -4,9 +4,9 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.impl; +package org.hibernate.search.mapper.orm.outboxpolling.mapping.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxPollingOutboxEventAdditionalJaxbMappingProducer.ENTITY_NAME; import java.lang.invoke.MethodHandles; import java.util.Set; @@ -18,9 +18,9 @@ import org.hibernate.query.Query; import org.hibernate.search.mapper.orm.common.spi.TransactionHelper; import org.hibernate.search.mapper.orm.coordination.common.spi.CoordinationStrategyStartContext; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.logging.impl.Log; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.OutboxPollingSearchMapping; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.logging.impl.Log; +import org.hibernate.search.mapper.orm.outboxpolling.mapping.OutboxPollingSearchMapping; import org.hibernate.search.mapper.orm.tenancy.spi.TenancyConfiguration; import org.hibernate.search.util.common.logging.impl.LoggerFactory; diff --git a/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java new file mode 100644 index 00000000000..d0e5edb9b17 --- /dev/null +++ b/mapper/orm-outbox-polling/src/main/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClasses.java @@ -0,0 +1,51 @@ +/* + * Hibernate Search, full-text search for your domain model + * + * License: GNU Lesser General Public License (LGPL), version 2.1 or later + * See the lgpl.txt file in the root directory or . + */ +package org.hibernate.search.mapper.orm.outboxpolling.mapping.spi; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +public final class HibernateOrmMapperOutboxPollingClasses { + + private HibernateOrmMapperOutboxPollingClasses() { + } + + /** + * @return A set of names of all classes that will be involved in Avro serialization + * and thus will require reflection support. + * Useful to enable reflection for these classes in GraalVM-based native images. + */ + public static Set avroTypes() { + return new HashSet<>( Arrays.asList( + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto$Builder", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto$Builder", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DirtinessDescriptorDto", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRoutesDescriptorDto", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto$Builder", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.DocumentRouteDescriptorDto", + "org.hibernate.search.mapper.orm.outboxpolling.avro.generated.impl.PojoIndexingQueueEventPayloadDto$Builder" + ) ); + } + + /** + * @return A set of names of all classes that will be involved in Hibernate ORM mapping + * and thus will require reflection support. + * Useful to enable reflection for these classes in GraalVM-based native images. + */ + public static Set hibernateOrmTypes() { + return new HashSet<>( Arrays.asList( + "org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType", + "org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent", + "org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent", + "org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent$Status", + "org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState" + ) ); + } + +} diff --git a/mapper/orm-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer b/mapper/orm-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer new file mode 100644 index 00000000000..00748e4bc26 --- /dev/null +++ b/mapper/orm-outbox-polling/src/main/resources/META-INF/services/org.hibernate.search.engine.environment.bean.spi.BeanConfigurer @@ -0,0 +1 @@ +org.hibernate.search.mapper.orm.outboxpolling.impl.OutboxPollingBeanConfigurer diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java similarity index 92% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java index 88852b8f159..09f4ab57e40 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/cfg/HibernateOrmMapperOutboxPollingSettingsTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg; +package org.hibernate.search.mapper.orm.outboxpolling.cfg; import static org.assertj.core.api.Assertions.assertThat; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java index 94612411d4c..e9e839a1915 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkBaseTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -12,9 +12,9 @@ import java.time.Duration; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.junit.Before; import org.junit.Test; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java similarity index 86% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java index 4b887e034e9..15511aaa492 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractEventProcessorClusterLinkTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -22,13 +22,13 @@ import java.util.UUID; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepository; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentReference; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepository; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.hibernate.search.util.common.spi.ToStringTreeAppender; import org.junit.After; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java index 9018406d889..1e87df0f14b 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkBaseTest.java @@ -4,18 +4,18 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.time.Duration; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.junit.Before; import org.junit.Test; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java similarity index 80% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java index 6c06c98357c..7af99910492 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AbstractMassIndexerAgentClusterLinkTest.java @@ -4,9 +4,8 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.mockito.Mockito.when; @@ -21,12 +20,12 @@ import java.util.UUID; import org.hibernate.search.engine.reporting.FailureHandler; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepository; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentReference; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepository; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.junit.After; import org.junit.Before; @@ -51,7 +50,7 @@ abstract class AbstractMassIndexerAgentClusterLinkTest { HibernateOrmMapperOutboxPollingSettings.Defaults.COORDINATION_MASS_INDEXER_PULSE_EXPIRATION ); static final long SELF_ID_ORDINAL = 42L; - static final UUID SELF_ID = toUUID( SELF_ID_ORDINAL ); + static final UUID SELF_ID = AbstractEventProcessorClusterLinkTest.toUUID( SELF_ID_ORDINAL ); static final AgentReference SELF_REF = AgentReference.of( SELF_ID, "Self Agent Name" ); @Rule diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentRepositoryMockingHelper.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentRepositoryMockingHelper.java similarity index 88% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentRepositoryMockingHelper.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentRepositoryMockingHelper.java index 57f18983a93..6637448f68a 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/AgentRepositoryMockingHelper.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/AgentRepositoryMockingHelper.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.assertj.core.api.Assertions.fail; import static org.mockito.Answers.CALLS_REAL_METHODS; @@ -26,11 +26,11 @@ import java.util.stream.Collectors; import java.util.stream.Stream; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentRepository; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentRepository; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.mockito.ArgumentCaptor; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java similarity index 93% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java index df8dcc09b6c..257cb15b9dc 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkDynamicShardingBaseTest.java @@ -4,13 +4,13 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; @@ -29,17 +29,17 @@ abstract static class AbstractBaseTest extends AbstractEventProcessorClusterLink @Override protected UUID other1Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL - 1 ); + return toUUID( SELF_ID_ORDINAL - 1 ); } @Override protected UUID other2Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL + 1 ); + return toUUID( SELF_ID_ORDINAL + 1 ); } @Override protected UUID other3Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL + 2 ); + return toUUID( SELF_ID_ORDINAL + 2 ); } @Override diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java index 2f2acbc5258..a003f40e8ba 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkLeaveClusterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java similarity index 89% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java index c3fccabee73..00f3c5644b0 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfDynamicBaseTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; @@ -31,17 +31,17 @@ abstract static class AbstractBaseTest extends AbstractEventProcessorClusterLink @Override protected UUID other1Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL + 1 ); + return toUUID( SELF_ID_ORDINAL + 1 ); } @Override protected UUID other2Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL - 1 ); + return toUUID( SELF_ID_ORDINAL - 1 ); } @Override protected UUID other3Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL - 2 ); + return toUUID( SELF_ID_ORDINAL - 2 ); } @Override diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java similarity index 94% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java index 35da2fd2595..7bef419c985 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkMixedSharding4ShardSelfStaticBaseTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java similarity index 89% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java index 23b48f3c9bb..ac0da60c301 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkPulseExpectations.java @@ -4,20 +4,20 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.NOW; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.PULSE_EXPIRATION; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.PULSE_INTERVAL; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.NOW; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.PULSE_EXPIRATION; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.PULSE_INTERVAL; import java.time.Instant; import java.util.Optional; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; public class EventProcessorClusterLinkPulseExpectations { diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java similarity index 89% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java index c18c64931cc..b34d5b4971a 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticSharding4ShardBaseTest.java @@ -4,12 +4,12 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; @@ -29,17 +29,17 @@ abstract static class AbstractBaseTest extends AbstractEventProcessorClusterLink @Override protected UUID other1Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL + 1 ); + return toUUID( SELF_ID_ORDINAL + 1 ); } @Override protected UUID other2Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL - 1 ); + return toUUID( SELF_ID_ORDINAL - 1 ); } @Override protected UUID other3Id() { - return toUUID( AbstractEventProcessorClusterLinkTest.SELF_ID_ORDINAL - 2 ); + return toUUID( SELF_ID_ORDINAL - 2 ); } @Override diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java similarity index 97% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java index f703ccd34de..77e5652c170 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/EventProcessorClusterLinkStaticShardingEdgeCasesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.verify; @@ -13,9 +13,9 @@ import java.util.UUID; import org.hibernate.search.engine.reporting.FailureContext; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor; import org.hibernate.search.util.common.SearchException; import org.junit.Before; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java similarity index 84% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java index 62e1c965c6e..2d1f104a74e 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkDynamicShardingBaseTest.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; @@ -31,17 +31,17 @@ abstract static class AbstractBaseTest extends AbstractMassIndexerAgentClusterLi @Override protected UUID other1Id() { - return toUUID( AbstractMassIndexerAgentClusterLinkTest.SELF_ID_ORDINAL + 1 ); + return toUUID( SELF_ID_ORDINAL + 1 ); } @Override protected UUID other2Id() { - return toUUID( AbstractMassIndexerAgentClusterLinkTest.SELF_ID_ORDINAL - 1 ); + return toUUID( SELF_ID_ORDINAL - 1 ); } @Override protected UUID other3Id() { - return toUUID( AbstractMassIndexerAgentClusterLinkTest.SELF_ID_ORDINAL - 2 ); + return toUUID( SELF_ID_ORDINAL - 2 ); } @Override diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java similarity index 96% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java index d507a648c85..82c0ec4bb73 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkLeaveClusterTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java similarity index 86% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java index 492bca73297..735d7923b42 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkPulseExpectations.java @@ -4,18 +4,15 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; import static org.assertj.core.api.SoftAssertions.assertSoftly; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractMassIndexerAgentClusterLinkTest.NOW; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractMassIndexerAgentClusterLinkTest.PULSE_EXPIRATION; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractMassIndexerAgentClusterLinkTest.PULSE_INTERVAL; import java.time.Instant; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; public class MassIndexerAgentClusterLinkPulseExpectations { @@ -124,7 +121,8 @@ public AgentMainStateStep pulseAgain(Instant expiration) { @Override public AgentMainStateStep considerEventProcessingSuspendedThenPulse() { - expectedInstructionsExpiration = NOW.plus( PULSE_INTERVAL ); + expectedInstructionsExpiration = + AbstractMassIndexerAgentClusterLinkTest.NOW.plus( AbstractMassIndexerAgentClusterLinkTest.PULSE_INTERVAL ); expectedInstructionsConsiderEventProcessingSuspended = true; return this; } @@ -133,7 +131,8 @@ public AgentMainStateStep considerEventProcessingSuspendedThenPulse() { public AgentOptionsStep agent(UUID expectedId, AgentState expectedCurrentState) { this.expectedSelfAgentId = expectedId; this.expectedSelfAgentCurrentState = expectedCurrentState; - this.expectedSelfAgentExpiration = NOW.plus( PULSE_EXPIRATION ); + this.expectedSelfAgentExpiration = AbstractMassIndexerAgentClusterLinkTest.NOW + .plus( AbstractMassIndexerAgentClusterLinkTest.PULSE_EXPIRATION ); return this; } diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java similarity index 90% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java index f6496fe5fea..76f2fef40a9 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/event/impl/MassIndexerAgentClusterLinkStaticSharding3ShardBaseTest.java @@ -4,14 +4,14 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl; +package org.hibernate.search.mapper.orm.outboxpolling.event.impl; -import static org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; +import static org.hibernate.search.mapper.orm.outboxpolling.event.impl.AbstractEventProcessorClusterLinkTest.toUUID; import java.util.UUID; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentState; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentType; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentState; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentType; import org.hibernate.search.util.impl.test.runner.nested.Nested; import org.hibernate.search.util.impl.test.runner.nested.NestedRunner; diff --git a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java similarity index 87% rename from mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java rename to mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java index 852bafc6a80..60aa4018b8c 100644 --- a/mapper/orm-coordination-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/coordination/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java +++ b/mapper/orm-outbox-polling/src/test/java/org/hibernate/search/mapper/orm/outboxpolling/mapping/spi/HibernateOrmMapperOutboxPollingClassesTest.java @@ -4,7 +4,7 @@ * License: GNU Lesser General Public License (LGPL), version 2.1 or later * See the lgpl.txt file in the root directory or . */ -package org.hibernate.search.mapper.orm.coordination.outboxpolling.mapping.spi; +package org.hibernate.search.mapper.orm.outboxpolling.mapping.spi; import static org.assertj.core.api.Assertions.assertThat; import static org.hibernate.search.util.common.jar.impl.JandexUtils.readOrBuildIndex; @@ -15,9 +15,9 @@ import java.util.Set; import java.util.stream.Collectors; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.Agent; -import org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEvent; +import org.hibernate.search.mapper.orm.outboxpolling.cfg.HibernateOrmMapperOutboxPollingSettings; +import org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.Agent; +import org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEvent; import org.hibernate.search.util.common.AssertionFailure; import org.hibernate.search.util.common.jar.impl.JandexUtils; @@ -46,7 +46,7 @@ public static void index() { outboxPollingIndex = readOrBuildIndex( codeSourceLocation( HibernateOrmMapperOutboxPollingSettings.class ) .orElseThrow( () -> new AssertionFailure( - "Could not find hibernate-search-mapper-orm-coordination-outbox-polling JAR?" ) ) + "Could not find hibernate-search-mapper-orm-outbox-polling JAR?" ) ) ); } @@ -75,9 +75,9 @@ public void testNoMissingJpaModelClass() { // Despite being referenced from entities, these types are not included in the JPA model. modelClassNames.removeAll( Arrays.asList( - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.AgentReference", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.event.impl.OutboxEventReference", - "org.hibernate.search.mapper.orm.coordination.outboxpolling.cluster.impl.ShardAssignmentDescriptor" + "org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.AgentReference", + "org.hibernate.search.mapper.orm.outboxpolling.event.impl.OutboxEventReference", + "org.hibernate.search.mapper.orm.outboxpolling.cluster.impl.ShardAssignmentDescriptor" ) ); assertThat( modelClassNames ).isNotEmpty(); diff --git a/pom.xml b/pom.xml index 1e03e21630e..db96f30d94d 100644 --- a/pom.xml +++ b/pom.xml @@ -174,7 +174,7 @@ mapper/pojo-base mapper/pojo-standalone mapper/orm - mapper/orm-coordination-outbox-polling + mapper/orm-outbox-polling mapper/orm-batch-jsr352/core mapper/orm-batch-jsr352/jberet mapper/orm-jakarta-batch/core diff --git a/util/common/pom.xml b/util/common/pom.xml index 9c15973ff74..5534ce911da 100644 --- a/util/common/pom.xml +++ b/util/common/pom.xml @@ -67,7 +67,7 @@ - org.hibernate.search.*.impl to org.hibernate.search.util.common, org.hibernate.search.engine, org.hibernate.search.backend.lucene, org.hibernate.search.backend.elasticsearch, org.hibernate.search.backend.elasticsearch.aws, org.hibernate.search.mapper.pojo, org.hibernate.search.mapper.pojo.standalone, org.hibernate.search.mapper.orm, org.hibernate.search.mapper.orm.coordination.outboxpolling, org.hibernate.search.jakarta.batch.core, org.jboss.logging; + org.hibernate.search.*.impl to org.hibernate.search.util.common, org.hibernate.search.engine, org.hibernate.search.backend.lucene, org.hibernate.search.backend.elasticsearch, org.hibernate.search.backend.elasticsearch.aws, org.hibernate.search.mapper.pojo, org.hibernate.search.mapper.pojo.standalone, org.hibernate.search.mapper.orm, org.hibernate.search.mapper.orm.outboxpolling, org.hibernate.search.jakarta.batch.core, org.jboss.logging; *;