Revert "Clearer method names"

This reverts commit c740117.
neo4j · Aug 14, 2018 · 0cdeb1e · 0cdeb1e
1 parent 036854a
commit 0cdeb1e
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 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
@@ -172,7 +172,7 @@ public GraphDatabaseFacade initFacade( File storeDir, Config config, final Depen
         platform.life.add( databaseManager );
         platform.dependencies.satisfyDependency( databaseManager );
 
-        edition.createSecurityModule( platform, procedures );
+        edition.setupSecurityModule( 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
@@ -259,7 +259,7 @@ public void registerEditionSpecificProcedures( Procedures procedures ) throws Ke
     }
 
     @Override
-    public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
+    public void setupSecurityModule( 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
@@ -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 )
     {

diff --git a/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java b/...clustering/src/main/java/org/neo4j/causalclustering/core/EnterpriseCoreEditionModule.java
@@ -484,9 +484,9 @@ protected NetworkConnectionTracker createConnectionTracker()
     }
 
     @Override
-    public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
+    public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
     {
-        EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
+        EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
     }
 
     public void disableCatchupServer() throws Throwable

diff --git a/.../main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java b/.../main/java/org/neo4j/causalclustering/readreplica/EnterpriseReadReplicaEditionModule.java
@@ -411,9 +411,9 @@ protected NetworkConnectionTracker createConnectionTracker()
     }
 
     @Override
-    public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
+    public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
     {
-        EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
+        EnterpriseEditionModule.setupEnterpriseSecurityModule( 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
@@ -925,9 +925,9 @@ protected NetworkConnectionTracker createConnectionTracker()
     }
 
     @Override
-    public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
+    public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
     {
-        EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
+        EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
     }
 
     private static <T> T resolveDatabaseDependency( PlatformModule platfrom, Class<T> clazz )

diff --git a/...rprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java b/...rprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/EnterpriseEditionModule.java
@@ -113,12 +113,12 @@ protected StatementLocksFactory createStatementLocksFactory( Locks locks, Config
     }
 
     @Override
-    public void createSecurityModule( PlatformModule platformModule, Procedures procedures )
+    public void setupSecurityModule( PlatformModule platformModule, Procedures procedures )
     {
-        EnterpriseEditionModule.createEnterpriseSecurityModule( this, platformModule, procedures );
+        EnterpriseEditionModule.setupEnterpriseSecurityModule( this, platformModule, procedures );
     }
 
-    public static void createEnterpriseSecurityModule( EditionModule editionModule, PlatformModule platformModule, Procedures procedures )
+    public static void setupEnterpriseSecurityModule( EditionModule editionModule, PlatformModule platformModule, Procedures procedures )
     {
         if ( platformModule.config.get( GraphDatabaseSettings.auth_enabled ) )
         {