mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATADOC-271 Re-packaging Mongo cross-store support, removing 'document' in package name

Browse Source
This commit is contained in:
Thomas Risberg
2011-10-12 07:08:01 -04:00
parent cd4b409bf2
commit 1c2c592b96
7 changed files with 12 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java
View File

@@ -1,63 +0,0 @@
package org.springframework.data.persistence.document;
//public class DocumentBackedTransactionSynchronization {
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.data.persistence.ChangeSetBacked;
import org.springframework.data.persistence.ChangeSetPersister;
import org.springframework.transaction.support.TransactionSynchronization;
public class DocumentBackedTransactionSynchronization implements TransactionSynchronization {
protected final Log log = LogFactory.getLog(getClass());
private ChangeSetPersister<Object> changeSetPersister;
private ChangeSetBacked entity;
private int changeSetTxStatus = -1;
public DocumentBackedTransactionSynchronization(ChangeSetPersister<Object> changeSetPersister, ChangeSetBacked entity) {
this.changeSetPersister = changeSetPersister;
this.entity = entity;
}
public void afterCommit() {
log.debug("After Commit called for " + entity);
changeSetPersister.persistState(entity, entity.getChangeSet());
changeSetTxStatus = 0;
}
public void afterCompletion(int status) {
log.debug("After Completion called with status = " + status);
if (changeSetTxStatus == 0) {
if (status == STATUS_COMMITTED) {
// this is good
log.debug("ChangedSetBackedTransactionSynchronization completed successfully for " + this.entity);
}
else {
// this could be bad - TODO: compensate
log.error("ChangedSetBackedTransactionSynchronization failed for " + this.entity);
}
}
}
public void beforeCommit(boolean readOnly) {
}
public void beforeCompletion() {
}
public void flush() {
}
public void resume() {
throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
}
public void suspend() {
throw new IllegalStateException("ChangedSetBackedTransactionSynchronization does not support transaction suspension currently.");
}
}

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.persistence.document;
package org.springframework.data.persistence.mongodb;
import org.springframework.data.persistence.ChangeSetBacked;

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java
View File

@@ -1,4 +1,4 @@
package org.springframework.data.persistence.document.mongodb;
package org.springframework.data.persistence.mongodb;
import javax.persistence.EntityManagerFactory;

12
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj
View File

@@ -1,4 +1,4 @@
package org.springframework.data.persistence.document.mongodb;
package org.springframework.data.persistence.mongodb;
import java.lang.reflect.Field;
@@ -12,10 +12,10 @@ import org.aspectj.lang.JoinPoint;
import org.aspectj.lang.reflect.FieldSignature;
import org.springframework.dao.DataAccessException;
import org.springframework.data.persistence.document.RelatedDocument;
import org.springframework.data.persistence.document.DocumentBacked;
import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
import org.springframework.data.persistence.mongodb.RelatedDocument;
import org.springframework.data.persistence.mongodb.DocumentBacked;
import org.springframework.data.persistence.ChangeSetBackedTransactionSynchronization;
import org.springframework.data.persistence.ChangeSet;
import org.springframework.data.persistence.ChangeSetPersister;
import org.springframework.data.persistence.ChangeSetPersister.NotFoundException;
@@ -130,7 +130,7 @@ public aspect MongoDocumentBacking {
entity.setChangeSet(new HashMapChangeSet());
entity.itdChangeSetPersister = changeSetPersister;
entity.itdTransactionSynchronization =
new DocumentBackedTransactionSynchronization(changeSetPersister, entity);
new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
//registerTransactionSynchronization(entity);
}
@@ -163,7 +163,7 @@ public aspect MongoDocumentBacking {
@Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
@Transient private DocumentBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
@Transient private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
public void DocumentBacked.setChangeSet(ChangeSet cs) {
this.changeSet = cs;

2
spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/RelatedDocument.java → spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.data.persistence.document;
package org.springframework.data.persistence.mongodb;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;

2
spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java
View File

@@ -3,7 +3,7 @@ package org.springframework.data.document.persistence.test;
import javax.persistence.Entity;
import javax.persistence.Id;
import org.springframework.data.persistence.document.RelatedDocument;
import org.springframework.data.persistence.mongodb.RelatedDocument;
@Entity
public class Person {

4
spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml
View File

@@ -38,12 +38,12 @@
<bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
<!-- Mongo aspect config -->
<bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"
<bean class="org.springframework.data.persistence.mongodb.MongoDocumentBacking"
factory-method="aspectOf">
<property name="changeSetPersister" ref="mongoChangeSetPersister"/>
</bean>
<bean id="mongoChangeSetPersister"
class="org.springframework.data.persistence.document.mongodb.MongoChangeSetPersister">
class="org.springframework.data.persistence.mongodb.MongoChangeSetPersister">
<property name="mongoTemplate" ref="mongoTemplate"/>
<property name="entityManagerFactory" ref="entityManagerFactory"/>
</bean>