rebase fixes

Signed-off-by: Rishabh Maurya <rishabhmaurya05@gmail.com>
opensearch-project · Jan 20, 2025 · 1fc5a05 · 1fc5a05
1 parent 9d306c5
commit 1fc5a05
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/arrow-flight-rpc/build.gradle b/plugins/arrow-flight-rpc/build.gradle
@@ -12,8 +12,8 @@
 apply plugin: 'opensearch.internal-cluster-test'
 
 opensearchplugin {
-  description 'Arrow flight based Stream implementation'
-  classname 'org.opensearch.arrow.flight.FlightStreamPlugin'
+  description = 'Arrow flight based Stream implementation'
+  classname = 'org.opensearch.arrow.flight.FlightStreamPlugin'
 }
 
 dependencies {

diff --git a/...rrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/ServerComponents.java b/...rrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/ServerComponents.java
@@ -46,7 +46,7 @@
 import static java.util.Collections.emptyList;
 import static org.opensearch.common.settings.Setting.intSetting;
 import static org.opensearch.common.settings.Setting.listSetting;
-import static org.opensearch.plugins.NetworkPlugin.AuxTransport.AUX_TRANSPORT_PORTS;
+import static org.opensearch.plugins.NetworkPlugin.AuxTransport.AUX_TRANSPORT_PORT;
 import static org.opensearch.transport.Transport.resolveTransportPublishPort;
 
 final class ServerComponents implements AutoCloseable {
@@ -86,7 +86,7 @@ final class ServerComponents implements AutoCloseable {
     private static final int SHUTDOWN_TIMEOUT_SECONDS = 5;
 
     public static final String FLIGHT_TRANSPORT_SETTING_KEY = "transport-flight";
-    public static final Setting<PortsRange> SETTING_FLIGHT_PORTS = AUX_TRANSPORT_PORTS.getConcreteSettingForNamespace(
+    public static final Setting<PortsRange> SETTING_FLIGHT_PORTS = AUX_TRANSPORT_PORT.getConcreteSettingForNamespace(
         FLIGHT_TRANSPORT_SETTING_KEY
     );