HSEARCH-4001 Use ReindexOnUpdate.SHALLOW instead of ReindexOnUpdate.N…

…O in migration helper tests where relevant That's closer to how Search 5 used to behave.
hibernate · Sep 28, 2020 · aca7f54 · aca7f54
1 parent 2463195
commit aca7f54
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 17 deletions.
diff --git a/...est/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java b/...est/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/Book.java
@@ -54,7 +54,7 @@ public void setTitle(String title) {
 	@ManyToOne(fetch = FetchType.LAZY, optional = false)
 	@Fetch(FetchMode.SELECT)
 	@IndexedEmbedded(depth = 3)
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public Nation getFirstPublishedIn() {
 		return firstPublishedIn;
 	}

diff --git a/...src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java b/...src/test/java/org/hibernate/search/test/batchindexing/IndexedEmbeddedProxyRootEntity.java
@@ -28,12 +28,12 @@ public class IndexedEmbeddedProxyRootEntity {
 
 	@OneToOne(optional = false, fetch = FetchType.LAZY)
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private IndexedEmbeddedProxyLazyEntity lazyEntity;
 
 	@OneToOne(optional = false, fetch = FetchType.LAZY)
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private IndexedEmbeddedProxyLazyEntity lazyEntity2;
 
 	public Integer getId() {

diff --git a/...ationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java b/...ationhelper/orm/src/test/java/org/hibernate/search/test/batchindexing/LegacyCarPlant.java
@@ -52,7 +52,7 @@ public void setName(String name) {
 	}
 
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	@ManyToOne
 	@JoinColumn(name = "CAR_ID", insertable = false, updatable = false)
 	public LegacyCar getCar() {

diff --git a/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java b/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Address.java
@@ -51,7 +51,7 @@ public class Address {
 
 	@ManyToOne(cascade = CascadeType.ALL)
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private Country country;
 
 	public Long getId() {

diff --git a/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java b/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Country.java
@@ -41,7 +41,7 @@ public class Country {
 	//FIXME with JPA 2, move to @OrderColumn
 	@IndexColumn(name = "list_position")
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private List<State> states = new ArrayList<State>();
 
 	public Integer getId() {

diff --git a/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java b/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/embedded/Product.java
@@ -45,7 +45,7 @@ public class Product {
 	@ManyToMany(cascade = CascadeType.REMOVE) //just to make the test easier, cascade doesn't really make any business sense
 	@MapKeyColumn(name = "CUST_NAME", nullable = false)
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private Map<String, Order> orders = new HashMap<String, Order>();
 
 	public Integer getId() {

diff --git a/...est/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java b/...est/java/org/hibernate/search/test/embedded/path/validation/DepthExceedsPathTestCase.java
@@ -14,6 +14,8 @@
 
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
+import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
+import org.hibernate.search.mapper.pojo.mapping.definition.annotation.IndexingDependency;
 
 /**
  * @author zkurey
@@ -28,6 +30,7 @@ public class DepthExceedsPathTestCase {
 
 	@ManyToOne
 	@IndexedEmbedded(depth = 6, includePaths = { "a.b.c.indexed" })
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public ReferencesIndexedEmbeddedA e;
 
 }
diff --git a/...st/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java b/...st/java/org/hibernate/search/test/embedded/path/validation/DepthMatchesPathDepthCase.java
@@ -31,7 +31,7 @@ public class DepthMatchesPathDepthCase {
 
 	@ManyToOne
 	@IndexedEmbedded(depth = 4, includePaths = { "a.b.c.indexed" })
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public ReferencesIndexedEmbeddedA e;
 
 }
diff --git a/...t/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java b/...t/java/org/hibernate/search/test/embedded/path/validation/ReferencesIndexedEmbeddedA.java
@@ -30,7 +30,7 @@ public class ReferencesIndexedEmbeddedA {
 
 	@ManyToOne
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public A a;
 
 }
diff --git a/...t/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java b/...t/java/org/hibernate/search/test/embedded/update/UpdateIndexedEmbeddedCollectionTest.java
@@ -162,7 +162,7 @@ public Driver() {
 
 		@IndexedEmbedded(includeEmbeddedObjectId = true)
 		@OneToOne(cascade = CascadeType.ALL)
-		@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+		@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 		public Truck getTruck() { return truck; }
 		public void setTruck(Truck truck) { this.truck = truck; }
 		private Truck truck;
@@ -192,7 +192,7 @@ public Truck() {
 		private String numberPlate;
 
 		@IndexedEmbedded @OneToMany(cascade = CascadeType.ALL)
-		@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+		@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 		public Set<Item> getItems() { return items; }
 		public void setItems(Set<Item> items) { this.items = items; }
 		private Set<Item> items;

diff --git a/...t/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java b/...t/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/engine/indexapi/Book.java
@@ -42,7 +42,7 @@ public class Book {
 
 	@IndexedEmbedded
 	@ManyToOne
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public Author getMainAuthor() {
 		return mainAuthor;
 	}

diff --git a/...grationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java b/...grationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Book.java
@@ -49,7 +49,7 @@ public class Book {
 
 	@IndexedEmbedded
 	@ManyToOne
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public Author getMainAuthor() {
 		return mainAuthor;
 	}

diff --git a/...rationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java b/...rationtest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/Music.java
@@ -49,7 +49,7 @@ public void setId(Long id) {
 			fetch = FetchType.EAGER,
 			targetEntity = Author.class)
 	@IndexedEmbedded(depth = 1)
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	public Set<Author> getAuthors() {
 		return authors;
 	}

diff --git a/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java b/...ntest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/query/facet/Book.java
@@ -37,7 +37,7 @@ public class Book {
 
 	@ManyToMany
 	@IndexedEmbedded
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private Set<Author> authors = new HashSet<>();
 
 	public String getName() {

diff --git a/...tiontest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java b/...tiontest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Email.java
@@ -38,7 +38,7 @@ public class Email {
 
 	@IndexedEmbedded
 	@ManyToOne(fetch = FetchType.LAZY)
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private Domain domain;
 
 	public Domain getDomain() {

diff --git a/...iontest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java b/...iontest/v5migrationhelper/orm/src/test/java/org/hibernate/search/test/session/Entite.java
@@ -36,7 +36,7 @@ public class Entite {
 
 	@IndexedEmbedded
 	@ManyToOne(fetch = FetchType.LAZY)
-	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.NO)
+	@IndexingDependency(reindexOnUpdate = ReindexOnUpdate.SHALLOW)
 	private Categorie categorie;
 
 	public Entite() {