Merge remote-tracking branch 'upstream/master'

Conflicts:
	spring-data-mongodb/src/main/java/org/baeldung/repository/UserRepository.java
	spring-data-mongodb/src/test/java/org/baeldung/repository/UserRepositoryIntegrationTest.java
This commit is contained in:
coach88 2015-07-31 12:20:15 +03:00
commit 7ad6ba42a4
1 changed files with 3 additions and 3 deletions

View File

@ -15,7 +15,7 @@ public class User {
return id; return id;
} }
public void setId(String id) { public void setId(final String id) {
this.id = id; this.id = id;
} }
@ -23,7 +23,7 @@ public class User {
return name; return name;
} }
public void setName(String name) { public void setName(final String name) {
this.name = name; this.name = name;
} }
@ -31,7 +31,7 @@ public class User {
return age; return age;
} }
public void setAge(Integer age) { public void setAge(final Integer age) {
this.age = age; this.age = age;
} }
} }