Skip to content

Commit 1c2c592

Browse files
author
Thomas Risberg
committed
DATADOC-271 Re-packaging Mongo cross-store support, removing 'document' in package name
1 parent cd4b409 commit 1c2c592

File tree

7 files changed

+12
-75
lines changed

7 files changed

+12
-75
lines changed

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

-63
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.springframework.data.persistence.document;
1+
package org.springframework.data.persistence.mongodb;
22

33
import org.springframework.data.persistence.ChangeSetBacked;
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.springframework.data.persistence.document.mongodb;
1+
package org.springframework.data.persistence.mongodb;
22

33
import javax.persistence.EntityManagerFactory;
44

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.springframework.data.persistence.document.mongodb;
1+
package org.springframework.data.persistence.mongodb;
22

33
import java.lang.reflect.Field;
44

@@ -12,10 +12,10 @@ import org.aspectj.lang.JoinPoint;
1212
import org.aspectj.lang.reflect.FieldSignature;
1313

1414
import org.springframework.dao.DataAccessException;
15-
import org.springframework.data.persistence.document.RelatedDocument;
1615

17-
import org.springframework.data.persistence.document.DocumentBacked;
18-
import org.springframework.data.persistence.document.DocumentBackedTransactionSynchronization;
16+
import org.springframework.data.persistence.mongodb.RelatedDocument;
17+
import org.springframework.data.persistence.mongodb.DocumentBacked;
18+
import org.springframework.data.persistence.ChangeSetBackedTransactionSynchronization;
1919
import org.springframework.data.persistence.ChangeSet;
2020
import org.springframework.data.persistence.ChangeSetPersister;
2121
import org.springframework.data.persistence.ChangeSetPersister.NotFoundException;
@@ -130,7 +130,7 @@ public aspect MongoDocumentBacking {
130130
entity.setChangeSet(new HashMapChangeSet());
131131
entity.itdChangeSetPersister = changeSetPersister;
132132
entity.itdTransactionSynchronization =
133-
new DocumentBackedTransactionSynchronization(changeSetPersister, entity);
133+
new ChangeSetBackedTransactionSynchronization(changeSetPersister, entity);
134134
//registerTransactionSynchronization(entity);
135135
}
136136

@@ -163,7 +163,7 @@ public aspect MongoDocumentBacking {
163163

164164
@Transient private ChangeSetPersister<?> DocumentBacked.itdChangeSetPersister;
165165

166-
@Transient private DocumentBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
166+
@Transient private ChangeSetBackedTransactionSynchronization DocumentBacked.itdTransactionSynchronization;
167167

168168
public void DocumentBacked.setChangeSet(ChangeSet cs) {
169169
this.changeSet = cs;
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.data.persistence.document;
17+
package org.springframework.data.persistence.mongodb;
1818

1919
import java.lang.annotation.ElementType;
2020
import java.lang.annotation.Retention;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import javax.persistence.Entity;
44
import javax.persistence.Id;
55

6-
import org.springframework.data.persistence.document.RelatedDocument;
6+
import org.springframework.data.persistence.mongodb.RelatedDocument;
77

88
@Entity
99
public class Person {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
<bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
3939

4040
<!-- Mongo aspect config -->
41-
<bean class="org.springframework.data.persistence.document.mongodb.MongoDocumentBacking"
41+
<bean class="org.springframework.data.persistence.mongodb.MongoDocumentBacking"
4242
factory-method="aspectOf">
4343
<property name="changeSetPersister" ref="mongoChangeSetPersister"/>
4444
</bean>
4545
<bean id="mongoChangeSetPersister"
46-
class="org.springframework.data.persistence.document.mongodb.MongoChangeSetPersister">
46+
class="org.springframework.data.persistence.mongodb.MongoChangeSetPersister">
4747
<property name="mongoTemplate" ref="mongoTemplate"/>
4848
<property name="entityManagerFactory" ref="entityManagerFactory"/>
4949
</bean>

0 commit comments

Comments
 (0)