From 3c848ee91b8c55c7c0888c5a1a993b9a49913d42 Mon Sep 17 00:00:00 2001
From: Stephan Pirnbaum <stephan.pirnbaum@buschmais.com>
Date: Thu, 1 Feb 2024 15:43:42 +0100
Subject: [PATCH] Update queries for Neo4j v5

---
 pom.xml                                               | 11 +++++------
 .../META-INF/jqassistant-rules/spring-injection.xml   | 10 +++++-----
 .../META-INF/jqassistant-rules/spring-transaction.xml |  2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb53dbb..28c2bb7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.jqassistant.plugin</groupId>
         <artifactId>parent</artifactId>
-        <version>2.0.0</version>
+        <version>2.1.0-M1</version>
         <relativePath />
     </parent>
 
@@ -52,11 +52,10 @@
     </scm>
 
     <properties>
-        <jqa-java-plugin.version>2.0.0</jqa-java-plugin.version>
-        <jqa-plugin-common.version>2.0.0</jqa-plugin-common.version>
-        <org.springframework.version>5.3.2</org.springframework.version>
-        <org.springframework.boot_version>2.4.1</org.springframework.boot_version>
-        <org.springframework.data_version>2.4.2</org.springframework.data_version>
+        <jqa-java-plugin.version>2.1.0-M1</jqa-java-plugin.version>
+        <jqa-plugin-common.version>2.1.0-M1</jqa-plugin-common.version>
+        <org.springframework.boot_version>3.2.2</org.springframework.boot_version>
+        <org.springframework.data_version>3.2.2</org.springframework.data_version>
         <javax.transaction.transaction-api_version>1.3</javax.transaction.transaction-api_version>
     </properties>
 
diff --git a/src/main/resources/META-INF/jqassistant-rules/spring-injection.xml b/src/main/resources/META-INF/jqassistant-rules/spring-injection.xml
index 2c2cb78..c9a432d 100644
--- a/src/main/resources/META-INF/jqassistant-rules/spring-injection.xml
+++ b/src/main/resources/META-INF/jqassistant-rules/spring-injection.xml
@@ -161,8 +161,8 @@
             WHERE NOT (
               artifact:Test
               OR type:Generated
-              OR (exists(field.final) AND field.final = true)
-              OR (exists(field.synthetic) AND field.synthetic) // synthetic fields, e.g. generated by Groovy
+              OR (field.final IS NOT NULL AND field.final = true)
+              OR (field.synthetic IS NOT NULL AND field.synthetic) // synthetic fields, e.g. generated by Groovy
             )
             RETURN
               type AS Type, field AS Field
@@ -191,7 +191,7 @@
                 OR method:Constructor // method is a constructor
                 OR method:PostConstruct
                 OR method:PreDestroy
-                OR (exists(field.synthetic) AND field.synthetic) // synthetic fields, e.g. generated by Groovy
+                OR (field.synthetic IS NOT NULL AND field.synthetic) // synthetic fields, e.g. generated by Groovy
               )
             RETURN
                injectable as Injectable, writes as WriteToInjectableField, field as Field
@@ -322,7 +322,7 @@
               artifact:Test
               or t:Generated
               or t:Spring:Injectable
-              or exists(f.synthetic) // exclude synthetic inner class field referencing the outer class
+              or f.synthetic IS NOT NULL // exclude synthetic inner class field referencing the outer class
             )
             WITH
               t, collect(DISTINCT fType.fqn) AS fields
@@ -331,7 +331,7 @@
             WITH
               t, fields, count(DISTINCT injectableImpl) AS injectableImplCnt
             WHERE
-              NOT exists(t.abstract) OR injectableImplCnt = 0
+              NOT t.abstract IS NOT NULL OR injectableImplCnt = 0
             RETURN
               t AS NonInjectableHavingInjectablesAsField, fields AS Fields
         ]]></cypher>
diff --git a/src/main/resources/META-INF/jqassistant-rules/spring-transaction.xml b/src/main/resources/META-INF/jqassistant-rules/spring-transaction.xml
index ae11806..9bdb897 100644
--- a/src/main/resources/META-INF/jqassistant-rules/spring-transaction.xml
+++ b/src/main/resources/META-INF/jqassistant-rules/spring-transaction.xml
@@ -70,7 +70,7 @@
              (transactionalClass)-[:DECLARES]->(transactionalMethod:Method)
            WHERE NOT (
              transactionalMethod:Constructor
-             or (exists(transactionalMethod.static) and transactionalMethod.static)
+             or (transactionalMethod.static IS NOT NULL and transactionalMethod.static)
            )
            SET
              transactionalMethod:Spring:Transactional