Make Cypher Neo4j 5 compatible.

neo4j · Jul 5, 2022 · 054d06c · 054d06c
1 parent 9527d87
commit 054d06c
Show file tree

Hide file tree

Showing 34 changed files with 352 additions and 601 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ build/
 .gradle/
 devenv.local
 .vscode/
+build.log
diff --git a/api/src/main/java/org/neo4j/ogm/config/Configuration.java b/api/src/main/java/org/neo4j/ogm/config/Configuration.java
@@ -601,7 +601,9 @@ public Builder verifyConnection(Boolean verifyConnection) {
          *
          * @param autoIndex auto index config
          * @return the changed builder
+         * @deprecated The usage of this tool is deprecated. Please use a proper migration tooling, like neo4j-migrations or liquibase with the Neo4j plugin. The build-in auto index manager only supports Neo4j 4.4 and higher.
          */
+        @Deprecated
         public Builder autoIndex(String autoIndex) {
             this.autoIndex = autoIndex;
             return this;

diff --git a/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndex.java b/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndex.java
diff --git a/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndexManager.java b/core/src/main/java/org/neo4j/ogm/autoindex/AutoIndexManager.java
@@ -58,7 +58,9 @@
  * @author Eric Spiegelberg
  * @author Michael J. Simons
  * @author Gerrit Meier
+ * @deprecated The usage of this tool is deprecated. Please use a proper migration tooling, like neo4j-migrations or liquibase with the Neo4j plugin.
  */
+@Deprecated
 public class AutoIndexManager {
 
     /**
@@ -186,17 +188,17 @@ private List<AutoIndex> loadIndexesFromDB() {
         List<AutoIndex> dbIndexes = new ArrayList<>();
 
         session.doInTransaction(() -> {
-            Result query = session.query("CALL db.constraints()", emptyMap());
+            Result query = session.query("SHOW CONSTRAINTS YIELD *", emptyMap());
             for (Map<String, Object> queryResult : query.queryResults()) {
-                Optional<AutoIndex> dbIndex = AutoIndex.parseConstraint(queryResult, databaseInfo.version);
+                Optional<AutoIndex> dbIndex = AutoIndex.parseConstraint(queryResult);
                 dbIndex.ifPresent(dbIndexes::add);
             }
         }, READ_ONLY);
 
         session.doInTransaction(() -> {
-            Result query = session.query("CALL db.indexes()", emptyMap());
+            Result query = session.query("SHOW INDEXES YIELD *", emptyMap());
             for (Map<String, Object> queryResult : query.queryResults()) {
-                Optional<AutoIndex> dbIndex = AutoIndex.parseIndex(queryResult, databaseInfo.version);
+                Optional<AutoIndex> dbIndex = AutoIndex.parseIndex(queryResult);
                 dbIndex.ifPresent(dbIndexes::add);
             }
         }, READ_ONLY);
@@ -279,8 +281,8 @@ private static Set<AutoIndex> initialiseAutoIndex(MetaData metaData) {
                                 properties.add(p);
                             }
                         });
-                    AutoIndex autoIndex = new AutoIndex(type, owningType,
-                        properties.toArray(new String[properties.size()]));
+                    AutoIndex autoIndex = new AutoIndex(classInfo.getUnderlyingClass(), type, owningType,
+                        properties.toArray(new String[0]), null);
                     LOGGER.debug("Adding composite index [description={}]", autoIndex);
                     indexMetadata.add(autoIndex);
                 }
@@ -300,7 +302,7 @@ private static Set<AutoIndex> initialiseAutoIndex(MetaData metaData) {
                         continue;
                     }
 
-                    final AutoIndex autoIndex = new AutoIndex(type, owningType, new String[] { fieldInfo.property() });
+                    final AutoIndex autoIndex = new AutoIndex(classInfo.getUnderlyingClass(), type, owningType, new String[] { fieldInfo.property() }, null);
                     LOGGER.debug("Adding Index [description={}]", autoIndex);
                     indexMetadata.add(autoIndex);
                 }
@@ -311,8 +313,8 @@ private static Set<AutoIndex> initialiseAutoIndex(MetaData metaData) {
                     IndexType type = classInfo.isRelationshipEntity() ?
                         IndexType.REL_PROP_EXISTENCE_CONSTRAINT : IndexType.NODE_PROP_EXISTENCE_CONSTRAINT;
 
-                    AutoIndex autoIndex = new AutoIndex(type, owningType,
-                        new String[] { requiredField.property() });
+                    AutoIndex autoIndex = new AutoIndex(classInfo.getUnderlyingClass(), type, owningType,
+                        new String[] { requiredField.property() }, null);
 
                     LOGGER.debug("Adding required constraint [description={}]", autoIndex);
                     indexMetadata.add(autoIndex);

diff --git a/core/src/main/java/org/neo4j/ogm/autoindex/IndexType.java b/core/src/main/java/org/neo4j/ogm/autoindex/IndexType.java
@@ -18,6 +18,8 @@
  */
 package org.neo4j.ogm.autoindex;
 
+import java.util.EnumSet;
+
 /**
  * @author Frantisek Hartman
  */
@@ -51,6 +53,10 @@ enum IndexType {
     /**
      * Relationship property existence constraint
      */
-    REL_PROP_EXISTENCE_CONSTRAINT,
+    REL_PROP_EXISTENCE_CONSTRAINT;
 
+    boolean isConstraint() {
+        return EnumSet.of(UNIQUE_CONSTRAINT, NODE_KEY_CONSTRAINT, NODE_PROP_EXISTENCE_CONSTRAINT,
+            REL_PROP_EXISTENCE_CONSTRAINT).contains(this);
+    }
 }
diff --git a/core/src/main/java/org/neo4j/ogm/cypher/function/DistanceComparison.java b/core/src/main/java/org/neo4j/ogm/cypher/function/DistanceComparison.java
@@ -61,7 +61,7 @@ public String expression(String nodeIdentifier, String filteredProperty,
         String latitude = nodeIdentifier + LATITUDE_PROPERTY_SUFFIX;
         String longitude = nodeIdentifier + LONGITUDE_PROPERTY_SUFFIX;
         return String
-            .format("distance(point({latitude: %s, longitude: %s}),point({latitude: $lat, longitude: $lon})) " +
+            .format("point.distance(point({latitude: %s, longitude: %s}),point({latitude: $lat, longitude: $lon})) " +
                 "%s $distance ", latitude, longitude, operator.getValue());
     }
 

diff --git a/core/src/main/java/org/neo4j/ogm/cypher/function/NativeDistanceComparison.java b/core/src/main/java/org/neo4j/ogm/cypher/function/NativeDistanceComparison.java
@@ -64,7 +64,7 @@ public String expression(String nodeIdentifier, String filteredProperty,
         String comparisonOperator = operator.getValue();
 
         return String.format(
-            "distance($%s,%s) %s $%s ",
+            "point.distance($%s,%s) %s $%s ",
             OGM_POINT_PARAMETER, pointPropertyOfEntity, comparisonOperator, DISTANCE_VALUE_PARAMETER);
     }
 

diff --git a/core/src/main/java/org/neo4j/ogm/cypher/function/PropertyComparison.java b/core/src/main/java/org/neo4j/ogm/cypher/function/PropertyComparison.java
@@ -60,7 +60,7 @@ public String expression(String nodeIdentifier, String filteredProperty,
         if (operator == IS_NULL) {
             return String.format("%s.`%s` IS NULL ", nodeIdentifier, filteredProperty);
         } else if (operator == EXISTS) {
-            return String.format("EXISTS(%s.`%s`) ", nodeIdentifier, filteredProperty);
+            return String.format("%s.`%s` IS NOT NULL ", nodeIdentifier, filteredProperty);
         } else if (operator == IS_TRUE) {
             return String.format("%s.`%s` = true ", nodeIdentifier, filteredProperty);
         } else {

diff --git a/core/src/main/java/org/neo4j/ogm/session/SessionFactory.java b/core/src/main/java/org/neo4j/ogm/session/SessionFactory.java
@@ -21,6 +21,7 @@
 import static java.util.Objects.*;
 import static org.neo4j.ogm.config.AutoIndexMode.*;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.List;
 import java.util.Optional;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -164,7 +165,7 @@ public void register(EventListener eventListener) {
     }
 
     /**
-     * Removes the the specified listener from <code>this SessionFactory</code>.
+     * Removes the specified listener from <code>this SessionFactory</code>.
      * Only Session instances created after this call are affected.
      *
      * @param eventListener The event listener to deregister.
@@ -264,10 +265,10 @@ private static Driver newConfiguredDriverInstance(Configuration configuration) {
         String driverClassName = configuration.getDriverClassName();
         try {
             final Class<?> driverClass = Class.forName(driverClassName);
-            final Driver driver = (Driver) driverClass.newInstance();
+            final Driver driver = (Driver) driverClass.getConstructor().newInstance();
             driver.configure(configuration);
             return driver;
-        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException e) {
+        } catch (ClassNotFoundException | IllegalAccessException | InstantiationException | NoSuchMethodException | InvocationTargetException e) {
             throw new ConfigurationException("Could not load driver class " + driverClassName, e);
         }
     }

diff --git a/core/src/test/java/org/neo4j/ogm/autoindex/AutoIndexTest.java b/core/src/test/java/org/neo4j/ogm/autoindex/AutoIndexTest.java
diff --git a/...4j-ogm-integration-tests/src/main/java/org/neo4j/ogm/testutil/TestContainersTestBase.java b/...4j-ogm-integration-tests/src/main/java/org/neo4j/ogm/testutil/TestContainersTestBase.java
@@ -41,7 +41,7 @@ public class TestContainersTestBase {
 
     private static final boolean isEnterpriseEdition;
 
-    private static final String DEFAULT_IMAGE = "neo4j:4.3.7";
+    private static final String DEFAULT_IMAGE = "neo4j:4.4.6";
 
     private static final String SYS_PROPERTY_ACCEPT_AND_USE_COMMERCIAL_EDITION = "NEO4J_OGM_NEO4J_ACCEPT_AND_USE_COMMERCIAL_EDITION";