From 9439a0ebaaac5369de7f295caf7e89d8434854c4 Mon Sep 17 00:00:00 2001
From: Craig Perkins <cwperx@amazon.com>
Date: Wed, 8 Jan 2025 10:24:52 -0500
Subject: [PATCH] Use general Client

Signed-off-by: Craig Perkins <cwperx@amazon.com>
---
 .../org/opensearch/identity/shiro/ShiroIdentityPlugin.java     | 3 +--
 .../java/org/opensearch/identity/noop/NoopIdentityPlugin.java  | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java b/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java
index 5fc93a144ec88..f6e89d25ea548 100644
--- a/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java
+++ b/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroIdentityPlugin.java
@@ -13,7 +13,6 @@
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.mgt.SecurityManager;
 import org.opensearch.client.Client;
-import org.opensearch.client.FilterClient;
 import org.opensearch.client.node.NodeClient;
 import org.opensearch.cluster.metadata.IndexNameExpressionResolver;
 import org.opensearch.cluster.service.ClusterService;
@@ -141,7 +140,7 @@ public void handleRequest(RestRequest request, RestChannel channel, NodeClient c
         }
     }
 
-    public FilterClient getRunAsClient(Plugin plugin) {
+    public Client getRunAsClient(Plugin plugin) {
         return new RunAsSystemClient(client);
     }
 }
diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopIdentityPlugin.java b/server/src/main/java/org/opensearch/identity/noop/NoopIdentityPlugin.java
index 8ae9b145f7020..7aa433e81e15b 100644
--- a/server/src/main/java/org/opensearch/identity/noop/NoopIdentityPlugin.java
+++ b/server/src/main/java/org/opensearch/identity/noop/NoopIdentityPlugin.java
@@ -9,7 +9,6 @@
 package org.opensearch.identity.noop;
 
 import org.opensearch.client.Client;
-import org.opensearch.client.FilterClient;
 import org.opensearch.identity.Subject;
 import org.opensearch.identity.tokens.TokenManager;
 import org.opensearch.plugins.IdentityPlugin;
@@ -49,7 +48,7 @@ public TokenManager getTokenManager() {
     }
 
     @Override
-    public FilterClient getRunAsClient(Plugin plugin) {
+    public Client getRunAsClient(Plugin plugin) {
         return new RunAsSystemClient(client);
     }
 }