apply spotless

Signed-off-by: Jiaping Zeng <[email protected]>

Author: jiapingzeng

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/agent/AgentUtils.java

@@ -148,9 +148,10 @@ public class AgentUtils {
     public static Map<String, String> extractRequestHeaders(Client client) {
         try {
             @SuppressWarnings("unchecked")
-            Map<String, String> headers = client.threadPool().getThreadContext().getTransient(
-                CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY
-            );
+            Map<String, String> headers = client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
             return headers != null ? headers : Collections.emptyMap();
         } catch (Exception e) {
             log.warn("Failed to retrieve MCP request headers from ThreadContext", e);

ml-algorithms/src/test/java/org/opensearch/ml/engine/algorithms/agent/AgentUtilsTest.java

@@ -2007,11 +2007,11 @@ public void testExtractRequestHeaders_WithValidHeaders() {
         Map<String, String> expectedHeaders = new HashMap<>();
         expectedHeaders.put("x-amzn-fas-accesskey", "access-key-value");
         expectedHeaders.put("x-amzn-datasources", "https://example.aos.us-east-1.on.aws");
-        
+
         ThreadContext realThreadContext = new ThreadContext(Settings.EMPTY);
         when(client.threadPool()).thenReturn(threadPool);
         when(threadPool.getThreadContext()).thenReturn(realThreadContext);
-        
+
         realThreadContext.putTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY, expectedHeaders);
 
         Map<String, String> result = AgentUtils.extractRequestHeaders(client);
@@ -2036,11 +2036,11 @@ public void testExtractRequestHeaders_WithNoHeaders() {
     @Test
     public void testExtractRequestHeaders_WithEmptyHeaders() {
         Map<String, String> emptyHeaders = new HashMap<>();
-        
+
         ThreadContext realThreadContext = new ThreadContext(Settings.EMPTY);
         when(client.threadPool()).thenReturn(threadPool);
         when(threadPool.getThreadContext()).thenReturn(realThreadContext);
-        
+
         realThreadContext.putTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY, emptyHeaders);
 
         Map<String, String> result = AgentUtils.extractRequestHeaders(client);
@@ -2065,11 +2065,11 @@ public void testExtractRequestHeaders_WithException() {
     public void testExtractRequestHeaders_WithPartialHeaders() {
         Map<String, String> partialHeaders = new HashMap<>();
         partialHeaders.put("x-amzn-fas-accesskey", "access-key-value");
-        
+
         ThreadContext realThreadContext = new ThreadContext(Settings.EMPTY);
         when(client.threadPool()).thenReturn(threadPool);
         when(threadPool.getThreadContext()).thenReturn(realThreadContext);
-        
+
         realThreadContext.putTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY, partialHeaders);
 
         Map<String, String> result = AgentUtils.extractRequestHeaders(client);

plugin/src/main/java/org/opensearch/ml/rest/RestMLExecuteAction.java

@@ -14,9 +14,9 @@
 import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_AGENT_ID;
 import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_ALGORITHM;
 import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_TOOL_NAME;
-import static org.opensearch.ml.utils.RestActionUtils.storeMcpRequestHeaders;
 import static org.opensearch.ml.utils.RestActionUtils.getAlgorithm;
 import static org.opensearch.ml.utils.RestActionUtils.isAsync;
+import static org.opensearch.ml.utils.RestActionUtils.storeMcpRequestHeaders;
 import static org.opensearch.ml.utils.TenantAwareHelper.getTenantID;
 
 import java.io.IOException;

plugin/src/main/java/org/opensearch/ml/rest/RestMLExecuteStreamAction.java

@@ -14,8 +14,8 @@
 import static org.opensearch.ml.utils.MLExceptionUtils.AGENT_FRAMEWORK_DISABLED_ERR_MSG;
 import static org.opensearch.ml.utils.MLExceptionUtils.STREAM_DISABLED_ERR_MSG;
 import static org.opensearch.ml.utils.RestActionUtils.PARAMETER_AGENT_ID;
-import static org.opensearch.ml.utils.RestActionUtils.storeMcpRequestHeaders;
 import static org.opensearch.ml.utils.RestActionUtils.isAsync;
+import static org.opensearch.ml.utils.RestActionUtils.storeMcpRequestHeaders;
 import static org.opensearch.ml.utils.TenantAwareHelper.getTenantID;
 
 import java.io.ByteArrayOutputStream;

plugin/src/main/java/org/opensearch/ml/utils/RestActionUtils.java

@@ -377,7 +377,10 @@ public static void storeMcpRequestHeaders(RestRequest request, Client client) {
 
     public static Map<String, String> getMcpRequestHeaders(Client client) {
         try {
-            Map<String, String> headers = client.threadPool().getThreadContext().getTransient(CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
+            Map<String, String> headers = client
+                .threadPool()
+                .getThreadContext()
+                .getTransient(CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
             return headers != null ? headers : Collections.emptyMap();
         } catch (Exception e) {
             log.warn("Failed to retrieve MCP request headers from ThreadContext", e);

plugin/src/test/java/org/opensearch/ml/utils/RestActionUtilsTests.java

@@ -404,7 +404,7 @@ public void testStoreMcpRequestHeaders_withAllHeaders() {
         headers.put("x-amzn-fas-secretkey", List.of("secret-key-value"));
         headers.put("x-amzn-fas-sessiontoken", List.of("session-token-value"));
         headers.put("x-amzn-datasources", List.of("https://example.aos.us-east-1.on.aws"));
-        
+
         FakeRestRequest request = new FakeRestRequest.Builder(xContentRegistry())
             .withMethod(RestRequest.Method.POST)
             .withPath(urlPath)
@@ -422,7 +422,8 @@ public void testStoreMcpRequestHeaders_withAllHeaders() {
 
         // Verify
         @SuppressWarnings("unchecked")
-        Map<String, String> storedHeaders = threadContext.getTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
+        Map<String, String> storedHeaders = threadContext
+            .getTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
         assertNotNull(storedHeaders);
         assertEquals(4, storedHeaders.size());
         assertEquals("access-key-value", storedHeaders.get("x-amzn-fas-accesskey"));
@@ -450,7 +451,8 @@ public void testStoreMcpRequestHeaders_withNoHeaders() {
 
         // Verify - should not store anything in ThreadContext
         @SuppressWarnings("unchecked")
-        Map<String, String> storedHeaders = threadContext.getTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
+        Map<String, String> storedHeaders = threadContext
+            .getTransient(org.opensearch.ml.common.CommonValue.MCP_REQUEST_HEADERS_THREAD_CONTEXT_KEY);
         assertNull(storedHeaders);
     }