Fix BaseMorphiaRepository.get(id) returning wrong document

Author: adrienlauer

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Version 3.1.1 (2020-02-05)
+
+* [fix] Fix `BaseMorphiaRepository.get(id)` always returning the first document from the collection (ignoring given id).
+
 # Version 3.1.0 (2020-01-31)
 
 * [new] Morphia repository now has the ability to stream results from the database as consumed (using a cursor instead of a list behind the scenes). 

core/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
     </parent>
 
 	<artifactId>mongodb-core</artifactId>

morphia/pom.xml

@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.addons.mongodb</groupId>
         <artifactId>mongodb</artifactId>
-        <version>3.1.0-SNAPSHOT</version>
+        <version>3.1.1-SNAPSHOT</version>
     </parent>
 
     <artifactId>mongodb-morphia</artifactId>

morphia/src/main/java/org/seedstack/mongodb/morphia/BaseMorphiaRepository.java

@@ -90,7 +90,7 @@ public Stream<A> get(Specification<A> specification, Option... options) {
 
     @Override
     public Optional<A> get(ID id) {
-        return Optional.ofNullable(datastore.createQuery(getAggregateRootClass()).first());
+        return Optional.ofNullable(datastore.find(getAggregateRootClass()).filter(ID_KEY, id).first());
     }
 
     @Override

morphia/src/test/java/org/seedstack/mongodb/morphia/MorphiaRepositoryIT.java

@@ -34,12 +34,15 @@ public void setUp() throws Exception {
 
     @Test
     public void addAndGet() throws Exception {
-        User user1 = createUser(1L, "someFirstName", "someLastName");
+        User user1 = createUser(1L, "someFirstName1", "someLastName1");
+        User user2 = createUser(2L, "someFirstName2", "someLastName2");
         userRepository.add(user1);
-        Optional<User> loaded = userRepository.get(1L);
+        userRepository.add(user2);
+        Optional<User> loaded = userRepository.get(2L);
         assertThat(loaded).isPresent();
-        assertThat(loaded.get().getName()).isEqualTo("someFirstName");
-        assertThat(loaded.get().getLastname()).isEqualTo("someLastName");
+        assertThat(loaded.get().getName()).isEqualTo("someFirstName2");
+        assertThat(loaded.get().getLastname()).isEqualTo("someLastName2");
+        assertThat(userRepository.get(3L)).isNotPresent();
     }
 
     @Test

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.seedstack.addons.mongodb</groupId>
     <artifactId>mongodb</artifactId>
-    <version>3.1.0-SNAPSHOT</version>
+    <version>3.1.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>