From 105e1da82b46cc3cbbb2fbb7f2ecdd247db0735c Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 12 Oct 2011 14:30:21 +0200 Subject: [PATCH] DATADOC-271 - Added license headers to cross-store files. --- .../mongodb/crossstore/DocumentBacked.java | 15 ++ .../crossstore/MongoChangeSetPersister.java | 15 ++ .../crossstore/MongoDocumentBacking.aj | 15 ++ .../mongodb/crossstore/RelatedDocument.java | 5 +- .../crossstore/CrossStoreMongoTests.java | 249 ++++++++++-------- .../data/mongodb/crossstore/test/Address.java | 27 +- .../data/mongodb/crossstore/test/Person.java | 125 +++++---- .../data/mongodb/crossstore/test/Resume.java | 69 +++-- 8 files changed, 312 insertions(+), 208 deletions(-) diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java index 066cc8bb7..949c72f3b 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/DocumentBacked.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore; import org.springframework.data.persistence.ChangeSetBacked; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java index bceb0ed54..d95d04cac 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoChangeSetPersister.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore; import javax.persistence.EntityManagerFactory; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj index 7cd18d9b9..45b9e5d3d 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/MongoDocumentBacking.aj @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore; import java.lang.reflect.Field; diff --git a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java index ab65928bb..95c955999 100644 --- a/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java +++ b/spring-data-mongodb-cross-store/src/main/java/org/springframework/data/mongodb/crossstore/RelatedDocument.java @@ -1,11 +1,11 @@ /* - * Copyright (c) 2011 by the original author(s). + * Copyright 2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.springframework.data.mongodb.crossstore; import java.lang.annotation.ElementType; diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java index 733d7ac32..b6e9d7cdd 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/CrossStoreMongoTests.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore; import javax.persistence.EntityManager; @@ -27,128 +42,128 @@ import com.mongodb.DBObject; @ContextConfiguration(locations = "classpath:/META-INF/spring/applicationContext.xml") public class CrossStoreMongoTests { - @Autowired - private MongoTemplate mongoTemplate; + @Autowired + private MongoTemplate mongoTemplate; - private EntityManager entityManager; + private EntityManager entityManager; - @Autowired - private PlatformTransactionManager transactionManager; - - @PersistenceContext - public void setEntityManager(EntityManager entityManager) { - this.entityManager = entityManager; - } + @Autowired + private PlatformTransactionManager transactionManager; - private void clearData(String collectionName) { - DBCollection col = this.mongoTemplate.getCollection(collectionName); - if (col != null) { - this.mongoTemplate.dropCollection(collectionName); - } - } + @PersistenceContext + public void setEntityManager(EntityManager entityManager) { + this.entityManager = entityManager; + } - @Test - @Transactional - @Rollback(false) - public void testCreateJpaToMongoEntityRelationship() { - clearData(Person.class.getName()); - Person p = new Person("Thomas", 20); - Address a = new Address(12, "MAin St.", "Boston", "MA", "02101"); - p.setAddress(a); - Resume r = new Resume(); - r.addEducation("Skanstulls High School, 1975"); - r.addEducation("Univ. of Stockholm, 1980"); - r.addJob("DiMark, DBA, 1990-2000"); - r.addJob("VMware, Developer, 2007-"); - p.setResume(r); - p.setId(1L); - entityManager.persist(p); - } + private void clearData(String collectionName) { + DBCollection col = this.mongoTemplate.getCollection(collectionName); + if (col != null) { + this.mongoTemplate.dropCollection(collectionName); + } + } - @Test - @Transactional - @Rollback(false) - public void testReadJpaToMongoEntityRelationship() { - Person found = entityManager.find(Person.class, 1L); - Assert.assertNotNull(found); - Assert.assertEquals(Long.valueOf(1), found.getId()); - Assert.assertNotNull(found); - Assert.assertEquals(Long.valueOf(1), found.getId()); - Assert.assertNotNull(found.getResume()); - Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " - + "VMware, Developer, 2007-", found.getResume().getJobs()); - found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006"); - found.setAge(44); - } + @Test + @Transactional + @Rollback(false) + public void testCreateJpaToMongoEntityRelationship() { + clearData(Person.class.getName()); + Person p = new Person("Thomas", 20); + Address a = new Address(12, "MAin St.", "Boston", "MA", "02101"); + p.setAddress(a); + Resume r = new Resume(); + r.addEducation("Skanstulls High School, 1975"); + r.addEducation("Univ. of Stockholm, 1980"); + r.addJob("DiMark, DBA, 1990-2000"); + r.addJob("VMware, Developer, 2007-"); + p.setResume(r); + p.setId(1L); + entityManager.persist(p); + } - @Test - @Transactional - @Rollback(false) - public void testUpdatedJpaToMongoEntityRelationship() { - Person found = entityManager.find(Person.class, 1L); - Assert.assertNotNull(found); - Assert.assertEquals(Long.valueOf(1), found.getId()); - Assert.assertNotNull(found); - Assert.assertEquals(Long.valueOf(1), found.getId()); - Assert.assertNotNull(found.getResume()); - Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " - + "VMware, Developer, 2007-" + "; " - + "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs()); - } - - @Test - public void testMergeJpaEntityWithMongoDocument() { - TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); - final Person detached = entityManager.find(Person.class, 1L); - detached.getResume().addJob("TargetRx, Developer, 2000-2005"); - Person merged = txTemplate.execute(new TransactionCallback() { - public Person doInTransaction(TransactionStatus status) { - return entityManager.merge(detached); - } - }); - Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); - Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); - final Person updated = entityManager.find(Person.class, 1L); - Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); - } + @Test + @Transactional + @Rollback(false) + public void testReadJpaToMongoEntityRelationship() { + Person found = entityManager.find(Person.class, 1L); + Assert.assertNotNull(found); + Assert.assertEquals(Long.valueOf(1), found.getId()); + Assert.assertNotNull(found); + Assert.assertEquals(Long.valueOf(1), found.getId()); + Assert.assertNotNull(found.getResume()); + Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + + "VMware, Developer, 2007-", found.getResume().getJobs()); + found.getResume().addJob("SpringDeveloper.com, Consultant, 2005-2006"); + found.setAge(44); + } + + @Test + @Transactional + @Rollback(false) + public void testUpdatedJpaToMongoEntityRelationship() { + Person found = entityManager.find(Person.class, 1L); + Assert.assertNotNull(found); + Assert.assertEquals(Long.valueOf(1), found.getId()); + Assert.assertNotNull(found); + Assert.assertEquals(Long.valueOf(1), found.getId()); + Assert.assertNotNull(found.getResume()); + Assert.assertEquals("DiMark, DBA, 1990-2000" + "; " + + "VMware, Developer, 2007-" + "; " + + "SpringDeveloper.com, Consultant, 2005-2006", found.getResume().getJobs()); + } + + @Test + public void testMergeJpaEntityWithMongoDocument() { + TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); + final Person detached = entityManager.find(Person.class, 1L); + detached.getResume().addJob("TargetRx, Developer, 2000-2005"); + Person merged = txTemplate.execute(new TransactionCallback() { + public Person doInTransaction(TransactionStatus status) { + return entityManager.merge(detached); + } + }); + Assert.assertTrue(detached.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); + Assert.assertTrue(merged.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); + final Person updated = entityManager.find(Person.class, 1L); + Assert.assertTrue(updated.getResume().getJobs().contains("TargetRx, Developer, 2000-2005")); + } + + @Test + public void testRemoveJpaEntityWithMongoDocument() { + TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); + txTemplate.execute(new TransactionCallback() { + public Person doInTransaction(TransactionStatus status) { + Person p2 = new Person("Thomas", 20); + Resume r2 = new Resume(); + r2.addEducation("Skanstulls High School, 1975"); + r2.addJob("DiMark, DBA, 1990-2000"); + p2.setResume(r2); + p2.setId(2L); + entityManager.persist(p2); + Person p3 = new Person("Thomas", 20); + Resume r3 = new Resume(); + r3.addEducation("Univ. of Stockholm, 1980"); + r3.addJob("VMware, Developer, 2007-"); + p3.setResume(r3); + p3.setId(3L); + entityManager.persist(p3); + return null; + } + }); + txTemplate.execute(new TransactionCallback() { + public Person doInTransaction(TransactionStatus status) { + final Person found2 = entityManager.find(Person.class, 2L); + entityManager.remove(found2); + return null; + } + }); + boolean weFound3 = false; + for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) { + Assert.assertTrue(!dbo.get("_entity_id").equals(2L)); + if (dbo.get("_entity_id").equals(3L)) { + weFound3 = true; + } + } + Assert.assertTrue(weFound3); + } - @Test - public void testRemoveJpaEntityWithMongoDocument() { - TransactionTemplate txTemplate = new TransactionTemplate(transactionManager); - txTemplate.execute(new TransactionCallback() { - public Person doInTransaction(TransactionStatus status) { - Person p2 = new Person("Thomas", 20); - Resume r2 = new Resume(); - r2.addEducation("Skanstulls High School, 1975"); - r2.addJob("DiMark, DBA, 1990-2000"); - p2.setResume(r2); - p2.setId(2L); - entityManager.persist(p2); - Person p3 = new Person("Thomas", 20); - Resume r3 = new Resume(); - r3.addEducation("Univ. of Stockholm, 1980"); - r3.addJob("VMware, Developer, 2007-"); - p3.setResume(r3); - p3.setId(3L); - entityManager.persist(p3); - return null; - } - }); - txTemplate.execute(new TransactionCallback() { - public Person doInTransaction(TransactionStatus status) { - final Person found2 = entityManager.find(Person.class, 2L); - entityManager.remove(found2); - return null; - } - }); - boolean weFound3 = false; - for (DBObject dbo : this.mongoTemplate.getCollection(Person.class.getName()).find()) { - Assert.assertTrue(!dbo.get("_entity_id").equals(2L)); - if (dbo.get("_entity_id").equals(3L)) { - weFound3 = true; - } - } - Assert.assertTrue(weFound3); - } - } diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java index 911ac4f38..d23a560b9 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Address.java @@ -1,13 +1,28 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore.test; public class Address { - + private Integer streetNumber; private String streetName; private String city; private String state; private String zip; - + public Address(Integer streetNumber, String streetName, String city, String state, String zip) { super(); @@ -17,7 +32,7 @@ public class Address { this.state = state; this.zip = zip; } - + public Integer getStreetNumber() { return streetNumber; } @@ -48,7 +63,7 @@ public class Address { public void setZip(String zip) { this.zip = zip; } - - - + + + } diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java index c7649888e..a05ca3140 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Person.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore.test; import javax.persistence.Entity; @@ -8,80 +23,80 @@ import org.springframework.data.mongodb.crossstore.RelatedDocument; @Entity public class Person { - @Id - Long id; + @Id + Long id; - private String name; + private String name; - private int age; + private int age; - private java.util.Date birthDate; + private java.util.Date birthDate; - @RelatedDocument - private Address address; + @RelatedDocument + private Address address; - @RelatedDocument - private Resume resume; + @RelatedDocument + private Resume resume; - public Person() { - } + public Person() { + } - public Person(String name, int age) { - this.name = name; - this.age = age; - this.birthDate = new java.util.Date(); - } + public Person(String name, int age) { + this.name = name; + this.age = age; + this.birthDate = new java.util.Date(); + } - public void birthday() { - ++age; - } + public void birthday() { + ++age; + } - public Long getId() { - return id; - } + public Long getId() { + return id; + } - public void setId(Long id) { - this.id = id; - } + public void setId(Long id) { + this.id = id; + } - public String getName() { - return name; - } + public String getName() { + return name; + } - public void setName(String name) { - this.name = name; - } + public void setName(String name) { + this.name = name; + } - public int getAge() { - return age; - } + public int getAge() { + return age; + } - public void setAge(int age) { - this.age = age; - } + public void setAge(int age) { + this.age = age; + } - public java.util.Date getBirthDate() { - return birthDate; - } + public java.util.Date getBirthDate() { + return birthDate; + } - public void setBirthDate(java.util.Date birthDate) { - this.birthDate = birthDate; - } + public void setBirthDate(java.util.Date birthDate) { + this.birthDate = birthDate; + } - public Resume getResume() { - return resume; - } + public Resume getResume() { + return resume; + } - public void setResume(Resume resume) { - this.resume = resume; - } + public void setResume(Resume resume) { + this.resume = resume; + } - public Address getAddress() { - return address; - } + public Address getAddress() { + return address; + } - public void setAddress(Address address) { - this.address = address; - } + public void setAddress(Address address) { + this.address = address; + } } diff --git a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java index d977ce7e1..eb714bf3b 100644 --- a/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java +++ b/spring-data-mongodb-cross-store/src/test/java/org/springframework/data/mongodb/crossstore/test/Resume.java @@ -1,3 +1,18 @@ +/* + * Copyright 2011 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package org.springframework.data.mongodb.crossstore.test; import org.apache.commons.logging.Log; @@ -9,40 +24,40 @@ import org.springframework.data.mongodb.core.mapping.Document; @Document public class Resume { - private static final Log LOGGER = LogFactory.getLog(Resume.class); + private static final Log LOGGER = LogFactory.getLog(Resume.class); - @Id - private ObjectId id; + @Id + private ObjectId id; - private String education = ""; + private String education = ""; - private String jobs = ""; + private String jobs = ""; - public String getId() { - return id.toString(); - } - - public String getEducation() { - return education; - } + public String getId() { + return id.toString(); + } - public void addEducation(String education) { - LOGGER.debug("Adding education " + education); - this.education = this.education + (this.education.length() > 0 ? "; " : "") + education; - } + public String getEducation() { + return education; + } - public String getJobs() { - return jobs; - } + public void addEducation(String education) { + LOGGER.debug("Adding education " + education); + this.education = this.education + (this.education.length() > 0 ? "; " : "") + education; + } - public void addJob(String job) { - LOGGER.debug("Adding job " + job); - this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job; - } + public String getJobs() { + return jobs; + } - @Override - public String toString() { - return "Resume [education=" + education + ", jobs=" + jobs + "]"; - } + public void addJob(String job) { + LOGGER.debug("Adding job " + job); + this.jobs = this.jobs + (this.jobs.length() > 0 ? "; " : "") + job; + } + + @Override + public String toString() { + return "Resume [education=" + education + ", jobs=" + jobs + "]"; + } }