DATAMONGO-1393 - Polishing.

Inline repositories into test. Apply Spring Data formatting rules. Remove final keyword from local variables. Remove unused XML namespace declarations.

Original pull request: #350.

Author: mp911de

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java

@@ -60,8 +60,8 @@ public ValidatingMongoEventListener(Validator validator) {
 	public void onBeforeSave(Object source, DBObject dbo) {
 
 		LOG.debug("Validating object: {}", source);
-		final Object target = source instanceof LazyLoadingProxy ? ((LazyLoadingProxy) source).getTarget() : source;
-		final Set violations = validator.validate(target);
+		Object target = source instanceof LazyLoadingProxy ? ((LazyLoadingProxy) source).getTarget() : source;
+		Set violations = validator.validate(target);
 
 		if (!violations.isEmpty()) {
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/Address.java

@@ -29,28 +29,31 @@
 @Document(collection = "ADDRESS")
 public class Address {
 
-	@Id
-	private ObjectId id;
-	
-	@NotNull @Size(min = 2)
-	private String name;
+	@Id private ObjectId id;
+
+	@NotNull @Size(min = 2) private String name;
 
 	public Address() {
 		super();
 	}
+
 	public Address(String name) {
 		this();
 		this.name = name;
 	}
+
 	public ObjectId getId() {
 		return id;
 	}
+
 	public void setId(ObjectId id) {
 		this.id = id;
 	}
+
 	public String getName() {
 		return name;
 	}
+
 	public void setName(String name) {
 		this.name = name;
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java

@@ -37,59 +37,69 @@
  */
 @Document(collection = "USER")
 public class User {
-	
+
 	public static class AddressRelation {
 		public enum Type {
-			PRIVATE,
-			WORK
+			PRIVATE, WORK
 		}
+
 		private Type type = Type.PRIVATE;
-		@DBRef(lazy = true)
-		private Address address;
+		@DBRef(lazy = true) private Address address;
+
 		// needed otherwise spring doesn't create the proxy for some reason ...
 		public AddressRelation() {
 			super();
 		}
+
 		public AddressRelation(Type type, Address address) {
+			
 			this();
+			
 			this.type = type;
 			this.address = address;
 		}
+
 		public Type getType() {
 			return type;
 		}
+
 		public void setType(Type type) {
 			this.type = type;
 		}
+
 		public Address getAddress() {
 			return address;
 		}
+
 		public void setAddress(Address address) {
 			this.address = address;
 		}
 	}
 
-	@Id
-	private ObjectId id;
+	@Id private ObjectId id;
+
+	@Size(min = 10) private String name;
 
-	@Size(min = 10)
-	private String name;
+	@Min(18) private Integer age;
 
-	@Min(18)
-	private Integer age;
-	
 	private List<AddressRelation> addresses = new ArrayList<AddressRelation>();
 
 	public User() {
 		super();
 	}
+
 	public User(String name, Integer age) {
+		
 		this();
+		
 		this.name = name;
 		this.age = age;
 	}
-	public User(String name, Integer age, Address...addresses) {
+
+	public User(String name, Integer age, Address... addresses) {
+		
 		this(name, age);
+		
 		for (Address address : addresses) {
 			this.addresses.add(new AddressRelation(Type.WORK, address));
 		}
@@ -110,9 +120,11 @@ public String getName() {
 	public Integer getAge() {
 		return age;
 	}
+
 	public List<AddressRelation> getAddresses() {
 		return addresses;
 	}
+
 	public void setAddresses(List<AddressRelation> addresses) {
 		this.addresses = addresses;
 	}

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java

@@ -15,20 +15,20 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import static org.hamcrest.core.IsEqual.*;
+import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.util.UUID;
 
 import javax.validation.ConstraintViolationException;
 
+import org.bson.types.ObjectId;
 import org.junit.ClassRule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.convert.LazyLoadingProxy;
-import org.springframework.data.mongodb.core.mapping.event.repo.AddressRepository;
-import org.springframework.data.mongodb.core.mapping.event.repo.UserRepository;
+import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.test.util.MongoVersionRule;
 import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
@@ -69,32 +69,50 @@ public void shouldThrowConstraintViolationException() {
 	public void shouldNotThrowAnyExceptions() {
 		userRepo.save(new User("john smith", 18));
 	}
-	
+
 	/**
 	 * @see DATAMONGO-1393
 	 */
 	@Test
-	public void validationOfLazyProxy() {
+	public void validationOfLazyProxyShouldPass() {
+
 		Address address = addressRepo.insert(new Address(UUID.randomUUID().toString()));
 		User user = userRepo.insert(new User("Foo Bar Name 123456", 18, address));
-		
+
 		user = userRepo.findOne(user.getId());
-		assertTrue("Spring should use now a LazyLoadingProxy.", user.getAddresses().get(0).getAddress() instanceof LazyLoadingProxy);
+
+		assertThat(user.getAddresses().get(0).getAddress(), is(instanceOf(LazyLoadingProxy.class)));
+
 		address = user.getAddresses().get(0).getAddress();
 		address.setName("New Fancy Address Name");
+
 		addressRepo.save(address);
 	}
+
 	/**
 	 * @see DATAMONGO-1393
 	 */
 	@Test(expected = ConstraintViolationException.class)
-	public void validationErrorTest() {
+	public void validationOfLazyProxyShouldFail() {
+
 		Address address = addressRepo.insert(new Address(UUID.randomUUID().toString()));
 		User user = userRepo.insert(new User("Foo Bar Name 123456", 18, address));
-		
+
 		user = userRepo.findOne(user.getId());
 		address = user.getAddresses().get(0).getAddress();
+
 		address.setName(null);
+
 		addressRepo.save(address);
 	}
+
+	/**
+	 * @author Paul Sterl
+	 */
+	public interface AddressRepository extends MongoRepository<Address, ObjectId> {}
+
+	/**
+	 * @author Paul Sterl
+	 */
+	public interface UserRepository extends MongoRepository<User, ObjectId> {}
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/repo/AddressRepository.java

@@ -2,15 +2,13 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
 	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-			 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-			 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd">
+			 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<mongo:db-factory dbname="validation" />
 
 	<mongo:mapping-converter base-package="org.springframework.data.mongodb.core" />
-    <mongo:repositories base-package="org.springframework.data.mongodb.core.mapping.event.repo" />
+    <mongo:repositories base-package="org.springframework.data.mongodb.core.mapping.event" consider-nested-repositories="true"/>
 
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory" />