fix japicmp check for threadContext (opensearch-project#14147)

Signed-off-by: Chenyang Ji <[email protected]>
jed326 · Jun 10, 2024 · 1ac9d6f · 1ac9d6f
1 parent 04a417a
commit 1ac9d6f
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java b/server/src/main/java/org/opensearch/common/util/concurrent/ThreadContext.java
@@ -480,7 +480,7 @@ public <T> T getTransient(String key) {
      * @param value       the header value
      */
     public void addResponseHeader(final String key, final String value) {
-        updateResponseHeader(key, value, v -> v, false);
+        addResponseHeader(key, value, v -> v);
     }
 
     /**
@@ -490,7 +490,19 @@ public void addResponseHeader(final String key, final String value) {
      * @param value       the header value
      */
     public void updateResponseHeader(final String key, final String value) {
-        updateResponseHeader(key, value, v -> v, true);
+        updateResponseHeader(key, value, v -> v);
+    }
+
+    /**
+     * Add the {@code value} for the specified {@code key} with the specified {@code uniqueValue} used for de-duplication. Any duplicate
+     * {@code value} after applying {@code uniqueValue} is ignored.
+     *
+     * @param key         the header name
+     * @param value       the header value
+     * @param uniqueValue the function that produces de-duplication values
+     */
+    public void addResponseHeader(final String key, final String value, final Function<String, String> uniqueValue) {
+        threadLocal.set(threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, false));
     }
 
     /**
@@ -500,17 +512,9 @@ public void updateResponseHeader(final String key, final String value) {
      * @param key         the header name
      * @param value       the header value
      * @param uniqueValue the function that produces de-duplication values
-     * @param replaceExistingKey whether to replace the existing header if it already exists
-     */
-    public void updateResponseHeader(
-        final String key,
-        final String value,
-        final Function<String, String> uniqueValue,
-        final boolean replaceExistingKey
-    ) {
-        threadLocal.set(
-            threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, replaceExistingKey)
-        );
+     */
+    public void updateResponseHeader(final String key, final String value, final Function<String, String> uniqueValue) {
+        threadLocal.set(threadLocal.get().putResponse(key, value, uniqueValue, maxWarningHeaderCount, maxWarningHeaderSize, true));
     }
 
     /**

diff --git a/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java b/server/src/test/java/org/opensearch/common/util/concurrent/ThreadContextTests.java
@@ -344,16 +344,11 @@ public void testResponseHeaders() {
         }
 
         final String value = HeaderWarning.formatWarning("qux");
-        threadContext.updateResponseHeader("baz", value, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false), false);
+        threadContext.updateResponseHeader("baz", value, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false));
         // pretend that another thread created the same response at a different time
         if (randomBoolean()) {
             final String duplicateValue = HeaderWarning.formatWarning("qux");
-            threadContext.updateResponseHeader(
-                "baz",
-                duplicateValue,
-                s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false),
-                false
-            );
+            threadContext.updateResponseHeader("baz", duplicateValue, s -> HeaderWarning.extractWarningValueFromWarningHeader(s, false));
         }
 
         threadContext.addResponseHeader("Warning", "One is the loneliest number");