ISSUE #1060 - step 1 - change org.mongodb.morphia to

dev.morphia.morphia

Author: kkrzywanski

pom.xml

@@ -120,7 +120,7 @@
     <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>4.1.1</mongodb.version>
 
     <r2dbc.version>1.0.0.RELEASE</r2dbc.version>
 
@@ -141,7 +141,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>1.6.1</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>

querydsl-libraries/pom.xml

@@ -100,7 +100,7 @@
                     <exclude>org.eclipse.persistence:eclipselink:*:*:compile</exclude>
                     <exclude>org.datanucleus:javax.jdo:*:*:compile</exclude>
                     <exclude>org.springframework.roo:org.springframework.roo.annotations:*:*: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

@@ -14,7 +14,7 @@
 
   <properties>
     <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 +27,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>core</artifactId>
       <version>${morphia.version}</version>
       <scope>provided</scope>
       <optional>true</optional>

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/morphia/MorphiaQuery.java

@@ -18,11 +18,11 @@
 import com.mongodb.DBObject;
 import com.querydsl.core.types.EntityPath;
 import com.querydsl.mongodb.AbstractMongodbQuery;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
+import dev.morphia.mapping.cache.DefaultEntityCache;
+import dev.morphia.mapping.cache.EntityCache;
 import java.util.function.Function;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
-import org.mongodb.morphia.mapping.cache.DefaultEntityCache;
-import org.mongodb.morphia.mapping.cache.EntityCache;
 
 /**
  * {@code MorphiaQuery} extends {@link AbstractMongodbQuery} with Morphia specific transformations

querydsl-libraries/querydsl-mongodb/src/main/java/com/querydsl/mongodb/morphia/MorphiaSerializer.java

@@ -18,12 +18,12 @@
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.PathMetadata;
 import com.querydsl.mongodb.MongodbSerializer;
-import org.mongodb.morphia.Key;
-import org.mongodb.morphia.Morphia;
-import org.mongodb.morphia.annotations.Id;
-import org.mongodb.morphia.annotations.Property;
-import org.mongodb.morphia.annotations.Reference;
-import org.mongodb.morphia.mapping.Mapper;
+import dev.morphia.Key;
+import dev.morphia.Morphia;
+import dev.morphia.annotations.Id;
+import dev.morphia.annotations.Property;
+import dev.morphia.annotations.Reference;
+import dev.morphia.mapping.Mapper;
 
 /**
  * {@code MorphiaSerializer} extends {@link MongodbSerializer} with Morphia specific annotation

querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbGeoSpatialQueryTest.java

@@ -22,12 +22,12 @@
 import com.querydsl.mongodb.domain.GeoEntity;
 import com.querydsl.mongodb.domain.QGeoEntity;
 import com.querydsl.mongodb.morphia.MorphiaQuery;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
 import java.net.UnknownHostException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
 
 @Category(MongoDB.class)
 public class MongodbGeoSpatialQueryTest {

querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbJoinTest.java

@@ -10,12 +10,12 @@
 import com.querydsl.mongodb.domain.QUser;
 import com.querydsl.mongodb.domain.User;
 import com.querydsl.mongodb.morphia.MorphiaQuery;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
 import java.net.UnknownHostException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
 
 @Category(MongoDB.class)
 public class MongodbJoinTest {

querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbPolymorphicCollectionTest.java

@@ -12,12 +12,12 @@
 import com.querydsl.mongodb.domain.QFish;
 import com.querydsl.mongodb.domain.QFood;
 import com.querydsl.mongodb.morphia.MorphiaQuery;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
 import java.net.UnknownHostException;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
 
 @Category(MongoDB.class)
 public class MongodbPolymorphicCollectionTest {

querydsl-libraries/querydsl-mongodb/src/test/java/com/querydsl/mongodb/MongodbQueryTest.java

@@ -40,6 +40,8 @@
 import com.querydsl.mongodb.domain.User;
 import com.querydsl.mongodb.domain.User.Gender;
 import com.querydsl.mongodb.morphia.MorphiaQuery;
+import dev.morphia.Datastore;
+import dev.morphia.Morphia;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -52,8 +54,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
-import org.mongodb.morphia.Datastore;
-import org.mongodb.morphia.Morphia;
 
 @Category(MongoDB.class)
 public class MongodbQueryTest {