Merge pull request #127 from schemacrawler/cleanup

Clean up code

Author: sualeh

.mvn/extensions.xml

@@ -0,0 +1,22 @@
+/*
+ * SchemaCrawler AI
+ * http://www.schemacrawler.com
+ * Copyright (c) 2000-2025, Sualeh Fatehi <sualeh@hotmail.com>.
+ * All rights reserved.
+ * SPDX-License-Identifier: CC-BY-NC-4.0
+ */
+
+package schemacrawler.tools.ai.mcpserver;
+
+import java.util.Collection;
+import java.util.Collections;
+import jakarta.annotation.Nullable;
+
+/** Wrapper for bean that would otherwise have a collection of strings */
+public record ExcludeTools(@Nullable Collection<String> excludeTools) {
+  public ExcludeTools {
+    if (excludeTools == null) {
+      excludeTools = Collections.emptySet();
+    }
+  }
+}

.mvn/jvm.config

@@ -14,6 +14,7 @@
 
 import java.nio.file.Path;
 import java.util.Collection;
+import java.util.Set;
 import java.util.logging.Level;
 import schemacrawler.schema.Catalog;
 import schemacrawler.schemacrawler.InfoLevel;
@@ -23,10 +24,10 @@
 import schemacrawler.schemacrawler.LoadOptionsBuilder;
 import schemacrawler.schemacrawler.SchemaCrawlerOptions;
 import schemacrawler.schemacrawler.SchemaCrawlerOptionsBuilder;
-import schemacrawler.tools.ai.mcpserver.utility.CollectionsUtility;
 import schemacrawler.tools.databaseconnector.EnvironmentalDatabaseConnectionSourceBuilder;
 import schemacrawler.tools.offline.jdbc.OfflineConnectionUtility;
 import schemacrawler.tools.utility.SchemaCrawlerUtility;
+import us.fatehi.utility.CollectionsUtility;
 import us.fatehi.utility.LoggingConfig;
 import us.fatehi.utility.datasource.DatabaseConnectionSource;
 import us.fatehi.utility.ioresource.EnvironmentVariableAccessor;
@@ -107,7 +108,7 @@ protected SchemaCrawlerOptions buildSchemaCrawlerOptions() {
   }
 
   protected Collection<String> excludeTools() {
-    return CollectionsUtility.setOfStrings(envAccessor.getenv(EXCLUDE_TOOLS));
+    return Set.of(CollectionsUtility.splitList(envAccessor.getenv(EXCLUDE_TOOLS)));
   }
 
   protected Catalog getCatalog() {

.mvn/maven-build-cache-config.xml

@@ -8,8 +8,6 @@
 
 package schemacrawler.tools.ai.mcpserver;
 
-import static java.util.Collections.emptySet;
-import static java.util.Collections.unmodifiableCollection;
 import static java.util.Objects.requireNonNull;
 
 import java.sql.Connection;
@@ -31,7 +29,7 @@ public class McpServerInitializer
   private final Catalog catalog;
   private final DatabaseConnectionSource connectionSource;
   private final McpServerTransportType mcpTransport;
-  private final Collection<String> excludeTools;
+  private final ExcludeTools excludeTools;
 
   public McpServerInitializer(
       final Catalog catalog,
@@ -61,9 +59,9 @@ public McpServerInitializer(
     this.catalog = requireNonNull(catalog, "No catalog provided");
 
     if (excludeTools == null) {
-      this.excludeTools = emptySet();
+      this.excludeTools = new ExcludeTools(null);
     } else {
-      this.excludeTools = unmodifiableCollection(excludeTools);
+      this.excludeTools = new ExcludeTools(excludeTools);
     }
   }
 
@@ -99,7 +97,7 @@ public McpServerInitializer(final McpServerContext context) {
     }
     this.connectionSource = connectionSource;
 
-    excludeTools = context.excludeTools();
+    excludeTools = new ExcludeTools(context.excludeTools());
   }
 
   @Override
@@ -115,6 +113,6 @@ public void initialize(@NonNull final GenericApplicationContext context) {
         "functionDefinitionRegistry",
         FunctionDefinitionRegistry.class,
         () -> FunctionDefinitionRegistry.getFunctionDefinitionRegistry());
-    context.registerBean("excludeTools", Collection.class, () -> excludeTools);
+    context.registerBean("excludeTools", ExcludeTools.class, () -> excludeTools);
   }
 }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/ExcludeTools.java

@@ -24,7 +24,7 @@ public class HealthController {
   @GetMapping(
       value = {"/", "/health"},
       produces = APPLICATION_JSON_VALUE)
-  public Map<String, String> healthCheck() {
+  public Map<String, Object> healthCheck() {
     return serverHealth.currentState();
   }
 }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/McpServerContext.java

@@ -35,13 +35,13 @@ public class HeartbeatLogger {
 
   private final Supplier<String> heartbeatMessage =
       () -> {
-        final Map<String, String> heartbeatMessage = serverHealth.currentState();
+        final Map<String, Object> heartbeatMessage = serverHealth.currentState();
         try {
           return "\n"
               + mapper.writerWithDefaultPrettyPrinter().writeValueAsString(heartbeatMessage);
         } catch (final JsonProcessingException e) {
           LOGGER.log(Level.WARNING, "Could not convert server state to JSON", e);
-          return serverHealth.currentStateString();
+          return heartbeatMessage.toString();
         }
       };
 

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/McpServerInitializer.java

@@ -17,6 +17,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
+import schemacrawler.tools.ai.mcpserver.ExcludeTools;
 import schemacrawler.tools.ai.mcpserver.McpServerTransportType;
 
 @Component
@@ -29,25 +30,20 @@ public class ServerHealth {
   private String serverVersion;
 
   @Autowired private boolean isInErrorState;
-
   @Autowired private McpServerTransportType mcpTransport;
+  @Autowired private ExcludeTools excludeTools;
 
-  public Map<String, String> currentState() {
-    final Map<String, String> currentState = new HashMap<>();
+  public Map<String, Object> currentState() {
+    final Map<String, Object> currentState = new HashMap<>();
     currentState.put("_server", getServerName());
     currentState.put("current-timestamp", String.valueOf(ZonedDateTime.now(ZoneOffset.UTC)));
-    currentState.put("in-error-state", Boolean.toString(isInErrorState));
+    currentState.put("in-error-state", isInErrorState);
     currentState.put("server-uptime", String.valueOf(getServerUptime()));
     currentState.put("transport", mcpTransport.name());
+    currentState.put("exclude-tools", excludeTools.excludeTools());
     return currentState;
   }
 
-  public String currentStateString() {
-    return String.format(
-        "%s%nin-error-state=%s; server-uptime=%s; transport=%s",
-        getServerName(), isInErrorState, getServerUptime(), mcpTransport);
-  }
-
   public McpServerTransportType getMcpTransport() {
     return mcpTransport;
   }

schemacrawler-ai-mcpserver/src/main/java/schemacrawler/tools/ai/mcpserver/server/HealthController.java

@@ -15,7 +15,6 @@
 import io.modelcontextprotocol.server.McpSyncServerExchange;
 import io.modelcontextprotocol.spec.McpSchema.Implementation;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -26,6 +25,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import schemacrawler.Version;
+import schemacrawler.tools.ai.mcpserver.ExcludeTools;
 import schemacrawler.tools.ai.tools.FunctionDefinition;
 import schemacrawler.tools.ai.tools.FunctionDefinitionRegistry;
 import schemacrawler.tools.ai.utility.JsonUtility;
@@ -43,7 +43,7 @@ public class ToolProvider {
   @Autowired private ServerHealth serverHealth;
   @Autowired private FunctionDefinitionRegistry functionDefinitionRegistry;
   @Autowired private ToolHelper toolHelper;
-  @Autowired private Collection<String> excludeTools;
+  @Autowired private ExcludeTools excludeTools;
 
   @McpTool(
       name = "mcp-server-health",
@@ -84,7 +84,7 @@ public List<McpServerFeatures.SyncToolSpecification> schemaCrawlerTools() {
     for (final FunctionDefinition<?> functionDefinition :
         functionDefinitionRegistry.getFunctionDefinitions()) {
       final String functionName = functionDefinition.getFunctionName().getName();
-      if (excludeTools == null || excludeTools.contains(functionName)) {
+      if (excludeTools == null || excludeTools.excludeTools().contains(functionName)) {
         LOGGER.log(Level.WARNING, new StringFormat("Excluding tool <%s>", functionName));
         continue;
       }