Merge remote-tracking branch 'origin/master' into querydsl-7.0

Author: velo

.circleci/config.yml

@@ -292,7 +292,7 @@ jobs:
     working_directory: ~/querydsl
     docker:
       - image: velo/toolchains-4-ci-builds:latest
-      - image: mongo:3.6.1
+      - image: mongo:8.0.9
     steps:
       - checkout
       - restore_cache:

docker-compose.yml

@@ -56,7 +56,7 @@ services:
       start_period: 60s
 
   mongo:
-    image: mongo:4
+    image: mongo:8.0.9
     ports:
       - "27017:27017"
 

pom.xml

@@ -116,14 +116,14 @@
     <hsqldb.version>2.7.4</hsqldb.version>
     <h2.version>2.3.232</h2.version>
     <postgresql.version>42.7.5</postgresql.version>
-    <oracle.version>23.7.0.25.01</oracle.version>
+    <oracle.version>23.8.0.25.04</oracle.version>
     <mysql.version>9.3.0</mysql.version>
     <mssql.version>12.10.0.jre8</mssql.version>
     <cubrid.version>9.3.9.0002</cubrid.version>
     <sqlite.version>3.49.1.0</sqlite.version>
     <teradata.version>13.10.00.35</teradata.version>
     <firebird.version>5.0.7.java11</firebird.version>
-    <mongodb.version>3.12.14</mongodb.version>
+    <mongodb.version>5.5.0</mongodb.version>
 
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
@@ -143,7 +143,7 @@
     <surefire.version>3.5.3</surefire.version>
     <animal-sniffer.version>1.24</animal-sniffer.version>
     <h2gis.version>2.2.3</h2gis.version>
-    <morphia.version>1.3.2</morphia.version>
+    <morphia.version>2.5.0</morphia.version>
     <jmh.version>1.37</jmh.version>
     <kotlin.version>2.1.20</kotlin.version>
     <ksp.version>2.1.20-2.0.1</ksp.version>
@@ -456,7 +456,7 @@
         <configuration>
           <parameter>
             <excludes>
-              <exclude>com.querydsl.core.annotations.QueryProjection</exclude>          
+              <exclude>com.querydsl.core.annotations.QueryProjection</exclude>
             </excludes>
             <ignoreMissingOldVersion>true</ignoreMissingOldVersion>
             <onlyModified>true</onlyModified>
@@ -1037,18 +1037,18 @@
           <plugin>
             <groupId>org.openrewrite.maven</groupId>
             <artifactId>rewrite-maven-plugin</artifactId>
-            <version>6.7.0</version>
+            <version>6.8.0</version>
 
             <dependencies>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-testing-frameworks</artifactId>
-                <version>3.7.0</version>
+                <version>3.8.0</version>
               </dependency>
               <dependency>
                 <groupId>org.openrewrite.recipe</groupId>
                 <artifactId>rewrite-migrate-java</artifactId>
-                <version>3.8.0</version>
+                <version>3.9.0</version>
               </dependency>
             </dependencies>
 

querydsl-examples/querydsl-example-jpa-quarkus/pom.xml

@@ -12,7 +12,7 @@
   <name>Querydsl example - JPA Quarkus</name>
 
   <properties>
-    <quarkus.version>3.22.1</quarkus.version>
+    <quarkus.version>3.22.2</quarkus.version>
   </properties>
 
   <dependencyManagement>

querydsl-libraries/pom.xml

@@ -98,7 +98,7 @@
                     <exclude>org.hibernate:hibernate-envers:*:*:compile</exclude>
                     <exclude>org.hibernate.validator:hibernate-validator:*:*:compile</exclude>
                     <exclude>org.eclipse.persistence:eclipselink:*:*:compile</exclude>
-                    <exclude>org.mongodb.morphia:morphia:*:*:compile</exclude>
+                    <exclude>dev.morphia:core:*:*:compile</exclude>
                     <exclude>org.joda:joda-money:*:*:compile</exclude>
                     <exclude>org.batoo.jpa:batoo-jpa:*:*:compile</exclude>
                     <exclude>jakarta.annotation:jakarta.annotation-api:*:*:compile</exclude>

querydsl-libraries/querydsl-mongodb/pom.xml

@@ -13,8 +13,9 @@
   <description>Mongodb support for Querydsl</description>
 
   <properties>
+    <japicmp.skip>true</japicmp.skip>
     <osgi.import.package>com.mongodb;version="0.0.0",
-            org.mongodb.morphia.*;version="1.3.2",
+            dev.morphia.*;version="1.6.1",
             org.bson.*;version="0.0.0",
             ${osgi.import.package.root}</osgi.import.package>
   </properties>
@@ -27,12 +28,17 @@
     </dependency>
     <dependency>
       <groupId>org.mongodb</groupId>
-      <artifactId>mongo-java-driver</artifactId>
+      <artifactId>mongodb-driver-sync</artifactId>
       <version>${mongodb.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mongodb.morphia</groupId>
-      <artifactId>morphia</artifactId>
+      <groupId>org.mongodb</groupId>
+      <artifactId>mongodb-driver-legacy</artifactId>
+      <version>${mongodb.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>dev.morphia.morphia</groupId>
+      <artifactId>morphia-core</artifactId>
       <version>${morphia.version}</version>
       <scope>provided</scope>
       <optional>true</optional>

querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/AbstractMongodbQuery.java

@@ -14,10 +14,9 @@
 package com.querydsl.mongodb;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
 import com.mongodb.ReadPreference;
+import com.mongodb.client.FindIterable;
+import com.mongodb.client.MongoCollection;
 import com.querydsl.core.CloseableIterator;
 import com.querydsl.core.DefaultQueryMetadata;
 import com.querydsl.core.Fetchable;
@@ -44,6 +43,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
+import org.bson.conversions.Bson;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -64,22 +64,22 @@ private static class NoResults extends RuntimeException {}
 
   private final QueryMixin<Q> queryMixin;
 
-  private final DBCollection collection;
+  private final MongoCollection collection;
 
-  private final Function<DBObject, K> transformer;
+  private final Function<K, Object> transformer;
 
   private ReadPreference readPreference;
 
   /**
    * Create a new MongodbQuery instance
    *
    * @param collection collection
-   * @param transformer result transformer
+   * @param transformer id transformer
    * @param serializer serializer
    */
   @SuppressWarnings("unchecked")
   public AbstractMongodbQuery(
-      DBCollection collection, Function<DBObject, K> transformer, MongodbSerializer serializer) {
+      MongoCollection collection, Function<K, Object> transformer, MongodbSerializer serializer) {
     @SuppressWarnings("unchecked") // Q is this plus subclass
     var query = (Q) this;
     this.queryMixin = new QueryMixin<>(query, new DefaultQueryMetadata(), false);
@@ -122,7 +122,7 @@ public <T> AnyEmbeddedBuilder<Q, K> anyEmbedded(
     return new AnyEmbeddedBuilder<>(queryMixin, collection);
   }
 
-  protected abstract DBCollection getCollection(Class<?> type);
+  protected abstract MongoCollection getCollection(Class<?> type);
 
   @Nullable
   protected Predicate createFilter(QueryMetadata metadata) {
@@ -164,16 +164,15 @@ protected List<Object> getIds(Class<?> targetType, Predicate condition) {
     // TODO : fetch only ids
     var cursor =
         createCursor(
-            collection,
-            condition,
-            null,
-            QueryModifiers.EMPTY,
-            Collections.<OrderSpecifier<?>>emptyList());
+                collection,
+                condition,
+                null,
+                QueryModifiers.EMPTY,
+                Collections.<OrderSpecifier<?>>emptyList())
+            .cursor();
     if (cursor.hasNext()) {
-      List<Object> ids = new ArrayList<>(cursor.count());
-      for (DBObject obj : cursor) {
-        ids.add(obj.get("_id"));
-      }
+      List<Object> ids = new ArrayList<>();
+      cursor.forEachRemaining(document -> ids.add(transformer.apply(document)));
       return ids;
     } else {
       return Collections.emptyList();
@@ -236,7 +235,7 @@ public CloseableIterator<K> iterate(Path<?>... paths) {
 
   @Override
   public CloseableIterator<K> iterate() {
-    final var cursor = createCursor();
+    final var cursor = createCursor().cursor();
     return new CloseableIterator<>() {
       @Override
       public boolean hasNext() {
@@ -245,7 +244,7 @@ public boolean hasNext() {
 
       @Override
       public K next() {
-        return transformer.apply(cursor.next());
+        return cursor.next();
       }
 
       @Override
@@ -272,16 +271,16 @@ public List<K> fetch() {
     try {
       var cursor = createCursor();
       List<K> results = new ArrayList<>();
-      for (DBObject dbObject : cursor) {
-        results.add(transformer.apply(dbObject));
+      for (K dbObject : cursor) {
+        results.add(dbObject);
       }
       return results;
     } catch (NoResults ex) {
       return Collections.emptyList();
     }
   }
 
-  protected DBCursor createCursor() {
+  protected FindIterable<K> createCursor() {
     var metadata = queryMixin.getMetadata();
     Predicate filter = createFilter(metadata);
     return createCursor(
@@ -292,13 +291,19 @@ protected DBCursor createCursor() {
         metadata.getOrderBy());
   }
 
-  protected DBCursor createCursor(
-      DBCollection collection,
+  protected FindIterable<K> createCursor(
+      MongoCollection collection,
       @Nullable Predicate where,
       Expression<?> projection,
       QueryModifiers modifiers,
       List<OrderSpecifier<?>> orderBy) {
-    var cursor = collection.find(createQuery(where), createProjection(projection));
+    var cursor =
+        readPreference != null
+            ? collection
+                .withReadPreference(readPreference)
+                .find(createQuery(where))
+                .projection(createProjection(projection))
+            : collection.find(createQuery(where)).projection(createProjection(projection));
     Integer limit = modifiers.getLimitAsInteger();
     Integer offset = modifiers.getOffsetAsInteger();
     if (limit != null) {
@@ -310,15 +315,12 @@ protected DBCursor createCursor(
     if (orderBy.size() > 0) {
       cursor.sort(serializer.toSort(orderBy));
     }
-    if (readPreference != null) {
-      cursor.setReadPreference(readPreference);
-    }
     return cursor;
   }
 
-  private DBObject createProjection(Expression<?> projection) {
+  private Bson createProjection(Expression<?> projection) {
     if (projection instanceof FactoryExpression) {
-      DBObject obj = new BasicDBObject();
+      var obj = new BasicDBObject();
       for (Object expr : ((FactoryExpression) projection).getArgs()) {
         if (expr instanceof Expression) {
           obj.put((String) serializer.handle((Expression) expr), 1);
@@ -343,9 +345,9 @@ public K fetchFirst(Path<?>... paths) {
   @Override
   public K fetchFirst() {
     try {
-      var c = createCursor().limit(1);
+      var c = createCursor().limit(1).cursor();
       if (c.hasNext()) {
-        return transformer.apply(c.next());
+        return c.next();
       } else {
         return null;
       }
@@ -372,9 +374,9 @@ public K fetchOne() throws NonUniqueResultException {
       if (limit == null) {
         limit = 2L;
       }
-      var c = createCursor().limit(limit.intValue());
+      var c = createCursor().limit(limit.intValue()).cursor();
       if (c.hasNext()) {
-        var rv = transformer.apply(c.next());
+        var rv = c.next();
         if (c.hasNext()) {
           throw new NonUniqueResultException();
         }
@@ -416,15 +418,15 @@ public QueryResults<K> fetchResults() {
   public long fetchCount() {
     try {
       Predicate filter = createFilter(queryMixin.getMetadata());
-      return collection.count(createQuery(filter));
+      return collection.countDocuments(createQuery(filter));
     } catch (NoResults ex) {
       return 0L;
     }
   }
 
-  private DBObject createQuery(@Nullable Predicate predicate) {
+  private Bson createQuery(@Nullable Predicate predicate) {
     if (predicate != null) {
-      return (DBObject) serializer.handle(predicate);
+      return (Bson) serializer.handle(predicate);
     } else {
       return new BasicDBObject();
     }
@@ -444,7 +446,7 @@ public void setReadPreference(ReadPreference readPreference) {
    *
    * @return
    */
-  public DBObject asDBObject() {
+  public Bson asDBObject() {
     return createQuery(queryMixin.getMetadata().getWhere());
   }
 

querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/MongodbSerializer.java

@@ -38,6 +38,7 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 import org.bson.BSONObject;
+import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
 
 /**
@@ -52,7 +53,7 @@ public Object handle(Expression<?> expression) {
     return expression.accept(this, null);
   }
 
-  public DBObject toSort(List<OrderSpecifier<?>> orderBys) {
+  public Bson toSort(List<OrderSpecifier<?>> orderBys) {
     var sort = new BasicDBObject();
     for (OrderSpecifier<?> orderBy : orderBys) {
       Object key = orderBy.getTarget().accept(this, null);

querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/AbstractFetchableMongodbQuery.java

@@ -227,7 +227,7 @@ public QueryResults<K> fetchResults() {
   public long fetchCount() {
     try {
       Predicate filter = createFilter(getQueryMixin().getMetadata());
-      return collection.count(createQuery(filter));
+      return collection.countDocuments(createQuery(filter));
     } catch (NoResults ex) {
       return 0L;
     }

querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/document/DocumentUtils.java

@@ -0,0 +1,15 @@
+package com.querydsl.mongodb.document;
+
+import dev.morphia.Datastore;
+import dev.morphia.mapping.Mapper;
+import dev.morphia.mapping.codec.writer.DocumentWriter;
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+
+public class DocumentUtils {
+  public static Document getAsDocument(Datastore morphia, Object value) {
+    Mapper mapper = morphia.getMapper();
+    CodecRegistry codecRegistry = morphia.getCodecRegistry();
+    return DocumentWriter.encode(value, mapper, codecRegistry);
+  }
+}