refactor: Removing unnecessary PluginManager.runX() methods

PiperOrigin-RevId: 881456806

Author: google-genai-bot

core/src/main/java/com/google/adk/plugins/PluginManager.java

@@ -34,6 +34,7 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.function.Function;
+import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,7 +48,7 @@ public class PluginManager extends BasePlugin {
   private static final Logger logger = LoggerFactory.getLogger(PluginManager.class);
   private final List<Plugin> plugins = new ArrayList<>();
 
-  public PluginManager(List<? extends Plugin> plugins) {
+  public PluginManager(@Nullable List<? extends Plugin> plugins) {
     super("PluginManager");
     if (plugins != null) {
       plugins.forEach(this::registerPlugin);
@@ -123,10 +124,6 @@ public Maybe<Content> beforeRunCallback(InvocationContext invocationContext) {
         plugin -> plugin.beforeRunCallback(invocationContext), "beforeRunCallback");
   }
 
-  public Completable runAfterRunCallback(InvocationContext invocationContext) {
-    return afterRunCallback(invocationContext);
-  }
-
   @Override
   public Completable afterRunCallback(InvocationContext invocationContext) {
     return Flowable.fromIterable(plugins)
@@ -155,65 +152,38 @@ public Completable close() {
                                 "[{}] Error during callback 'close'", plugin.getName(), e)));
   }
 
-  public Maybe<Event> runOnEventCallback(InvocationContext invocationContext, Event event) {
-    return onEventCallback(invocationContext, event);
-  }
-
   @Override
   public Maybe<Event> onEventCallback(InvocationContext invocationContext, Event event) {
     return runMaybeCallbacks(
         plugin -> plugin.onEventCallback(invocationContext, event), "onEventCallback");
   }
 
-  public Maybe<Content> runBeforeAgentCallback(BaseAgent agent, CallbackContext callbackContext) {
-    return beforeAgentCallback(agent, callbackContext);
-  }
-
   @Override
   public Maybe<Content> beforeAgentCallback(BaseAgent agent, CallbackContext callbackContext) {
     return runMaybeCallbacks(
         plugin -> plugin.beforeAgentCallback(agent, callbackContext), "beforeAgentCallback");
   }
 
-  public Maybe<Content> runAfterAgentCallback(BaseAgent agent, CallbackContext callbackContext) {
-    return afterAgentCallback(agent, callbackContext);
-  }
-
   @Override
   public Maybe<Content> afterAgentCallback(BaseAgent agent, CallbackContext callbackContext) {
     return runMaybeCallbacks(
         plugin -> plugin.afterAgentCallback(agent, callbackContext), "afterAgentCallback");
   }
 
-  public Maybe<LlmResponse> runBeforeModelCallback(
-      CallbackContext callbackContext, LlmRequest.Builder llmRequest) {
-    return beforeModelCallback(callbackContext, llmRequest);
-  }
-
   @Override
   public Maybe<LlmResponse> beforeModelCallback(
       CallbackContext callbackContext, LlmRequest.Builder llmRequest) {
     return runMaybeCallbacks(
         plugin -> plugin.beforeModelCallback(callbackContext, llmRequest), "beforeModelCallback");
   }
 
-  public Maybe<LlmResponse> runAfterModelCallback(
-      CallbackContext callbackContext, LlmResponse llmResponse) {
-    return afterModelCallback(callbackContext, llmResponse);
-  }
-
   @Override
   public Maybe<LlmResponse> afterModelCallback(
       CallbackContext callbackContext, LlmResponse llmResponse) {
     return runMaybeCallbacks(
         plugin -> plugin.afterModelCallback(callbackContext, llmResponse), "afterModelCallback");
   }
 
-  public Maybe<LlmResponse> runOnModelErrorCallback(
-      CallbackContext callbackContext, LlmRequest.Builder llmRequest, Throwable error) {
-    return onModelErrorCallback(callbackContext, llmRequest, error);
-  }
-
   @Override
   public Maybe<LlmResponse> onModelErrorCallback(
       CallbackContext callbackContext, LlmRequest.Builder llmRequest, Throwable error) {
@@ -222,26 +192,13 @@ public Maybe<LlmResponse> onModelErrorCallback(
         "onModelErrorCallback");
   }
 
-  public Maybe<Map<String, Object>> runBeforeToolCallback(
-      BaseTool tool, Map<String, Object> toolArgs, ToolContext toolContext) {
-    return beforeToolCallback(tool, toolArgs, toolContext);
-  }
-
   @Override
   public Maybe<Map<String, Object>> beforeToolCallback(
       BaseTool tool, Map<String, Object> toolArgs, ToolContext toolContext) {
     return runMaybeCallbacks(
         plugin -> plugin.beforeToolCallback(tool, toolArgs, toolContext), "beforeToolCallback");
   }
 
-  public Maybe<Map<String, Object>> runAfterToolCallback(
-      BaseTool tool,
-      Map<String, Object> toolArgs,
-      ToolContext toolContext,
-      Map<String, Object> result) {
-    return afterToolCallback(tool, toolArgs, toolContext, result);
-  }
-
   @Override
   public Maybe<Map<String, Object>> afterToolCallback(
       BaseTool tool,
@@ -253,11 +210,6 @@ public Maybe<Map<String, Object>> afterToolCallback(
         "afterToolCallback");
   }
 
-  public Maybe<Map<String, Object>> runOnToolErrorCallback(
-      BaseTool tool, Map<String, Object> toolArgs, ToolContext toolContext, Throwable error) {
-    return onToolErrorCallback(tool, toolArgs, toolContext, error);
-  }
-
   @Override
   public Maybe<Map<String, Object>> onToolErrorCallback(
       BaseTool tool, Map<String, Object> toolArgs, ToolContext toolContext, Throwable error) {

core/src/main/java/com/google/adk/runner/Runner.java

@@ -568,7 +568,7 @@ private Flowable<Event> runAgentWithFreshSession(
         .toFlowable()
         .switchIfEmpty(agentEvents)
         .concatWith(
-            Completable.defer(() -> pluginManager.runAfterRunCallback(contextWithUpdatedSession)))
+            Completable.defer(() -> pluginManager.afterRunCallback(contextWithUpdatedSession)))
         .concatWith(Completable.defer(() -> compactEvents(updatedSession)));
   }