refactor: Renaming SchemaUtils.validateOutputSchema to SchemaUtils.validateSchema

core/src/main/java/com/google/adk/SchemaUtils.java

@@ -132,12 +132,28 @@ public static void validateMapOnSchema(Map<String, Object> args, Schema schema,
    * @return The output map.
    * @throws IllegalArgumentException If the output string does not match the schema.
    * @throws JsonProcessingException If the output string cannot be parsed.
+   * @deprecated Use {@link #validateSchema(String, Schema)} instead.
    */
-  @SuppressWarnings("unchecked") // For tool parameter type casting.
+  @Deprecated
   public static Map<String, Object> validateOutputSchema(String output, Schema schema)
       throws JsonProcessingException {
-    Map<String, Object> outputMap = JsonBaseModel.getMapper().readValue(output, HashMap.class);
-    validateMapOnSchema(outputMap, schema, false);
-    return outputMap;
+    return validateSchema(output, schema);
+  }
+
+  /**
+   * Validates a string against a schema.
+   *
+   * @param input The input string to validate.
+   * @param schema The schema to validate against.
+   * @return The input map.
+   * @throws IllegalArgumentException If the input string does not match the schema.
+   * @throws JsonProcessingException If the input string cannot be parsed.
+   */
+  @SuppressWarnings("unchecked") // For tool parameter type casting.
+  public static Map<String, Object> validateSchema(String s, Schema schema)
+      throws JsonProcessingException {
+    Map<String, Object> map = JsonBaseModel.getMapper().readValue(s, HashMap.class);
+    validateMapOnSchema(map, schema, false);
+    return map;
   }
 }

core/src/main/java/com/google/adk/agents/LlmAgent.java

@@ -674,7 +674,7 @@ private void maybeSaveOutputToState(Event event) {
       if (outputSchema.isPresent()) {
         try {
           Map<String, Object> validatedMap =
-              SchemaUtils.validateOutputSchema(rawResult, outputSchema.get());
+              SchemaUtils.validateSchema(rawResult, outputSchema.get());
           output = validatedMap;
         } catch (JsonProcessingException e) {
           logger.error(

core/src/main/java/com/google/adk/tools/AgentTool.java

@@ -168,7 +168,7 @@ public Single<Map<String, Object>> runAsync(Map<String, Object> args, ToolContex
               }
 
               if (agentOutputSchema.isPresent()) {
-                return SchemaUtils.validateOutputSchema(output, agentOutputSchema.get());
+                return SchemaUtils.validateSchema(output, agentOutputSchema.get());
               } else {
                 return ImmutableMap.of("result", output);
               }