Skip to content

Commit

Permalink
Coalesce duplicate implementations of KernelData.
Browse files Browse the repository at this point in the history
Replace three identical inner classes with a single top-level class
adjacent to the the abstract super-class.
  • Loading branch information
apcj committed Jul 25, 2016
1 parent 6eb6aac commit 9d77467
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 126 deletions.
Expand Up @@ -54,11 +54,10 @@
import org.neo4j.kernel.impl.store.id.configuration.IdTypeConfigurationProvider;
import org.neo4j.kernel.impl.transaction.TransactionHeaderInformationFactory;
import org.neo4j.kernel.impl.transaction.state.DataSourceManager;
import org.neo4j.kernel.internal.DefaultKernelData;
import org.neo4j.kernel.internal.GraphDatabaseAPI;
import org.neo4j.kernel.internal.KernelData;
import org.neo4j.kernel.internal.Version;
import org.neo4j.kernel.lifecycle.LifeSupport;
import org.neo4j.kernel.lifecycle.Lifecycle;
import org.neo4j.kernel.lifecycle.LifecycleStatus;
import org.neo4j.udc.UsageData;

Expand Down Expand Up @@ -243,43 +242,4 @@ protected void doAfterRecoveryAndStartup( DatabaseInfo databaseInfo, DependencyR
new RemoveOrphanConstraintIndexesOnStartup( dependencyResolver.resolveDependency( NeoStoreDataSource.class )
.getKernel(), dependencyResolver.resolveDependency( LogService.class ).getInternalLogProvider() ).perform();
}

protected final class DefaultKernelData extends KernelData implements Lifecycle
{
private final GraphDatabaseAPI graphDb;

public DefaultKernelData( FileSystemAbstraction fileSystem, PageCache pageCache, File storeDir, Config config,
GraphDatabaseAPI graphDb )
{
super( fileSystem, pageCache, storeDir, config );
this.graphDb = graphDb;
}

@Override
public Version version()
{
return Version.getKernel();
}

@Override
public GraphDatabaseAPI graphDatabase()
{
return graphDb;
}

@Override
public void init() throws Throwable
{
}

@Override
public void start() throws Throwable
{
}

@Override
public void stop() throws Throwable
{
}
}
}
@@ -0,0 +1,66 @@
/*
* Copyright (c) 2002-2016 "Neo Technology,"
* Network Engine for Objects in Lund AB [http://neotechnology.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.kernel.internal;

import java.io.File;

import org.neo4j.io.fs.FileSystemAbstraction;
import org.neo4j.io.pagecache.PageCache;
import org.neo4j.kernel.configuration.Config;
import org.neo4j.kernel.lifecycle.Lifecycle;

public final class DefaultKernelData extends KernelData implements Lifecycle
{
private final GraphDatabaseAPI graphDb;

public DefaultKernelData( FileSystemAbstraction fileSystem, PageCache pageCache, File storeDir, Config config,
GraphDatabaseAPI graphDb )
{
super( fileSystem, pageCache, storeDir, config );
this.graphDb = graphDb;
}

@Override
public Version version()
{
return Version.getKernel();
}

@Override
public GraphDatabaseAPI graphDatabase()
{
return graphDb;
}

@Override
public void init() throws Throwable
{
}

@Override
public void start() throws Throwable
{
}

@Override
public void stop() throws Throwable
{
}
}
Expand Up @@ -104,11 +104,10 @@
import org.neo4j.kernel.impl.util.Dependencies;
import org.neo4j.kernel.impl.util.JobScheduler;
import org.neo4j.kernel.internal.DatabaseHealth;
import org.neo4j.kernel.internal.DefaultKernelData;
import org.neo4j.kernel.internal.GraphDatabaseAPI;
import org.neo4j.kernel.internal.KernelData;
import org.neo4j.kernel.internal.Version;
import org.neo4j.kernel.lifecycle.LifeSupport;
import org.neo4j.kernel.lifecycle.Lifecycle;
import org.neo4j.kernel.lifecycle.LifecycleStatus;
import org.neo4j.logging.LogProvider;
import org.neo4j.udc.UsageData;
Expand Down Expand Up @@ -429,45 +428,6 @@ protected void doAfterRecoveryAndStartup( DatabaseInfo databaseInfo, DependencyR
}
}

private final class DefaultKernelData extends KernelData implements Lifecycle
{
private final GraphDatabaseAPI graphDb;

DefaultKernelData( FileSystemAbstraction fileSystem, PageCache pageCache, File storeDir, Config config,
GraphDatabaseAPI graphDb )
{
super( fileSystem, pageCache, storeDir, config );
this.graphDb = graphDb;
}

@Override
public Version version()
{
return Version.getKernel();
}

@Override
public GraphDatabaseAPI graphDatabase()
{
return graphDb;
}

@Override
public void init() throws Throwable
{
}

@Override
public void start() throws Throwable
{
}

@Override
public void stop() throws Throwable
{
}
}

@Override
protected SessionTracker createSessionTracker()
{
Expand Down
Expand Up @@ -65,8 +65,8 @@
import org.neo4j.kernel.impl.core.ReadOnlyTokenCreator;
import org.neo4j.kernel.impl.coreapi.CoreAPIAvailabilityGuard;
import org.neo4j.kernel.impl.enterprise.EnterpriseConstraintSemantics;
import org.neo4j.kernel.impl.enterprise.id.EnterpriseIdTypeConfigurationProvider;
import org.neo4j.kernel.impl.enterprise.StandardSessionTracker;
import org.neo4j.kernel.impl.enterprise.id.EnterpriseIdTypeConfigurationProvider;
import org.neo4j.kernel.impl.enterprise.transaction.log.checkpoint.ConfigurableIOLimiter;
import org.neo4j.kernel.impl.factory.DatabaseInfo;
import org.neo4j.kernel.impl.factory.EditionModule;
Expand All @@ -81,11 +81,8 @@
import org.neo4j.kernel.impl.transaction.log.TransactionIdStore;
import org.neo4j.kernel.impl.util.JobScheduler;
import org.neo4j.kernel.internal.DatabaseHealth;
import org.neo4j.kernel.internal.GraphDatabaseAPI;
import org.neo4j.kernel.internal.KernelData;
import org.neo4j.kernel.internal.Version;
import org.neo4j.kernel.internal.DefaultKernelData;
import org.neo4j.kernel.lifecycle.LifeSupport;
import org.neo4j.kernel.lifecycle.Lifecycle;
import org.neo4j.kernel.lifecycle.LifecycleStatus;
import org.neo4j.logging.Log;
import org.neo4j.logging.LogProvider;
Expand Down Expand Up @@ -249,45 +246,6 @@ private CommitProcessFactory readOnly()
return ( appender, storageEngine, config ) -> new ReadOnlyTransactionCommitProcess();
}

private final class DefaultKernelData extends KernelData implements Lifecycle
{
private final GraphDatabaseAPI graphDb;

DefaultKernelData( FileSystemAbstraction fileSystem, PageCache pageCache, File storeDir,
Config config, GraphDatabaseAPI graphDb )
{
super( fileSystem, pageCache, storeDir, config );
this.graphDb = graphDb;
}

@Override
public Version version()
{
return Version.getKernel();
}

@Override
public GraphDatabaseAPI graphDatabase()
{
return graphDb;
}

@Override
public void init() throws Throwable
{
}

@Override
public void start() throws Throwable
{
}

@Override
public void stop() throws Throwable
{
}
}

@Override
protected SessionTracker createSessionTracker()
{
Expand Down

0 comments on commit 9d77467

Please sign in to comment.