From 1c2c592b96865ca7c50d8402e9650e0517a25419 Mon Sep 17 00:00:00 2001 From: Thomas Risberg Date: Wed, 12 Oct 2011 07:08:01 -0400 Subject: [PATCH] DATADOC-271 Re-packaging Mongo cross-store support, removing 'document' in package name --- ...umentBackedTransactionSynchronization.java | 63 ------------------- .../{document => mongodb}/DocumentBacked.java | 2 +- .../mongodb/MongoChangeSetPersister.java | 2 +- .../mongodb/MongoDocumentBacking.aj | 12 ++-- .../RelatedDocument.java | 2 +- .../document/persistence/test/Person.java | 2 +- .../META-INF/spring/applicationContext.xml | 4 +- 7 files changed, 12 insertions(+), 75 deletions(-) delete mode 100644 spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java rename spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/{document => mongodb}/DocumentBacked.java (69%) rename spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/{document => }/mongodb/MongoChangeSetPersister.java (96%) rename spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/{document => }/mongodb/MongoDocumentBacking.aj (94%) rename spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/{document => mongodb}/RelatedDocument.java (94%) diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java deleted file mode 100644 index 4cd477100..000000000 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBackedTransactionSynchronization.java +++ /dev/null @@ -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 changeSetPersister; - - private ChangeSetBacked entity; - - private int changeSetTxStatus = -1; - - public DocumentBackedTransactionSynchronization(ChangeSetPersister 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."); - } - -} diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java similarity index 69% rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java index 4f8620e6a..466a039c4 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/DocumentBacked.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/DocumentBacked.java @@ -1,4 +1,4 @@ -package org.springframework.data.persistence.document; +package org.springframework.data.persistence.mongodb; import org.springframework.data.persistence.ChangeSetBacked; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java similarity index 96% rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java index 01962213d..c895eb069 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoChangeSetPersister.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoChangeSetPersister.java @@ -1,4 +1,4 @@ -package org.springframework.data.persistence.document.mongodb; +package org.springframework.data.persistence.mongodb; import javax.persistence.EntityManagerFactory; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj similarity index 94% rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj index 8021c12fb..45af4e4e4 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/mongodb/MongoDocumentBacking.aj +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/MongoDocumentBacking.aj @@ -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; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/RelatedDocument.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java similarity index 94% rename from spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/RelatedDocument.java rename to spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java index c3cd47c12..353a4d313 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/document/RelatedDocument.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/persistence/mongodb/RelatedDocument.java @@ -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; diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java index 867a4fd48..33a4db2ec 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/document/persistence/test/Person.java @@ -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 { diff --git a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml index 4f6da556a..41e5d9571 100644 --- a/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml +++ b/spring-data-mongodb-cross-store/src/test/resources/META-INF/spring/applicationContext.xml @@ -38,12 +38,12 @@ - + class="org.springframework.data.persistence.mongodb.MongoChangeSetPersister">