From 1454bc7cd0d035e3944d4ed35338dc981f26ebad Mon Sep 17 00:00:00 2001 From: Jonas Kalderstam Date: Wed, 4 Jan 2017 12:29:10 +0100 Subject: [PATCH] Fix merge conficts --- ...atabaseFactoryWithCustomBoltKernelExtension.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/integrationtests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java b/integrationtests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java index a497438e75326..b7108f2bccf25 100644 --- a/integrationtests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java +++ b/integrationtests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java @@ -26,6 +26,7 @@ import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.security.URLAccessRule; import org.neo4j.helpers.collection.Iterables; +import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.extension.KernelExtensionFactory; import org.neo4j.kernel.extension.KernelExtensions; import org.neo4j.kernel.impl.enterprise.EnterpriseEditionModule; @@ -52,12 +53,18 @@ public GraphDatabaseFactoryWithCustomBoltKernelExtension( BoltKernelExtension cu } @Override - protected GraphDatabaseService newDatabase( File storeDir, Map config, Dependencies dependencies ) + protected GraphDatabaseService newDatabase( File storeDir, Config config, Dependencies dependencies ) { GraphDatabaseFacadeFactory factory = new CustomBoltKernelExtensionFacadeFactory( customExtension ); return factory.newFacade( storeDir, config, dependencies ); } + @Override + protected GraphDatabaseService newDatabase( File storeDir, Map config, Dependencies dependencies ) + { + return newDatabase( storeDir, Config.embeddedDefaults( config ), dependencies ); + } + private static class CustomBoltKernelExtensionFacadeFactory extends GraphDatabaseFacadeFactory { final BoltKernelExtension customExtension; @@ -69,11 +76,11 @@ private static class CustomBoltKernelExtensionFacadeFactory extends GraphDatabas } @Override - protected PlatformModule createPlatform( File storeDir, Map params, + protected PlatformModule createPlatform( File storeDir, Config config, Dependencies dependencies, GraphDatabaseFacade graphDatabaseFacade ) { Dependencies newDependencies = new CustomBoltKernelExtensionDependencies( customExtension, dependencies ); - return new PlatformModule( storeDir, params, databaseInfo, newDependencies, graphDatabaseFacade ); + return new PlatformModule( storeDir, config, databaseInfo, newDependencies, graphDatabaseFacade ); } }