Remove AbstractSubject

Signed-off-by: Craig Perkins <[email protected]>
cwperks · Aug 16, 2024 · 94a5f2c · 94a5f2c
1 parent 0a26f26
commit 94a5f2c
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 30 deletions.
diff --git a/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroSubject.java b/plugins/identity-shiro/src/main/java/org/opensearch/identity/shiro/ShiroSubject.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.identity.shiro;
 
-import org.opensearch.identity.AbstractSubject;
 import org.opensearch.identity.Subject;
 import org.opensearch.identity.tokens.AuthToken;
 
@@ -20,7 +19,7 @@
  *
  * @opensearch.experimental
  */
-public class ShiroSubject extends AbstractSubject {
+public class ShiroSubject implements Subject {
     private final ShiroTokenManager authTokenHandler;
     private final org.apache.shiro.subject.Subject shiroSubject;
 

diff --git a/server/src/main/java/org/opensearch/identity/AbstractSubject.java b/server/src/main/java/org/opensearch/identity/AbstractSubject.java
diff --git a/server/src/main/java/org/opensearch/identity/Subject.java b/server/src/main/java/org/opensearch/identity/Subject.java
@@ -34,5 +34,7 @@ public interface Subject {
     /**
      * runAs allows the caller to run a callable function as this subject
      */
-    void runAs(Callable<Void> callable) throws Exception;
+    default void runAs(Callable<Void> callable) throws Exception {
+        callable.call();
+    };
 }
diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopPluginSubject.java b/server/src/main/java/org/opensearch/identity/noop/NoopPluginSubject.java
@@ -9,15 +9,15 @@
 package org.opensearch.identity.noop;
 
 import org.opensearch.common.util.concurrent.ThreadContext;
-import org.opensearch.identity.AbstractSubject;
 import org.opensearch.identity.NamedPrincipal;
+import org.opensearch.identity.Subject;
 import org.opensearch.identity.tokens.AuthToken;
 import org.opensearch.threadpool.ThreadPool;
 
 import java.security.Principal;
 import java.util.concurrent.Callable;
 
-public class NoopPluginSubject extends AbstractSubject {
+public class NoopPluginSubject implements Subject {
     private final ThreadPool threadPool;
 
     public NoopPluginSubject(ThreadPool threadPool) {

diff --git a/server/src/main/java/org/opensearch/identity/noop/NoopSubject.java b/server/src/main/java/org/opensearch/identity/noop/NoopSubject.java
@@ -8,7 +8,6 @@
 
 package org.opensearch.identity.noop;
 
-import org.opensearch.identity.AbstractSubject;
 import org.opensearch.identity.NamedPrincipal;
 import org.opensearch.identity.Subject;
 import org.opensearch.identity.tokens.AuthToken;
@@ -23,7 +22,7 @@
  *
  * @opensearch.internal
  */
-public class NoopSubject extends AbstractSubject {
+public class NoopSubject implements Subject {
 
     public NoopSubject() {
         super();