Index: data/ibatis/src/main/resources/applicationContext-dao.xml =================================================================== --- data/ibatis/src/main/resources/applicationContext-dao.xml (revision 3196) +++ data/ibatis/src/main/resources/applicationContext-dao.xml Mon Jan 05 00:43:18 IST 2009 @@ -1,10 +1,12 @@ - + @@ -21,4 +23,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + getUsers + + + + + + + + + + + + + + + + + + + + + + + Index: data/jpa/src/test/resources/log4j.xml =================================================================== --- data/jpa/src/test/resources/log4j.xml (revision 3196) +++ data/jpa/src/test/resources/log4j.xml Sun Jan 04 23:22:26 IST 2009 @@ -14,6 +14,10 @@ + + + + Index: data/hibernate/src/test/resources/log4j.xml =================================================================== --- data/hibernate/src/test/resources/log4j.xml (revision 3196) +++ data/hibernate/src/test/resources/log4j.xml Sun Jan 04 22:17:18 IST 2009 @@ -14,6 +14,10 @@ + + + + Index: data/common/src/main/java/org/appfuse/model/Address.java =================================================================== --- data/common/src/main/java/org/appfuse/model/Address.java (revision 3196) +++ data/common/src/main/java/org/appfuse/model/Address.java Sun Jan 04 21:04:13 IST 2009 @@ -7,6 +7,8 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import org.compass.annotations.Searchable; +import org.compass.annotations.SearchableProperty; /** * This class is used to represent an address with address, @@ -15,6 +17,7 @@ * @author Matt Raible */ @Embeddable +@Searchable(root = false) public class Address extends BaseObject implements Serializable { private static final long serialVersionUID = 3617859655330969141L; private String address; @@ -24,26 +27,31 @@ private String postalCode; @Column(length=150) + @SearchableProperty public String getAddress() { return address; } @Column(length=50) + @SearchableProperty public String getCity() { return city; } @Column(length=100) + @SearchableProperty public String getProvince() { return province; } @Column(length=100) + @SearchableProperty public String getCountry() { return country; } @Column(name="postal_code",length=15) + @SearchableProperty public String getPostalCode() { return postalCode; } Index: data/common/src/main/java/org/appfuse/model/User.java =================================================================== --- data/common/src/main/java/org/appfuse/model/User.java (revision 3196) +++ data/common/src/main/java/org/appfuse/model/User.java Sun Jan 04 21:03:47 IST 2009 @@ -4,6 +4,10 @@ import org.springframework.security.userdetails.UserDetails; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.lang.builder.ToStringStyle; +import org.compass.annotations.Searchable; +import org.compass.annotations.SearchableId; +import org.compass.annotations.SearchableProperty; +import org.compass.annotations.SearchableComponent; import javax.persistence.*; import java.io.Serializable; @@ -23,6 +27,7 @@ */ @Entity @Table(name="app_user") +@Searchable public class User extends BaseObject implements Serializable, UserDetails { private static final long serialVersionUID = 3832626162173359411L; @@ -58,11 +63,13 @@ } @Id @GeneratedValue(strategy=GenerationType.AUTO) + @SearchableId public Long getId() { return id; } @Column(nullable=false,length=50,unique=true) + @SearchableProperty public String getUsername() { return username; } @@ -83,25 +90,30 @@ } @Column(name="first_name",nullable=false,length=50) + @SearchableProperty public String getFirstName() { return firstName; } @Column(name="last_name",nullable=false,length=50) + @SearchableProperty public String getLastName() { return lastName; } @Column(nullable=false,unique=true) + @SearchableProperty public String getEmail() { return email; } @Column(name="phone_number") + @SearchableProperty public String getPhoneNumber() { return phoneNumber; } + @SearchableProperty public String getWebsite() { return website; } @@ -116,6 +128,7 @@ } @Embedded + @SearchableComponent public Address getAddress() { return address; } Index: data/ibatis/src/test/java/org/appfuse/dao/UserDaoTest.java =================================================================== --- data/ibatis/src/test/java/org/appfuse/dao/UserDaoTest.java (revision 3196) +++ data/ibatis/src/test/java/org/appfuse/dao/UserDaoTest.java Sun Jan 04 23:44:01 IST 2009 @@ -9,13 +9,20 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.ExpectedException; import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.compass.core.*; +import org.compass.gps.CompassGps; public class UserDaoTest extends BaseDaoTestCase { @Autowired private UserDao dao; @Autowired private RoleDao rdao; + @Autowired + private CompassTemplate compassTemplate; + @Autowired + private CompassGps compassGps; @Test @ExpectedException(DataAccessException.class) @@ -123,4 +130,43 @@ boolean b = dao.exists(111L); assertFalse(b); } + + @Test + public void testUserSearch() throws Exception { + // reindex all the data + compassGps.index(); + + User user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("Matt", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("Matt"); + assertEquals(1, hits.length()); + assertEquals("Matt", ((User) hits.data(0)).getFirstName()); + assertEquals("Matt", hits.resource(0).getValue("firstName")); -} + } + }); + + // test mirroring + user = dao.get(-2L); + user.setFirstName("MattX"); + dao.saveUser(user); + + // now verify it is reflected in the index + user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("MattX", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("MattX"); + assertEquals(1, hits.length()); + assertEquals("MattX", ((User) hits.data(0)).getFirstName()); + } + }); + } +} Index: data/ibatis/pom.xml =================================================================== --- data/ibatis/pom.xml (revision 3196) +++ data/ibatis/pom.xml Sun Jan 04 23:49:07 IST 2009 @@ -44,6 +44,42 @@ org.codehaus.mojo + aspectj-maven-plugin + 1.0 + + 1.5 + true + 1.5 + true + + + org.springframework + spring-aspects + + + + + + + compile + + + + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.aspectj + aspectjtools + ${aspectj.version} + + + + + org.codehaus.mojo dbunit-maven-plugin 1.0-beta-1 @@ -136,5 +172,25 @@ ibatis-sqlmap ${ibatis.version} + + org.aspectj + aspectjweaver + ${aspectj.version} + + + org.aspectj + aspectjrt + ${aspectj.version} + + + org.springframework + spring-aop + ${spring.version} + + + org.springframework + spring-aspects + ${spring.version} + Index: data/ibatis/src/test/resources/log4j.xml =================================================================== --- data/ibatis/src/test/resources/log4j.xml (revision 3196) +++ data/ibatis/src/test/resources/log4j.xml Sun Jan 04 23:43:01 IST 2009 @@ -14,6 +14,10 @@ + + + + Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassSaveAdvice.java =================================================================== --- data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassSaveAdvice.java Mon Jan 05 00:38:53 IST 2009 +++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassSaveAdvice.java Mon Jan 05 00:38:53 IST 2009 @@ -0,0 +1,38 @@ +package org.appfuse.dao.ibatis.search; + +import org.appfuse.dao.ibatis.GenericDaoiBatis; +import org.compass.core.mapping.CascadeMapping; +import org.compass.core.mapping.CompassMapping; +import org.compass.core.spi.InternalCompass; + +import java.lang.reflect.Method; + +/** + * An extension to Compass Save Advice that works only wiht {@link org.appfuse.dao.ibatis.GenericDaoiBatis} + * class (or sub classes) and uses its {@link org.appfuse.dao.ibatis.GenericDaoiBatis#getPersistentClass()} + * in order to know if the class can be saved/created in the index. + * + * @author kimchy + */ +public class CompassSaveAdvice extends org.compass.spring.aop.CompassSaveAdvice { + + private CompassMapping compassMapping; + + @Override + public void afterPropertiesSet() throws Exception { + super.afterPropertiesSet(); + compassMapping = ((InternalCompass) compassTemplate.getCompass()).getMapping(); + } + + @Override + public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { + if (!(target instanceof GenericDaoiBatis)) { + return; + } + Class persistentClass = ((GenericDaoiBatis) target).getPersistentClass(); + if (compassMapping.hasMappingForClass(persistentClass, CascadeMapping.Cascade.SAVE) || + compassMapping.hasMappingForClass(persistentClass, CascadeMapping.Cascade.CREATE)) { + compassTemplate.save(findObject(returnValue, args)); + } + } +} \ No newline at end of file Index: data/jpa/src/main/resources/applicationContext-dao.xml =================================================================== --- data/jpa/src/main/resources/applicationContext-dao.xml (revision 3196) +++ data/jpa/src/main/resources/applicationContext-dao.xml Mon Jan 05 00:45:15 IST 2009 @@ -44,4 +44,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: data/hibernate/src/test/java/org/appfuse/dao/UserDaoTest.java =================================================================== --- data/hibernate/src/test/java/org/appfuse/dao/UserDaoTest.java (revision 3196) +++ data/hibernate/src/test/java/org/appfuse/dao/UserDaoTest.java Sun Jan 04 22:42:25 IST 2009 @@ -11,12 +11,18 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.NotTransactional; import org.springframework.test.annotation.ExpectedException; +import org.compass.core.*; +import org.compass.gps.CompassGps; public class UserDaoTest extends BaseDaoTestCase { @Autowired private UserDao dao; @Autowired private RoleDao rdao; + @Autowired + private CompassTemplate compassTemplate; + @Autowired + private CompassGps compassGps; @Test @ExpectedException(DataAccessException.class) @@ -139,4 +145,44 @@ boolean b = dao.exists(111L); assertFalse(b); } + + @Test + public void testUserSearch() throws Exception { + // reindex all the data + compassGps.index(); + + User user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("Matt", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("Matt"); + assertEquals(1, hits.length()); + assertEquals("Matt", ((User) hits.data(0)).getFirstName()); + assertEquals("Matt", hits.resource(0).getValue("firstName")); -} + } + }); + + // test mirroring + user = dao.get(-2L); + user.setFirstName("MattX"); + dao.saveUser(user); + flush(); + + // now verify it is reflected in the index + user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("MattX", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("MattX"); + assertEquals(1, hits.length()); + assertEquals("MattX", ((User) hits.data(0)).getFirstName()); + } + }); + } +} Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java =================================================================== --- data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java (revision 3196) +++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/GenericDaoiBatis.java Sun Jan 04 23:57:07 IST 2009 @@ -90,6 +90,10 @@ return this.sqlMapClientTemplate; } + public Class getPersistentClass() { + return persistentClass; + } + /** * {@inheritDoc} */ Index: data/jpa/src/test/java/org/appfuse/dao/UserDaoTest.java =================================================================== --- data/jpa/src/test/java/org/appfuse/dao/UserDaoTest.java (revision 3196) +++ data/jpa/src/test/java/org/appfuse/dao/UserDaoTest.java Sun Jan 04 23:43:55 IST 2009 @@ -5,16 +5,31 @@ import org.appfuse.model.Role; import org.appfuse.model.User; import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.orm.ObjectRetrievalFailureException; import org.springframework.test.annotation.ExpectedException; +import org.springframework.test.annotation.NotTransactional; +import org.compass.core.*; +import org.compass.gps.CompassGps; +import javax.persistence.PersistenceContext; +import javax.persistence.EntityManager; +import javax.persistence.FlushModeType; + public class UserDaoTest extends BaseDaoTestCase { + @PersistenceContext + private EntityManager entityManager; + @Autowired private UserDao dao; @Autowired private RoleDao rdao; + @Autowired + private CompassTemplate compassTemplate; + @Autowired + private CompassGps compassGps; @Test @ExpectedException(ObjectRetrievalFailureException.class) @@ -123,4 +138,45 @@ boolean b = dao.exists(111L); assertFalse(b); } + + @Test + public void testUserSearch() throws Exception { + // reindex all the data + compassGps.index(); + + User user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("Matt", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("Matt"); + assertEquals(1, hits.length()); + assertEquals("Matt", ((User) hits.data(0)).getFirstName()); + assertEquals("Matt", hits.resource(0).getValue("firstName")); -} + } + }); + + // test mirroring + user = dao.get(-2L); + user.setFirstName("MattX"); + dao.saveUser(user); + entityManager.flush(); + entityManager.clear(); + + // now verify it is reflected in the index + user = compassTemplate.get(User.class, -2); + assertNotNull(user); + assertEquals("MattX", user.getFirstName()); + + compassTemplate.execute(new CompassCallbackWithoutResult() { + @Override + protected void doInCompassWithoutResult(CompassSession compassSession) throws CompassException { + CompassHits hits = compassSession.find("MattX"); + assertEquals(1, hits.length()); + assertEquals("MattX", ((User) hits.data(0)).getFirstName()); + } + }); + } +} Index: data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassDeleteAdvice.java =================================================================== --- data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassDeleteAdvice.java Mon Jan 05 00:38:32 IST 2009 +++ data/ibatis/src/main/java/org/appfuse/dao/ibatis/search/CompassDeleteAdvice.java Mon Jan 05 00:38:32 IST 2009 @@ -0,0 +1,37 @@ +package org.appfuse.dao.ibatis.search; + +import org.appfuse.dao.ibatis.GenericDaoiBatis; +import org.compass.core.spi.InternalCompass; +import org.compass.core.mapping.CascadeMapping; +import org.compass.core.mapping.CompassMapping; + +import java.lang.reflect.Method; + +/** + * An extension to Compass Delete Advice that works only wiht {@link org.appfuse.dao.ibatis.GenericDaoiBatis} + * class (or sub classes) and uses its {@link org.appfuse.dao.ibatis.GenericDaoiBatis#getPersistentClass()} + * in order to know which class to delete from the index based on its PK. + * + * @author kimchy + */ +public class CompassDeleteAdvice extends org.compass.spring.aop.CompassDeleteAdvice { + + private CompassMapping compassMapping; + + @Override + public void afterPropertiesSet() throws Exception { + super.afterPropertiesSet(); + compassMapping = ((InternalCompass) compassTemplate.getCompass()).getMapping(); + } + + @Override + public void afterReturning(Object returnValue, Method method, Object[] args, Object target) throws Throwable { + if (!(target instanceof GenericDaoiBatis)) { + return; + } + Class persistentClass = ((GenericDaoiBatis) target).getPersistentClass(); + if (compassMapping.hasMappingForClass(persistentClass, CascadeMapping.Cascade.DELETE)) { + compassTemplate.delete(persistentClass, findObject(returnValue, args)); + } + } +} Index: data/hibernate/src/main/resources/applicationContext-dao.xml =================================================================== --- data/hibernate/src/main/resources/applicationContext-dao.xml (revision 3196) +++ data/hibernate/src/main/resources/applicationContext-dao.xml Mon Jan 05 00:45:15 IST 2009 @@ -34,4 +34,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: pom.xml =================================================================== --- pom.xml (revision 3196) +++ pom.xml Mon Jan 05 00:29:59 IST 2009 @@ -253,6 +253,13 @@ true + + compass + http://repo.compass-project.org + + true + + @@ -478,6 +485,7 @@ 1.2.1 1.2.1 1.3.2 + 2.1.0 1.0 1.1.1 2.0.1 @@ -487,7 +495,7 @@ 3.3.1.GA 3.4.0.GA 3.4.0.GA - 2.3.0 + 2.3.4.726 1.4 2.4.0 1.0 Index: data/common/pom.xml =================================================================== --- data/common/pom.xml (revision 3196) +++ data/common/pom.xml Sun Jan 04 20:16:32 IST 2009 @@ -50,6 +50,11 @@ persistence-api ${jpa.version} + + org.compass-project + compass + ${compass.version} +