HSEARCH-711 Updating test using the new Field parameters. Removing de…

…fault parameter settings.
hibernate · Sep 13, 2011 · 7c95544 · 7c95544
1 parent d174123
commit 7c95544
Show file tree

Hide file tree

Showing 99 changed files with 1,297 additions and 1,195 deletions.
diff --git a/hibernate-search-archetype/src/main/java/com/example/Author.java b/hibernate-search-archetype/src/main/java/com/example/Author.java
@@ -5,7 +5,6 @@
 import javax.persistence.Id;
 
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Store;
 
 @Entity
@@ -23,7 +22,7 @@ public void setId(Integer id) {
 		this.id = id;
 	}
 
-	@Field(index = Index.TOKENIZED, store = Store.YES)
+	@Field(store = Store.YES)
 	public String getName() {
 		return name;
 	}

diff --git a/hibernate-search-archetype/src/main/java/com/example/Book.java b/hibernate-search-archetype/src/main/java/com/example/Book.java
@@ -11,12 +11,12 @@
 import org.apache.solr.analysis.SnowballPorterFilterFactory;
 import org.apache.solr.analysis.StandardTokenizerFactory;
 
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.AnalyzerDef;
 import org.hibernate.search.annotations.DateBridge;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.IndexedEmbedded;
 import org.hibernate.search.annotations.Parameter;
@@ -56,7 +56,7 @@ public void setAuthors(Set<Author> authors) {
 	public Book() {
 	}
 
-	@Field(index = Index.TOKENIZED, store = Store.YES)
+	@Field(store = Store.YES)
 	@Analyzer(definition = "customanalyzer")
 	public String getTitle() {
 		return title;
@@ -76,7 +76,7 @@ public void setId(Integer id) {
 		this.id = id;
 	}
 
-	@Field(index = Index.TOKENIZED, store = Store.NO)
+	@Field(store = Store.NO)
 	@Analyzer(definition = "customanalyzer")
 	public String getSubtitle() {
 		return subtitle;
@@ -86,7 +86,7 @@ public void setSubtitle(String subtitle) {
 		this.subtitle = subtitle;
 	}
 
-	@Field(index = Index.UN_TOKENIZED, store = Store.YES)
+	@Field(analyze = Analyze.NO, store = Store.YES)
 	@DateBridge(resolution = Resolution.DAY)
 	public Date getPublicationDate() {
 		return publicationDate;

diff --git a/hibernate-search-archetype/src/test/java/com/example/IndexAndSearchTest.java b/hibernate-search-archetype/src/test/java/com/example/IndexAndSearchTest.java
@@ -92,7 +92,7 @@ private void initHibernate() {
 	}
 
 	private void index() {
-		FullTextSession ftSession = org.hibernate.search.Search.getFullTextSession( ( Session ) em.getDelegate() );
+		FullTextSession ftSession = org.hibernate.search.Search.getFullTextSession( (Session) em.getDelegate() );
 		try {
 			ftSession.createIndexer().startAndWait();
 		}
@@ -102,7 +102,7 @@ private void index() {
 	}
 
 	private void purge() {
-		FullTextSession ftSession = org.hibernate.search.Search.getFullTextSession( ( Session ) em.getDelegate() );
+		FullTextSession ftSession = org.hibernate.search.Search.getFullTextSession( (Session) em.getDelegate() );
 		ftSession.purgeAll( Book.class );
 		ftSession.flushToIndexes();
 		ftSession.close();
@@ -126,10 +126,10 @@ private Query searchQuery(String searchQuery) throws ParseException {
 
 		//lucene part
 		Map<String, Float> boostPerField = new HashMap<String, Float>( 4 );
-		boostPerField.put( bookFields[0], ( float ) 4 );
-		boostPerField.put( bookFields[1], ( float ) 3 );
-		boostPerField.put( bookFields[2], ( float ) 4 );
-		boostPerField.put( bookFields[3], ( float ) .5 );
+		boostPerField.put( bookFields[0], (float) 4 );
+		boostPerField.put( bookFields[1], (float) 3 );
+		boostPerField.put( bookFields[2], (float) 4 );
+		boostPerField.put( bookFields[3], (float) .5 );
 
 		FullTextEntityManager ftEm = org.hibernate.search.jpa.Search.getFullTextEntityManager( em );
 		Analyzer customAnalyzer = ftEm.getSearchFactory().getAnalyzer( "customanalyzer" );
@@ -145,5 +145,4 @@ private Query searchQuery(String searchQuery) throws ParseException {
 
 		return query;
 	}
-
 }
diff --git a/hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/SimpleEmail.java b/hibernate-search-infinispan/src/test/java/org/hibernate/search/infinispan/SimpleEmail.java
@@ -28,8 +28,8 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
 
@@ -44,8 +44,8 @@ public class SimpleEmail {
 	@GeneratedValue
 	public Long id;
 
-	@Field(index = Index.UN_TOKENIZED)
-	@Column(name="recipient")
+	@Field(analyze = Analyze.NO)
+	@Column(name = "recipient")
 	public String to = "";
 
 	@Field(store = Store.COMPRESS)

diff --git a/...-integrationtest/src/test/java/org/hibernate/search/test/integration/jtaspring/Snert.java b/...-integrationtest/src/test/java/org/hibernate/search/test/integration/jtaspring/Snert.java
@@ -1,7 +1,6 @@
 package org.hibernate.search.test.integration.jtaspring;
 
 import java.util.Date;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -10,48 +9,49 @@
 import javax.persistence.Table;
 
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
+
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.Analyzer;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
 import org.hibernate.search.annotations.TermVector;
 
 @Entity
 @Table(name = "snert")
-@Cache(usage=CacheConcurrencyStrategy.TRANSACTIONAL, region="snert")
+@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL, region = "snert")
 
 // full text search
-@Indexed(index="Snert")
+@Indexed(index = "Snert")
 @Analyzer(impl = StandardAnalyzer.class)
 
 public class Snert {
-	
+
 	@Id()
 	@GeneratedValue(strategy = GenerationType.AUTO)
 	@DocumentId
 	private Long id;
 
-	@Column(nullable=true)
+	@Column(nullable = true)
 	private Date birthday;
-	
+
 	@Column(length = 255)
-	@Field(index = Index.TOKENIZED, store = Store.NO, termVector = TermVector.YES)
+	@Field(termVector = TermVector.YES)
 	private String name;
-	
-	@Column(length=24)
+
+	@Column(length = 24)
 	private String nickname;
-	
-	@Field(index=Index.UN_TOKENIZED, store=Store.NO)
+
+	@Field(analyze = Analyze.NO)
 	private Boolean cool;
-	
-	@Column(name="readCount")
-	@Field(index=Index.UN_TOKENIZED, store=Store.YES)
+
+	@Column(name = "readCount")
+	@Field(analyze = Analyze.NO, store = Store.YES)
 	private int age;
-	
+
 	public Snert() {
 	}
 
@@ -139,5 +139,5 @@ public void setAge(int age) {
 		this.age = age;
 	}
 
-	
+
 }
diff --git a/...ationtest/src/test/java/org/hibernate/search/test/performance/optimizer/Construction.java b/...ationtest/src/test/java/org/hibernate/search/test/performance/optimizer/Construction.java
@@ -29,7 +29,6 @@
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 
 /**
@@ -42,9 +41,9 @@ public class Construction {
 	@GeneratedValue
 	@DocumentId
 	private Integer id;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String name;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String address;
 
 

diff --git a/...integrationtest/src/test/java/org/hibernate/search/test/performance/optimizer/Worker.java b/...integrationtest/src/test/java/org/hibernate/search/test/performance/optimizer/Worker.java
@@ -27,9 +27,9 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 
 /**
@@ -42,9 +42,9 @@ public class Worker {
 	@GeneratedValue
 	@DocumentId
 	private Integer id;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String name;
-	@Field(index = Index.UN_TOKENIZED)
+	@Field(analyze = Analyze.NO)
 	private int workhours;
 
 

diff --git a/...integrationtest/src/test/java/org/hibernate/search/test/performance/reader/Detective.java b/...integrationtest/src/test/java/org/hibernate/search/test/performance/reader/Detective.java
@@ -27,9 +27,9 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.search.annotations.Analyze;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 
 /**
@@ -42,11 +42,11 @@ public class Detective {
 	@GeneratedValue
 	@DocumentId
 	private Integer id;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String name;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String physicalDescription;
-	@Field(index = Index.UN_TOKENIZED)
+	@Field(analyze = Analyze.NO)
 	private String badge;
 
 

diff --git a/...h-integrationtest/src/test/java/org/hibernate/search/test/performance/reader/Suspect.java b/...h-integrationtest/src/test/java/org/hibernate/search/test/performance/reader/Suspect.java
@@ -30,7 +30,6 @@
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 
 /**
@@ -43,11 +42,11 @@ public class Suspect {
 	@GeneratedValue
 	@DocumentId
 	private Integer id;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String name;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	private String physicalDescription;
-	@Field(index = Index.TOKENIZED)
+	@Field
 	@Column(length = 500)
 	private String suspectCharge;
 

diff --git a/hibernate-search/src/test/java/org/hibernate/search/test/AlternateDocument.java b/hibernate-search/src/test/java/org/hibernate/search/test/AlternateDocument.java
@@ -27,15 +27,15 @@
 import javax.persistence.Id;
 import javax.persistence.Lob;
 
-import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Boost;
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Boost;
 
 /**
  * Example of 2 entities mapped in the same index
+ *
  * @author Emmanuel Bernard
  */
 @Entity
@@ -67,7 +67,7 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-	@Field( name = "alt_title", store = Store.YES, index = Index.TOKENIZED )
+	@Field(name = "alt_title", store = Store.YES)
 	@Boost(2)
 	public String getTitle() {
 		return title;
@@ -77,7 +77,7 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 
-	@Field( name="Abstract", store = Store.NO, index = Index.TOKENIZED )
+	@Field(name = "Abstract", store = Store.NO)
 	public String getSummary() {
 		return summary;
 	}
@@ -87,7 +87,7 @@ public void setSummary(String summary) {
 	}
 
 	@Lob
-	@Field( store = Store.NO, index = Index.TOKENIZED )
+	@Field(store = Store.NO)
 	public String getText() {
 		return text;
 	}

diff --git a/hibernate-search/src/test/java/org/hibernate/search/test/Clock.java b/hibernate-search/src/test/java/org/hibernate/search/test/Clock.java
@@ -28,7 +28,6 @@
 
 import org.hibernate.search.annotations.DocumentId;
 import org.hibernate.search.annotations.Field;
-import org.hibernate.search.annotations.Index;
 import org.hibernate.search.annotations.Indexed;
 import org.hibernate.search.annotations.Store;
 
@@ -46,15 +45,17 @@ public Clock(Integer id, String brand) {
 		this.brand = brand;
 	}
 
-	@Field(index= Index.TOKENIZED, store= Store.YES) public String getBrand() {
+	@Field(store = Store.YES)
+	public String getBrand() {
 		return brand;
 	}
 
 	public void setBrand(String brand) {
 		this.brand = brand;
 	}
 
-	@Id @DocumentId
+	@Id
+	@DocumentId
 	public Integer getId() {
 		return id;
 	}

diff --git a/hibernate-search/src/test/java/org/hibernate/search/test/Document.java b/hibernate-search/src/test/java/org/hibernate/search/test/Document.java
@@ -63,7 +63,7 @@ public void setId(Long id) {
 		this.id = id;
 	}
 
-	@Field(store = Store.YES, index = Index.TOKENIZED)
+	@Field(store = Store.YES)
 	@Boost(2)
 	public String getTitle() {
 		return title;
@@ -73,7 +73,7 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 
-	@Field(name = "Abstract", store = Store.NO, index = Index.TOKENIZED)
+	@Field(name = "Abstract")
 	public String getSummary() {
 		return summary;
 	}
@@ -82,7 +82,7 @@ public void setSummary(String summary) {
 		this.summary = summary;
 	}
 
-	@Field(store = Store.NO, index = Index.TOKENIZED)
+	@Field
 	public String getText() {
 		return text;
 	}