Unify Modeler and MCP dbimport tool path logic

Author: stariy95

cayenne-mcp-server/src/main/java/org/apache/cayenne/mcp/tools/dbimport/DbImportRunTool.java

@@ -189,11 +189,12 @@ public DbImportRunResult run(String projectPath, String dataMapName) {
                     new DbImportValidation(true, false, null, null, null));
         }
 
-        // Resolve DataMap file path for preference node lookup
-        Path dataMapFile = resolveDataMapFile(dataMap);
-
         // Step 4 — DBConnector stored in preferences?
-        String dataMapId = PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString());
+        // Keep this in sync with PrefsManager.dataMapPath(...), which keys Modeler preferences
+        // from URL.getPath(). On Windows file:/D:/... has a leading slash here, and hashing a
+        // java.nio Path string would point to a different preference node.
+        URL dataMapSourceUrl = dataMap.getConfigurationSource().getURL();
+        String dataMapId = PreferenceNodeIds.idForPath(dataMapSourceUrl.getPath());
         DBConnector connector = new DataMapPrefs(prefsLocator.dataMapNode(dataMapId)).getConnector();
         if (connector == null) {
             return validationFailed(DbImportErrorCode.dbconnector_not_configured,
@@ -206,6 +207,7 @@ public DbImportRunResult run(String projectPath, String dataMapName) {
                     new DbImportValidation(true, true, false, null, null));
         }
 
+        Path dataMapFile = resolveDataMapFile(dataMap);
         DbImportResolved resolved = new DbImportResolved(
                 dataMapFile.toAbsolutePath().toString(),
                 connector.getUrl(),

cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/dbimport/DbImportRunIT.java

@@ -167,7 +167,7 @@ public void drift() throws Exception {
     public void connectorNotConfigured() {
         // Clear the connector from prefs
         new DataMapPrefs(prefsLocator.dataMapNode(
-                PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString())))
+                PreferenceNodeIds.idForPath(dataMapFile.toUri().getRawPath())))
                 .setConnector(new DBConnector()); // empty connector clears URL sentinel
 
         DbImportRunResult result = tool.run(projectFile.toString(), "TestMap");
@@ -191,7 +191,7 @@ private void storeConnector(
         c.setJdbcDriver(driver);
         c.setDbAdapter(adapter);
 
-        Preferences mapPrefs = prefsLocator.dataMapNode(PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString()));
+        Preferences mapPrefs = prefsLocator.dataMapNode(PreferenceNodeIds.idForPath(dataMapFile.toUri().getRawPath()));
         new DataMapPrefs(mapPrefs).setConnector(c);
     }
 }

cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/dbimport/DbImportRunMcpIT.java

@@ -87,7 +87,7 @@ FOREIGN KEY (artist_id) REFERENCES artist(id)
 
         // The in-process MCP server uses new PrefsLocator() → Preferences.userRoot().
         // Write the connector there so the server can find it when the tool runs.
-        String dataMapId = PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString());
+        String dataMapId = PreferenceNodeIds.idForPath(dataMapFile.toUri().getRawPath());
         PrefsLocator locator = new PrefsLocator(Preferences.userRoot());
         dataMapPrefsNode = locator.dataMapNode(dataMapId);
         DBConnector connector = new DBConnector();

cayenne-mcp-server/src/test/java/org/apache/cayenne/mcp/tools/dbimport/DbImportRunValidationTest.java

@@ -165,7 +165,7 @@ public void jdbcDriverNotLoadable(@TempDir Path tmp) throws IOException {
         connector.setJdbcDriver("com.nonexistent.Driver");
         connector.setDbAdapter("org.apache.cayenne.dba.hsqldb.HSQLDBNoSchemaAdapter");
         new DataMapPrefs(locator.dataMapNode(
-                PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString())))
+                PreferenceNodeIds.idForPath(dataMapFile.toUri().getRawPath())))
                 .setConnector(connector);
 
         DbImportRunTool isolatedTool = new DbImportRunTool(locator);
@@ -198,7 +198,7 @@ public void jdbcConnectionFailed(@TempDir Path tmp) throws IOException {
         connector.setJdbcDriver("org.hsqldb.jdbc.JDBCDriver");
         connector.setDbAdapter("org.apache.cayenne.dba.hsqldb.HSQLDBNoSchemaAdapter");
         new DataMapPrefs(locator.dataMapNode(
-                PreferenceNodeIds.idForPath(dataMapFile.toAbsolutePath().toString())))
+                PreferenceNodeIds.idForPath(dataMapFile.toUri().getRawPath())))
                 .setConnector(connector);
 
         DbImportRunTool isolatedTool = new DbImportRunTool(locator);