code cleanup

Graylog2 · Feb 10, 2025 · c25849b · c25849b
1 parent 81e2553
commit c25849b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/data-node/src/main/java/org/graylog/datanode/bindings/PreflightChecksBindings.java b/data-node/src/main/java/org/graylog/datanode/bindings/PreflightChecksBindings.java
@@ -34,19 +34,16 @@
 import org.graylog2.cluster.certificates.CertificateExchange;
 import org.graylog2.cluster.certificates.CertificateExchangeImpl;
 import org.graylog2.database.MongoConnection;
-import org.graylog2.featureflag.FeatureFlags;
 import org.graylog2.shared.plugins.ChainingClassLoader;
 import org.graylog2.shared.plugins.GraylogClassLoader;
 
 public class PreflightChecksBindings extends AbstractModule {
 
 
     private final ChainingClassLoader chainingClassLoader;
-    private final FeatureFlags featureFlags;
 
-    public PreflightChecksBindings(ChainingClassLoader chainingClassLoader, FeatureFlags featureFlags) {
+    public PreflightChecksBindings(ChainingClassLoader chainingClassLoader) {
         this.chainingClassLoader = chainingClassLoader;
-        this.featureFlags = featureFlags;
     }
 
     @Override
@@ -61,20 +58,12 @@ protected void configure() {
         addPreflightCheck(OpenSearchPreconditionsCheck.class);
         addPreflightCheck(OpensearchDataDirCompatibilityCheck.class);
         addPreflightCheck(PasswordSecretPreflightCheck.class);
-
-        bindLimittedObjectMapper();
-
         // Mongodb is needed for legacy datanode storage, where we want to extract the certificate chain from
         // mongodb and store it in local keystore
         bind(MongoConnection.class).toProvider(MongoConnectionProvider.class);
         addPreflightCheck(DatanodeKeystoreCheck.class);
     }
 
-    private void bindLimittedObjectMapper() {
-        bind(ClassLoader.class).annotatedWith(GraylogClassLoader.class).toInstance(chainingClassLoader);
-        bind(ObjectMapper.class).toProvider(PreflightObjectMapperProvider.class).asEagerSingleton();
-    }
-
     protected void addPreflightCheck(Class<? extends PreflightCheck> preflightCheck) {
         preflightChecksBinder().addBinding(preflightCheck.getCanonicalName()).to(preflightCheck);
     }

diff --git a/data-node/src/main/java/org/graylog/datanode/bootstrap/DatanodeBootstrap.java b/data-node/src/main/java/org/graylog/datanode/bootstrap/DatanodeBootstrap.java
@@ -84,7 +84,7 @@ private Injector getPreflightInjector(List<Module> preflightCheckModules) {
                 new PreflightClusterConfigurationModule(chainingClassLoader),
                 new NamedConfigParametersOverrideModule(jadConfig.getConfigurationBeans()),
                 new ConfigurationModule(configuration),
-                new PreflightChecksBindings(chainingClassLoader, featureFlags),
+                new PreflightChecksBindings(chainingClassLoader),
                 new DatanodeConfigurationBindings(),
         new Module() {
                     @Override

diff --git a/...in/java/org/graylog/datanode/bootstrap/preflight/PreflightClusterConfigurationModule.java b/...in/java/org/graylog/datanode/bootstrap/preflight/PreflightClusterConfigurationModule.java
@@ -16,10 +16,13 @@
  */
 package org.graylog.datanode.bootstrap.preflight;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.inject.AbstractModule;
+import org.graylog.datanode.bindings.PreflightObjectMapperProvider;
 import org.graylog2.cluster.ClusterConfigServiceImpl;
 import org.graylog2.plugin.cluster.ClusterConfigService;
 import org.graylog2.shared.plugins.ChainingClassLoader;
+import org.graylog2.shared.plugins.GraylogClassLoader;
 
 public class PreflightClusterConfigurationModule extends AbstractModule {
     private final ChainingClassLoader chainingClassLoader;
@@ -32,5 +35,12 @@ public PreflightClusterConfigurationModule(ChainingClassLoader chainingClassLoad
     protected void configure() {
         bind(ChainingClassLoader.class).toInstance(chainingClassLoader);
         bind(ClusterConfigService.class).to(ClusterConfigServiceImpl.class).asEagerSingleton();
+
+        bindLimitedObjectMapper();
+    }
+
+    private void bindLimitedObjectMapper() {
+        bind(ClassLoader.class).annotatedWith(GraylogClassLoader.class).toInstance(chainingClassLoader);
+        bind(ObjectMapper.class).toProvider(PreflightObjectMapperProvider.class).asEagerSingleton();
     }
 }