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

spring-data-mongodb/src/main/java/org/baeldung/model/User.java

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