From 734d43602f14b16591a9b62c9b16a1ca61abba01 Mon Sep 17 00:00:00 2001 From: Chris Gioran Date: Thu, 11 Jan 2018 21:48:02 +0100 Subject: [PATCH] Gives server bootstrap classes more descriptive names Sets the name of server bootstrap classes to something that better reflects their position in the new hierarchy. Should not affect any surface except for the name of the main running process. --- .../management/VersionAndEditionService.java | 2 +- .../EnterpriseInProcessServerBuilder.java | 4 ++-- enterprise/server-enterprise/pom.xml | 2 +- ...er.java => OpenEnterpriseBootstrapper.java} | 4 ++-- ...oint.java => OpenEnterpriseEntryPoint.java} | 8 ++++---- ...erver.java => OpenEnterpriseNeoServer.java} | 10 +++++----- ...a => OpenEnterpriseBootstrapperTestIT.java} | 14 +++++++------- ....java => OpenEnterpriseEntryPointTest.java} | 7 +++---- .../server/enterprise/ServerClassNameTest.java | 4 ++-- .../StandaloneHaInfoFunctionalTest.java | 2 +- .../helpers/EnterpriseServerBuilder.java | 8 ++++---- .../enterprise/jmx/ServerManagementIT.java | 4 ++-- .../test/server/ha/EnterpriseServerHelper.java | 8 ++++---- .../neo4j/TransactionGuardIntegrationTest.java | 18 +++++++++--------- 14 files changed, 47 insertions(+), 48 deletions(-) rename enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/{EnterpriseBootstrapper.java => OpenEnterpriseBootstrapper.java} (92%) rename enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/{EnterpriseEntryPoint.java => OpenEnterpriseEntryPoint.java} (85%) rename enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/{EnterpriseNeoServer.java => OpenEnterpriseNeoServer.java} (96%) rename enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/{EnterpriseBootstrapperTestIT.java => OpenEnterpriseBootstrapperTestIT.java} (97%) rename enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/{EnterpriseEntryPointTest.java => OpenEnterpriseEntryPointTest.java} (91%) diff --git a/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java b/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java index 66ae98945f584..ab3b5deb268b3 100644 --- a/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java +++ b/community/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java @@ -76,7 +76,7 @@ private String neoServerEdition( NeoServer neoServer ) { String serverClassName = neoServer.getClass().getName().toLowerCase(); - if ( serverClassName.contains( "enterpriseneoserver" ) || serverClassName.contains( "commercialneoserver" ) ) + if ( serverClassName.contains( "openenterpriseneoserver" ) || serverClassName.contains( "commercialneoserver" ) ) { return "enterprise"; } diff --git a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java index eca3660392b07..c75a5b05644d7 100644 --- a/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java +++ b/enterprise/neo4j-harness-enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java @@ -26,7 +26,7 @@ import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory; import org.neo4j.logging.FormattedLogProvider; import org.neo4j.server.AbstractNeoServer; -import org.neo4j.server.enterprise.EnterpriseNeoServer; +import org.neo4j.server.enterprise.OpenEnterpriseNeoServer; public class EnterpriseInProcessServerBuilder extends AbstractInProcessServerBuilder { @@ -49,6 +49,6 @@ public EnterpriseInProcessServerBuilder( File workingDir, String dataSubDir ) protected AbstractNeoServer createNeoServer( Map config, GraphDatabaseFacadeFactory.Dependencies dependencies, FormattedLogProvider userLogProvider ) { - return new EnterpriseNeoServer( Config.defaults( config ), dependencies, userLogProvider ); + return new OpenEnterpriseNeoServer( Config.defaults( config ), dependencies, userLogProvider ); } } diff --git a/enterprise/server-enterprise/pom.xml b/enterprise/server-enterprise/pom.xml index a26ea46345ce3..95d7b742e0de3 100644 --- a/enterprise/server-enterprise/pom.xml +++ b/enterprise/server-enterprise/pom.xml @@ -20,7 +20,7 @@ org.neo4j.server.enterprise server-enterprise server.enterprise - org.neo4j.server.enterprise.EnterpriseEntryPoint + org.neo4j.server.enterprise.OpenEnterpriseEntryPoint target/generated-resources/appassembler/jsw target/test-classes/etc/neo-server ${project.build.directory} diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapper.java similarity index 92% rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapper.java index 11b0d91549568..128e31c2a7112 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseBootstrapper.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapper.java @@ -32,13 +32,13 @@ import org.neo4j.server.CommunityBootstrapper; import org.neo4j.server.NeoServer; -public class EnterpriseBootstrapper extends CommunityBootstrapper +public class OpenEnterpriseBootstrapper extends CommunityBootstrapper { @Override protected NeoServer createNeoServer( Config configurator, GraphDatabaseDependencies dependencies, LogProvider userLogProvider ) { - return new EnterpriseNeoServer( configurator, dependencies, userLogProvider ); + return new OpenEnterpriseNeoServer( configurator, dependencies, userLogProvider ); } @Override diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPoint.java similarity index 85% rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPoint.java index 841b0cdf6a656..efcf01f1c3787 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseEntryPoint.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPoint.java @@ -23,17 +23,17 @@ import org.neo4j.server.Bootstrapper; import org.neo4j.server.ServerBootstrapper; -public class EnterpriseEntryPoint +public class OpenEnterpriseEntryPoint { private static Bootstrapper bootstrapper; - private EnterpriseEntryPoint() + private OpenEnterpriseEntryPoint() { } public static void main( String[] args ) { - int status = ServerBootstrapper.start( new EnterpriseBootstrapper(), args ); + int status = ServerBootstrapper.start( new OpenEnterpriseBootstrapper(), args ); if ( status != 0 ) { System.exit( status ); @@ -42,7 +42,7 @@ public static void main( String[] args ) public static void start( String[] args ) { - bootstrapper = new BlockingBootstrapper( new EnterpriseBootstrapper() ); + bootstrapper = new BlockingBootstrapper( new OpenEnterpriseBootstrapper() ); System.exit( ServerBootstrapper.start( bootstrapper, args ) ); } diff --git a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseNeoServer.java similarity index 96% rename from enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java rename to enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseNeoServer.java index d7708a0491a6d..bb76c699b576a 100644 --- a/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java +++ b/enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/OpenEnterpriseNeoServer.java @@ -19,14 +19,14 @@ */ package org.neo4j.server.enterprise; -import org.eclipse.jetty.util.thread.ThreadPool; - import java.io.File; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.regex.Pattern; +import org.eclipse.jetty.util.thread.ThreadPool; + import org.neo4j.causalclustering.core.CausalClusteringSettings; import org.neo4j.causalclustering.core.CoreGraphDatabase; import org.neo4j.causalclustering.readreplica.ReadReplicaGraphDatabase; @@ -60,7 +60,7 @@ import static org.neo4j.server.configuration.ServerSettings.jmx_module_enabled; import static org.neo4j.server.database.LifecycleManagingDatabase.lifecycleManagingDatabase; -public class EnterpriseNeoServer extends CommunityNeoServer +public class OpenEnterpriseNeoServer extends CommunityNeoServer { private static final GraphFactory HA_FACTORY = ( config, dependencies ) -> @@ -87,12 +87,12 @@ public class EnterpriseNeoServer extends CommunityNeoServer return new ReadReplicaGraphDatabase( storeDir, config, dependencies ); }; - public EnterpriseNeoServer( Config config, Dependencies dependencies, LogProvider logProvider ) + public OpenEnterpriseNeoServer( Config config, Dependencies dependencies, LogProvider logProvider ) { super( config, createDbFactory( config ), dependencies, logProvider ); } - public EnterpriseNeoServer( Config config, Database.Factory dbFactory, GraphDatabaseFacadeFactory.Dependencies + public OpenEnterpriseNeoServer( Config config, Database.Factory dbFactory, GraphDatabaseFacadeFactory.Dependencies dependencies, LogProvider logProvider ) { super( config, dbFactory, dependencies, logProvider ); diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapperTestIT.java similarity index 97% rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapperTestIT.java index e5c83759774ce..f917b52375dcf 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseBootstrapperTestIT.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseBootstrapperTestIT.java @@ -19,15 +19,15 @@ */ package org.neo4j.server.enterprise; +import java.io.File; +import java.util.Map; +import java.util.concurrent.TimeUnit; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; import org.junit.rules.TemporaryFolder; -import java.io.File; -import java.util.Map; -import java.util.concurrent.TimeUnit; - import org.neo4j.backup.OnlineBackupSettings; import org.neo4j.cluster.ClusterSettings; import org.neo4j.com.ports.allocation.PortAuthority; @@ -53,7 +53,7 @@ import static org.neo4j.server.ServerTestUtils.getRelativePath; import static org.neo4j.test.assertion.Assert.assertEventually; -public class EnterpriseBootstrapperTestIT extends BaseBootstrapperTestIT +public class OpenEnterpriseBootstrapperTestIT extends BaseBootstrapperTestIT { private final TemporaryFolder folder = new TemporaryFolder(); private final CleanupRule cleanupRule = new CleanupRule(); @@ -64,7 +64,7 @@ public class EnterpriseBootstrapperTestIT extends BaseBootstrapperTestIT @Override protected ServerBootstrapper newBootstrapper() { - return new EnterpriseBootstrapper(); + return new OpenEnterpriseBootstrapper(); } @Test @@ -165,7 +165,7 @@ public void debugLoggingEnabledBySetting() throws Exception assertTrue( "Debug logging enabled by setting value.", userLogProvider.getLog( getClass() ).isDebugEnabled() ); } - private class UncoveredEnterpriseBootstrapper extends EnterpriseBootstrapper + private class UncoveredEnterpriseBootstrapper extends OpenEnterpriseBootstrapper { private LogProvider userLogProvider; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseEntryPointTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPointTest.java similarity index 91% rename from enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseEntryPointTest.java rename to enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPointTest.java index 3a17ae0734234..10b69160e3570 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseEntryPointTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/OpenEnterpriseEntryPointTest.java @@ -30,8 +30,7 @@ import static org.mockito.Mockito.verifyNoMoreInteractions; import static org.neo4j.commandline.Util.neo4jVersion; - -public class EnterpriseEntryPointTest +public class OpenEnterpriseEntryPointTest { private PrintStream realSystemOut; private PrintStream fakeSystemOut; @@ -51,10 +50,10 @@ public void teardown() } @Test - public void mainPrintsVersion() throws Exception + public void mainPrintsVersion() { // when - EnterpriseEntryPoint.main( new String[]{ "--version" } ); + OpenEnterpriseEntryPoint.main( new String[]{ "--version" } ); // then verify( fakeSystemOut ).println( "neo4j " + neo4jVersion() ); diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerClassNameTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerClassNameTest.java index 01a41c88b7256..c35c80631f22f 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerClassNameTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerClassNameTest.java @@ -53,8 +53,8 @@ public void shouldMaintainNamingOfCommunityNeoServerSoThatTheNeo4jEditionIsCorre public void shouldMaintainNamingOfEnterpriseNeoServerSoThatTheNeo4jEditionIsCorrectlyShownToRESTAPICallers() throws Exception { - assertEquals( getErrorMessage( EnterpriseNeoServer.class ), "enterpriseneoserver", - EnterpriseNeoServer.class.getSimpleName().toLowerCase() ); + assertEquals( getErrorMessage( OpenEnterpriseNeoServer.class ), "openenterpriseneoserver", + OpenEnterpriseNeoServer.class.getSimpleName().toLowerCase() ); } private String getErrorMessage( Class neoServerClass ) diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java index 397cfe79a566c..91069f9647bb8 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java @@ -43,7 +43,7 @@ public class StandaloneHaInfoFunctionalTest { - private static EnterpriseNeoServer server; + private static OpenEnterpriseNeoServer server; @Rule public final TestDirectory target = TestDirectory.testDirectory(); diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java index 99045c033ec45..a3bb049d698d2 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java @@ -31,7 +31,7 @@ import org.neo4j.logging.LogProvider; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.CommunityNeoServer; -import org.neo4j.server.enterprise.EnterpriseNeoServer; +import org.neo4j.server.enterprise.OpenEnterpriseNeoServer; import org.neo4j.server.helpers.CommunityServerBuilder; import org.neo4j.server.rest.web.DatabaseActions; @@ -65,9 +65,9 @@ public static EnterpriseServerBuilder server( LogProvider logProvider ) } @Override - public EnterpriseNeoServer build() throws IOException + public OpenEnterpriseNeoServer build() throws IOException { - return (EnterpriseNeoServer) super.build(); + return (OpenEnterpriseNeoServer) super.build(); } @Override @@ -84,7 +84,7 @@ protected CommunityNeoServer build( File configFile, Config config, return new TestEnterpriseNeoServer( config, configFile, dependencies, logProvider ); } - private class TestEnterpriseNeoServer extends EnterpriseNeoServer + private class TestEnterpriseNeoServer extends OpenEnterpriseNeoServer { private final File configFile; diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java index 2773add9ab8f1..c7860a01e905b 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java @@ -29,7 +29,7 @@ import org.neo4j.kernel.configuration.Config; import org.neo4j.logging.NullLogProvider; import org.neo4j.server.NeoServer; -import org.neo4j.server.enterprise.EnterpriseNeoServer; +import org.neo4j.server.enterprise.OpenEnterpriseNeoServer; import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder; import org.neo4j.test.rule.CleanupRule; import org.neo4j.test.rule.SuppressOutput; @@ -65,7 +65,7 @@ public void shouldBeAbleToRestartServer() throws Exception .build(); // When - NeoServer server = cleanup.add( new EnterpriseNeoServer( config, graphDbDependencies(), NullLogProvider + NeoServer server = cleanup.add( new OpenEnterpriseNeoServer( config, graphDbDependencies(), NullLogProvider .getInstance() ) ); server.start(); diff --git a/enterprise/server-enterprise/src/test/java/org/neo4j/test/server/ha/EnterpriseServerHelper.java b/enterprise/server-enterprise/src/test/java/org/neo4j/test/server/ha/EnterpriseServerHelper.java index a336d80425741..43f88323a3808 100644 --- a/enterprise/server-enterprise/src/test/java/org/neo4j/test/server/ha/EnterpriseServerHelper.java +++ b/enterprise/server-enterprise/src/test/java/org/neo4j/test/server/ha/EnterpriseServerHelper.java @@ -22,7 +22,7 @@ import java.io.File; import java.io.IOException; -import org.neo4j.server.enterprise.EnterpriseNeoServer; +import org.neo4j.server.enterprise.OpenEnterpriseNeoServer; import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder; public class EnterpriseServerHelper @@ -31,12 +31,12 @@ private EnterpriseServerHelper() { } - public static EnterpriseNeoServer createNonPersistentServer( File databaseDir ) throws IOException + public static OpenEnterpriseNeoServer createNonPersistentServer( File databaseDir ) throws IOException { return createServer( databaseDir, false ); } - private static EnterpriseNeoServer createServer( File databaseDir, boolean persistent ) throws IOException + private static OpenEnterpriseNeoServer createServer( File databaseDir, boolean persistent ) throws IOException { EnterpriseServerBuilder builder = EnterpriseServerBuilder.serverOnRandomPorts().usingDataDir( databaseDir.getAbsolutePath() ); if ( persistent ) @@ -44,7 +44,7 @@ private static EnterpriseNeoServer createServer( File databaseDir, boolean persi builder = (EnterpriseServerBuilder) builder.persistent(); } builder.withDefaultDatabaseTuning(); - EnterpriseNeoServer server = builder.build(); + OpenEnterpriseNeoServer server = builder.build(); server.start(); return server; } diff --git a/integrationtests/src/test/java/org/neo4j/TransactionGuardIntegrationTest.java b/integrationtests/src/test/java/org/neo4j/TransactionGuardIntegrationTest.java index 17934eb013edd..2724ea945e8e5 100644 --- a/integrationtests/src/test/java/org/neo4j/TransactionGuardIntegrationTest.java +++ b/integrationtests/src/test/java/org/neo4j/TransactionGuardIntegrationTest.java @@ -72,7 +72,7 @@ import org.neo4j.logging.NullLogProvider; import org.neo4j.server.CommunityNeoServer; import org.neo4j.server.database.LifecycleManagingDatabase; -import org.neo4j.server.enterprise.EnterpriseNeoServer; +import org.neo4j.server.enterprise.OpenEnterpriseNeoServer; import org.neo4j.server.enterprise.helpers.EnterpriseServerBuilder; import org.neo4j.server.web.HttpHeaderUtils; import org.neo4j.shell.InterruptSignalHandler; @@ -111,7 +111,7 @@ public class TransactionGuardIntegrationTest private static final FakeClock fakeClock = Clocks.fakeClock(); private static GraphDatabaseAPI databaseWithTimeout; private static GraphDatabaseAPI databaseWithoutTimeout; - private static EnterpriseNeoServer neoServer; + private static OpenEnterpriseNeoServer neoServer; private static int boltPortDatabaseWithTimeout; private static final String DEFAULT_TIMEOUT = "2s"; private static final KernelTransactionTimeoutMonitorSupplier monitorSupplier = new @@ -307,7 +307,7 @@ public void terminateLongRunningRestTransactionalEndpointQuery() throws Exceptio GraphDatabaseAPI database = startDatabaseWithTimeout(); KernelTransactionTimeoutMonitor timeoutMonitor = database.getDependencyResolver().resolveDependency( KernelTransactionTimeoutMonitor.class ); - EnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); + OpenEnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); String transactionEndPoint = HTTP.POST( transactionUri( neoServer ) ).location(); fakeClock.forward( 3, TimeUnit.SECONDS ); @@ -331,7 +331,7 @@ public void terminateLongRunningRestTransactionalEndpointWithCustomTimeoutQuery( GraphDatabaseAPI database = startDatabaseWithTimeout(); KernelTransactionTimeoutMonitor timeoutMonitor = database.getDependencyResolver().resolveDependency( KernelTransactionTimeoutMonitor.class ); - EnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); + OpenEnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); long customTimeout = TimeUnit.SECONDS.toMillis( 10 ); HTTP.Response beginResponse = HTTP .withHeaders( HttpHeaderUtils.MAX_EXECUTION_TIME_HEADER, String.valueOf( customTimeout ) ) @@ -367,7 +367,7 @@ public void terminateLongRunningDriverQuery() throws Exception GraphDatabaseAPI database = startDatabaseWithTimeout(); KernelTransactionTimeoutMonitor timeoutMonitor = database.getDependencyResolver().resolveDependency( KernelTransactionTimeoutMonitor.class ); - EnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); + OpenEnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); org.neo4j.driver.v1.Config driverConfig = getDriverConfig(); @@ -399,7 +399,7 @@ public void terminateLongRunningDriverPeriodicCommitQuery() throws Exception KernelTransactionTimeoutMonitor timeoutMonitor = database.getDependencyResolver().resolveDependency( KernelTransactionTimeoutMonitor.class ); monitorSupplier.setTransactionTimeoutMonitor( timeoutMonitor ); - EnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); + OpenEnterpriseNeoServer neoServer = startNeoServer( (GraphDatabaseFacade) database ); org.neo4j.driver.v1.Config driverConfig = getDriverConfig(); @@ -511,7 +511,7 @@ private org.neo4j.driver.v1.Config getDriverConfig() .toConfig(); } - private EnterpriseNeoServer startNeoServer( GraphDatabaseFacade database ) throws IOException + private OpenEnterpriseNeoServer startNeoServer( GraphDatabaseFacade database ) throws IOException { if ( neoServer == null ) { @@ -546,7 +546,7 @@ private Map,String> getSettingsWithoutTransactionTimeout() return MapUtil.genericMap(); } - private String transactionUri( EnterpriseNeoServer neoServer ) + private String transactionUri( OpenEnterpriseNeoServer neoServer ) { return neoServer.baseUri().toString() + "db/data/transaction"; } @@ -667,7 +667,7 @@ protected CommunityNeoServer build( File configFile, Config config, return new GuardTestServer( config, dependencies, NullLogProvider.getInstance() ); } - private class GuardTestServer extends EnterpriseNeoServer + private class GuardTestServer extends OpenEnterpriseNeoServer { GuardTestServer( Config config, GraphDatabaseFacadeFactory.Dependencies dependencies, LogProvider logProvider ) {