From 174344be751a6887a07d883be03f818eed50221f Mon Sep 17 00:00:00 2001 From: Craig Perkins Date: Fri, 18 Oct 2024 15:38:36 -0400 Subject: [PATCH] Move DefaultSecureTransportParameters to separate file and add javadoc Signed-off-by: Craig Perkins --- .../DefaultSecureTransportParameters.java | 28 +++++++++++++++++++ .../SecureTransportSettingsProvider.java | 17 ++--------- 2 files changed, 31 insertions(+), 14 deletions(-) create mode 100644 server/src/main/java/org/opensearch/plugins/DefaultSecureTransportParameters.java diff --git a/server/src/main/java/org/opensearch/plugins/DefaultSecureTransportParameters.java b/server/src/main/java/org/opensearch/plugins/DefaultSecureTransportParameters.java new file mode 100644 index 0000000000000..e3771f224a7db --- /dev/null +++ b/server/src/main/java/org/opensearch/plugins/DefaultSecureTransportParameters.java @@ -0,0 +1,28 @@ +/* + * SPDX-License-Identifier: Apache-2.0 + * + * The OpenSearch Contributors require contributions made to + * this file be licensed under the Apache-2.0 license or a + * compatible open source license. + */ + +package org.opensearch.plugins; + +import org.opensearch.common.network.NetworkModule; +import org.opensearch.common.settings.Settings; + +/** + * Default implementation of {@link SecureTransportSettingsProvider.SecureTransportParameters}. + */ +class DefaultSecureTransportParameters implements SecureTransportSettingsProvider.SecureTransportParameters { + private final Settings settings; + + DefaultSecureTransportParameters(Settings settings) { + this.settings = settings; + } + + @Override + public boolean dualModeEnabled() { + return NetworkModule.TRANSPORT_SSL_DUAL_MODE_ENABLED.get(settings); + } +} diff --git a/server/src/main/java/org/opensearch/plugins/SecureTransportSettingsProvider.java b/server/src/main/java/org/opensearch/plugins/SecureTransportSettingsProvider.java index 1b5cd45620d32..5f9e1a952b6e8 100644 --- a/server/src/main/java/org/opensearch/plugins/SecureTransportSettingsProvider.java +++ b/server/src/main/java/org/opensearch/plugins/SecureTransportSettingsProvider.java @@ -9,7 +9,6 @@ package org.opensearch.plugins; import org.opensearch.common.annotation.ExperimentalApi; -import org.opensearch.common.network.NetworkModule; import org.opensearch.common.settings.Settings; import org.opensearch.transport.Transport; import org.opensearch.transport.TransportAdapterProvider; @@ -47,24 +46,14 @@ default Optional parameters(Settings settings) { return Optional.of(new DefaultSecureTransportParameters(settings)); } + /** + * Dynamic parameters that can be provided by the {@link SecureTransportSettingsProvider} + */ @ExperimentalApi interface SecureTransportParameters { boolean dualModeEnabled(); } - class DefaultSecureTransportParameters implements SecureTransportParameters { - private final Settings settings; - - DefaultSecureTransportParameters(Settings settings) { - this.settings = settings; - } - - @Override - public boolean dualModeEnabled() { - return NetworkModule.TRANSPORT_SSL_DUAL_MODE_ENABLED.get(settings); - } - } - /** * If supported, builds the {@link TransportExceptionHandler} instance for {@link Transport} instance * @param settings settings