Skip to content

Commit

Permalink
Address code review feedback
Browse files Browse the repository at this point in the history
Signed-off-by: Craig Perkins <cwperx@amazon.com>
  • Loading branch information
cwperks committed May 1, 2023
1 parent 15c82db commit 54d057c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 18 deletions.
31 changes: 13 additions & 18 deletions src/main/java/org/opensearch/sdk/ExtensionSettings.java
Original file line number Diff line number Diff line change
Expand Up @@ -97,23 +97,15 @@ private ExtensionSettings() {
* @param hostPort The port to bind this extension to.
* @param opensearchAddress The IP Address on which OpenSearch is running.
* @param opensearchPort The port on which OpenSearch is running.
* @param securitySettings A generic map of any settings set in the config file that are not default setting keys
*/
public ExtensionSettings(
String extensionName,
String hostAddress,
String hostPort,
String opensearchAddress,
String opensearchPort,
Map<String, String> securitySettings
) {
public ExtensionSettings(String extensionName, String hostAddress, String hostPort, String opensearchAddress, String opensearchPort) {
super();
this.extensionName = extensionName;
this.hostAddress = hostAddress;
this.hostPort = hostPort;
this.opensearchAddress = opensearchAddress;
this.opensearchPort = opensearchPort;
this.securitySettings = securitySettings;
this.securitySettings = Map.of();
}

/**
Expand All @@ -124,15 +116,18 @@ public ExtensionSettings(
* @param hostPort The port to bind this extension to.
* @param opensearchAddress The IP Address on which OpenSearch is running.
* @param opensearchPort The port on which OpenSearch is running.
* @param securitySettings A generic map of any settings set in the config file that are not default setting keys
*/
public ExtensionSettings(String extensionName, String hostAddress, String hostPort, String opensearchAddress, String opensearchPort) {
super();
this.extensionName = extensionName;
this.hostAddress = hostAddress;
this.hostPort = hostPort;
this.opensearchAddress = opensearchAddress;
this.opensearchPort = opensearchPort;
this.securitySettings = Map.of();
public ExtensionSettings(
String extensionName,
String hostAddress,
String hostPort,
String opensearchAddress,
String opensearchPort,
Map<String, String> securitySettings
) {
this(extensionName, hostAddress, hostPort, opensearchAddress, opensearchPort);
this.securitySettings = securitySettings;
}

public String getExtensionName() {
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/opensearch/sdk/ExtensionsRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,8 @@ protected ExtensionsRunner(Extension extension) throws IOException {
addSettingsToBuilder(settingsBuilder, settingsKey, extensionSettings);
}
}
String sslText = sslEnabled ? "enabled" : "disabled";
logger.info("SSL is " + sslText + " for transport");
this.settings = settingsBuilder.build();

final List<ExecutorBuilder<?>> executorBuilders = extension.getExecutorBuilders(settings);
Expand Down

0 comments on commit 54d057c

Please sign in to comment.