Remove JacksonDBCollection usage from DBTelemetryUserSettingsService

Graylog2 · Jan 20, 2025 · 48b70c1 · 48b70c1
1 parent c4b3e65
commit 48b70c1
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/...2-server/src/main/java/org/graylog2/telemetry/user/db/DBTelemetryUserSettingsService.java b/...2-server/src/main/java/org/graylog2/telemetry/user/db/DBTelemetryUserSettingsService.java
@@ -16,13 +16,11 @@
  */
 package org.graylog2.telemetry.user.db;
 
-import org.bson.types.ObjectId;
-import org.graylog2.bindings.providers.MongoJackObjectMapperProvider;
-import org.graylog2.database.MongoConnection;
-import org.mongojack.DBQuery;
-import org.mongojack.JacksonDBCollection;
-
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
 import jakarta.inject.Inject;
+import org.graylog2.database.MongoCollections;
+import org.graylog2.database.utils.MongoUtils;
 
 import java.util.Optional;
 
@@ -32,26 +30,24 @@ public class DBTelemetryUserSettingsService {
 
     public static final String COLLECTION_NAME = "telemetry_user_settings";
 
-    private final JacksonDBCollection<TelemetryUserSettingsDto, ObjectId> db;
+    private final MongoCollection<TelemetryUserSettingsDto> collection;
+    private final MongoUtils<TelemetryUserSettingsDto> mongoUtils;
 
     @Inject
-    public DBTelemetryUserSettingsService(MongoConnection mongoConnection,
-                                          MongoJackObjectMapperProvider mapper) {
-        this.db = JacksonDBCollection.wrap(mongoConnection.getDatabase().getCollection(COLLECTION_NAME),
-                TelemetryUserSettingsDto.class,
-                ObjectId.class,
-                mapper.get());
+    public DBTelemetryUserSettingsService(MongoCollections mongoCollections) {
+        collection = mongoCollections.collection(COLLECTION_NAME, TelemetryUserSettingsDto.class);
+        mongoUtils = mongoCollections.utils(collection);
     }
 
     public Optional<TelemetryUserSettingsDto> findByUserId(String userId) {
-        return Optional.ofNullable(db.findOne(DBQuery.is(FIELD_USER_ID, userId)));
+        return Optional.ofNullable(collection.find(Filters.eq(FIELD_USER_ID, userId)).first());
     }
 
     public void save(TelemetryUserSettingsDto dto) {
-        db.save(dto);
+        mongoUtils.save(dto);
     }
 
     public void delete(String userId) {
-        db.remove(DBQuery.is(FIELD_USER_ID, userId));
+        collection.deleteMany(Filters.eq(FIELD_USER_ID, userId));
     }
 }
diff --git a/graylog2-server/src/main/java/org/graylog2/telemetry/user/db/TelemetryUserSettingsDto.java b/graylog2-server/src/main/java/org/graylog2/telemetry/user/db/TelemetryUserSettingsDto.java
@@ -19,13 +19,15 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.auto.value.AutoValue;
+import org.graylog2.database.BuildableMongoEntity;
 import org.mongojack.Id;
 import org.mongojack.ObjectId;
 
 import javax.annotation.Nullable;
 
 @AutoValue
-public abstract class TelemetryUserSettingsDto {
+public abstract class TelemetryUserSettingsDto
+        implements BuildableMongoEntity<TelemetryUserSettingsDto, TelemetryUserSettingsDto.Builder> {
 
     public static final String FIELD_USER_ID = "user_id";
 
@@ -62,7 +64,7 @@ public static TelemetryUserSettingsDto create(@JsonProperty("id") @Id @ObjectId
     public abstract Boolean telemetryPermissionAsked();
 
     @AutoValue.Builder
-    public abstract static class Builder {
+    public abstract static class Builder implements BuildableMongoEntity.Builder<TelemetryUserSettingsDto, Builder> {
 
         public abstract Builder id(String id);
 

diff --git a/graylog2-server/src/test/java/org/graylog2/telemetry/rest/TelemetryServiceWithDbTest.java b/graylog2-server/src/test/java/org/graylog2/telemetry/rest/TelemetryServiceWithDbTest.java
@@ -24,6 +24,7 @@
 import org.graylog2.bindings.providers.MongoJackObjectMapperProvider;
 import org.graylog2.cluster.leader.LeaderElectionService;
 import org.graylog2.cluster.nodes.NodeService;
+import org.graylog2.database.MongoCollections;
 import org.graylog2.indexer.cluster.ClusterAdapter;
 import org.graylog2.plugin.PluginMetaData;
 import org.graylog2.plugin.ServerStatus;
@@ -111,7 +112,7 @@ public void setUp() {
                 elasticClusterAdapter,
                 elasticsearchVersion,
                 new TelemetryResponseFactory(new ObjectMapperProvider().get()),
-                new DBTelemetryUserSettingsService(mongodb.mongoConnection(), mongoJackObjectMapperProvider),
+                new DBTelemetryUserSettingsService(new MongoCollections(mongoJackObjectMapperProvider, mongodb.mongoConnection())),
                 eventBus,
                 telemetryClusterService,
                 "unknown",