From d0aa176c95b3c1ff7eb2b75879aea8d9ed664e76 Mon Sep 17 00:00:00 2001 From: MishaDemianenko Date: Tue, 11 Sep 2018 13:32:35 +0200 Subject: [PATCH] Review class renaming and extraction. --- .../factory/module/DataSourceModule.java | 4 +- .../ModularDatabaseCreationContext.java | 4 +- .../factory/module/edition/EditionModule.java | 53 +------------ ...ecurityModuleDependenciesDependencies.java | 77 +++++++++++++++++++ ...ntext.java => DatabaseEditionContext.java} | 2 +- .../DefaultEditionModuleDatabaseContext.java | 2 +- 6 files changed, 85 insertions(+), 57 deletions(-) create mode 100644 community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/SecurityModuleDependenciesDependencies.java rename community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/{EditionDatabaseContext.java => DatabaseEditionContext.java} (98%) diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java index aea76079c536c..b64428ec66582 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/DataSourceModule.java @@ -23,7 +23,7 @@ import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.module.edition.EditionModule; -import org.neo4j.graphdb.factory.module.edition.context.EditionDatabaseContext; +import org.neo4j.graphdb.factory.module.edition.context.DatabaseEditionContext; import org.neo4j.kernel.NeoStoreDataSource; import org.neo4j.kernel.api.InwardKernel; import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard; @@ -45,7 +45,7 @@ public DataSourceModule( String databaseName, PlatformModule platformModule, Edi GraphDatabaseFacade graphDatabaseFacade ) { platformModule.diagnosticsManager.prependProvider( platformModule.config ); - EditionDatabaseContext editionContext = editionModule.createDatabaseContext( databaseName ); + DatabaseEditionContext editionContext = editionModule.createDatabaseContext( databaseName ); ModularDatabaseCreationContext context = new ModularDatabaseCreationContext( databaseName, platformModule, editionContext, procedures, graphDatabaseFacade ); neoStoreDataSource = new NeoStoreDataSource( context ); diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ModularDatabaseCreationContext.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ModularDatabaseCreationContext.java index 39c7da4d65cb3..0daac6c01d777 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ModularDatabaseCreationContext.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/ModularDatabaseCreationContext.java @@ -24,7 +24,7 @@ import org.neo4j.graphdb.DependencyResolver; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.graphdb.factory.module.edition.context.EditionDatabaseContext; +import org.neo4j.graphdb.factory.module.edition.context.DatabaseEditionContext; import org.neo4j.graphdb.factory.module.id.DatabaseIdContext; import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector; import org.neo4j.internal.kernel.api.TokenNameLookup; @@ -121,7 +121,7 @@ public class ModularDatabaseCreationContext implements DatabaseCreationContext private final DatabaseLayout databaseLayout; private final DatabaseAvailability databaseAvailability; - ModularDatabaseCreationContext( String databaseName, PlatformModule platformModule, EditionDatabaseContext editionContext, + ModularDatabaseCreationContext( String databaseName, PlatformModule platformModule, DatabaseEditionContext editionContext, Procedures procedures, GraphDatabaseFacade facade ) { this.databaseName = databaseName; diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/EditionModule.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/EditionModule.java index cc39a44ca9a54..ce75bdca163eb 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/EditionModule.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/EditionModule.java @@ -30,8 +30,8 @@ import org.neo4j.graphdb.facade.GraphDatabaseFacadeFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.factory.module.PlatformModule; +import org.neo4j.graphdb.factory.module.edition.context.DatabaseEditionContext; import org.neo4j.graphdb.factory.module.edition.context.DefaultEditionModuleDatabaseContext; -import org.neo4j.graphdb.factory.module.edition.context.EditionDatabaseContext; import org.neo4j.graphdb.factory.module.id.IdContextFactory; import org.neo4j.helpers.Service; import org.neo4j.internal.kernel.api.exceptions.KernelException; @@ -59,7 +59,6 @@ import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory; import org.neo4j.kernel.impl.transaction.stats.DatabaseTransactionStats; import org.neo4j.kernel.impl.transaction.stats.TransactionCounters; -import org.neo4j.kernel.impl.util.DependencySatisfier; import org.neo4j.kernel.impl.util.watcher.DefaultFileDeletionEventListener; import org.neo4j.kernel.impl.util.watcher.DefaultFileSystemWatcherService; import org.neo4j.kernel.impl.util.watcher.FileSystemWatcherService; @@ -96,7 +95,7 @@ public abstract class EditionModule protected AvailabilityGuard globalAvailabilityGuard; protected SecurityProvider securityProvider; - public EditionDatabaseContext createDatabaseContext( String databaseName ) + public DatabaseEditionContext createDatabaseContext( String databaseName ) { return new DefaultEditionModuleDatabaseContext( this, databaseName ); } @@ -298,52 +297,4 @@ public void setSecurityProvider( SecurityProvider securityProvider ) { this.securityProvider = securityProvider; } - - private static class SecurityModuleDependenciesDependencies implements SecurityModule.Dependencies - { - private final PlatformModule platformModule; - private final Procedures procedures; - - SecurityModuleDependenciesDependencies( PlatformModule platformModule, Procedures procedures ) - { - this.platformModule = platformModule; - this.procedures = procedures; - } - - @Override - public LogService logService() - { - return platformModule.logging; - } - - @Override - public Config config() - { - return platformModule.config; - } - - @Override - public Procedures procedures() - { - return procedures; - } - - @Override - public JobScheduler scheduler() - { - return platformModule.jobScheduler; - } - - @Override - public FileSystemAbstraction fileSystem() - { - return platformModule.fileSystem; - } - - @Override - public DependencySatisfier dependencySatisfier() - { - return platformModule.dependencies; - } - } } diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/SecurityModuleDependenciesDependencies.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/SecurityModuleDependenciesDependencies.java new file mode 100644 index 0000000000000..56c7f068543ba --- /dev/null +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/SecurityModuleDependenciesDependencies.java @@ -0,0 +1,77 @@ +/* + * Copyright (c) 2002-2018 "Neo4j," + * Neo4j Sweden AB [http://neo4j.com] + * + * This file is part of Neo4j. + * + * Neo4j is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ +package org.neo4j.graphdb.factory.module.edition; + +import org.neo4j.graphdb.factory.module.PlatformModule; +import org.neo4j.io.fs.FileSystemAbstraction; +import org.neo4j.kernel.api.security.SecurityModule; +import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.proc.Procedures; +import org.neo4j.kernel.impl.util.DependencySatisfier; +import org.neo4j.logging.internal.LogService; +import org.neo4j.scheduler.JobScheduler; + +class SecurityModuleDependenciesDependencies implements SecurityModule.Dependencies +{ + private final PlatformModule platformModule; + private final Procedures procedures; + + SecurityModuleDependenciesDependencies( PlatformModule platformModule, Procedures procedures ) + { + this.platformModule = platformModule; + this.procedures = procedures; + } + + @Override + public LogService logService() + { + return platformModule.logging; + } + + @Override + public Config config() + { + return platformModule.config; + } + + @Override + public Procedures procedures() + { + return procedures; + } + + @Override + public JobScheduler scheduler() + { + return platformModule.jobScheduler; + } + + @Override + public FileSystemAbstraction fileSystem() + { + return platformModule.fileSystem; + } + + @Override + public DependencySatisfier dependencySatisfier() + { + return platformModule.dependencies; + } +} diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/EditionDatabaseContext.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DatabaseEditionContext.java similarity index 98% rename from community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/EditionDatabaseContext.java rename to community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DatabaseEditionContext.java index 7b777dd5555e0..b801640e9810c 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/EditionDatabaseContext.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DatabaseEditionContext.java @@ -39,7 +39,7 @@ import org.neo4j.logging.internal.LogService; import org.neo4j.time.SystemNanoClock; -public interface EditionDatabaseContext +public interface DatabaseEditionContext { DatabaseIdContext getIdContext(); diff --git a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DefaultEditionModuleDatabaseContext.java b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DefaultEditionModuleDatabaseContext.java index da00566ac8453..4bf986d1c7f6e 100644 --- a/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DefaultEditionModuleDatabaseContext.java +++ b/community/neo4j/src/main/java/org/neo4j/graphdb/factory/module/edition/context/DefaultEditionModuleDatabaseContext.java @@ -40,7 +40,7 @@ import org.neo4j.logging.internal.LogService; import org.neo4j.time.SystemNanoClock; -public class DefaultEditionModuleDatabaseContext implements EditionDatabaseContext +public class DefaultEditionModuleDatabaseContext implements DatabaseEditionContext { private final Function watcherServiceFactory; private final String databaseName;