Fix merge conficts

neo4j · Jan 5, 2017 · 1454bc7 · 1454bc7
1 parent 084e604
commit 1454bc7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...tests/src/test/java/org/neo4j/bolt/GraphDatabaseFactoryWithCustomBoltKernelExtension.java b/...tests/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<String,String> 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<String,String> 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<String,String> 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 );
         }
     }