From 6f21f564938ffb4703a3c63a287a42c786f4e510 Mon Sep 17 00:00:00 2001 From: lojjs Date: Thu, 9 Aug 2018 09:50:48 +0200 Subject: [PATCH] Clearer method names Don't call all methods setupSecurityModule but split it into createSecurityModule and setupSecurityModule for clarity --- .../neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java | 2 +- .../graphdb/factory/module/CommunityEditionModule.java | 2 +- .../org/neo4j/graphdb/factory/module/EditionModule.java | 4 ++-- .../causalclustering/core/EnterpriseCoreEditionModule.java | 4 ++-- .../readreplica/EnterpriseReadReplicaEditionModule.java | 4 ++-- .../kernel/ha/factory/HighlyAvailableEditionModule.java | 4 ++-- .../kernel/impl/enterprise/EnterpriseEditionModule.java | 6 +++--- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java index ebb4b82b2f53..4ebb6e94f781 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/facade/GraphDatabaseFacadeFactory.java @@ -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 ) ); diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java index 93d47cf40fd3..4dadc801d0ce 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/CommunityEditionModule.java @@ -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 ) ) { diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java index 66c410a91754..a12804f3ac84 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/EditionModule.java @@ -174,14 +174,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 ) { diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java index f7ee7a45e80b..7b6317805b83 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java @@ -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 diff --git a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java index 3d9e15d89358..f56f5f416b7b 100644 --- a/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java +++ b/enterprise/causal-clustering/src/main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java @@ -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 ) diff --git a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java index 9051cc677c4a..ef34fffcfebb 100644 --- a/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java +++ b/enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableEditionModule.java @@ -927,9 +927,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 resolveDatabaseDependency( PlatformModule platfrom, Class clazz ) diff --git a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java index 5df2c5beabf8..7b43cd7c6d74 100644 --- a/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java +++ b/enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java @@ -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 ) ) {