Merge pull request #76 from schemacrawler/deps

sualeh · web-flow · commit 284eaccf8632 · 2025-08-02T12:42:12.000-04:00
Update Spring AI version and refactor code
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,13 @@
 
 SchemaCrawler AI release notes.
 
+<a name="v16.26.3-4"></a>
+## Release 16.26.3-4 - 2025-08-04
+
+- Use later version of Spring AI and Spring Boot
+- Refactor health endpoint to show uptime
+
+
 <a name="v16.26.3-3"></a>
 ## Release 16.26.3-3 - 2025-07-15
 
@@ -10,7 +17,7 @@ SchemaCrawler AI release notes.
 - Add logging for stdio transport
 
 
-<a name="v16.26.3-3"></a>
+<a name="v16.26.3-4"></a>
 ## Release 16.26.3-2 - 2025-07-15
 
 - Add additional tests, and fix startup issues
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
   <groupId>us.fatehi</groupId>
   <artifactId>schemacrawler-ai-aggregator</artifactId>
-  <version>16.26.3-3</version>
+  <version>16.26.3-4</version>
   <packaging>pom</packaging>
   <name>SchemaCrawler AI [Aggregator]</name>
 
diff --git a/schemacrawler-ai-aichat/pom.xml b/schemacrawler-ai-aichat/pom.xml
@@ -4,7 +4,7 @@
    <parent>
       <groupId>us.fatehi</groupId>
       <artifactId>schemacrawler-ai-parent</artifactId>
-      <version>16.26.3-3</version>
+      <version>16.26.3-4</version>
       <relativePath>../schemacrawler-ai-parent</relativePath>
    </parent>
    <artifactId>schemacrawler-ai-aichat</artifactId>
diff --git a/schemacrawler-ai-core/pom.xml b/schemacrawler-ai-core/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.26.3-3</version>
+    <version>16.26.3-4</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-distrib/pom.xml b/schemacrawler-ai-distrib/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.26.3-3</version>
+    <version>16.26.3-4</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-distrib/src/main/assembly/assembly-bin.xml b/schemacrawler-ai-distrib/src/main/assembly/assembly-bin.xml
@@ -6,7 +6,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-               http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+               https://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>bin</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
diff --git a/schemacrawler-ai-distrib/src/main/assembly/assembly-lib.xml b/schemacrawler-ai-distrib/src/main/assembly/assembly-lib.xml
@@ -6,7 +6,7 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
      xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
-               http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+               https://maven.apache.org/xsd/assembly-1.1.2.xsd">
   <id>lib</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <dependencySets>
diff --git a/schemacrawler-ai-langchain4j/pom.xml b/schemacrawler-ai-langchain4j/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.26.3-3</version>
+    <version>16.26.3-4</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
 
diff --git a/schemacrawler-ai-mcpserver/pom.xml b/schemacrawler-ai-mcpserver/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>us.fatehi</groupId>
     <artifactId>schemacrawler-ai-parent</artifactId>
-    <version>16.26.3-3</version>
+    <version>16.26.3-4</version>
     <relativePath>../schemacrawler-ai-parent</relativePath>
   </parent>
   <artifactId>schemacrawler-ai-mcpserver</artifactId>
@@ -45,7 +45,7 @@
       <dependency>
         <groupId>org.springframework.ai</groupId>
         <artifactId>spring-ai-bom</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -68,6 +68,20 @@
     <dependency>
       <groupId>org.springframework.ai</groupId>
       <artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-starter</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
     </dependency>
     <!-- Test dependencies -->
     <dependency>
@@ -80,14 +94,15 @@
       <artifactId>schemacrawler-api</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
-    </dependency>  
+    </dependency>
     <dependency>
       <groupId>us.fatehi</groupId>
       <artifactId>schemacrawler-tools</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
     <dependency>
+      <!-- Use a version consistent with Spring Boot provided by Spring AI -->
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
       <scope>test</scope>
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/DockerMcpServer.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/DockerMcpServer.java
@@ -158,24 +158,6 @@ protected void addServerConnection(final List<String> arguments) {
       }
     }
 
-    /**
-     * Checks if a string is a valid numeric value.
-     *
-     * @param value The string to check
-     * @return true if the string is a valid numeric value, false otherwise
-     */
-    protected boolean isValidPort(final String value) {
-      if (isBlank(value)) {
-        return false;
-      }
-      try {
-        final int port = Integer.parseInt(value);
-        return port > 1023 && port < 65536;
-      } catch (final NumberFormatException e) {
-        return false;
-      }
-    }
-
     /**
      * Checks if a string is a valid SchemaCrawler database plugin.
      *
@@ -229,6 +211,24 @@ protected boolean isValidLogLevel(final String logLevel) {
         return false;
       }
     }
+
+    /**
+     * Checks if a string is a valid numeric value.
+     *
+     * @param value The string to check
+     * @return true if the string is a valid numeric value, false otherwise
+     */
+    protected boolean isValidPort(final String value) {
+      if (isBlank(value)) {
+        return false;
+      }
+      try {
+        final int port = Integer.parseInt(value);
+        return port > 1023 && port < 65536;
+      } catch (final NumberFormatException e) {
+        return false;
+      }
+    }
   }
 
   /**
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/SseMcpServer.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/SseMcpServer.java
@@ -23,7 +23,7 @@ public static void main(final String[] args) {
   }
 
   public static void start() {
-    SpringApplication app = new SpringApplication(SseMcpServer.class);
+    final SpringApplication app = new SpringApplication(SseMcpServer.class);
     app.setAdditionalProfiles("sse");
     app.run();
   }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/StdioMcpServer.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/StdioMcpServer.java
@@ -23,7 +23,7 @@ public static void main(final String[] args) {
   }
 
   public static void start() {
-    SpringApplication app = new SpringApplication(StdioMcpServer.class);
+    final SpringApplication app = new SpringApplication(StdioMcpServer.class);
     app.setAdditionalProfiles("stdio");
     app.run();
   }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ConfigurationManager.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ConfigurationManager.java
@@ -17,12 +17,6 @@ public class ConfigurationManager {
   private static final Object lock = new Object();
   private static volatile ConfigurationManager instance;
 
-  private boolean isDryRun = false;
-
-  private ConfigurationManager() {
-    // Private constructor to prevent direct instantiation
-  }
-
   public static ConfigurationManager getInstance() {
     if (instance == null) {
       synchronized (lock) {
@@ -34,11 +28,17 @@ public static ConfigurationManager getInstance() {
     return instance;
   }
 
+  private boolean isDryRun = false;
+
+  private ConfigurationManager() {
+    // Private constructor to prevent direct instantiation
+  }
+
   public boolean isDryRun() {
     return isDryRun;
   }
 
   public void setDryRun(final boolean dryRun) {
-    this.isDryRun = dryRun;
+    isDryRun = dryRun;
   }
 }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/HealthController.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/HealthController.java
@@ -8,31 +8,52 @@
 
 package schemacrawler.tools.ai.mcpserver.server;
 
+import java.lang.management.ManagementFactory;
+import java.time.Duration;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
+import jakarta.annotation.PostConstruct;
 
 /** Simple controller to check if the server is running. */
 @RestController
 public class HealthController {
 
-  @GetMapping("/health")
+  private static final Logger LOGGER = Logger.getLogger(HealthController.class.getCanonicalName());
+
+  public static Duration serverUptime() {
+    final long uptime = ManagementFactory.getRuntimeMXBean().getUptime() / 1_000;
+    final Duration duration = Duration.ofSeconds(uptime);
+    return duration;
+  }
+
+  @Value("${server.name}")
+  private String serverName;
+
+  @Value("${server.version}")
+  private String serverVersion;
+
+  @GetMapping({"/", "/health"})
   public Map<String, Object> healthCheck() {
     final Map<String, Object> response = new HashMap<>();
     response.put("status", "UP");
-    response.put("service", "SchemaCrawler MCP Server");
+    response.put("service", serverName());
     response.put("timestamp", LocalDateTime.now().toString());
+    response.put("uptime", serverUptime());
     return response;
   }
 
-  @GetMapping("/")
-  public Map<String, Object> root() {
-    final Map<String, Object> response = new HashMap<>();
-    response.put("message", "SchemaCrawler AI MCP Server is running");
-    response.put("health_endpoint", "/health");
-    response.put("timestamp", LocalDateTime.now().toString());
-    return response;
+  @PostConstruct
+  public void init() {
+    LOGGER.log(Level.INFO, serverName());
+  }
+
+  private String serverName() {
+    return String.format("%s %s", serverName, serverVersion);
   }
 }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/HeartbeatLogger.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/HeartbeatLogger.java
@@ -8,16 +8,15 @@
 
 package schemacrawler.tools.ai.mcpserver.server;
 
-import java.lang.management.ManagementFactory;
-import java.time.Duration;
+import static schemacrawler.tools.ai.mcpserver.server.HealthController.serverUptime;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.springframework.core.env.Environment;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import schemacrawler.Version;
+import jakarta.annotation.PostConstruct;
 import us.fatehi.utility.string.StringFormat;
 
 @Component
@@ -26,27 +25,33 @@ public class HeartbeatLogger {
 
   private static final Logger LOGGER = Logger.getLogger(HeartbeatLogger.class.getCanonicalName());
 
-  private final Environment environment;
+  @Value("${server.heartbeat}")
+  private boolean heartbeat;
 
-  public HeartbeatLogger(final Environment environment) {
-    this.environment = environment;
+  @Value("${server.name}")
+  private String serverName;
+
+  @Value("${server.version}")
+  private String serverVersion;
+
+  @PostConstruct
+  public void init() {
+    LOGGER.log(Level.INFO, String.format("%s; heartbeat=%b", serverName(), heartbeat));
   }
 
   @Scheduled(timeUnit = TimeUnit.SECONDS, fixedRate = 30)
   public void logHeartbeat() {
-    final boolean heartbeat = Boolean.valueOf(environment.getProperty("server.heartbeat", "false"));
     if (!heartbeat) {
       return;
     }
 
-    final String serverName = environment.getProperty("server.name", "SchemaCrawler MCP Server");
-    final String serverVersion = Version.version().toString();
-    final long uptime = ManagementFactory.getRuntimeMXBean().getUptime() / 1_000;
-    final Duration duration = Duration.ofSeconds(uptime);
-
     LOGGER.log(
         Level.INFO,
         new StringFormat(
-            "Heartbeat: %s (%s) is running. Uptime %s.", serverName, serverVersion, duration));
+            "Heartbeat: %s is running with uptime %s.", serverName(), serverUptime()));
+  }
+
+  private String serverName() {
+    return String.format("%s %s", serverName, serverVersion);
   }
 }
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ToolProviderService.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/ToolProviderService.java
diff --git a/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/command/mcpserver/McpServerCommandOptionsBuilder.java b/schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/command/mcpserver/McpServerCommandOptionsBuilder.java
diff --git a/schemacrawler-ai-mcpserver/src/main/resources/application.yaml b/schemacrawler-ai-mcpserver/src/main/resources/application.yaml
diff --git a/schemacrawler-ai-mcpserver/src/main/resources/banner.txt b/schemacrawler-ai-mcpserver/src/main/resources/banner.txt
diff --git a/schemacrawler-ai-mcpserver/src/test/java/schemacrawler/tools/ai/mcpserver/server/test/HealthControllerTest.java b/schemacrawler-ai-mcpserver/src/test/java/schemacrawler/tools/ai/mcpserver/server/test/HealthControllerTest.java
diff --git a/schemacrawler-ai-mcpserver/src/test/java/schemacrawler/tools/ai/mcpserver/test/SchemaCrawlerMCPServerTest.java b/schemacrawler-ai-mcpserver/src/test/java/schemacrawler/tools/ai/mcpserver/test/SchemaCrawlerMCPServerTest.java
diff --git a/schemacrawler-ai-parent/pom.xml b/schemacrawler-ai-parent/pom.xml
