Skip to content

Commit 7f0b984

Browse files
GalLaloucheGalLalouche
committed
More CR fixes
1 parent 28eefa8 commit 7f0b984

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.apache.http.NameValuePair;
1717
import org.apache.http.client.utils.URLEncodedUtils;
1818
import org.elasticsearch.TransportVersion;
19+
import org.elasticsearch.common.UUIDs;
1920
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
2021
import org.elasticsearch.common.settings.Settings;
2122
import org.elasticsearch.common.transport.TransportAddress;
@@ -63,7 +64,7 @@ protected MockTransportService createTransportService() {
6364
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
6465
null,
6566
null,
66-
null
67+
UUIDs.randomBase64UUID()
6768
);
6869
}
6970

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.apache.http.NameValuePair;
2020
import org.apache.http.client.utils.URLEncodedUtils;
2121
import org.elasticsearch.TransportVersion;
22+
import org.elasticsearch.common.UUIDs;
2223
import org.elasticsearch.common.network.NetworkService;
2324
import org.elasticsearch.common.settings.Settings;
2425
import org.elasticsearch.common.transport.TransportAddress;
@@ -85,7 +86,7 @@ public TransportAddress[] addressesFromString(String address) {
8586
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
8687
null,
8788
null,
88-
null
89+
UUIDs.randomBase64UUID()
8990
);
9091
}
9192

‎server/src/main/java/org/elasticsearch/node/NodeServiceProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ TransportService newTransportService(
115115
ClusterSettings clusterSettings,
116116
TaskManager taskManager,
117117
Tracer tracer,
118-
String initialNodeId
118+
String nodeId
119119
) {
120120
return new TransportService(settings, transport, threadPool, interceptor, localNodeFactory, clusterSettings, taskManager, tracer);
121121
}

‎server/src/main/java/org/elasticsearch/tasks/TaskManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public TaskManager(Settings settings, ThreadPool threadPool, Set<String> taskHea
101101
this(settings, threadPool, taskHeaders, tracer, UUIDs.randomBase64UUID());
102102
}
103103

104-
public TaskManager(Settings settings, ThreadPool threadPool, Set<String> taskHeaders, Tracer tracer, @Nullable String nodeId) {
104+
public TaskManager(Settings settings, ThreadPool threadPool, Set<String> taskHeaders, Tracer tracer, String nodeId) {
105105
this.threadPool = threadPool;
106106
this.taskHeaders = Set.copyOf(taskHeaders);
107107
this.maxHeaderSize = SETTING_HTTP_MAX_HEADER_SIZE.get(settings);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
package org.elasticsearch.discovery;
1111

1212
import org.elasticsearch.TransportVersion;
13+
import org.elasticsearch.common.UUIDs;
1314
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
1415
import org.elasticsearch.common.network.NetworkService;
1516
import org.elasticsearch.common.settings.Settings;
@@ -94,7 +95,7 @@ public BoundTransportAddress boundAddress() {
9495
TransportService.NOOP_TRANSPORT_INTERCEPTOR,
9596
null,
9697
null,
97-
null
98+
UUIDs.randomBase64UUID()
9899
);
99100
}
100101

‎test/framework/src/main/java/org/elasticsearch/node/MockNode.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ protected TransportService newTransportService(
168168
ClusterSettings clusterSettings,
169169
TaskManager taskManager,
170170
Tracer tracer,
171-
String initialNodeId
171+
String nodeId
172172
) {
173173

174174
// we use the MockTransportService.TestPlugin class as a marker to create a network
@@ -186,7 +186,7 @@ protected TransportService newTransportService(
186186
clusterSettings,
187187
taskManager,
188188
tracer,
189-
initialNodeId
189+
nodeId
190190
);
191191
} else {
192192
return new MockTransportService(
@@ -197,7 +197,7 @@ protected TransportService newTransportService(
197197
localNodeFactory,
198198
clusterSettings,
199199
taskManager.getTaskHeaders(),
200-
initialNodeId
200+
nodeId
201201
);
202202
}
203203
}

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

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -188,21 +188,21 @@ public static MockTransportService createNewService(
188188
Set<String> taskHeaders,
189189
TransportInterceptor interceptor
190190
) {
191-
String initialNodeId = UUIDs.randomBase64UUID();
191+
String nodeId = UUIDs.randomBase64UUID();
192192
return new MockTransportService(
193193
settings,
194194
new StubbableTransport(transport),
195195
threadPool,
196196
interceptor,
197-
boundAddress -> DiscoveryNodeUtils.builder(initialNodeId)
197+
boundAddress -> DiscoveryNodeUtils.builder(nodeId)
198198
.name(Node.NODE_NAME_SETTING.get(settings))
199199
.address(boundAddress.publishAddress())
200200
.attributes(Node.NODE_ATTRIBUTES.getAsMap(settings))
201201
.roles(DiscoveryNode.getRolesFromSettings(settings))
202202
.version(version)
203203
.build(),
204204
clusterSettings,
205-
createTaskManager(settings, threadPool, taskHeaders, Tracer.NOOP, initialNodeId)
205+
createTaskManager(settings, threadPool, taskHeaders, Tracer.NOOP, nodeId)
206206
);
207207
}
208208

@@ -231,18 +231,15 @@ public static MockTransportService createMockTransportService(
231231
TransportInterceptor interceptor,
232232
@Nullable ClusterSettings clusterSettings
233233
) {
234-
String initialNodeId = settings.get(Node.NODE_NAME_SETTING.getKey(), UUIDs.randomBase64UUID());
234+
String nodeId = settings.get(Node.NODE_NAME_SETTING.getKey(), UUIDs.randomBase64UUID());
235235
return new MockTransportService(
236236
settings,
237237
new StubbableTransport(transport),
238238
threadPool,
239239
interceptor,
240-
(boundAddress) -> DiscoveryNodeUtils.builder(initialNodeId)
241-
.applySettings(settings)
242-
.address(boundAddress.publishAddress())
243-
.build(),
240+
(boundAddress) -> DiscoveryNodeUtils.builder(nodeId).applySettings(settings).address(boundAddress.publishAddress()).build(),
244241
clusterSettings,
245-
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, initialNodeId)
242+
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, nodeId)
246243
);
247244
}
248245

@@ -261,7 +258,7 @@ public MockTransportService(
261258
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
262259
@Nullable ClusterSettings clusterSettings,
263260
Set<String> taskHeaders,
264-
@Nullable String initialNodeId
261+
String nodeId
265262
) {
266263
this(
267264
settings,
@@ -270,7 +267,7 @@ public MockTransportService(
270267
interceptor,
271268
localNodeFactory,
272269
clusterSettings,
273-
createTaskManager(settings, threadPool, taskHeaders, Tracer.NOOP, initialNodeId)
270+
createTaskManager(settings, threadPool, taskHeaders, Tracer.NOOP, nodeId)
274271
);
275272
}
276273

@@ -281,7 +278,7 @@ public MockTransportService(
281278
TransportInterceptor interceptor,
282279
Function<BoundTransportAddress, DiscoveryNode> localNodeFactory,
283280
@Nullable ClusterSettings clusterSettings,
284-
String initialNodeId
281+
String nodeId
285282
) {
286283
this(
287284
settings,
@@ -290,7 +287,7 @@ public MockTransportService(
290287
interceptor,
291288
localNodeFactory,
292289
clusterSettings,
293-
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, initialNodeId)
290+
createTaskManager(settings, threadPool, Set.of(), Tracer.NOOP, nodeId)
294291
);
295292
}
296293

@@ -340,9 +337,9 @@ public static TaskManager createTaskManager(
340337
ThreadPool threadPool,
341338
Set<String> taskHeaders,
342339
Tracer tracer,
343-
@Nullable String initialNodeId
340+
String nodeId
344341
) {
345-
TaskManager mockTaskManager = createMockTaskManager(settings, threadPool, taskHeaders, tracer, initialNodeId);
342+
TaskManager mockTaskManager = createMockTaskManager(settings, threadPool, taskHeaders, tracer, nodeId);
346343
return MockTaskManager.SPY_TASK_MANAGER_SETTING.get(settings) ? spy(mockTaskManager) : mockTaskManager;
347344
}
348345

@@ -351,12 +348,12 @@ private static TaskManager createMockTaskManager(
351348
ThreadPool threadPool,
352349
Set<String> taskHeaders,
353350
Tracer tracer,
354-
@Nullable String initialNodeId
351+
String nodeId
355352
) {
356353
if (MockTaskManager.USE_MOCK_TASK_MANAGER_SETTING.get(settings)) {
357354
return new MockTaskManager(settings, threadPool, taskHeaders);
358355
} else {
359-
return new TaskManager(settings, threadPool, taskHeaders, tracer, initialNodeId);
356+
return new TaskManager(settings, threadPool, taskHeaders, tracer, nodeId);
360357
}
361358
}
362359

0 commit comments

Comments
 (0)