HSEARCH-4043 Remove redundant @documentid

We don't need them with Search 6 if an @id is present
hibernate · Nov 4, 2020 · c4a0055 · c4a0055
1 parent e62e568
commit c4a0055
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 10 deletions.
diff --git a/...t/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java b/...t/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Company.java
@@ -11,7 +11,6 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
@@ -26,7 +25,6 @@ public class Company implements Serializable {
 
 	@Id
 	@GeneratedValue
-	@DocumentId
 	private int id;
 
 	@FullTextField

diff --git a/...a/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java b/...a/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/CompanyGroup.java
@@ -14,7 +14,6 @@
 import javax.persistence.ManyToMany;
 
 import org.hibernate.search.mapper.pojo.automaticindexing.ReindexOnUpdate;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
 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.IndexingDependency;
@@ -27,7 +26,6 @@
 public class CompanyGroup {
 
 	@Id
-	@DocumentId
 	private String id;
 
 	@ManyToMany

diff --git a/...st/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java b/...st/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/Person.java
@@ -9,7 +9,6 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
@@ -21,7 +20,6 @@
 public class Person {
 
 	@Id
-	@DocumentId
 	private String id;
 
 	@FullTextField

diff --git a/...nate/search/integrationtest/batch/jsr352/massindexing/entity/SimulatedFailureCompany.java b/...nate/search/integrationtest/batch/jsr352/massindexing/entity/SimulatedFailureCompany.java
@@ -13,7 +13,6 @@
 import javax.persistence.Id;
 
 import org.hibernate.search.integrationtest.batch.jsr352.util.SimulatedFailure;
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
 
@@ -38,7 +37,6 @@ public SimulatedFailureCompany(String name) {
 
 	@Id
 	@GeneratedValue
-	@DocumentId
 	public int getId() {
 		// Called by Hibernate Search indexer#addOrUpdate, which in turn
 		// is called by the EntityWriter phase of the batch.

diff --git a/...st/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java b/...st/java/org/hibernate/search/integrationtest/batch/jsr352/massindexing/entity/WhoAmI.java
@@ -9,7 +9,6 @@
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
-import org.hibernate.search.mapper.pojo.mapping.definition.annotation.DocumentId;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.FullTextField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.GenericField;
 import org.hibernate.search.mapper.pojo.mapping.definition.annotation.Indexed;
@@ -25,7 +24,6 @@
 public class WhoAmI {
 
 	@Id
-	@DocumentId
 	private String customId;
 
 	@FullTextField