Skip to content

Commit

Permalink
Review class renaming and extraction.
Browse files Browse the repository at this point in the history
  • Loading branch information
MishaDemianenko committed Sep 11, 2018
1 parent 8ff657a commit d0aa176
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 57 deletions.
Expand Up @@ -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;
Expand All @@ -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 );
Expand Down
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 );
}
Expand Down Expand Up @@ -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;
}
}
}
@@ -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 <http://www.gnu.org/licenses/>.
*/
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;
}
}
Expand Up @@ -39,7 +39,7 @@
import org.neo4j.logging.internal.LogService;
import org.neo4j.time.SystemNanoClock;

public interface EditionDatabaseContext
public interface DatabaseEditionContext
{
DatabaseIdContext getIdContext();

Expand Down
Expand Up @@ -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<File,FileSystemWatcherService> watcherServiceFactory;
private final String databaseName;
Expand Down

0 comments on commit d0aa176

Please sign in to comment.