Merge pull request #9407 from loicmathieu/fix/panache-projection

geoand · web-flow · commit 3f46fda26388 · 2020-05-22T10:04:10.000+03:00
Fix MongoDB Panache projection
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/impl/ReactiveMongoCollectionImpl.java
@@ -820,4 +820,9 @@ public Uni<Void> renameCollection(ClientSession clientSession, MongoNamespace ne
     public CodecRegistry getCodecRegistry() {
         return collection.getCodecRegistry();
     }
+
+    @Override
+    public <NewTDocument> ReactiveMongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz) {
+        return new ReactiveMongoCollectionImpl<>(this.collection.withDocumentClass(clazz));
+    }
 }
diff --git a/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java b/extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/reactive/ReactiveMongoCollection.java
@@ -8,6 +8,7 @@
 
 import com.mongodb.MongoNamespace;
 import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.CreateIndexOptions;
@@ -1489,4 +1490,14 @@ Uni<Void> renameCollection(ClientSession clientSession, MongoNamespace newCollec
      * @return the codec registry
      */
     CodecRegistry getCodecRegistry();
+
+    /**
+     * Create a new ReactiveMongoCollection instance with a different default class to cast any documents returned from the
+     * database into..
+     *
+     * @param clazz the default class to cast any documents returned from the database into.
+     * @param <NewTDocument> The type that the new collection will encode documents from and decode documents to
+     * @return a new MongoCollection instance with the different default class
+     */
+    <NewTDocument> ReactiveMongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz);
 }
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/reactive/runtime/ReactivePanacheQueryImpl.java
@@ -38,8 +38,8 @@ public class ReactivePanacheQueryImpl<Entity> implements ReactivePanacheQuery<En
         this.sort = sort;
     }
 
-    private ReactivePanacheQueryImpl(ReactivePanacheQueryImpl previousQuery, Bson projections) {
-        this.collection = previousQuery.collection;
+    private ReactivePanacheQueryImpl(ReactivePanacheQueryImpl previousQuery, Bson projections, Class<?> type) {
+        this.collection = previousQuery.collection.withDocumentClass(type);
         this.mongoQuery = previousQuery.mongoQuery;
         this.sort = previousQuery.sort;
         this.projections = projections;
@@ -62,7 +62,7 @@ public <T> ReactivePanacheQuery<T> project(Class<T> type) {
             projections.append(fieldName, 1);
         }
 
-        return new ReactivePanacheQueryImpl(this, projections);
+        return new ReactivePanacheQueryImpl(this, projections, type);
     }
 
     @Override
diff --git a/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java b/extensions/panache/mongodb-panache/runtime/src/main/java/io/quarkus/mongodb/panache/runtime/PanacheQueryImpl.java
@@ -38,8 +38,8 @@ public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {
         this.sort = sort;
     }
 
-    private PanacheQueryImpl(PanacheQueryImpl previousQuery, Bson projections) {
-        this.collection = previousQuery.collection;
+    private PanacheQueryImpl(PanacheQueryImpl previousQuery, Bson projections, Class<?> documentClass) {
+        this.collection = previousQuery.collection.withDocumentClass(documentClass);
         this.mongoQuery = previousQuery.mongoQuery;
         this.sort = previousQuery.sort;
         this.projections = projections;
@@ -62,7 +62,7 @@ public <T> PanacheQuery<T> project(Class<T> type) {
             projections.append(fieldName, 1);
         }
 
-        return new PanacheQueryImpl(this, projections);
+        return new PanacheQueryImpl<>(this, projections, type);
     }
 
     @Override
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonEntityResource.java
@@ -1,7 +1,9 @@
 package io.quarkus.it.mongodb.panache.person;
 
 import java.net.URI;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -23,8 +25,11 @@ public List<PersonEntity> getPersons(@QueryParam("sort") String sort) {
 
     @GET
     @Path("/search/{name}")
-    public List<PersonName> searchPersons(@PathParam("name") String name) {
-        return PersonEntity.find("lastname", name).project(PersonName.class).list();
+    public Set<PersonName> searchPersons(@PathParam("name") String name) {
+        Set<PersonName> uniqueNames = new HashSet<>();
+        List<PersonName> lastnames = PersonEntity.find("lastname", name).project(PersonName.class).list();
+        lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
+        return uniqueNames;
     }
 
     @POST
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonName.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonName.java
@@ -1,5 +1,22 @@
 package io.quarkus.it.mongodb.panache.person;
 
+import java.util.Objects;
+
 public class PersonName {
     public String lastname;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+        if (o == null || getClass() != o.getClass())
+            return false;
+        PersonName that = (PersonName) o;
+        return Objects.equals(lastname, that.lastname);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(lastname);
+    }
 }
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/person/PersonRepositoryResource.java
@@ -1,7 +1,9 @@
 package io.quarkus.it.mongodb.panache.person;
 
 import java.net.URI;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.ws.rs.*;
@@ -32,8 +34,11 @@ public List<Person> getPersons(@QueryParam("sort") String sort) {
 
     @GET
     @Path("/search/{name}")
-    public List<PersonName> searchPersons(@PathParam("name") String name) {
-        return personRepository.find("lastname", name).project(PersonName.class).list();
+    public Set<PersonName> searchPersons(@PathParam("name") String name) {
+        Set<PersonName> uniqueNames = new HashSet<>();
+        List<PersonName> lastnames = personRepository.find("lastname", name).project(PersonName.class).list();
+        lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
+        return uniqueNames;
     }
 
     @POST
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntityResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonEntityResource.java
@@ -1,7 +1,9 @@
 package io.quarkus.it.mongodb.panache.reactive.person;
 
 import java.net.URI;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -25,8 +27,12 @@ public Uni<List<ReactivePersonEntity>> getPersons(@QueryParam("sort") String sor
 
     @GET
     @Path("/search/{name}")
-    public Uni<List<PersonName>> searchPersons(@PathParam("name") String name) {
-        return ReactivePersonEntity.find("lastname", name).project(PersonName.class).list();
+    public Set<PersonName> searchPersons(@PathParam("name") String name) {
+        Set<PersonName> uniqueNames = new HashSet<>();
+        List<PersonName> lastnames = ReactivePersonEntity.find("lastname", name).project(PersonName.class).list().await()
+                .indefinitely();
+        lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
+        return uniqueNames;
     }
 
     @POST
diff --git a/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepositoryResource.java b/integration-tests/mongodb-panache/src/main/java/io/quarkus/it/mongodb/panache/reactive/person/ReactivePersonRepositoryResource.java
@@ -1,7 +1,9 @@
 package io.quarkus.it.mongodb.panache.reactive.person;
 
 import java.net.URI;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.inject.Inject;
 import javax.ws.rs.*;
@@ -31,8 +33,12 @@ public Uni<List<Person>> getPersons(@QueryParam("sort") String sort) {
 
     @GET
     @Path("/search/{name}")
-    public Uni<List<PersonName>> searchPersons(@PathParam("name") String name) {
-        return reactivePersonRepository.find("lastname", name).project(PersonName.class).list();
+    public Set<PersonName> searchPersons(@PathParam("name") String name) {
+        Set<PersonName> uniqueNames = new HashSet<>();
+        List<PersonName> lastnames = reactivePersonRepository.find("lastname", name).project(PersonName.class).list().await()
+                .indefinitely();
+        lastnames.forEach(p -> uniqueNames.add(p));// this will throw if it's not the right type
+        return uniqueNames;
     }
 
     @POST
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/MongodbPanacheResourceTest.java
@@ -257,7 +257,7 @@ private void callPersonEndpoint(String endpoint) {
 
         //with project
         list = get(endpoint + "/search/Doe").as(LIST_OF_PERSON_TYPE_REF);
-        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals(1, list.size());
         Assertions.assertNotNull(list.get(0).lastname);
         //expected the firstname field to be null as we project on lastname only
         Assertions.assertNull(list.get(0).firstname);
@@ -270,7 +270,7 @@ private void callPersonEndpoint(String endpoint) {
                 .when().post(endpoint + "/rename")
                 .then().statusCode(200);
         list = get(endpoint + "/search/Dupont").as(LIST_OF_PERSON_TYPE_REF);
-        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals(1, list.size());
 
         //count
         Long count = get(endpoint + "/count").as(Long.class);
diff --git a/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java b/integration-tests/mongodb-panache/src/test/java/io/quarkus/it/mongodb/panache/reactive/ReactiveMongodbPanacheResourceTest.java
@@ -279,7 +279,7 @@ private void callReactivePersonEndpoint(String endpoint) {
 
         //with project
         list = get(endpoint + "/search/Doe").as(LIST_OF_PERSON_TYPE_REF);
-        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals(1, list.size());
         Assertions.assertNotNull(list.get(0).lastname);
         //expected the firstname field to be null as we project on lastname only
         Assertions.assertNull(list.get(0).firstname);
@@ -292,7 +292,7 @@ private void callReactivePersonEndpoint(String endpoint) {
                 .when().post(endpoint + "/rename")
                 .then().statusCode(200);
         list = get(endpoint + "/search/Dupont").as(LIST_OF_PERSON_TYPE_REF);
-        Assertions.assertEquals(2, list.size());
+        Assertions.assertEquals(1, list.size());
 
         //count
         Long count = get(endpoint + "/count").as(Long.class);

Original file line number	Diff line number	Diff line change
`@@ -820,4 +820,9 @@ public Uni<Void> renameCollection(ClientSession clientSession, MongoNamespace ne`
`820`	`820`	`public CodecRegistry getCodecRegistry() {`
`821`	`821`	`return collection.getCodecRegistry();`
`822`	`822`	`}`
	`823`	`+`
	`824`	`+ @Override`
	`825`	`+ public <NewTDocument> ReactiveMongoCollection<NewTDocument> withDocumentClass(Class<NewTDocument> clazz) {`
	`826`	`+ return new ReactiveMongoCollectionImpl<>(this.collection.withDocumentClass(clazz));`
	`827`	`+ }`
`823`	`828`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class ReactivePanacheQueryImpl<Entity> implements ReactivePanacheQuery<En`
`38`	`38`	`this.sort = sort;`
`39`	`39`	`}`
`40`	`40`
`41`		`- private ReactivePanacheQueryImpl(ReactivePanacheQueryImpl previousQuery, Bson projections) {`
`42`		`- this.collection = previousQuery.collection;`
	`41`	`+ private ReactivePanacheQueryImpl(ReactivePanacheQueryImpl previousQuery, Bson projections, Class<?> type) {`
	`42`	`+ this.collection = previousQuery.collection.withDocumentClass(type);`
`43`	`43`	`this.mongoQuery = previousQuery.mongoQuery;`
`44`	`44`	`this.sort = previousQuery.sort;`
`45`	`45`	`this.projections = projections;`
`@@ -62,7 +62,7 @@ public <T> ReactivePanacheQuery<T> project(Class<T> type) {`
`62`	`62`	`projections.append(fieldName, 1);`
`63`	`63`	`}`
`64`	`64`
`65`		`- return new ReactivePanacheQueryImpl(this, projections);`
	`65`	`+ return new ReactivePanacheQueryImpl(this, projections, type);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ public class PanacheQueryImpl<Entity> implements PanacheQuery<Entity> {`
`38`	`38`	`this.sort = sort;`
`39`	`39`	`}`
`40`	`40`
`41`		`- private PanacheQueryImpl(PanacheQueryImpl previousQuery, Bson projections) {`
`42`		`- this.collection = previousQuery.collection;`
	`41`	`+ private PanacheQueryImpl(PanacheQueryImpl previousQuery, Bson projections, Class<?> documentClass) {`
	`42`	`+ this.collection = previousQuery.collection.withDocumentClass(documentClass);`
`43`	`43`	`this.mongoQuery = previousQuery.mongoQuery;`
`44`	`44`	`this.sort = previousQuery.sort;`
`45`	`45`	`this.projections = projections;`
`@@ -62,7 +62,7 @@ public <T> PanacheQuery<T> project(Class<T> type) {`
`62`	`62`	`projections.append(fieldName, 1);`
`63`	`63`	`}`
`64`	`64`
`65`		`- return new PanacheQueryImpl(this, projections);`
	`65`	`+ return new PanacheQueryImpl<>(this, projections, type);`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`@Override`