HSEARCH-4148 Simplify PojoIndexingDependencyCollectorTypeNode constru…

…ctors Signed-off-by: Yoann Rodière <yoann@hibernate.org>
hibernate · Mar 12, 2021 · 512829d · 512829d
1 parent 109a41c
commit 512829d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 25 deletions.
diff --git a/...ojo/automaticindexing/building/impl/PojoIndexingDependencyCollectorDisjointValueNode.java b/...ojo/automaticindexing/building/impl/PojoIndexingDependencyCollectorDisjointValueNode.java
@@ -13,6 +13,7 @@
 import org.hibernate.search.mapper.pojo.logging.impl.Log;
 import org.hibernate.search.mapper.pojo.model.path.PojoModelPathValueNode;
 import org.hibernate.search.mapper.pojo.model.path.binding.impl.PojoModelPathBinder;
+import org.hibernate.search.mapper.pojo.model.path.impl.BoundPojoModelPath;
 import org.hibernate.search.mapper.pojo.model.path.impl.BoundPojoModelPathValueNode;
 import org.hibernate.search.mapper.pojo.model.spi.PojoRawTypeModel;
 import org.hibernate.search.mapper.pojo.model.spi.PojoTypeModel;
@@ -58,11 +59,8 @@ public class PojoIndexingDependencyCollectorDisjointValueNode<V>
 	}
 
 	public PojoIndexingDependencyCollectorTypeNode<?> type() {
-		return new PojoIndexingDependencyCollectorTypeNode<>(
-				this,
-				inverseSideEntityTypeModel,
-				buildingHelper
-		);
+		return new PojoIndexingDependencyCollectorTypeNode<>( this,
+				BoundPojoModelPath.root( inverseSideEntityTypeModel ), buildingHelper );
 	}
 
 	@Override

diff --git a/.../mapper/pojo/automaticindexing/building/impl/PojoIndexingDependencyCollectorTypeNode.java b/.../mapper/pojo/automaticindexing/building/impl/PojoIndexingDependencyCollectorTypeNode.java
@@ -47,41 +47,26 @@ public class PojoIndexingDependencyCollectorTypeNode<T> extends PojoIndexingDepe
 
 	PojoIndexingDependencyCollectorTypeNode(PojoRawTypeModel<T> typeModel,
 			PojoImplicitReindexingResolverBuildingHelper buildingHelper) {
-		super( buildingHelper );
-		this.parentNode = null;
-		this.modelPathFromCurrentNode = BoundPojoModelPath.root( typeModel );
-		this.lastEntityNode = this;
-		this.modelPathFromLastEntityNode = modelPathFromCurrentNode;
-		this.reindexOnUpdate = buildingHelper.getDefaultReindexOnUpdate();
+		this( null, BoundPojoModelPath.root( typeModel ), buildingHelper );
 	}
 
-	PojoIndexingDependencyCollectorTypeNode(PojoIndexingDependencyCollectorValueNode<?, ?> parentNode,
+	PojoIndexingDependencyCollectorTypeNode(AbstractPojoIndexingDependencyCollectorValueNode parentNode,
 			BoundPojoModelPathTypeNode<T> modelPathFromLastEntityNode,
 			PojoImplicitReindexingResolverBuildingHelper buildingHelper) {
 		super( buildingHelper );
 		this.parentNode = parentNode;
 		PojoTypeModel<T> typeModel = modelPathFromLastEntityNode.getTypeModel();
 		this.modelPathFromCurrentNode = BoundPojoModelPath.root( typeModel );
-		if ( buildingHelper.isEntity( typeModel.rawType() ) ) {
+		if ( parentNode == null || buildingHelper.isEntity( typeModel.rawType() ) ) {
 			this.lastEntityNode = this;
 			this.modelPathFromLastEntityNode = modelPathFromCurrentNode;
 		}
 		else {
 			this.lastEntityNode = parentNode.lastEntityNode();
 			this.modelPathFromLastEntityNode = modelPathFromLastEntityNode;
 		}
-		this.reindexOnUpdate = parentNode.composeReindexOnUpdate( lastEntityNode, null );
-	}
-
-	PojoIndexingDependencyCollectorTypeNode(PojoIndexingDependencyCollectorDisjointValueNode<T> parentNode,
-			PojoRawTypeModel<T> typeModel,
-			PojoImplicitReindexingResolverBuildingHelper buildingHelper) {
-		super( buildingHelper );
-		this.parentNode = parentNode;
-		this.modelPathFromCurrentNode = BoundPojoModelPath.root( typeModel );
-		this.lastEntityNode = this;
-		this.modelPathFromLastEntityNode = modelPathFromCurrentNode;
-		this.reindexOnUpdate = parentNode.composeReindexOnUpdate( lastEntityNode, null );
+		this.reindexOnUpdate = parentNode != null ? parentNode.composeReindexOnUpdate( lastEntityNode, null )
+				: buildingHelper.getDefaultReindexOnUpdate();
 	}
 
 	/*