Upgrade Mongojack to version 5.0.2 (#21493)

* Gracefully remove DBQuery usages

* Replace remaining usages of deprecated MongoJack API

* Fix DBJobTriggerServiceTest

* Update MongoJack to 5.0.2

* Remove unused fields from MongoUtils

* Add upgrade notes

* add changelog

* Improve readability when creating a projection

Author: thll

UPGRADING.md

@@ -4,10 +4,11 @@ Upgrading to Graylog 6.2.x
 ## Breaking Changes
 
 ### Plugins
-
-Adjustment of `enterpriseWidgets` web interface plugin. The `editComponent` attribute now no longer has a `onSubmit` prop.
-Before this change the prop had to be called to close the widget edit mode. Now it is enough to call `applyAllWidgetChanges` from the `WidgetEditApplyAllChangesContext`.
-Alternatively the `SaveOrCancelButtons` component can be used in the edit component for custom widgets. It renders a cancel and submit button and calls `applyAllWidgetChanges` on submit.
+* This release includes Java API changes which might require plugin authors to adjust their code. Please check
+  [Java API Changes](#java-api-changes) for details.
+* Adjustment of `enterpriseWidgets` web interface plugin. The `editComponent` attribute now no longer has a `onSubmit` prop.
+  Before this change the prop had to be called to close the widget edit mode. Now it is enough to call `applyAllWidgetChanges` from the `WidgetEditApplyAllChangesContext`.
+  Alternatively the `SaveOrCancelButtons` component can be used in the edit component for custom widgets. It renders a cancel and submit button and calls `applyAllWidgetChanges` on submit.
 
 ## Configuration File Changes
 
@@ -21,7 +22,12 @@ Alternatively the `SaveOrCancelButtons` component can be used in the edit compon
 
 ## Java API Changes
 
-The following Java Code API changes have been made.
+Upgraded [MongoJack](https://github.com/mongojack/mongojack) to version 5.x. This impacts the Java API for accessing
+documents in MongoDB. Some previously deprecated MongoJack classes (like `org.mongojack.DBQuery`) have been removed.
+Plugin authors will have to replace usages of removed classes to corresponding classes from the MongoDB driver
+packages, most prominently `com.mongodb.client.model.Filters`.
+
+Additionally, the following Java Code API changes are included in this release:
 
 | File/method                                    | Description |
 |------------------------------------------------|-------------|

changelog/unreleased/pr-21493.toml

@@ -0,0 +1,4 @@
+type = "c"
+message = "Upgraded MongoJack dependency to `5.0.2`. This might require changes to third-party plugins. Please check Graylog upgrade notes."
+
+pulls = ["21493"]

graylog2-server/src/main/java/org/graylog/scheduler/DBJobDefinitionService.java

@@ -26,7 +26,6 @@
 import org.graylog2.bindings.providers.MongoJackObjectMapperProvider;
 import org.graylog2.database.MongoCollections;
 import org.graylog2.database.utils.MongoUtils;
-import org.mongojack.DBQuery;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -78,12 +77,6 @@ private static Bson buildConfigFieldQuery(String configField, Object value) {
         return Filters.eq(field, value);
     }
 
-    @Deprecated
-    public List<JobDefinitionDto> getByQuery(DBQuery.Query query) {
-        mongoUtils.initializeLegacyMongoJackBsonObject(query);
-        return getByQuery((Bson) query);
-    }
-
     public List<JobDefinitionDto> getByQuery(Bson query) {
         return collection.find(query).into(new ArrayList<>());
     }

graylog2-server/src/main/java/org/graylog/scheduler/DBJobTriggerService.java

@@ -41,7 +41,6 @@
 import org.graylog2.database.utils.MongoUtils;
 import org.graylog2.plugin.system.NodeId;
 import org.joda.time.DateTime;
-import org.mongojack.DBQuery;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -335,22 +334,10 @@ public int deleteByQuery(Bson query) {
         return Ints.saturatedCast(collection.deleteMany(query).getDeletedCount());
     }
 
-    @Deprecated
-    public int deleteByQuery(DBQuery.Query query) {
-        mongoUtils.initializeLegacyMongoJackBsonObject(query);
-        return deleteByQuery((Bson) query);
-    }
-
     public long countByQuery(Bson query) {
         return collection.countDocuments(query);
     }
 
-    @Deprecated
-    public long countByQuery(DBQuery.Query query) {
-        mongoUtils.initializeLegacyMongoJackBsonObject(query);
-        return countByQuery((Bson) query);
-    }
-
     /**
      * Locks and returns the next runnable trigger. The caller needs to take care of releasing the trigger lock.
      *
@@ -545,13 +532,6 @@ public Optional<JobTriggerDto> cancelTriggerByQuery(Bson query) {
         return Optional.ofNullable(collection.findOneAndUpdate(query, update));
     }
 
-    @Deprecated
-    public Optional<JobTriggerDto> cancelTriggerByQuery(DBQuery.Query query) {
-        mongoUtils.initializeLegacyMongoJackBsonObject(query);
-        return cancelTriggerByQuery((Bson) query);
-    }
-
-
     /**
      * Find triggers by using the provided query. Use judiciously!
      *
@@ -562,12 +542,6 @@ public List<JobTriggerDto> findByQuery(Bson query) {
         return stream(collection.find(query).sort(descending(FIELD_UPDATED_AT))).toList();
     }
 
-    @Deprecated
-    public List<JobTriggerDto> findByQuery(DBQuery.Query query) {
-        mongoUtils.initializeLegacyMongoJackBsonObject(query);
-        return findByQuery((Bson) query);
-    }
-
     private record OverdueTrigger(@JsonProperty("_id") String type, @JsonProperty("count") long count) {}
 
     /**

graylog2-server/src/main/java/org/graylog2/database/MongoCollections.java

@@ -103,7 +103,7 @@ public <T extends MongoEntity> MongoUtils<T> utils(String collectionName, Class<
      * Provides utility methods like getting documents by ID, etc.
      */
     public <T extends MongoEntity> MongoUtils<T> utils(MongoCollection<T> collection) {
-        return new MongoUtils<>(collection, objectMapper);
+        return new MongoUtils<>(collection);
     }
 
     /**