Skip to content

Commit 8491584

Browse files
arteamarteam
committed
Migrate to Java16 records (part 2)
1 parent 3aa9716 commit 8491584

File tree

211 files changed

+1240
-2496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

211 files changed

+1240
-2496
lines changed

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ESRestHighLevelClientTestCase.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -341,19 +341,19 @@ protected static TaskId findTaskToRethrottle(String actionName, String descripti
341341
list.rethrowFailures("Finding tasks to rethrottle");
342342
List<TaskGroup> taskGroups = list.getTaskGroups()
343343
.stream()
344-
.filter(taskGroup -> taskGroup.getTaskInfo().getDescription().equals(description))
344+
.filter(taskGroup -> taskGroup.taskInfo().description().equals(description))
345345
.collect(Collectors.toList());
346346
assertThat("tasks are left over from the last execution of this test", taskGroups, hasSize(lessThan(2)));
347347
if (0 == taskGroups.size()) {
348348
// The parent task hasn't started yet
349349
continue;
350350
}
351351
TaskGroup taskGroup = taskGroups.get(0);
352-
assertThat(taskGroup.getChildTasks(), empty());
352+
assertThat(taskGroup.childTasks(), empty());
353353
// check that the task initialized enough that it can rethrottle too.
354-
Map<String, Object> statusMap = ((RawTaskStatus) taskGroup.getTaskInfo().getStatus()).toMap();
354+
Map<String, Object> statusMap = ((RawTaskStatus) taskGroup.taskInfo().status()).toMap();
355355
if (statusMap.get("batches").equals(1)) {
356-
return taskGroup.getTaskInfo().getTaskId();
356+
return taskGroup.taskInfo().taskId();
357357
}
358358
} while (System.nanoTime() - start < TimeUnit.SECONDS.toNanos(10));
359359
throw new AssertionError(

‎client/rest-high-level/src/test/java/org/elasticsearch/client/ReindexIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,11 +255,11 @@ public void onFailure(Exception e) {
255255
assertThat(response.getTaskFailures(), empty());
256256
assertThat(response.getNodeFailures(), empty());
257257
assertThat(response.getTasks(), hasSize(1));
258-
assertEquals(taskIdToRethrottle, response.getTasks().get(0).getTaskId());
259-
assertThat(response.getTasks().get(0).getStatus(), instanceOf(RawTaskStatus.class));
258+
assertEquals(taskIdToRethrottle, response.getTasks().get(0).taskId());
259+
assertThat(response.getTasks().get(0).status(), instanceOf(RawTaskStatus.class));
260260
assertEquals(
261261
Float.toString(requestsPerSecond),
262-
((RawTaskStatus) response.getTasks().get(0).getStatus()).toMap().get("requests_per_second").toString()
262+
((RawTaskStatus) response.getTasks().get(0).status()).toMap().get("requests_per_second").toString()
263263
);
264264
assertTrue(taskFinished.await(10, TimeUnit.SECONDS));
265265

‎client/rest-high-level/src/test/java/org/elasticsearch/client/RestHighLevelClientTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ static void mockGetRoot(RestClient restClient) throws IOException {
208208
Build.CURRENT.hash(),
209209
Build.CURRENT.date(),
210210
false,
211-
Build.CURRENT.getQualifiedVersion()
211+
Build.CURRENT.qualifiedVersion()
212212
);
213213

214214
mockGetRoot(restClient, build, true);
@@ -220,7 +220,7 @@ static void mockGetRoot(RestClient restClient) throws IOException {
220220
public static void mockGetRoot(RestClient restClient, Build build, boolean setProductHeader) throws IOException {
221221
org.elasticsearch.action.main.MainResponse mainResp = new org.elasticsearch.action.main.MainResponse(
222222
"node",
223-
Version.fromString(build.getQualifiedVersion().replace("-SNAPSHOT", "")),
223+
Version.fromString(build.qualifiedVersion().replace("-SNAPSHOT", "")),
224224
new ClusterName("cluster"),
225225
"uuid",
226226
build

‎client/rest-high-level/src/test/java/org/elasticsearch/client/TasksIT.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public void testListTasks() throws IOException {
4747
assertThat(response.getTasks().size(), greaterThanOrEqualTo(2));
4848
boolean listTasksFound = false;
4949
for (TaskGroup taskGroup : response.getTaskGroups()) {
50-
org.elasticsearch.tasks.TaskInfo parent = taskGroup.getTaskInfo();
51-
if ("cluster:monitor/tasks/lists".equals(parent.getAction())) {
52-
assertThat(taskGroup.getChildTasks().size(), equalTo(1));
53-
TaskGroup childGroup = taskGroup.getChildTasks().iterator().next();
54-
assertThat(childGroup.getChildTasks().isEmpty(), equalTo(true));
55-
org.elasticsearch.tasks.TaskInfo child = childGroup.getTaskInfo();
56-
assertThat(child.getAction(), equalTo("cluster:monitor/tasks/lists[n]"));
57-
assertThat(child.getParentTaskId(), equalTo(parent.getTaskId()));
50+
org.elasticsearch.tasks.TaskInfo parent = taskGroup.taskInfo();
51+
if ("cluster:monitor/tasks/lists".equals(parent.action())) {
52+
assertThat(taskGroup.childTasks().size(), equalTo(1));
53+
TaskGroup childGroup = taskGroup.childTasks().iterator().next();
54+
assertThat(childGroup.childTasks().isEmpty(), equalTo(true));
55+
org.elasticsearch.tasks.TaskInfo child = childGroup.taskInfo();
56+
assertThat(child.action(), equalTo("cluster:monitor/tasks/lists[n]"));
57+
assertThat(child.parentTaskId(), equalTo(parent.taskId()));
5858
listTasksFound = true;
5959
}
6060
}
@@ -92,9 +92,9 @@ public void testGetValidTask() throws Exception {
9292
assertTrue(taskResponse.isCompleted());
9393
}
9494
org.elasticsearch.tasks.TaskInfo info = taskResponse.getTaskInfo();
95-
assertTrue(info.isCancellable());
96-
assertEquals("reindex from [source1] to [dest]", info.getDescription());
97-
assertEquals("indices:data/write/reindex", info.getAction());
95+
assertTrue(info.cancellable());
96+
assertEquals("reindex from [source1] to [dest]", info.description());
97+
assertEquals("indices:data/write/reindex", info.action());
9898
if (taskResponse.isCompleted() == false) {
9999
assertBusy(checkTaskCompletionStatus(client(), taskId));
100100
}
@@ -115,7 +115,7 @@ public void testCancelTasks() throws IOException {
115115
org.elasticsearch.tasks.TaskInfo firstTask = listResponse.getTasks().get(0);
116116
String node = listResponse.getPerNodeTasks().keySet().iterator().next();
117117

118-
CancelTasksRequest cancelTasksRequest = new CancelTasksRequest.Builder().withTaskId(new TaskId(node, firstTask.getId())).build();
118+
CancelTasksRequest cancelTasksRequest = new CancelTasksRequest.Builder().withTaskId(new TaskId(node, firstTask.id())).build();
119119
CancelTasksResponse response = execute(
120120
cancelTasksRequest,
121121
highLevelClient().tasks()::cancel,

‎client/rest-high-level/src/test/java/org/elasticsearch/client/UpdateByQueryIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,11 @@ public void onFailure(Exception e) {
139139
highLevelClient()::updateByQueryRethrottleAsync
140140
);
141141
assertThat(response.getTasks(), hasSize(1));
142-
assertEquals(taskIdToRethrottle, response.getTasks().get(0).getTaskId());
143-
assertThat(response.getTasks().get(0).getStatus(), instanceOf(RawTaskStatus.class));
142+
assertEquals(taskIdToRethrottle, response.getTasks().get(0).taskId());
143+
assertThat(response.getTasks().get(0).status(), instanceOf(RawTaskStatus.class));
144144
assertEquals(
145145
Float.toString(requestsPerSecond),
146-
((RawTaskStatus) response.getTasks().get(0).getStatus()).toMap().get("requests_per_second").toString()
146+
((RawTaskStatus) response.getTasks().get(0).status()).toMap().get("requests_per_second").toString()
147147
);
148148
assertTrue(taskFinished.await(10, TimeUnit.SECONDS));
149149

‎client/rest-high-level/src/test/java/org/elasticsearch/client/tasks/CancelTasksResponseTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -96,19 +96,19 @@ protected void assertInstances(
9696
.collect(Collectors.toMap(org.elasticsearch.client.tasks.TaskInfo::getTaskId, Function.identity()));
9797
for (TaskInfo ti : sTasks) {
9898
org.elasticsearch.client.tasks.TaskInfo taskInfo = cTasksMap.get(
99-
new org.elasticsearch.client.tasks.TaskId(ti.getTaskId().getNodeId(), ti.getTaskId().getId())
99+
new org.elasticsearch.client.tasks.TaskId(ti.taskId().getNodeId(), ti.taskId().getId())
100100
);
101-
assertEquals(ti.getAction(), taskInfo.getAction());
102-
assertEquals(ti.getDescription(), taskInfo.getDescription());
103-
assertEquals(new HashMap<>(ti.getHeaders()), new HashMap<>(taskInfo.getHeaders()));
104-
assertEquals(ti.getType(), taskInfo.getType());
105-
assertEquals(ti.getStartTime(), taskInfo.getStartTime());
106-
assertEquals(ti.getRunningTimeNanos(), taskInfo.getRunningTimeNanos());
107-
assertEquals(ti.isCancellable(), taskInfo.isCancellable());
108-
assertEquals(ti.isCancelled(), taskInfo.isCancelled());
109-
assertEquals(ti.getParentTaskId().getNodeId(), taskInfo.getParentTaskId().getNodeId());
110-
assertEquals(ti.getParentTaskId().getId(), taskInfo.getParentTaskId().getId());
111-
FakeTaskStatus status = (FakeTaskStatus) ti.getStatus();
101+
assertEquals(ti.action(), taskInfo.getAction());
102+
assertEquals(ti.description(), taskInfo.getDescription());
103+
assertEquals(new HashMap<>(ti.headers()), new HashMap<>(taskInfo.getHeaders()));
104+
assertEquals(ti.type(), taskInfo.getType());
105+
assertEquals(ti.startTime(), taskInfo.getStartTime());
106+
assertEquals(ti.runningTimeNanos(), taskInfo.getRunningTimeNanos());
107+
assertEquals(ti.cancellable(), taskInfo.isCancellable());
108+
assertEquals(ti.cancelled(), taskInfo.isCancelled());
109+
assertEquals(ti.parentTaskId().getNodeId(), taskInfo.getParentTaskId().getNodeId());
110+
assertEquals(ti.parentTaskId().getId(), taskInfo.getParentTaskId().getId());
111+
FakeTaskStatus status = (FakeTaskStatus) ti.status();
112112
assertEquals(status.code, taskInfo.getStatus().get("code"));
113113
assertEquals(status.status, taskInfo.getStatus().get("status"));
114114

‎distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/InstallPluginAction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -391,12 +391,12 @@ private String getElasticUrl(
391391
baseUrl,
392392
pluginId,
393393
platform,
394-
Build.CURRENT.getQualifiedVersion()
394+
Build.CURRENT.qualifiedVersion()
395395
);
396396
if (urlExists(platformUrl)) {
397397
return platformUrl;
398398
}
399-
return String.format(Locale.ROOT, "%s/%s-%s.zip", baseUrl, pluginId, Build.CURRENT.getQualifiedVersion());
399+
return String.format(Locale.ROOT, "%s/%s-%s.zip", baseUrl, pluginId, Build.CURRENT.qualifiedVersion());
400400
}
401401

402402
private String nonReleaseUrl(final String hostname, final Version version, final String stagingHash, final String pluginId) {

‎distribution/tools/plugin-cli/src/main/java/org/elasticsearch/plugins/cli/PluginSecurity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ static String formatPermission(Permission permission) {
123123
* Extract a unique set of permissions from the plugin's policy file. Each permission is formatted for output to users.
124124
*/
125125
public static Set<String> getPermissionDescriptions(PluginPolicyInfo pluginPolicyInfo, Path tmpDir) throws IOException {
126-
Set<Permission> allPermissions = new HashSet<>(PolicyUtil.getPolicyPermissions(null, pluginPolicyInfo.policy, tmpDir));
127-
for (URL jar : pluginPolicyInfo.jars) {
128-
Set<Permission> jarPermissions = PolicyUtil.getPolicyPermissions(jar, pluginPolicyInfo.policy, tmpDir);
126+
Set<Permission> allPermissions = new HashSet<>(PolicyUtil.getPolicyPermissions(null, pluginPolicyInfo.policy(), tmpDir));
127+
for (URL jar : pluginPolicyInfo.jars()) {
128+
Set<Permission> jarPermissions = PolicyUtil.getPolicyPermissions(jar, pluginPolicyInfo.policy(), tmpDir);
129129
allPermissions.addAll(jarPermissions);
130130
}
131131

‎distribution/tools/plugin-cli/src/test/java/org/elasticsearch/plugins/cli/InstallPluginActionTests.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ void jarHellCheck(PluginInfo candidateInfo, Path candidate, Path pluginsDir, Pat
975975

976976
public void testOfficialPlugin() throws Exception {
977977
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
978-
+ Build.CURRENT.getQualifiedVersion()
978+
+ Build.CURRENT.qualifiedVersion()
979979
+ ".zip";
980980
assertInstallPluginFromUrl("analysis-icu", url, null, false);
981981
}
@@ -985,7 +985,7 @@ public void testOfficialPluginSnapshot() throws Exception {
985985
Locale.ROOT,
986986
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip",
987987
Version.CURRENT,
988-
Build.CURRENT.getQualifiedVersion()
988+
Build.CURRENT.qualifiedVersion()
989989
);
990990
assertInstallPluginFromUrl("analysis-icu", url, "abc123", true);
991991
}
@@ -995,7 +995,7 @@ public void testInstallReleaseBuildOfPluginOnSnapshotBuild() {
995995
Locale.ROOT,
996996
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s.zip",
997997
Version.CURRENT,
998-
Build.CURRENT.getQualifiedVersion()
998+
Build.CURRENT.qualifiedVersion()
999999
);
10001000
// attempting to install a release build of a plugin (no staging ID) on a snapshot build should throw a user exception
10011001
final UserException e = expectThrows(
@@ -1013,7 +1013,7 @@ public void testOfficialPluginStaging() throws Exception {
10131013
String url = "https://staging.elastic.co/"
10141014
+ Version.CURRENT
10151015
+ "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1016-
+ Build.CURRENT.getQualifiedVersion()
1016+
+ Build.CURRENT.qualifiedVersion()
10171017
+ ".zip";
10181018
assertInstallPluginFromUrl("analysis-icu", url, "abc123", false);
10191019
}
@@ -1022,7 +1022,7 @@ public void testOfficialPlatformPlugin() throws Exception {
10221022
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
10231023
+ Platforms.PLATFORM_NAME
10241024
+ "-"
1025-
+ Build.CURRENT.getQualifiedVersion()
1025+
+ Build.CURRENT.qualifiedVersion()
10261026
+ ".zip";
10271027
assertInstallPluginFromUrl("analysis-icu", url, null, false);
10281028
}
@@ -1033,7 +1033,7 @@ public void testOfficialPlatformPluginSnapshot() throws Exception {
10331033
"https://snapshots.elastic.co/%s-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-%s-%s.zip",
10341034
Version.CURRENT,
10351035
Platforms.PLATFORM_NAME,
1036-
Build.CURRENT.getQualifiedVersion()
1036+
Build.CURRENT.qualifiedVersion()
10371037
);
10381038
assertInstallPluginFromUrl("analysis-icu", url, "abc123", true);
10391039
}
@@ -1044,7 +1044,7 @@ public void testOfficialPlatformPluginStaging() throws Exception {
10441044
+ "-abc123/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
10451045
+ Platforms.PLATFORM_NAME
10461046
+ "-"
1047-
+ Build.CURRENT.getQualifiedVersion()
1047+
+ Build.CURRENT.qualifiedVersion()
10481048
+ ".zip";
10491049
assertInstallPluginFromUrl("analysis-icu", url, "abc123", false);
10501050
}
@@ -1084,7 +1084,7 @@ public void testMavenChecksumWithoutFilename() throws Exception {
10841084

10851085
public void testOfficialChecksumWithoutFilename() throws Exception {
10861086
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1087-
+ Build.CURRENT.getQualifiedVersion()
1087+
+ Build.CURRENT.qualifiedVersion()
10881088
+ ".zip";
10891089
MessageDigest digest = MessageDigest.getInstance("SHA-512");
10901090
UserException e = expectThrows(
@@ -1097,7 +1097,7 @@ public void testOfficialChecksumWithoutFilename() throws Exception {
10971097

10981098
public void testOfficialShaMissing() throws Exception {
10991099
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1100-
+ Build.CURRENT.getQualifiedVersion()
1100+
+ Build.CURRENT.qualifiedVersion()
11011101
+ ".zip";
11021102
MessageDigest digest = MessageDigest.getInstance("SHA-1");
11031103
UserException e = expectThrows(
@@ -1130,7 +1130,7 @@ public void testMavenShaMissing() {
11301130

11311131
public void testInvalidShaFileMissingFilename() throws Exception {
11321132
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1133-
+ Build.CURRENT.getQualifiedVersion()
1133+
+ Build.CURRENT.qualifiedVersion()
11341134
+ ".zip";
11351135
MessageDigest digest = MessageDigest.getInstance("SHA-512");
11361136
UserException e = expectThrows(
@@ -1143,7 +1143,7 @@ public void testInvalidShaFileMissingFilename() throws Exception {
11431143

11441144
public void testInvalidShaFileMismatchFilename() throws Exception {
11451145
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1146-
+ Build.CURRENT.getQualifiedVersion()
1146+
+ Build.CURRENT.qualifiedVersion()
11471147
+ ".zip";
11481148
MessageDigest digest = MessageDigest.getInstance("SHA-512");
11491149
UserException e = expectThrows(
@@ -1155,7 +1155,7 @@ public void testInvalidShaFileMismatchFilename() throws Exception {
11551155
null,
11561156
false,
11571157
".sha512",
1158-
checksumAndString(digest, " repository-s3-" + Build.CURRENT.getQualifiedVersion() + ".zip"),
1158+
checksumAndString(digest, " repository-s3-" + Build.CURRENT.qualifiedVersion() + ".zip"),
11591159
null,
11601160
(b, p) -> null
11611161
)
@@ -1166,7 +1166,7 @@ public void testInvalidShaFileMismatchFilename() throws Exception {
11661166

11671167
public void testInvalidShaFileContainingExtraLine() throws Exception {
11681168
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1169-
+ Build.CURRENT.getQualifiedVersion()
1169+
+ Build.CURRENT.qualifiedVersion()
11701170
+ ".zip";
11711171
MessageDigest digest = MessageDigest.getInstance("SHA-512");
11721172
UserException e = expectThrows(
@@ -1178,7 +1178,7 @@ public void testInvalidShaFileContainingExtraLine() throws Exception {
11781178
null,
11791179
false,
11801180
".sha512",
1181-
checksumAndString(digest, " analysis-icu-" + Build.CURRENT.getQualifiedVersion() + ".zip\nfoobar"),
1181+
checksumAndString(digest, " analysis-icu-" + Build.CURRENT.qualifiedVersion() + ".zip\nfoobar"),
11821182
null,
11831183
(b, p) -> null
11841184
)
@@ -1189,7 +1189,7 @@ public void testInvalidShaFileContainingExtraLine() throws Exception {
11891189

11901190
public void testSha512Mismatch() {
11911191
String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/analysis-icu-"
1192-
+ Build.CURRENT.getQualifiedVersion()
1192+
+ Build.CURRENT.qualifiedVersion()
11931193
+ ".zip";
11941194
UserException e = expectThrows(
11951195
UserException.class,
@@ -1200,7 +1200,7 @@ public void testSha512Mismatch() {
12001200
null,
12011201
false,
12021202
".sha512",
1203-
bytes -> "foobar analysis-icu-" + Build.CURRENT.getQualifiedVersion() + ".zip",
1203+
bytes -> "foobar analysis-icu-" + Build.CURRENT.qualifiedVersion() + ".zip",
12041204
null,
12051205
(b, p) -> null
12061206
)
@@ -1234,7 +1234,7 @@ public void testPublicKeyIdMismatchToExpectedPublicKeyId() throws Exception {
12341234
final String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/"
12351235
+ icu
12361236
+ "-"
1237-
+ Build.CURRENT.getQualifiedVersion()
1237+
+ Build.CURRENT.qualifiedVersion()
12381238
+ ".zip";
12391239
final MessageDigest digest = MessageDigest.getInstance("SHA-512");
12401240
/*
@@ -1269,7 +1269,7 @@ public void testFailedSignatureVerification() throws Exception {
12691269
final String url = "https://artifacts.elastic.co/downloads/elasticsearch-plugins/analysis-icu/"
12701270
+ icu
12711271
+ "-"
1272-
+ Build.CURRENT.getQualifiedVersion()
1272+
+ Build.CURRENT.qualifiedVersion()
12731273
+ ".zip";
12741274
final MessageDigest digest = MessageDigest.getInstance("SHA-512");
12751275
/*

0 commit comments

Comments
 (0)