CAY-2869 Upgrade handler v11 removes dbImport configuration

apache · Aug 27, 2024 · 585676d · 585676d
1 parent db45019
commit 585676d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/...nne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java b/...nne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java
@@ -105,7 +105,7 @@ default void updateExtensionSchema(UpgradeUnit upgradeUnit, String extension) {
         }
         for (int j = 0; j < nodes.getLength(); j++) {
             Element element = (Element) nodes.item(j);
-            element.setAttribute("xmlns", "http://cayenne.apache.org/schema/"+getVersion()+"/"+extension);
+            element.setAttribute("xmlns", "http://cayenne.apache.org/schema/"+getVersion()+"/"+extension.toLowerCase());
         }
     }
 }
diff --git a/...project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java b/...project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
@@ -78,7 +78,7 @@ public void processProjectDom(UpgradeUnit upgradeUnit) {
     public void processDataMapDom(UpgradeUnit upgradeUnit) {
         updateDataMapSchemaAndVersion(upgradeUnit);
         updateExtensionSchema(upgradeUnit, "cgen");
-        updateExtensionSchema(upgradeUnit, "dbimport");
+        updateExtensionSchema(upgradeUnit, "dbImport");
         updateExtensionSchema(upgradeUnit, "graph");
         upgradeComments(upgradeUnit);
 
@@ -151,7 +151,7 @@ private void updateDbImportConfig(UpgradeUnit upgradeUnit) {
         XPath xpath = XPathFactory.newInstance().newXPath();
         NodeList nodes;
         try {
-            nodes = (NodeList) xpath.evaluate("/data-map/*[local-name()='dbimport']/*[local-name()='usePrimitives']",
+            nodes = (NodeList) xpath.evaluate("/data-map/*[local-name()='dbImport']/*[local-name()='usePrimitives']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
         } catch (Exception e) {
             return;

diff --git a/...ect/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java b/...ect/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
@@ -158,7 +158,7 @@ public void testDbImportDomUpgrade() throws Exception {
         Element root = document.getDocumentElement();
 
         // check cgen config is updated
-        NodeList dbimport = root.getElementsByTagName("dbimport");
+        NodeList dbimport = root.getElementsByTagName("dbImport");
         assertEquals(1, dbimport.getLength());
         Node dbimportConfig = dbimport.item(0);
         assertEquals("http://cayenne.apache.org/schema/11/dbimport",

diff --git a/...oject/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml b/...oject/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
@@ -25,8 +25,8 @@
         <querySuperTemplate>templates/v4_1/datamap-superclass.vm</querySuperTemplate>
         <client>true</client>
     </cgen>
-    <dbimport xmlns="http://cayenne.apache.org/schema/10/dbimport">
+    <dbImport xmlns="http://cayenne.apache.org/schema/10/dbimport">
         <defaultPackage>org.example</defaultPackage>
         <usePrimitives>true</usePrimitives>
-    </dbimport>
+    </dbImport>
 </data-map>