(cayenne) branch master updated: CAY-2869 Upgrade handler v11 removes dbImport configuration

[ntimofeev]

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 b133964e1 CAY-2869 Upgrade handler v11 removes dbImport configuration
b133964e1 is described below

commit b133964e1c35f051424836e1992e98e4c25b5f06
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Tue Aug 27 12:34:39 2024 +0400

    CAY-2869 Upgrade handler v11 removes dbImport configuration
---
 .../project/upgrade/handlers/UpgradeHandler.java       | 18 ++++++++++++++++++
 .../project/upgrade/handlers/UpgradeHandler_V11.java   | 16 ++++++++--------
 2 files changed, 26 insertions(+), 8 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 0b031662b..e5be3c86d 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
@@ -37,6 +37,24 @@ import org.w3c.dom.NodeList;
  */
 public interface UpgradeHandler {
 
+    /**
+     * root tag for the cgen extension
+     * @since 5.0-M1
+     */
+    String CGEN = "cgen";
+
+    /**
+     * root tag for the dbImport extension
+     * @since 5.0-M1
+     */
+    String DB_IMPORT = "dbImport";
+
+    /**
+     * root tag for the graph extension
+     * @since 5.0-M1
+     */
+    String GRAPH = "graph";
+
     /**
      * @return target version for this handler
      */
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 4dd8d6f31..15ad9133e 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
@@ -77,9 +77,9 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
     @Override
     public void processDataMapDom(UpgradeUnit upgradeUnit) {
         updateDataMapSchemaAndVersion(upgradeUnit);
-        updateExtensionSchema(upgradeUnit, "cgen");
-        updateExtensionSchema(upgradeUnit, "dbImport");
-        updateExtensionSchema(upgradeUnit, "graph");
+        updateExtensionSchema(upgradeUnit, CGEN);
+        updateExtensionSchema(upgradeUnit, DB_IMPORT);
+        updateExtensionSchema(upgradeUnit, GRAPH);
         upgradeComments(upgradeUnit);
 
         dropROPProperties(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()='" + 
DB_IMPORT + "']/*[local-name()='usePrimitives']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
         } catch (Exception e) {
             return;
@@ -192,9 +192,9 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
         NodeList queryTemplates;
         NodeList querySuperTemplates;
         try {
-            queryTemplates = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='cgen']/*[local-name()='queryTemplate']",
+            queryTemplates = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='" + CGEN + 
"']/*[local-name()='queryTemplate']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
-            querySuperTemplates = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='cgen']/*[local-name()='querySuperTemplate']",
+            querySuperTemplates = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='" + CGEN + 
"']/*[local-name()='querySuperTemplate']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
         } catch (Exception e) {
             return;
@@ -215,7 +215,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
         XPath xpath = XPathFactory.newInstance().newXPath();
         NodeList nodes;
         try {
-            nodes = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='cgen']/*[local-name()='client']",
+            nodes = (NodeList) xpath.evaluate("/data-map/*[local-name()='" + 
CGEN + "']/*[local-name()='client']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
         } catch (Exception e) {
             return;
@@ -246,7 +246,7 @@ public class UpgradeHandler_V11 implements UpgradeHandler {
         XPath xpath = XPathFactory.newInstance().newXPath();
         NodeList templates;
         try {
-            templates = (NodeList) 
xpath.evaluate("/data-map/*[local-name()='cgen']/*[local-name()='" + nodeName + 
"']",
+            templates = (NodeList) xpath.evaluate("/data-map/*[local-name()='" 
+ CGEN + "']/*[local-name()='" + nodeName + "']",
                     upgradeUnit.getDocument(), XPathConstants.NODESET);
         } catch (Exception e) {
             return;