Remove usage of experimental and internal default language flags

Author: gem-neo4j

core/src/test/java/apoc/export/cypher/ExportCypherTest.java

@@ -59,7 +59,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.cypher.export.DatabaseSubGraph;
 import org.neo4j.graphdb.QueryExecutionException;
@@ -103,7 +102,6 @@ public class ExportCypherTest {
             .withSetting(
                     GraphDatabaseSettings.load_csv_file_url_root,
                     directory.toPath().toAbsolutePath())
-            .withSetting(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
             .withSetting(
                     newBuilder("internal.dbms.debug.track_cursor_close", BOOL, false)
                             .build(),

core/src/test/java/apoc/export/graphml/ExportGraphMLTest.java

@@ -61,7 +61,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.graphdb.Node;
 import org.neo4j.graphdb.QueryExecutionException;
@@ -97,7 +96,6 @@ public class ExportGraphMLTest {
     @Rule
     public DbmsRule db = new ImpermanentDbmsRule()
             .withSetting(GraphDatabaseSettings.memory_tracking, true)
-            .withSetting(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
             .withSetting(
                     GraphDatabaseSettings.load_csv_file_url_root,
                     directory.toPath().toAbsolutePath());

core/src/test/java/apoc/export/json/ExportJsonTest.java

@@ -60,7 +60,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Node;
@@ -83,7 +82,6 @@ public class ExportJsonTest {
             .withSetting(
                     GraphDatabaseSettings.load_csv_file_url_root,
                     directory.toPath().toAbsolutePath())
-            .withSetting(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
             // Run with aligned format to get sequential ids (assertions depends on this)
             .withSetting(GraphDatabaseSettings.db_format, "aligned");
 

core/src/test/java/apoc/graph/GraphsTest.java

@@ -54,7 +54,6 @@
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.configuration.SettingImpl;
 import org.neo4j.configuration.SettingValueParsers;
@@ -86,7 +85,6 @@ boolean virtual(Entity entity) {
     @Rule
     public DbmsRule db = new ImpermanentDbmsRule()
             .withSetting(GraphDatabaseSettings.procedure_unrestricted, Collections.singletonList("apoc.*"))
-            .withSetting(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
             .withSetting(
                     SettingImpl.newBuilder("internal.dbms.debug.track_cursor_close", SettingValueParsers.BOOL, false)
                             .build(),

core/src/test/java/apoc/meta/MetaTest.java

@@ -60,7 +60,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.graphdb.*;
 import org.neo4j.test.rule.DbmsRule;
@@ -78,7 +77,6 @@ public class MetaTest {
     @Rule
     public DbmsRule db = new ImpermanentDbmsRule()
             .withSetting(GraphDatabaseSettings.procedure_unrestricted, singletonList("apoc.*"))
-            .withSetting(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
             .withSetting(
                     newBuilder("internal.dbms.debug.track_cursor_close", BOOL, false)
                             .build(),

core/src/test/java/apoc/trigger/TriggerNewProceduresTest.java

@@ -47,7 +47,6 @@
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.ProvideSystemProperty;
 import org.junit.rules.TemporaryFolder;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.graphdb.GraphDatabaseService;
@@ -86,7 +85,6 @@ public static void beforeClass() {
         databaseManagementService = new TestDatabaseManagementServiceBuilder(
                         storeDir.getRoot().toPath())
                 .setConfig(procedure_unrestricted, List.of("apoc*"))
-                .setConfig(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true)
                 .build();
         db = databaseManagementService.database(GraphDatabaseSettings.DEFAULT_DATABASE_NAME);
         sysDb = databaseManagementService.database(GraphDatabaseSettings.SYSTEM_DATABASE_NAME);

test-utils/src/main/java/apoc/util/TestContainerUtil.java

@@ -208,7 +208,7 @@ private static Neo4jContainerExtension createNeo4jContainer(
                 .withNeo4jConfig("dbms.logs.debug.level", "DEBUG")
                 .withNeo4jConfig("dbms.routing.driver.logging.level", "DEBUG")
                 .withNeo4jConfig("internal.dbms.cypher.enable_experimental_versions", "true")
-                .withNeo4jConfig("internal.db.query.default_language", "cypher_" + cypherVersionSetting)
+                .withNeo4jConfig("db.query.default_language", "cypher_" + cypherVersionSetting)
                 // Additional kernel assertions
                 .withNeo4jConfig(
                         "server.jvm.additional",

test-utils/src/main/java/org/neo4j/test/rule/DbmsRule.java

@@ -27,7 +27,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import org.neo4j.common.DependencyResolver;
-import org.neo4j.configuration.GraphDatabaseInternalSettings;
 import org.neo4j.configuration.GraphDatabaseSettings;
 import org.neo4j.dbms.api.DatabaseManagementService;
 import org.neo4j.dbms.api.Neo4jDatabaseManagementServiceBuilder;
@@ -160,7 +159,8 @@ private void create() {
         databaseBuilder = newFactory();
 
         // Allow experimental versions of Cypher and set Cypher Default Version
-        globalConfig.put(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true);
+        // Might need to be enabled when the next experimental version appear:
+        // globalConfig.put(GraphDatabaseInternalSettings.enable_experimental_cypher_versions, true);
 
         // A test may set this for the entire file itself, so we shouldn't override that
         if (!globalConfig.containsKey(GraphDatabaseSettings.default_language)) {