This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 585676d72 CAY-2869 Upgrade handler v11 removes dbImport configuration
585676d72 is described below
commit 585676d7203ec3f509b2cf9f309c7e7a2b99168e
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Tue Aug 27 12:24:57 2024 +0400
CAY-2869 Upgrade handler v11 removes dbImport configuration
---
.../org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java | 2 +-
.../apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java | 4 ++--
.../cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java | 2 +-
.../org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java
index e0818a261..0b031662b 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler.java
@@ -105,7 +105,7 @@ public interface UpgradeHandler {
}
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/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
index 414befca8..4dd8d6f31 100644
---
a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
+++
b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11.java
@@ -78,7 +78,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
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 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
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/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
index ad92cee79..fcd643d5e 100644
---
a/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
+++
b/cayenne-project/src/test/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V11Test.java
@@ -158,7 +158,7 @@ public class UpgradeHandler_V11Test extends
BaseUpgradeHandlerTest {
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/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
b/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
index 92adb7718..621dd7ece 100644
---
a/cayenne-project/src/test/resources/org/apache/cayenne/project/upgrade/handlers/test-map-v10.map.xml
+++
b/cayenne-project/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>
