Skip to content

Commit 57324d9

Browse files
committed
Fix compilation error
1 parent a1a5803 commit 57324d9

File tree

4 files changed

+7
-13
lines changed

4 files changed

+7
-13
lines changed

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/EC2RetriesTests.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ public class EC2RetriesTests extends AbstractEC2MockAPITestCase {
4747
@Override
4848
protected MockTransportService createTransportService() {
4949
return MockTransportService.createMockTransportService(
50-
Settings.EMPTY,
5150
new Netty4Transport(
5251
Settings.EMPTY,
5352
TransportVersion.current(),

plugins/discovery-ec2/src/test/java/org/elasticsearch/discovery/ec2/Ec2DiscoveryTests.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,7 @@ public TransportAddress[] addressesFromString(String address) {
7878
return new TransportAddress[] { poorMansDNS.getOrDefault(address, buildNewFakeTransportAddress()) };
7979
}
8080
};
81-
return MockTransportService.createMockTransportService(
82-
Settings.EMPTY,
83-
transport,
84-
threadPool,
85-
TransportService.NOOP_TRANSPORT_INTERCEPTOR
86-
);
81+
return MockTransportService.createMockTransportService(transport, threadPool);
8782
}
8883

8984
protected List<TransportAddress> buildDynamicHosts(Settings nodeSettings, int nodes) {

server/src/test/java/org/elasticsearch/discovery/FileBasedSeedHostsProviderTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public BoundTransportAddress boundAddress() {
8686
);
8787
}
8888
};
89-
transportService = MockTransportService.createMockTransportService(Settings.EMPTY, transport, threadPool);
89+
transportService = MockTransportService.createMockTransportService(transport, threadPool);
9090
}
9191

9292
public void testBuildDynamicNodes() throws Exception {

test/framework/src/main/java/org/elasticsearch/test/transport/MockTransportService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,16 +218,16 @@ public static MockTransportService getInstance(String nodeName) {
218218
private final EsThreadPoolExecutor testExecutor;
219219

220220
/** Build the service. */
221-
public static MockTransportService createMockTransportService(Settings settings, Transport transport, ThreadPool threadPool) {
222-
String nodeId = settings.get(Node.NODE_NAME_SETTING.getKey(), UUIDs.randomBase64UUID());
221+
public static MockTransportService createMockTransportService(Transport transport, ThreadPool threadPool) {
222+
String nodeId = UUIDs.randomBase64UUID();
223223
return new MockTransportService(
224-
settings,
224+
Settings.EMPTY,
225225
new StubbableTransport(transport),
226226
threadPool,
227227
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
228-
(boundAddress) -> DiscoveryNodeUtils.builder(nodeId).applySettings(settings).address(boundAddress.publishAddress()).build(),
228+
(boundAddress) -> DiscoveryNodeUtils.builder(nodeId).address(boundAddress.publishAddress()).build(),
229229
null, // clusterSettings
230-
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, nodeId)
230+
createTaskManager(Settings.EMPTY, threadPool, Set.of(), Tracer.NOOP, nodeId)
231231
);
232232
}
233233

0 commit comments

Comments
 (0)