Skip to content

Commit

Permalink
Clearer method names
Browse files Browse the repository at this point in the history 
Don't call all methods setupSecurityModule but split it into
createSecurityModule and setupSecurityModule for clarity
  • Loading branch information
@Lojjs
Lojjs committed Aug 14, 2018
1 parent fc9327a commit c740117
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 19 deletions.
13 changes: 7 additions & 6 deletions ...commercial/src/main/java/com/neo4j/causalclustering/core/CommercialCoreEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,6 @@ public class CommercialCoreEditionModule extends EnterpriseCoreEditionModule
super( platformModule, discoveryServiceFactory );
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
{
EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
}

@Override
protected ClusteringModule getClusteringModule( PlatformModule platformModule, DiscoveryServiceFactory discoveryServiceFactory,
ClusterStateDirectory clusterStateDirectory, IdentityModule identityModule, Dependencies dependencies, File databaseDirectory )
Expand Down Expand Up @@ -87,4 +81,11 @@ private static void createConfiguredDatabases( DatabaseManager databaseManager,
{
databaseManager.createDatabase( config.get( GraphDatabaseSettings.active_database ) );
}

@Override
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
//TODO: change to commercial security module here when ready
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}
}
8 changes: 8 additions & 0 deletions .../main/java/com/neo4j/causalclustering/readreplica/CommercialReadReplicaEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.neo4j.graphdb.factory.module.PlatformModule;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.configuration.ssl.SslPolicyLoader;
import org.neo4j.kernel.impl.enterprise.EnterpriseEditionModule;
import org.neo4j.kernel.impl.factory.GraphDatabaseFacade;
import org.neo4j.kernel.impl.proc.Procedures;
import org.neo4j.kernel.impl.util.Dependencies;
Expand Down Expand Up @@ -75,4 +76,11 @@ private static void createConfiguredDatabases( DatabaseManager databaseManager,
{
databaseManager.createDatabase( config.get( GraphDatabaseSettings.active_database ) );
}

@Override
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
//TODO: change to commercial security module here when ready
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}
}
2 changes: 1 addition & 1 deletion ...ic/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ public GraphDatabaseFacade initFacade( File storeDir, Config config, final Depen
platform.life.add( databaseManager );
platform.dependencies.satisfyDependency( databaseManager );

edition.setupSecurityModule( platform, procedures );
edition.createSecurityModule( platform, procedures );

platform.life.add( platform.globalKernelExtensions );
platform.life.add( createBoltServer( platform, edition, databaseManager ) );
Expand Down
2 changes: 1 addition & 1 deletion ...ommunity/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
if ( platformModule.config.get( GraphDatabaseSettings.auth_enabled ) )
{
Expand Down
4 changes: 2 additions & 2 deletions public/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,14 +169,14 @@ protected void publishEditionInfo( UsageData sysInfo, DatabaseInfo databaseInfo,
config.augment( GraphDatabaseSettings.editionName, databaseInfo.edition.toString() );
}

public abstract void setupSecurityModule( PlatformModule platformModule, Procedures procedures );

public DatabaseManager createDatabaseManager( GraphDatabaseFacade graphDatabaseFacade, PlatformModule platform, EditionModule edition,
Procedures procedures, Logger msgLog )
{
return new DefaultDatabaseManager( platform, edition, procedures, msgLog, graphDatabaseFacade );
}

public abstract void createSecurityModule( PlatformModule platformModule, Procedures procedures );

protected static SecurityModule setupSecurityModule( PlatformModule platformModule, Log log, Procedures procedures,
String key )
{
Expand Down
4 changes: 2 additions & 2 deletions ...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,9 +484,9 @@ protected NetworkConnectionTracker createConnectionTracker()
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}

public void disableCatchupServer() throws Throwable
Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,9 @@ protected NetworkConnectionTracker createConnectionTracker()
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}

private static TopologyServiceRetryStrategy resolveStrategy( Config config, LogProvider logProvider )
Expand Down
4 changes: 2 additions & 2 deletions ...enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,9 +925,9 @@ protected NetworkConnectionTracker createConnectionTracker()
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}

private static <T> T resolveDatabaseDependency( PlatformModule platfrom, Class<T> clazz )
Expand Down
6 changes: 3 additions & 3 deletions ...rprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,12 +113,12 @@ protected StatementLocksFactory createStatementLocksFactory( Locks locks, Config
}

@Override
public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
{
EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
}

public static void setupEnterpriseSecurityModule( EditionModule editionModule, PlatformModule platformModule, Procedures procedures )
public static void createEnterpriseSecurityModule( EditionModule editionModule, PlatformModule platformModule, Procedures procedures )
{
if ( platformModule.config.get( GraphDatabaseSettings.auth_enabled ) )
{
Expand Down

0 comments on commit c740117

Please sign in to comment.