[hibernate-commits] Hibernate SVN: r13968 - in search/trunk/src: java/org/hibernate/search/engine and 6 other directories.
hibernate-commits at lists.jboss.org
hibernate-commits at lists.jboss.org
Thu Aug 30 12:20:00 EDT 2007
Author: epbernard
Date: 2007-08-30 12:20:00 -0400 (Thu, 30 Aug 2007)
New Revision: 13968
Removed:
search/trunk/src/java/org/hibernate/search/annotations/Keyword.java
search/trunk/src/java/org/hibernate/search/annotations/Text.java
search/trunk/src/java/org/hibernate/search/annotations/Unstored.java
Modified:
search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java
search/trunk/src/test/org/hibernate/search/test/Clock.java
search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
search/trunk/src/test/org/hibernate/search/test/fieldAccess/Document.java
search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java
search/trunk/src/test/org/hibernate/search/test/inheritance/Mammal.java
search/trunk/src/test/org/hibernate/search/test/query/Book.java
search/trunk/src/test/org/hibernate/search/test/query/Clock.java
Log:
HSEARCH-113 remove @Text, @Unstored and @Keyword
Deleted: search/trunk/src/java/org/hibernate/search/annotations/Keyword.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/Keyword.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/java/org/hibernate/search/annotations/Keyword.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,29 +0,0 @@
-//$Id$
-package org.hibernate.search.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
- at Retention( RetentionPolicy.RUNTIME )
- at Target( {ElementType.METHOD, ElementType.FIELD} )
- at Documented
-/**
- * Specifies that a property of an entity is a Lucene
- * keyword field
- * @deprecated use @Field(index=Index.UN_TOKENIZED, store=Store.YES) or @DocumentId when id=true was used
- */
- at Deprecated
-public @interface Keyword {
- /**
- * The field name
- */
- String name() default "";
-
- /**
- * Specifies that this is the "identifier" keyword
- */
- boolean id() default false;
-}
Deleted: search/trunk/src/java/org/hibernate/search/annotations/Text.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/Text.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/java/org/hibernate/search/annotations/Text.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,24 +0,0 @@
-//$Id$
-package org.hibernate.search.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
- at Retention( RetentionPolicy.RUNTIME )
- at Target( {ElementType.METHOD, ElementType.FIELD} )
- at Documented
-/**
- * Specifies that a property of an entity is a Lucene
- * text field
- * @deprecated use @Field(index=Index.TOKENIZED, store=Store.YES)
- */
- at Deprecated
-public @interface Text {
- /**
- * The field name
- */
- String name() default "";
-}
Deleted: search/trunk/src/java/org/hibernate/search/annotations/Unstored.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/annotations/Unstored.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/java/org/hibernate/search/annotations/Unstored.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,24 +0,0 @@
-//$Id$
-package org.hibernate.search.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
- at Retention( RetentionPolicy.RUNTIME )
- at Target( {ElementType.METHOD, ElementType.FIELD} )
- at Documented
-/**
- * Specifies that a property of an entity is a Lucene
- * unstored field
- * @deprecated use @Field(index=Index.TOKENIZED, store=Store.NO)
- */
- at Deprecated
-public @interface Unstored {
- /**
- * The field name
- */
- String name() default "";
-}
Modified: search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/java/org/hibernate/search/engine/DocumentBuilder.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -32,15 +32,12 @@
import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.search.annotations.Keyword;
import org.hibernate.search.annotations.Store;
-import org.hibernate.search.annotations.Text;
-import org.hibernate.search.annotations.Unstored;
import org.hibernate.search.backend.AddLuceneWork;
import org.hibernate.search.backend.DeleteLuceneWork;
import org.hibernate.search.backend.LuceneWork;
-import org.hibernate.search.backend.WorkType;
import org.hibernate.search.backend.PurgeAllLuceneWork;
+import org.hibernate.search.backend.WorkType;
import org.hibernate.search.bridge.BridgeFactory;
import org.hibernate.search.bridge.FieldBridge;
import org.hibernate.search.bridge.TwoWayFieldBridge;
@@ -161,47 +158,7 @@
private void initializeMember(XProperty member, PropertiesMetadata propertiesMetadata, boolean isRoot,
String prefix, Set<XClass> processedClasses) {
- Keyword keywordAnn = member.getAnnotation( Keyword.class );
- if ( keywordAnn != null ) {
- String name = prefix + BinderHelper.getAttributeName( member, keywordAnn.name() );
- if ( isRoot && keywordAnn.id() ) {
- idKeywordName = name;
- idBoost = getBoost( member );
- FieldBridge fieldBridge = BridgeFactory.guessType( null, member );
- if ( fieldBridge instanceof TwoWayFieldBridge ) {
- idBridge = (TwoWayFieldBridge) fieldBridge;
- }
- else {
- throw new SearchException(
- "Bridge for document id does not implement IdFieldBridge: " + member.getName() );
- }
- setAccessible( member );
- idGetter = member;
- }
- else {
- setAccessible( member );
- propertiesMetadata.keywordGetters.add( member );
- propertiesMetadata.keywordNames.add( name );
- propertiesMetadata.keywordBridges.add( BridgeFactory.guessType( null, member ) );
- }
- }
- Unstored unstoredAnn = member.getAnnotation( Unstored.class );
- if ( unstoredAnn != null ) {
- setAccessible( member );
- propertiesMetadata.unstoredGetters.add( member );
- propertiesMetadata.unstoredNames.add( prefix + BinderHelper.getAttributeName( member, unstoredAnn.name() ) );
- propertiesMetadata.unstoredBridges.add( BridgeFactory.guessType( null, member ) );
- }
-
- Text textAnn = member.getAnnotation( Text.class );
- if ( textAnn != null ) {
- setAccessible( member );
- propertiesMetadata.textGetters.add( member );
- propertiesMetadata.textNames.add( prefix + BinderHelper.getAttributeName( member, textAnn.name() ) );
- propertiesMetadata.textBridges.add( BridgeFactory.guessType( null, member ) );
- }
-
DocumentId documentIdAnn = member.getAnnotation( DocumentId.class );
if ( documentIdAnn != null ) {
if ( isRoot ) {
Modified: search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java
===================================================================
--- search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/java/org/hibernate/search/store/DirectoryProvider.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -15,6 +15,8 @@
*
* This class must be thread safe regarding <code>getDirectory()</code> calls
*
+ * To to implementors: a stop() method will be added in te future, for now use finalize() to free resources (we know)
+ *
* @author Emmanuel Bernard
* @author Sylvain Vieujot
*/
Modified: search/trunk/src/test/org/hibernate/search/test/Clock.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/Clock.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/Clock.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -4,9 +4,11 @@
import javax.persistence.Entity;
import javax.persistence.Id;
+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.Text;
-import org.hibernate.search.annotations.Keyword;
+import org.hibernate.search.annotations.Store;
/**
* @author Emmanuel Bernard
@@ -22,7 +24,7 @@
this.brand = brand;
}
- @Text public String getBrand() {
+ @Field(index= Index.TOKENIZED, store= Store.YES) public String getBrand() {
return brand;
}
@@ -30,7 +32,7 @@
this.brand = brand;
}
- @Id @Keyword
+ @Id @DocumentId
public Integer getId() {
return id;
}
Modified: search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/bridge/Cloud.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -3,18 +3,17 @@
import java.util.Date;
import javax.persistence.Entity;
-import javax.persistence.Id;
import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
-import org.hibernate.search.annotations.Keyword;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Text;
import org.hibernate.search.annotations.DateBridge;
-import org.hibernate.search.annotations.FieldBridge;
-import org.hibernate.search.annotations.Resolution;
-import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.FieldBridge;
import org.hibernate.search.annotations.Index;
+import org.hibernate.search.annotations.Indexed;
+import org.hibernate.search.annotations.Parameter;
+import org.hibernate.search.annotations.Resolution;
import org.hibernate.search.annotations.Store;
/**
@@ -46,7 +45,7 @@
private CloudType type;
private boolean storm;
- @Text
+ @Field(index=Index.TOKENIZED, store=Store.YES)
@FieldBridge(impl = TruncateFieldBridge.class)
public String getCustomFieldBridge() {
return customFieldBridge;
@@ -67,8 +66,8 @@
this.customStringBridge = customStringBridge;
}
- @Id @GeneratedValue @Keyword(id=true)
- public int getId() {
+ @Id @GeneratedValue @DocumentId
+ public int getId() {
return id;
}
@@ -76,7 +75,7 @@
this.id = id;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Long getLong1() {
return long1;
}
@@ -85,7 +84,7 @@
this.long1 = long1;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public long getLong2() {
return long2;
}
@@ -94,7 +93,7 @@
this.long2 = long2;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Integer getInt1() {
return int1;
}
@@ -103,7 +102,7 @@
this.int1 = int1;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public int getInt2() {
return int2;
}
@@ -112,7 +111,7 @@
this.int2 = int2;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Double getDouble1() {
return double1;
}
@@ -121,7 +120,7 @@
this.double1 = double1;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public double getDouble2() {
return double2;
}
@@ -130,7 +129,7 @@
this.double2 = double2;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Float getFloat1() {
return float1;
}
@@ -139,7 +138,7 @@
this.float1 = float1;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public float getFloat2() {
return float2;
}
@@ -148,7 +147,7 @@
this.float2 = float2;
}
- @Text
+ @Field(index=Index.TOKENIZED, store=Store.YES)
public String getString() {
return string;
}
@@ -157,7 +156,7 @@
this.string = string;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
public Date getDate() {
return date;
}
@@ -166,7 +165,7 @@
this.date = date;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.YEAR )
public Date getDateYear() {
return dateYear;
@@ -176,7 +175,7 @@
this.dateYear = dateYear;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.MONTH )
public Date getDateMonth() {
return dateMonth;
@@ -186,7 +185,7 @@
this.dateMonth = dateMonth;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.DAY )
public Date getDateDay() {
return dateDay;
@@ -196,7 +195,7 @@
this.dateDay = dateDay;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.HOUR )
public Date getDateHour() {
return dateHour;
@@ -207,7 +206,7 @@
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.MINUTE )
public Date getDateMinute() {
return dateMinute;
@@ -217,7 +216,7 @@
this.dateMinute = dateMinute;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.SECOND )
public Date getDateSecond() {
return dateSecond;
@@ -227,7 +226,7 @@
this.dateSecond = dateSecond;
}
- @Keyword
+ @Field(index=Index.UN_TOKENIZED, store=Store.YES)
@DateBridge( resolution = Resolution.MILLISECOND )
public Date getDateMillisecond() {
return dateMillisecond;
Modified: search/trunk/src/test/org/hibernate/search/test/fieldAccess/Document.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/fieldAccess/Document.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,18 +1,17 @@
//$Id$
package org.hibernate.search.test.fieldAccess;
-import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
import javax.persistence.Lob;
-import org.hibernate.search.annotations.Unstored;
-import org.hibernate.search.annotations.Text;
-import org.hibernate.search.annotations.Keyword;
import org.hibernate.search.annotations.Boost;
-import org.hibernate.search.annotations.Indexed;
+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;
/**
* @author Richard Hallier
@@ -22,18 +21,18 @@
public class Document {
@Id
@GeneratedValue
- @Keyword(id = true)
+ @DocumentId
private Long id;
@Field(index = Index.TOKENIZED)
@Boost(2)
private String title;
- @Unstored(name = "Abstract")
+ @Field(name="Abstract", index=Index.TOKENIZED, store= Store.NO)
private String summary;
@Lob
- @Unstored
+ @Field(index=Index.TOKENIZED, store=Store.NO)
private String text;
Document() {
Modified: search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/Animal.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,14 +1,16 @@
//$Id$
package org.hibernate.search.test.inheritance;
-import org.hibernate.search.annotations.Keyword;
-import org.hibernate.search.annotations.Text;
-import org.hibernate.search.annotations.Indexed;
-
import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
import javax.persistence.Id;
-import javax.persistence.GeneratedValue;
+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;
+
/**
* @author Emmanuel Bernard
*/
@@ -18,8 +20,8 @@
private Long id;
private String name;
- @Id @GeneratedValue @Keyword(id=true)
- public Long getId() {
+ @Id @GeneratedValue @DocumentId
+ public Long getId() {
return id;
}
@@ -27,7 +29,7 @@
this.id = id;
}
- @Text
+ @Field(index= Index.TOKENIZED, store= Store.YES)
public String getName() {
return name;
}
Modified: search/trunk/src/test/org/hibernate/search/test/inheritance/Mammal.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/inheritance/Mammal.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/inheritance/Mammal.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,11 +1,13 @@
//$Id$
package org.hibernate.search.test.inheritance;
+import javax.persistence.Entity;
+
+import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Index;
import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Keyword;
+import org.hibernate.search.annotations.Store;
-import javax.persistence.Entity;
-
/**
* @author Emmanuel Bernard
*/
@@ -14,7 +16,7 @@
public class Mammal extends Animal {
private int mammalNbr;
- @Keyword
+ @Field(index= Index.UN_TOKENIZED, store= Store.YES)
public int getMammalNbr() {
return mammalNbr;
}
Modified: search/trunk/src/test/org/hibernate/search/test/query/Book.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/query/Book.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/query/Book.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -1,25 +1,23 @@
//$Id$
package org.hibernate.search.test.query;
-import java.util.Set;
-import java.util.HashSet;
import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.ManyToMany;
import javax.persistence.ManyToOne;
-import org.hibernate.search.annotations.Indexed;
-import org.hibernate.search.annotations.Text;
-import org.hibernate.search.annotations.Keyword;
-import org.hibernate.search.annotations.Unstored;
+import org.hibernate.search.annotations.DateBridge;
+import org.hibernate.search.annotations.DocumentId;
import org.hibernate.search.annotations.Field;
+import org.hibernate.search.annotations.Fields;
import org.hibernate.search.annotations.Index;
-import org.hibernate.search.annotations.Store;
+import org.hibernate.search.annotations.Indexed;
import org.hibernate.search.annotations.IndexedEmbedded;
-import org.hibernate.search.annotations.Fields;
import org.hibernate.search.annotations.Resolution;
-import org.hibernate.search.annotations.DateBridge;
+import org.hibernate.search.annotations.Store;
/**
* @author Emmanuel Bernard
@@ -73,7 +71,7 @@
this.body = body;
}
- @Id @Keyword(id=true)
+ @Id @DocumentId
public Integer getId() {
return id;
}
Modified: search/trunk/src/test/org/hibernate/search/test/query/Clock.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/query/Clock.java 2007-08-30 15:30:19 UTC (rev 13967)
+++ search/trunk/src/test/org/hibernate/search/test/query/Clock.java 2007-08-30 16:20:00 UTC (rev 13968)
@@ -4,9 +4,11 @@
import javax.persistence.Entity;
import javax.persistence.Id;
+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.Text;
-import org.hibernate.search.annotations.Keyword;
+import org.hibernate.search.annotations.Store;
/**
* @author Emmanuel Bernard
@@ -25,7 +27,8 @@
this.brand = brand;
}
- @Text public String getBrand() {
+ @Field(index= Index.TOKENIZED, store= Store.YES)
+ public String getBrand() {
return brand;
}
@@ -33,7 +36,7 @@
this.brand = brand;
}
- @Id @Keyword(id=true)
+ @Id @DocumentId
public Integer getId() {
return id;
}
More information about the hibernate-commits
mailing list