Skip to content

Commit

Permalink
HSEARCH-4928 Rename outbox polling module
Browse files Browse the repository at this point in the history
  • Loading branch information
marko-bekhta authored and yrodiere committed Sep 29, 2023
1 parent 06b5b3b commit 29758bc
Show file tree
Hide file tree
Showing 153 changed files with 647 additions and 651 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bom/public/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion build/jqassistant/rules/rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build/parents/build/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down Expand Up @@ -628,7 +628,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-outbox-polling</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand All @@ -643,7 +643,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
6 changes: 3 additions & 3 deletions build/reports/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
Expand Down Expand Up @@ -140,7 +140,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-outbox-polling</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down Expand Up @@ -292,7 +292,7 @@
<dependencies>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ When <<mapper-orm,integrating with Hibernate ORM>>::
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<version>{hibernateSearchVersion}</version>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ You will also need to add this dependency:
----
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<version>{hibernateSearchVersion}</version>
</dependency>
----
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<version>7.0.0-SNAPSHOT</version>
<relativePath>../../..</relativePath>
</parent>
<artifactId>hibernate-search-integrationtest-java-modules-orm-coordination-outbox-polling-elasticsearch</artifactId>
<artifactId>hibernate-search-integrationtest-java-modules-orm-outbox-polling-elasticsearch</artifactId>
<packaging>jar</packaging>

<name>Hibernate Search ITs - Java - Modules - ORM/Elasticsearch outbox polling</name>
Expand Down Expand Up @@ -41,7 +41,7 @@

<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
</dependency>

<!-- Only needed here so we can require it in module info for Avro -->
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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.
* Hopefully we should be able to ask for a MethodHandles.Lookup instance from Hibernate ORM
* 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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;

Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<version>7.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<artifactId>hibernate-search-integrationtest-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-integrationtest-mapper-orm-outbox-polling</artifactId>

<name>Hibernate Search ITs - ORM - Coordination - Outbox Polling</name>
<description>Hibernate Search integration tests for the Hibernate ORM integration using outbox polling as coordination strategy</description>
Expand All @@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.hibernate.search</groupId>
<artifactId>hibernate-search-mapper-orm-coordination-outbox-polling</artifactId>
<artifactId>hibernate-search-mapper-orm-outbox-polling</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
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;
Expand All @@ -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;
Expand Down
Loading

0 comments on commit 29758bc

Please sign in to comment.