Skip to content

Commit 1ac9d6f

Browse files
authored
fix japicmp check for threadContext (opensearch-project#14147)
Signed-off-by: Chenyang Ji <cyji@amazon.com>
1 parent 04a417a commit 1ac9d6f

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java

+17-13
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ public <T> T getTransient(String key) {
480480
* @param value the header value
481481
*/
482482
public void addResponseHeader(final String key, final String value) {
483-
updateResponseHeader(key, value, v -> v, false);
483+
addResponseHeader(key, value, v -> v);
484484
}
485485

486486
/**
@@ -490,7 +490,19 @@ public void addResponseHeader(final String key, final String value) {
490490
* @param value the header value
491491
*/
492492
public void updateResponseHeader(final String key, final String value) {
493-
updateResponseHeader(key, value, v -> v, true);
493+
updateResponseHeader(key, value, v -> v);
494+
}
495+
496+
/**
497+
* Add the {@code value} for the specified {@code key} with the specified {@code uniqueValue} used for de-duplication. Any duplicate
498+
* {@code value} after applying {@code uniqueValue} is ignored.
499+
*
500+
* @param key the header name
501+
* @param value the header value
502+
* @param uniqueValue the function that produces de-duplication values
503+
*/
504+
public void addResponseHeader(final String key, final String value, final Function<String, String> uniqueValue) {
505+
threadLocal.set(threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, false));
494506
}
495507

496508
/**
@@ -500,17 +512,9 @@ public void updateResponseHeader(final String key, final String value) {
500512
* @param key the header name
501513
* @param value the header value
502514
* @param uniqueValue the function that produces de-duplication values
503-
* @param replaceExistingKey whether to replace the existing header if it already exists
504-
*/
505-
public void updateResponseHeader(
506-
final String key,
507-
final String value,
508-
final Function<String, String> uniqueValue,
509-
final boolean replaceExistingKey
510-
) {
511-
threadLocal.set(
512-
threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, replaceExistingKey)
513-
);
515+
*/
516+
public void updateResponseHeader(final String key, final String value, final Function<String, String> uniqueValue) {
517+
threadLocal.set(threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, true));
514518
}
515519

516520
/**

server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java

+2-7
Original file line numberDiff line numberDiff line change
@@ -344,16 +344,11 @@ public void testResponseHeaders() {
344344
}
345345

346346
final String value = HeaderWarning.formatWarning("qux");
347-
threadContext.updateResponseHeader("baz", value, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false), false);
347+
threadContext.updateResponseHeader("baz", value, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false));
348348
// pretend that another thread created the same response at a different time
349349
if (randomBoolean()) {
350350
final String duplicateValue = HeaderWarning.formatWarning("qux");
351-
threadContext.updateResponseHeader(
352-
"baz",
353-
duplicateValue,
354-
s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false),
355-
false
356-
);
351+
threadContext.updateResponseHeader("baz", duplicateValue, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false));
357352
}
358353

359354
threadContext.addResponseHeader("Warning", "One is the loneliest number");

0 commit comments

Comments
 (0)