diff --git a/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java b/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java index d4e6fe4e9e..22071035ca 100644 --- a/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java +++ b/data-node/src/main/java/org/graylog/datanode/configuration/OpensearchConfigurationProvider.java @@ -97,7 +97,7 @@ public class OpensearchConfigurationProvider implements Provider opensearchProperties = ImmutableMap.builder(); + ImmutableMap.Builder opensearchProperties = ImmutableMap.builder(); if (localConfiguration.getInitialClusterManagerNodes() != null && !localConfiguration.getInitialClusterManagerNodes().isBlank()) { opensearchProperties.put("cluster.initial_cluster_manager_nodes", localConfiguration.getInitialClusterManagerNodes()); @@ -136,8 +136,8 @@ public class OpensearchConfigurationProvider implements Provider commonOpensearchConfig(final Configuration localConfiguration) { - final ImmutableMap.Builder config = ImmutableMap.builder(); + private ImmutableMap commonOpensearchConfig(final Configuration localConfiguration) { + final ImmutableMap.Builder config = ImmutableMap.builder(); localConfiguration.getOpensearchNetworkHost().ifPresent( networkHost -> config.put("network.host", networkHost)); config.put("path.data", datanodeConfiguration.datanodeDirectories().getDataTargetDir().toString()); @@ -146,8 +146,8 @@ public class OpensearchConfigurationProvider implements Provider getOpensearchConfigurationArguments(OpensearchConfiguration config) { - Map allArguments = new LinkedHashMap<>(config.asMap()); + private static Map getOpensearchConfigurationArguments(OpensearchConfiguration config) { + Map allArguments = new LinkedHashMap<>(config.asMap()); // now copy all the environment values to the configuration arguments. Opensearch won't do it for us, // because we are using tar distriburion and opensearch does this only for docker dist. See opensearch-env script diff --git a/data-node/src/main/java/org/graylog/datanode/management/OpensearchProcessService.java b/data-node/src/main/java/org/graylog/datanode/management/OpensearchProcessService.java index 6aa5518fbb..f36e252ad5 100644 --- a/data-node/src/main/java/org/graylog/datanode/management/OpensearchProcessService.java +++ b/data-node/src/main/java/org/graylog/datanode/management/OpensearchProcessService.java @@ -168,7 +168,7 @@ public class OpensearchProcessService extends AbstractIdleService implements Pro private void configure(Map additionalConfig) { final OpensearchConfiguration original = configurationProvider.get(); - final var finalAdditionalConfig = new HashMap(); + final var finalAdditionalConfig = new HashMap(); finalAdditionalConfig.putAll(original.additionalConfiguration()); finalAdditionalConfig.putAll(additionalConfig); diff --git a/data-node/src/main/java/org/graylog/datanode/process/OpensearchConfiguration.java b/data-node/src/main/java/org/graylog/datanode/process/OpensearchConfiguration.java index 46b159ca6f..c9f0d81fa5 100644 --- a/data-node/src/main/java/org/graylog/datanode/process/OpensearchConfiguration.java +++ b/data-node/src/main/java/org/graylog/datanode/process/OpensearchConfiguration.java @@ -43,11 +43,11 @@ public record OpensearchConfiguration( S3RepositoryConfiguration s3RepositoryConfiguration, String nodeSearchCacheSize, - Map additionalConfiguration + Map additionalConfiguration ) { - public Map asMap() { + public Map asMap() { - Map config = new LinkedHashMap<>(); + Map config = new LinkedHashMap<>(); config.put("action.auto_create_index", "false"); @@ -78,7 +78,7 @@ public record OpensearchConfiguration( config.put("discovery.seed_providers", "file"); config.put("node.search.cache.size", nodeSearchCacheSize); - if(s3RepositoryConfiguration.isRepositoryEnabled()) { + if (s3RepositoryConfiguration.isRepositoryEnabled()) { config.putAll(s3RepositoryConfiguration.toOpensearchProperties()); } @@ -97,12 +97,12 @@ public record OpensearchConfiguration( } public HttpHost getRestBaseUrl() { - final boolean sslEnabled = Boolean.parseBoolean(asMap().getOrDefault("plugins.security.ssl.http.enabled", "false")); + final boolean sslEnabled = Boolean.parseBoolean(asMap().getOrDefault("plugins.security.ssl.http.enabled", "false").toString()); return new HttpHost(hostname(), httpPort(), sslEnabled ? "https" : "http"); } public HttpHost getClusterBaseUrl() { - final boolean sslEnabled = Boolean.parseBoolean(asMap().getOrDefault("plugins.security.ssl.http.enabled", "false")); + final boolean sslEnabled = Boolean.parseBoolean(asMap().getOrDefault("plugins.security.ssl.http.enabled", "false").toString()); return new HttpHost(hostname(), transportPort(), sslEnabled ? "https" : "http"); }