Remove the traversal endpoints and drop our Rhino dependency.

neo4j · May 9, 2018 · 63d4ec8 · 63d4ec8
1 parent 84395d2
commit 63d4ec8
Show file tree

Hide file tree

Showing 92 changed files with 32 additions and 6,478 deletions.
diff --git a/community/neo4j-harness/LICENSES.txt b/community/neo4j-harness/LICENSES.txt
diff --git a/community/neo4j-harness/NOTICE.txt b/community/neo4j-harness/NOTICE.txt
@@ -98,9 +98,6 @@ Eclipse Public License - v 1.0
 GNU General Public License, version 2 with the Classpath Exception
   Java Servlet API
 
-Mozilla Public License, Version 2.0
-  Mozilla Rhino
-
 Dependencies with multiple licenses
 -----------------------------------
 

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/FixturesTestIT.java
@@ -23,15 +23,12 @@
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
 
 import org.neo4j.graphdb.Label;
 import org.neo4j.graphdb.Transaction;
 import org.neo4j.io.fs.FileUtils;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig;
 import org.neo4j.server.ServerTestUtils;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.server.HTTP;
@@ -196,7 +193,6 @@ public void shouldHandleFunctionFixtures() throws Exception
         File targetFolder = testDir.directory();
 
         // When
-
         try ( ServerControls server = getServerBuilder( targetFolder )
                 .withFixture( graphDatabaseService ->
                 {
@@ -221,8 +217,7 @@ private TestServerBuilder getServerBuilder( File targetFolder )
     {
         TestServerBuilder serverBuilder = newInProcessBuilder( targetFolder )
                 .withConfig( LegacySslPolicyConfig.certificates_directory.name(),
-                        ServerTestUtils.getRelativePath( testDir.directory(), LegacySslPolicyConfig.certificates_directory ) )
-                .withConfig( ServerSettings.script_enabled, Settings.TRUE );
+                        ServerTestUtils.getRelativePath( testDir.directory(), LegacySslPolicyConfig.certificates_directory ) );
         return serverBuilder;
     }
 

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/InProcessBuilderTestIT.java
@@ -53,9 +53,7 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.configuration.HttpConnector;
 import org.neo4j.kernel.configuration.HttpConnector.Encryption;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.ports.allocation.PortAuthority;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.server.rest.domain.JsonParseException;
 import org.neo4j.ssl.ClientAuth;
 import org.neo4j.test.TestGraphDatabaseFactory;
@@ -100,7 +98,7 @@ public void shouldLaunchAServerInSpecifiedDirectory()
 
     private TestServerBuilder getTestServerBuilder( File workDir )
     {
-        return newInProcessBuilder( workDir ).withConfig( ServerSettings.script_enabled, Settings.TRUE );
+        return newInProcessBuilder( workDir );
     }
 
     @Test

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JUnitRuleTestIT.java
@@ -32,9 +32,7 @@
 import org.neo4j.harness.extensionpackage.MyUnmanagedExtension;
 import org.neo4j.harness.junit.Neo4jRule;
 import org.neo4j.helpers.collection.Iterators;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.kernel.configuration.ssl.LegacySslPolicyConfig;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.TestGraphDatabaseFactory;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
@@ -58,7 +56,6 @@ public class JUnitRuleTestIT
             .withFixture( "CREATE (u:User)" )
             .withConfig( LegacySslPolicyConfig.certificates_directory.name(),
                     getRelativePath( getSharedTestTemporaryFolder(), LegacySslPolicyConfig.certificates_directory ) )
-            .withConfig( ServerSettings.script_enabled, Settings.TRUE )
             .withFixture( graphDatabaseService ->
             {
                 try ( Transaction tx = graphDatabaseService.beginTx() )
@@ -109,7 +106,7 @@ public void shouldGraphDatabaseServiceBeAccessible()
     }
 
     @Test
-    public void shouldRuleWorkWithExsitingDirectory()
+    public void shouldRuleWorkWithExistingDirectory()
     {
         // given
 
@@ -127,7 +124,6 @@ public void shouldRuleWorkWithExsitingDirectory()
 
         // When a rule with an pre-populated graph db directory is used
         final Neo4jRule ruleWithDirectory = new Neo4jRule( testDirectory.directory() )
-                .withConfig( ServerSettings.script_enabled, Settings.TRUE )
                 .copyFrom( testDirectory.directory() );
         ruleWithDirectory.apply( new Statement()
         {

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaAggregationFunctionsTestIT.java
@@ -23,11 +23,9 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.procedure.UserAggregationFunction;
 import org.neo4j.procedure.UserAggregationResult;
 import org.neo4j.procedure.UserAggregationUpdate;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.server.HTTP;
@@ -95,7 +93,6 @@ public void shouldLaunchWithDeclaredFunctions() throws Exception
     private TestServerBuilder createServer( Class<?> functionClass )
     {
         return TestServerBuilders.newInProcessBuilder()
-                                 .withConfig( ServerSettings.script_enabled, Settings.TRUE )
                                  .withAggregationFunction( functionClass );
     }
 

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTestIT.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaFunctionsTestIT.java
@@ -24,10 +24,8 @@
 import org.junit.Test;
 
 import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.procedure.Context;
 import org.neo4j.procedure.UserFunction;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.server.HTTP;
@@ -95,7 +93,6 @@ public long countNodes()
     private TestServerBuilder createServer( Class<?> functionClass )
     {
         return TestServerBuilders.newInProcessBuilder()
-                                 .withConfig( ServerSettings.script_enabled, Settings.TRUE )
                                  .withFunction( functionClass );
     }
 

diff --git a/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java b/community/neo4j-harness/src/test/java/org/neo4j/harness/JavaProceduresTest.java
@@ -27,12 +27,10 @@
 
 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.internal.kernel.api.exceptions.ProcedureException;
-import org.neo4j.kernel.configuration.Settings;
 import org.neo4j.procedure.Context;
 import org.neo4j.procedure.Mode;
 import org.neo4j.procedure.Name;
 import org.neo4j.procedure.Procedure;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.server.HTTP;
@@ -127,8 +125,7 @@ public Stream<LongResult> countNodes()
     private TestServerBuilder createServer( Class<?> procedureClass )
     {
         return TestServerBuilders.newInProcessBuilder()
-                                 .withProcedure( procedureClass )
-                                 .withConfig( ServerSettings.script_enabled, Settings.TRUE );
+                                 .withProcedure( procedureClass );
     }
 
     @Test

diff --git a/...e-compiler/integration-tests/src/test/java/org/neo4j/tooling/procedure/ProcedureTest.java b/...e-compiler/integration-tests/src/test/java/org/neo4j/tooling/procedure/ProcedureTest.java
@@ -30,8 +30,6 @@
 import org.neo4j.driver.v1.Session;
 import org.neo4j.driver.v1.StatementResult;
 import org.neo4j.harness.junit.Neo4jRule;
-import org.neo4j.kernel.configuration.Settings;
-import org.neo4j.server.configuration.ServerSettings;
 import org.neo4j.test.rule.SuppressOutput;
 import org.neo4j.tooling.procedure.procedures.valid.Procedures;
 
@@ -40,14 +38,12 @@
 
 public class ProcedureTest
 {
-
     private static final Class<?> PROCEDURES_CLASS = Procedures.class;
 
     @Rule
     public final SuppressOutput suppressOutput = SuppressOutput.suppressAll();
     @Rule
     public Neo4jRule graphDb = new Neo4jRule()
-            .withConfig( ServerSettings.script_enabled, Settings.TRUE )
             .dumpLogsOnFailure( System.out )
             .withProcedure( PROCEDURES_CLASS );
     private String procedureNamespace = PROCEDURES_CLASS.getPackage().getName();