Skip to content

Remove duplicate enterprise startup logic #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SpecialThing44 wants to merge 1 commit into from
Closed

Remove duplicate enterprise startup logic #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 1 addition & 32 deletions ...rise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,55 +34,24 @@
*/
package org.neo4j.server.enterprise;

import java.io.File;

import org.neo4j.causalclustering.core.OpenEnterpriseCoreGraphDatabase;
import org.neo4j.causalclustering.readreplica.OpenEnterpriseReadReplicaGraphDatabase;
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.impl.enterprise.configuration.EnterpriseEditionSettings;
import org.neo4j.kernel.impl.enterprise.configuration.EnterpriseEditionSettings.Mode;
import org.neo4j.kernel.impl.factory.GraphDatabaseFacadeFactory.Dependencies;
import org.neo4j.logging.LogProvider;
import org.neo4j.server.database.Database.Factory;
import org.neo4j.server.database.LifecycleManagingDatabase;
import org.neo4j.server.database.LifecycleManagingDatabase.GraphFactory;

/**
* Normally our naming convention would call this OpenEnterpriseNeoServer - but in this case, ONgDB already has a class with this name, so we are just calling
* it EnterpriseNeoServer.
**/
public class EnterpriseNeoServer extends OpenEnterpriseNeoServer
{
private static final GraphFactory CORE_FACTORY = ( config, dependencies ) ->
{
File storeDir = config.get( GraphDatabaseSettings.database_path );
return new OpenEnterpriseCoreGraphDatabase( storeDir, config, dependencies );
};

private static final GraphFactory READ_REPLICA_FACTORY = ( config, dependencies ) ->
{
File storeDir = config.get( GraphDatabaseSettings.database_path );
return new OpenEnterpriseReadReplicaGraphDatabase( storeDir, config, dependencies );
};

public EnterpriseNeoServer( Config config, Dependencies dependencies, LogProvider logProvider )
{
super( config, createDbFactory( config ), dependencies, logProvider );
}

protected static Factory createDbFactory( Config config )
{
Mode mode = config.get( EnterpriseEditionSettings.mode );
switch ( mode )
{
case CORE:
return LifecycleManagingDatabase.lifecycleManagingDatabase( CORE_FACTORY );
case READ_REPLICA:
return LifecycleManagingDatabase.lifecycleManagingDatabase( READ_REPLICA_FACTORY );
default:
return OpenEnterpriseNeoServer.createDbFactory( config );
}
return OpenEnterpriseNeoServer.createDbFactory( config );
}
}

Loading