Skip to content

Commit 80deeb8

Browse files
authored
Drop unused prefix and suffix from string collection utils (#124353)
These parameters are confusing and almost entirely unused (apart from one easily-adjusted test, two production locations where they are used incorrectly, and one production location that can be adjusted not to need them). This commit just removes them.
1 parent ee4bcac commit 80deeb8

File tree

16 files changed

+50
-78
lines changed

16 files changed

+50
-78
lines changed

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/GetSnapshotsRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,9 +350,9 @@ public Task createTask(long id, String type, String action, TaskId parentTaskId,
350350
@Override
351351
public String getDescription() {
352352
final StringBuilder stringBuilder = new StringBuilder("repositories[");
353-
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(repositories), ",", "", "", 512, stringBuilder);
353+
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(repositories), ",", 512, stringBuilder);
354354
stringBuilder.append("], snapshots[");
355-
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(snapshots), ",", "", "", 1024, stringBuilder);
355+
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(snapshots), ",", 1024, stringBuilder);
356356
stringBuilder.append("]");
357357
return stringBuilder.toString();
358358
}

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/get/shard/GetShardSnapshotRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public int hashCode() {
114114
@Override
115115
public String getDescription() {
116116
final StringBuilder stringBuilder = new StringBuilder("shard").append(shardId).append(", repositories[");
117-
Strings.collectionToDelimitedStringWithLimit(repositories, ",", "", "", 1024, stringBuilder);
117+
Strings.collectionToDelimitedStringWithLimit(repositories, ",", 1024, stringBuilder);
118118
stringBuilder.append("]");
119119
return stringBuilder.toString();
120120
}

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/status/SnapshotsStatusRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public boolean ignoreUnavailable() {
145145
@Override
146146
public String getDescription() {
147147
final StringBuilder stringBuilder = new StringBuilder("repository[").append(repository).append("], snapshots[");
148-
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(snapshots), ",", "", "", 1024, stringBuilder);
148+
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(snapshots), ",", 1024, stringBuilder);
149149
stringBuilder.append("]");
150150
return stringBuilder.toString();
151151
}

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/LazyRolloverAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,8 +212,9 @@ public ClusterState execute(BatchExecutionContext<LazyRolloverTask> batchExecuti
212212
}
213213

214214
if (state != batchExecutionContext.initialState()) {
215-
var reason = new StringBuilder();
216-
Strings.collectionToDelimitedStringWithLimit(results, ",", "lazy bulk rollover [", "]", 1024, reason);
215+
var reason = new StringBuilder("lazy bulk rollover [");
216+
Strings.collectionToDelimitedStringWithLimit(results, ",", 1024, reason);
217+
reason.append(']');
217218
try (var ignored = batchExecutionContext.dropHeadersContext()) {
218219
state = allocationService.reroute(state, reason.toString(), listener.reroute());
219220
}

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/TransportRolloverAction.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -528,8 +528,9 @@ public ClusterState execute(BatchExecutionContext<RolloverTask> batchExecutionCo
528528
}
529529

530530
if (state != batchExecutionContext.initialState()) {
531-
var reason = new StringBuilder();
532-
Strings.collectionToDelimitedStringWithLimit(results, ",", "bulk rollover [", "]", 1024, reason);
531+
var reason = new StringBuilder("bulk rollover [");
532+
Strings.collectionToDelimitedStringWithLimit(results, ",", 1024, reason);
533+
reason.append(']');
533534
try (var ignored = batchExecutionContext.dropHeadersContext()) {
534535
state = allocationService.reroute(state, reason.toString(), listener.reroute());
535536
}

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesNodeRequest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public ActionRequestValidationException validate() {
158158
@Override
159159
public String getDescription() {
160160
final StringBuilder stringBuilder = new StringBuilder("shards[");
161-
Strings.collectionToDelimitedStringWithLimit(shardIds, ",", "", "", 1024, stringBuilder);
161+
Strings.collectionToDelimitedStringWithLimit(shardIds, ",", 1024, stringBuilder);
162162
return completeDescription(stringBuilder, fields, filters, allowedTypes, includeEmptyFields);
163163
}
164164

@@ -170,11 +170,11 @@ static String completeDescription(
170170
boolean includeEmptyFields
171171
) {
172172
stringBuilder.append("], fields[");
173-
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(fields), ",", "", "", 1024, stringBuilder);
173+
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(fields), ",", 1024, stringBuilder);
174174
stringBuilder.append("], filters[");
175-
Strings.collectionToDelimitedString(Arrays.asList(filters), ",", "", "", stringBuilder);
175+
Strings.collectionToDelimitedString(Arrays.asList(filters), ",", stringBuilder);
176176
stringBuilder.append("], types[");
177-
Strings.collectionToDelimitedString(Arrays.asList(allowedTypes), ",", "", "", stringBuilder);
177+
Strings.collectionToDelimitedString(Arrays.asList(allowedTypes), ",", stringBuilder);
178178
stringBuilder.append("], includeEmptyFields[");
179179
stringBuilder.append(includeEmptyFields);
180180
stringBuilder.append("]");

server/src/main/java/org/elasticsearch/action/fieldcaps/FieldCapabilitiesRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ public int hashCode() {
289289
@Override
290290
public String getDescription() {
291291
final StringBuilder stringBuilder = new StringBuilder("indices[");
292-
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(indices), ",", "", "", 1024, stringBuilder);
292+
Strings.collectionToDelimitedStringWithLimit(Arrays.asList(indices), ",", 1024, stringBuilder);
293293
return FieldCapabilitiesNodeRequest.completeDescription(stringBuilder, fields, filters, types, includeEmptyFields);
294294
}
295295

server/src/main/java/org/elasticsearch/cluster/ClusterStateTaskExecutor.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ default String describeTasks(List<T> tasks) {
7474
Strings.collectionToDelimitedStringWithLimit(
7575
(Iterable<String>) () -> tasks.stream().map(Object::toString).filter(s -> s.isEmpty() == false).iterator(),
7676
", ",
77-
"",
78-
"",
7977
1024,
8078
output
8179
);

server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexStateService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,8 +1194,6 @@ private ClusterState openIndices(final Index[] indices, final ClusterState curre
11941194
Strings.collectionToDelimitedStringWithLimit(
11951195
indicesToOpen.stream().map(i -> (CharSequence) i.v2().getIndex().toString()).toList(),
11961196
",",
1197-
"",
1198-
"",
11991197
512,
12001198
indexNames
12011199
);

server/src/main/java/org/elasticsearch/cluster/service/MasterService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ private String buildTasksDescription(List<ExecutionResult<T>> tasks) {
17021702
Strings.collectionToDelimitedStringWithLimit((Iterable<String>) () -> tasksBySource.entrySet().stream().map(entry -> {
17031703
var tasksDescription = executor.describeTasks(entry.getValue());
17041704
return tasksDescription.isEmpty() ? entry.getKey() : entry.getKey() + "[" + tasksDescription + "]";
1705-
}).filter(s -> s.isEmpty() == false).iterator(), ", ", "", "", MAX_TASK_DESCRIPTION_CHARS, output);
1705+
}).filter(s -> s.isEmpty() == false).iterator(), ", ", MAX_TASK_DESCRIPTION_CHARS, output);
17061706
if (output.length() > MAX_TASK_DESCRIPTION_CHARS) {
17071707
output.append(" (").append(tasks.size()).append(" tasks in total)");
17081708
}

0 commit comments

Comments
 (0)