[jbosscache-commits] JBoss Cache SVN: r6507 - in searchable/trunk: src/main/java/org/jboss/cache/search and 1 other directories.

Author: navssurtani Date: 2008-08-05 06:37:26 -0400 (Tue, 05 Aug 2008) New Revision: 6507 Added: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheConfiguration.java Removed: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheCfgImpl.java Modified: searchable/trunk/pom.xml searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java searchable/trunk/src/main/java/org/jboss/cache/search/SearchablePojoListener.java searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java Log: Old changes and changed core dep to CR7 Modified: searchable/trunk/pom.xml =================================================================== --- searchable/trunk/pom.xml 2008-08-05 10:31:21 UTC (rev 6506) +++ searchable/trunk/pom.xml 2008-08-05 10:37:26 UTC (rev 6507) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <properties> - <jbosscache-searchable-version>0.1-SNAPSHOT</jbosscache-searchable-version> + <jbosscache-searchable-version>0.1-Beta1</jbosscache-searchable-version> <!-- By default only generate Javadocs when we install the module. --> <javadocPhase>install</javadocPhase> </properties> @@ -31,7 +31,7 @@ <dependency> <groupId>org.jboss.cache</groupId> <artifactId>jbosscache-pojo</artifactId> - <version>2.2.0.CR5</version> + <version>2.2.0.CR7</version> <scope>test</scope> </dependency> Deleted: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheCfgImpl.java =================================================================== --- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheCfgImpl.java 2008-08-05 10:31:21 UTC (rev 6506) +++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheCfgImpl.java 2008-08-05 10:37:26 UTC (rev 6507) @@ -1,69 +0,0 @@ -package org.jboss.cache.search; - -import org.hibernate.search.cfg.SearchConfiguration; -import org.hibernate.mapping.PersistentClass; -import org.hibernate.mapping.RootClass; -import org.hibernate.annotations.common.reflection.ReflectionManager; - -import java.util.Iterator; -import java.util.Properties; -import java.util.Map; -import java.util.HashMap; - -/** - * Class that implements {@link org.hibernate.search.cfg.SearchConfiguration} so that within JBossCache Searchable, there is no - * need for a Hibernate Core configuration object. - * - * @author Navin Surtani - navin(a)surtani.org - */ -public class SearchableCacheCfgImpl implements SearchConfiguration -{ - protected Map<String, Class> classes; - private Properties properties; - - public SearchableCacheCfgImpl(Class[] classArray, Properties properties) - { - // null chks - if (classArray == null) throw new NullPointerException("Classes provided are null"); - this.properties = properties; - if (this.properties == null) this.properties = new Properties(); - - classes = new HashMap<String, Class>(); - - // loop thru your classArray - // populate your Map - - for (Class c: classArray) - { - String classname = c.getName(); - classes.put(classname, c); - } - } - - public Iterator getClassMappings() - { - return classes.values().iterator(); - } - - public Class getClassMapping(String name) - { - return classes.get(name); - } - - public String getProperty(String propertyName) - { - return properties.getProperty(propertyName); - } - - public Properties getProperties() - { - return properties; - } - - public ReflectionManager getReflectionManager() - { - throw new UnsupportedOperationException("This method is not supported within JBossCache Searchable"); - - } - -} Copied: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheConfiguration.java (from rev 6249, searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheCfgImpl.java) =================================================================== --- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheConfiguration.java (rev 0) +++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheConfiguration.java 2008-08-05 10:37:26 UTC (rev 6507) @@ -0,0 +1,68 @@ +package org.jboss.cache.search; + +import org.hibernate.search.cfg.SearchConfiguration; +import org.hibernate.mapping.PersistentClass; +import org.hibernate.mapping.RootClass; +import org.hibernate.annotations.common.reflection.ReflectionManager; + +import java.util.Iterator; +import java.util.Properties; +import java.util.Map; +import java.util.HashMap; + +/** + * Class that implements {@link org.hibernate.search.cfg.SearchConfiguration} so that within JBossCache Searchable, there is no + * need for a Hibernate Core configuration object. + * + * @author Navin Surtani - navin(a)surtani.org + */ +public class SearchableCacheConfiguration implements SearchConfiguration +{ + protected Map<String, Class> classes; + private Properties properties; + + public SearchableCacheConfiguration(Class[] classArray, Properties properties) + { + // null chks + if (classArray == null) throw new NullPointerException("Classes provided are null"); + this.properties = properties; + if (this.properties == null) this.properties = new Properties(); + + classes = new HashMap<String, Class>(); + + // loop thru your classArray + // populate your Map + + for (Class c: classArray) + { + String classname = c.getName(); + classes.put(classname, c); + } + } + + public Iterator getClassMappings() + { + return classes.values().iterator(); + } + + public Class getClassMapping(String name) + { + return classes.get(name); + } + + public String getProperty(String propertyName) + { + return properties.getProperty(propertyName); + } + + public Properties getProperties() + { + return properties; + } + + public ReflectionManager getReflectionManager() + { + return null; + } + +} Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java =================================================================== --- searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java 2008-08-05 10:31:21 UTC (rev 6506) +++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchableCacheFactory.java 2008-08-05 10:37:26 UTC (rev 6507) @@ -60,7 +60,7 @@ } // step 1: create hibernate search searchFactory - SearchConfiguration cfg = new SearchableCacheCfgImpl(classes, properties); + SearchConfiguration cfg = new SearchableCacheConfiguration(classes, properties); // set classes in the cfg SearchFactoryImplementor searchFactory = new SearchFactoryImpl(cfg); Modified: searchable/trunk/src/main/java/org/jboss/cache/search/SearchablePojoListener.java =================================================================== --- searchable/trunk/src/main/java/org/jboss/cache/search/SearchablePojoListener.java 2008-08-05 10:31:21 UTC (rev 6506) +++ searchable/trunk/src/main/java/org/jboss/cache/search/SearchablePojoListener.java 2008-08-05 10:37:26 UTC (rev 6507) @@ -1,21 +1,21 @@ -//package org.jboss.cache.search; -// -//import org.hibernate.search.impl.SearchFactoryImpl; -//import org.jboss.cache.notifications.event.NodeModifiedEvent; -//import org.jboss.cache.pojo.notification.annotation.*; -//import org.jboss.cache.pojo.notification.event.AttachedEvent; -//import org.apache.commons.logging.Log; -//import org.apache.commons.logging.LogFactory; -// -//import javax.transaction.Transaction; -// -///** -// * @author Navin Surtani - navin(a)surtani.org -// */ -// +package org.jboss.cache.search; + +import org.hibernate.search.impl.SearchFactoryImpl; +import org.jboss.cache.notifications.event.NodeModifiedEvent; +import org.jboss.cache.pojo.notification.annotation.*; +import org.jboss.cache.pojo.notification.event.AttachedEvent; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.transaction.Transaction; + +/** + * @author Navin Surtani - navin(a)surtani.org + */ + //@PojoCacheListener -//public class SearchablePojoListener extends -//{ +public class SearchablePojoListener //extends +{ // private SearchFactoryImpl searchFactory; // private static final Log log = LogFactory.getLog(SearchablePojoListener.class); // @@ -23,24 +23,21 @@ // { // this.searchFactory = searchFactory; // } -// -// /** -// * Takes in a NodeModifiedEvent and updates the Lucene indexes using methods on the NodeModifiedEvent class. -// * -// * @param event that has occured - or a node that has been changed. {@link org.jboss.cache.notifications.event.NodeModifiedEvent} -// * @throws InvalidKeyException if an invalid key is given. -// */ -// + + /** + * Takes in a NodeModifiedEvent and updates the Lucene indexes using methods on the NodeModifiedEvent class. + * + * @param event that has occured - or a node that has been changed. {@link org.jboss.cache.notifications.event.NodeModifiedEvent} + * @throws InvalidKeyException if an invalid key is given. + */ + // @Attached // public void handleAttach(AttachedEvent event) // { // Object added = event.getSource(); -// -// -// // } -// -// + + // @Detached // @FieldModified // @ListModified @@ -54,6 +51,8 @@ // if (!event.isPre()) // { // if (log.isTraceEnabled()) log.trace("event.isPre is false. Going to start updating indexes"); +// +// // switch (event.getModificationType()) // { // case PUT_MAP: @@ -67,6 +66,6 @@ // } // } // } -// -// -//} + + +} Modified: searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java =================================================================== --- searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java 2008-08-05 10:31:21 UTC (rev 6506) +++ searchable/trunk/src/test/java/org/jboss/cache/search/blackbox/LocalCacheTest.java 2008-08-05 10:37:26 UTC (rev 6507) @@ -3,10 +3,8 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.queryParser.ParseException; import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.search.Query; -import org.apache.lucene.search.Sort; -import org.apache.lucene.search.Filter; -import org.apache.lucene.search.QueryWrapperFilter; +import org.apache.lucene.search.*; +import org.apache.lucene.index.Term; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jboss.cache.Cache; @@ -227,13 +225,22 @@ public void testSetFilter() throws ParseException { - queryParser = new QueryParser("blurb", new StandardAnalyzer()); + queryParser = new QueryParser("name", new StandardAnalyzer()); + luceneQuery = queryParser.parse("goat"); - Filter filter = new QueryWrapperFilter(luceneQuery); - cacheQuery = searchableCache.createQuery(luceneQuery); + found = cacheQuery.list(); + assert found.size() == 2; + + Filter filter = new PrefixFilter(new Term("blurb", "cheese")); + cacheQuery.setFilter(filter); + + found = cacheQuery.list(); + + assert found.size() ==1; + } }