Skip to content

Commit 0ac61ba

Browse files
Fix minor naming conflict after rebase with flight server pr. boundAddress() -> getBoundAddress().
Signed-off-by: Finn Carroll <[email protected]>
1 parent bb95318 commit 0ac61ba

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

plugins/arrow-flight-rpc/src/main/java/org/opensearch/arrow/flight/bootstrap/FlightService.java

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ public StreamManager getStreamManager() {
134134
* Retrieves the bound address of the FlightService.
135135
* @return The BoundTransportAddress instance.
136136
*/
137+
@Override
137138
public BoundTransportAddress getBoundAddress() {
138139
return serverComponents.getBoundAddress();
139140
}

plugins/transport-grpc/src/main/java/org/opensearch/transport/grpc/Netty4GrpcServerTransport.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public Netty4GrpcServerTransport(Settings settings, List<BindableService> servic
156156

157157
// public for tests
158158
@Override
159-
public BoundTransportAddress boundAddress() {
159+
public BoundTransportAddress getBoundAddress() {
160160
return this.boundAddress;
161161
}
162162

plugins/transport-grpc/src/test/java/org/opensearch/transport/grpc/Netty4GrpcServerTransportIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class Netty4GrpcServerTransportIT extends OpenSearchIntegTestCase {
3030
private TransportAddress randomNetty4GrpcServerTransportAddr() {
3131
List<TransportAddress> addresses = new ArrayList<>();
3232
for (Netty4GrpcServerTransport transport : internalCluster().getInstances(Netty4GrpcServerTransport.class)) {
33-
TransportAddress tAddr = new TransportAddress(transport.boundAddress().publishAddress().address());
33+
TransportAddress tAddr = new TransportAddress(transport.getBoundAddress().publishAddress().address());
3434
addresses.add(tAddr);
3535
}
3636
return randomFrom(addresses);

plugins/transport-grpc/src/test/java/org/opensearch/transport/grpc/Netty4GrpcServerTransportTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,16 @@ public void setup() {
3636
public void testGrpcTransportStartStop() {
3737
try (Netty4GrpcServerTransport transport = new Netty4GrpcServerTransport(createSettings(), services, networkService)) {
3838
transport.start();
39-
MatcherAssert.assertThat(transport.boundAddress().boundAddresses(), not(emptyArray()));
40-
assertNotNull(transport.boundAddress().publishAddress().address());
39+
MatcherAssert.assertThat(transport.getBoundAddress().boundAddresses(), not(emptyArray()));
40+
assertNotNull(transport.getBoundAddress().publishAddress().address());
4141
transport.stop();
4242
}
4343
}
4444

4545
public void testGrpcTransportHealthcheck() {
4646
try (Netty4GrpcServerTransport transport = new Netty4GrpcServerTransport(createSettings(), services, networkService)) {
4747
transport.start();
48-
final TransportAddress remoteAddress = randomFrom(transport.boundAddress().boundAddresses());
48+
final TransportAddress remoteAddress = randomFrom(transport.getBoundAddress().boundAddresses());
4949
try (NettyGrpcClient client = new NettyGrpcClient.Builder().setAddress(remoteAddress).build()) {
5050
assertEquals(client.checkHealth(), HealthCheckResponse.ServingStatus.SERVING);
5151
}

plugins/transport-grpc/src/test/java/org/opensearch/transport/grpc/SecureNetty4GrpcServerTransportTests.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public void testGrpcSecureTransportStartStop() {
132132
)
133133
) {
134134
transport.start();
135-
assertTrue(transport.boundAddress().boundAddresses().length > 0);
136-
assertNotNull(transport.boundAddress().publishAddress().address());
135+
assertTrue(transport.getBoundAddress().boundAddresses().length > 0);
136+
assertNotNull(transport.getBoundAddress().publishAddress().address());
137137
transport.stop();
138138
} catch (Exception e) {
139139
throw new RuntimeException(e);
@@ -150,9 +150,9 @@ public void testGrpcSecureTransportHealthcheck() {
150150
)
151151
) {
152152
transport.start();
153-
assertTrue(transport.boundAddress().boundAddresses().length > 0);
154-
assertNotNull(transport.boundAddress().publishAddress().address());
155-
final TransportAddress remoteAddress = randomFrom(transport.boundAddress().boundAddresses());
153+
assertTrue(transport.getBoundAddress().boundAddresses().length > 0);
154+
assertNotNull(transport.getBoundAddress().publishAddress().address());
155+
final TransportAddress remoteAddress = randomFrom(transport.getBoundAddress().boundAddresses());
156156
try (
157157
NettyGrpcClient client = new NettyGrpcClient.Builder().setAddress(remoteAddress)
158158
.setSecureSettingsProvider(settingsProvider)

server/src/main/java/org/opensearch/plugins/NetworkPlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ abstract class AuxTransport extends AbstractLifecycleComponent {
9595
);
9696

9797
// public for tests
98-
public abstract BoundTransportAddress boundAddress();
98+
public abstract BoundTransportAddress getBoundAddress();
9999
}
100100

101101
/**

0 commit comments

Comments
 (0)