Upgrade to Spring AI 1.0.0-M6

alexcheng1982 · alexcheng1982 · commit 70f12a086315 · 2025-04-16T20:32:29.000+12:00
diff --git a/code-generator/cli/pom.xml b/code-generator/cli/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>code-generator-cli</artifactId>
diff --git a/code-generator/cli/src/main/kotlin/com/javaaidev/easyllmtools/codegenerator/cli/CodeGeneratorCli.kt b/code-generator/cli/src/main/kotlin/com/javaaidev/easyllmtools/codegenerator/cli/CodeGeneratorCli.kt
@@ -8,7 +8,7 @@ import kotlin.system.exitProcess
 @CommandLine.Command(
     name = "easy-llm-tools",
     mixinStandardHelpOptions = true,
-    version = ["0.1.9"],
+    version = ["0.2.0"],
     description = ["Generate code for LLM tools"],
     scope = CommandLine.ScopeType.INHERIT,
     subcommands = [
diff --git a/code-generator/openapi/pom.xml b/code-generator/openapi/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>code-generator-openapi</artifactId>
diff --git a/code-generator/openapi/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/code-generator/openapi/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -392,7 +392,7 @@
       <dependency>
         <groupId>com.javaaidev.easyllmtools</groupId>
         <artifactId>llm-tool-spec</artifactId>
-        <version>0.1.9</version>
+        <version>0.2.0</version>
       </dependency>
         <!-- test dependencies -->
         <dependency>
diff --git a/code-generator/pom.xml b/code-generator/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>code-generator</artifactId>
diff --git a/code-generator/shared/pom.xml b/code-generator/shared/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>code-generator-shared</artifactId>
diff --git a/code-generator/simple/pom.xml b/code-generator/simple/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>code-generator</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>code-generator-simple</artifactId>
diff --git a/code-generator/simple/src/main/resources/template/pom.hbs b/code-generator/simple/src/main/resources/template/pom.hbs
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>com.javaaidev.easyllmtools</groupId>
             <artifactId>llm-tool-spec</artifactId>
-            <version>0.1.9</version>
+            <version>0.2.0</version>
         </dependency>
     </dependencies>
 
diff --git a/integration/core/pom.xml b/integration/core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>integration</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>integration-core</artifactId>
diff --git a/integration/mcp/pom.xml b/integration/mcp/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>integration</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>integration-mcp</artifactId>
diff --git a/integration/pom.xml b/integration/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>integration</artifactId>
diff --git a/integration/spring-ai/pom.xml b/integration/spring-ai/pom.xml
@@ -6,19 +6,20 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>integration</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>integration-spring-ai</artifactId>
   <name>Integration :: Spring AI</name>
   <description>Spring AI Integration</description>
 
   <properties>
-    <maven.compiler.source>17</maven.compiler.source>
-    <maven.compiler.target>17</maven.compiler.target>
+    <java.version>17</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <spring-ai.version>1.0.0-M5</spring-ai.version>
-    <jackson.version>2.17.3</jackson.version>
+    <spring-ai.version>1.0.0-M6</spring-ai.version>
+    <jackson.version>2.18.3</jackson.version>
   </properties>
 
   <dependencyManagement>
diff --git a/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolFunctionCallback.java b/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolFunctionCallback.java
@@ -2,9 +2,10 @@
 
 import com.javaaidev.easyllmtools.integration.core.ToolInvoker;
 import com.javaaidev.easyllmtools.llmtoolspec.Tool;
-import org.springframework.ai.model.function.FunctionCallback;
+import org.springframework.ai.tool.ToolCallback;
+import org.springframework.ai.tool.definition.ToolDefinition;
 
-public class ToolFunctionCallback implements FunctionCallback {
+public class ToolFunctionCallback implements ToolCallback {
 
   private final Tool tool;
   private final ToolInvoker toolInvoker;
@@ -15,18 +16,12 @@ public ToolFunctionCallback(Tool tool, ToolInvoker toolInvoker) {
   }
 
   @Override
-  public String getName() {
-    return this.tool.getName();
-  }
-
-  @Override
-  public String getDescription() {
-    return this.tool.getDescription();
-  }
-
-  @Override
-  public String getInputTypeSchema() {
-    return this.tool.getParametersSchema();
+  public ToolDefinition getToolDefinition() {
+    return ToolDefinition.builder()
+        .name(this.tool.getName())
+        .description(this.tool.getDescription())
+        .inputSchema(this.tool.getParametersSchema())
+        .build();
   }
 
   @Override
diff --git a/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolsFunctionCallbackResolver.java b/integration/spring-ai/src/main/kotlin/com/javaaidev/easyllmtools/integration/springai/ToolsFunctionCallbackResolver.java
@@ -7,21 +7,21 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.ai.model.function.FunctionCallback;
-import org.springframework.ai.model.function.FunctionCallbackResolver;
+import org.springframework.ai.tool.resolution.ToolCallbackResolver;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
 public class ToolsFunctionCallbackResolver implements ApplicationContextAware,
-    FunctionCallbackResolver {
+    ToolCallbackResolver {
 
-  private final FunctionCallbackResolver fallbackResolver;
+  private final ToolCallbackResolver fallbackResolver;
   private final Map<String, Tool> toolsMap = new HashMap<>();
   private final ToolInvoker toolInvoker = new ToolInvoker();
 
   private static final Logger LOGGER = LoggerFactory.getLogger(ToolsFunctionCallbackResolver.class);
 
-  public ToolsFunctionCallbackResolver(FunctionCallbackResolver fallbackResolver) {
+  public ToolsFunctionCallbackResolver(ToolCallbackResolver fallbackResolver) {
     this.fallbackResolver = fallbackResolver;
   }
 
diff --git a/llm-tool-spec/pom.xml b/llm-tool-spec/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>llm-tool-spec</artifactId>
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
   <artifactId>easyllmtools-parent</artifactId>
   <name>Easy LLM Tools</name>
   <description>Build tools for LLM</description>
-  <version>0.1.9</version>
+  <version>0.2.0</version>
   <packaging>pom</packaging>
   <modules>
     <module>llm-tool-spec</module>
@@ -24,6 +24,11 @@
       <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
     </license>
   </licenses>
+  <organization>
+    <name>JavaAIDev.com</name>
+    <url>https://javaaidev.com</url>
+  </organization>
+  <inceptionYear>2025</inceptionYear>
 
   <developers>
     <developer>
diff --git a/support/command-line-invoker/pom.xml b/support/command-line-invoker/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>support</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>command-line-invoker</artifactId>
diff --git a/support/pom.xml b/support/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.javaaidev.easyllmtools</groupId>
     <artifactId>easyllmtools-parent</artifactId>
-    <version>0.1.9</version>
+    <version>0.2.0</version>
   </parent>
 
   <artifactId>support</artifactId>
