Skip to content

Commit

Permalink
Gives server bootstrap classes more descriptive names
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@digitalstain
digitalstain committed Jan 11, 2018
1 parent bc60628 commit 734d436
Show file tree
Hide file tree
Showing 14 changed files with 47 additions and 48 deletions.
2 changes: 1 addition & 1 deletion ...unity/server/src/main/java/org/neo4j/server/rest/management/VersionAndEditionService.java
View file
Expand Up @@ -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";
}
Expand Down
4 changes: 2 additions & 2 deletions ...enterprise/src/main/java/org/neo4j/harness/internal/EnterpriseInProcessServerBuilder.java
View file
Expand Up @@ -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
{
Expand All @@ -49,6 +49,6 @@ public EnterpriseInProcessServerBuilder( File workingDir, String dataSubDir )
protected AbstractNeoServer createNeoServer( Map<String,String> config,
GraphDatabaseFacadeFactory.Dependencies dependencies, FormattedLogProvider userLogProvider )
{
return new EnterpriseNeoServer( Config.defaults( config ), dependencies, userLogProvider );
return new OpenEnterpriseNeoServer( Config.defaults( config ), dependencies, userLogProvider );
}
}
2 changes: 1 addition & 1 deletion enterprise/server-enterprise/pom.xml
View file
Expand Up @@ -20,7 +20,7 @@
<bundle.namespace>org.neo4j.server.enterprise</bundle.namespace>
<short-name>server-enterprise</short-name>
<version-package>server.enterprise</version-package>
<neo4j-server.mainClass>org.neo4j.server.enterprise.EnterpriseEntryPoint</neo4j-server.mainClass>
<neo4j-server.mainClass>org.neo4j.server.enterprise.OpenEnterpriseEntryPoint</neo4j-server.mainClass>
<neo-server.home>target/generated-resources/appassembler/jsw</neo-server.home>
<neo-server.confdir>target/test-classes/etc/neo-server</neo-server.confdir>
<java.io.tmpdir>${project.build.directory}</java.io.tmpdir>
Expand Down
4 changes: 2 additions & 2 deletions ...er/enterprise/EnterpriseBootstrapper.java → ...nterprise/OpenEnterpriseBootstrapper.java
View file
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions ...rver/enterprise/EnterpriseEntryPoint.java → .../enterprise/OpenEnterpriseEntryPoint.java
View file
Expand Up @@ -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 );
Expand All @@ -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 ) );
}

Expand Down
10 changes: 5 additions & 5 deletions ...erver/enterprise/EnterpriseNeoServer.java → ...r/enterprise/OpenEnterpriseNeoServer.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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 ) ->
Expand All @@ -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 );
Expand Down
14 changes: 7 additions & 7 deletions ...erprise/EnterpriseBootstrapperTestIT.java → ...ise/OpenEnterpriseBootstrapperTestIT.java
View file
Expand Up @@ -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;
Expand All @@ -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();
Expand All @@ -64,7 +64,7 @@ public class EnterpriseBootstrapperTestIT extends BaseBootstrapperTestIT
@Override
protected ServerBootstrapper newBootstrapper()
{
return new EnterpriseBootstrapper();
return new OpenEnterpriseBootstrapper();
}

@Test
Expand Down Expand Up @@ -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;

Expand Down
7 changes: 3 additions & 4 deletions .../enterprise/EnterpriseEntryPointTest.java → ...erprise/OpenEnterpriseEntryPointTest.java
View file
Expand Up @@ -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;
Expand All @@ -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() );
Expand Down
4 changes: 2 additions & 2 deletions ...rise/server-enterprise/src/test/java/org/neo4j/server/enterprise/ServerClassNameTest.java
View file
Expand Up @@ -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<? extends AbstractNeoServer> neoServerClass )
Expand Down
2 changes: 1 addition & 1 deletion ...-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneHaInfoFunctionalTest.java
View file
Expand Up @@ -43,7 +43,7 @@

public class StandaloneHaInfoFunctionalTest
{
private static EnterpriseNeoServer server;
private static OpenEnterpriseNeoServer server;

@Rule
public final TestDirectory target = TestDirectory.testDirectory();
Expand Down
8 changes: 4 additions & 4 deletions ...enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java
View file
Expand Up @@ -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;

Expand Down Expand Up @@ -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
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions ...e/server-enterprise/src/test/java/org/neo4j/server/enterprise/jmx/ServerManagementIT.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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();

Expand Down
8 changes: 4 additions & 4 deletions ...rise/server-enterprise/src/test/java/org/neo4j/test/server/ha/EnterpriseServerHelper.java
View file
Expand Up @@ -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
Expand All @@ -31,20 +31,20 @@ 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 )
{
builder = (EnterpriseServerBuilder) builder.persistent();
}
builder.withDefaultDatabaseTuning();
EnterpriseNeoServer server = builder.build();
OpenEnterpriseNeoServer server = builder.build();
server.start();
return server;
}
Expand Down
18 changes: 9 additions & 9 deletions integrationtests/src/test/java/org/neo4j/TransactionGuardIntegrationTest.java
View file
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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 );
Expand All @@ -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 ) )
Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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();

Expand Down Expand Up @@ -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 )
{
Expand Down Expand Up @@ -546,7 +546,7 @@ private Map<Setting<?>,String> getSettingsWithoutTransactionTimeout()
return MapUtil.genericMap();
}

private String transactionUri( EnterpriseNeoServer neoServer )
private String transactionUri( OpenEnterpriseNeoServer neoServer )
{
return neoServer.baseUri().toString() + "db/data/transaction";
}
Expand Down Expand Up @@ -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 )
{
Expand Down

0 comments on commit 734d436

Please sign in to comment.