remove internal MorphiaCursor

update rewrite scripts to update usages of old cursor type
bendherville · Oct 22, 2023 · cba79ea · cba79ea
1 parent 7da16ff
commit cba79ea
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 32 deletions.
diff --git a/config/findbugs-exclude.xml b/config/findbugs-exclude.xml
@@ -25,10 +25,6 @@
     <Match>
         <Bug pattern="EI_EXPOSE_REP"/>
     </Match>
-    <Match>
-        <Class name="dev.morphia.query.internal.MorphiaCursor"/>
-        <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
-    </Match>
     <Match>
         <Class name="~.*\.*Test.*"/>
         <Not>

diff --git a/core/src/main/java/dev/morphia/aggregation/Aggregation.java b/core/src/main/java/dev/morphia/aggregation/Aggregation.java
@@ -28,8 +28,8 @@
 import dev.morphia.aggregation.stages.Unset;
 import dev.morphia.aggregation.stages.Unwind;
 import dev.morphia.annotations.internal.MorphiaInternal;
+import dev.morphia.query.MorphiaCursor;
 import dev.morphia.query.filters.Filter;
-import dev.morphia.query.internal.MorphiaCursor;
 
 /**
  * @param <T> The initial type of the aggregation. Used for collection name resolution.

diff --git a/core/src/main/java/dev/morphia/aggregation/AggregationImpl.java b/core/src/main/java/dev/morphia/aggregation/AggregationImpl.java
@@ -54,8 +54,8 @@
 import dev.morphia.mapping.codec.pojo.EntityModel;
 import dev.morphia.mapping.codec.reader.DocumentReader;
 import dev.morphia.mapping.codec.writer.DocumentWriter;
+import dev.morphia.query.MorphiaCursor;
 import dev.morphia.query.filters.Filter;
-import dev.morphia.query.internal.MorphiaCursor;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 

diff --git a/core/src/main/java/dev/morphia/query/MorphiaQuery.java b/core/src/main/java/dev/morphia/query/MorphiaQuery.java
@@ -26,7 +26,6 @@
 import dev.morphia.mapping.codec.pojo.EntityModel;
 import dev.morphia.mapping.codec.writer.DocumentWriter;
 import dev.morphia.query.filters.Filter;
-import dev.morphia.query.internal.MorphiaCursor;
 import dev.morphia.query.updates.UpdateOperator;
 import dev.morphia.sofia.Sofia;
 

diff --git a/core/src/main/java/dev/morphia/query/Query.java b/core/src/main/java/dev/morphia/query/Query.java
@@ -16,7 +16,6 @@
 import dev.morphia.UpdateOptions;
 import dev.morphia.aggregation.stages.Stage;
 import dev.morphia.query.filters.Filter;
-import dev.morphia.query.internal.MorphiaCursor;
 import dev.morphia.query.updates.UpdateOperator;
 
 /**

diff --git a/core/src/main/java/dev/morphia/query/internal/MorphiaCursor.java b/core/src/main/java/dev/morphia/query/internal/MorphiaCursor.java
diff --git a/upgrading/UpgradeTo30.yml b/upgrading/UpgradeTo30.yml
@@ -37,3 +37,6 @@ recipeList:
   - org.openrewrite.java.ChangeType:
       oldFullyQualifiedTypeName: dev.morphia.geo.Polygon
       newFullyQualifiedTypeName: com.mongodb.client.model.geojson.Polygon
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: dev.morphia.query.internal.MorphiaCursor
+      newFullyQualifiedTypeName: dev.morphia.query.MorphiaCursor