Compilation fix after rebase

neo4j · Aug 15, 2017 · d7f6772 · d7f6772
1 parent 2906829
commit d7f6772
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java b/...ncy-check/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java
@@ -262,7 +262,7 @@ public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider()
 
         ConsistencyCheckService service = new ConsistencyCheckService();
         Config configuration =
-                Config.embeddedDefaults( settings( enableNativeIndex, Settings.TRUE ) );
+                Config.defaults( settings( enableNativeIndex, Settings.TRUE ) );
         Result result = runFullConsistencyCheck( service, configuration, storeDir );
         assertTrue( result.isSuccessful() );
     }

diff --git a/...ava/org/neo4j/kernel/api/impl/schema/FusionSchemaIndexProviderCompatibilitySuiteTest.java b/...ava/org/neo4j/kernel/api/impl/schema/FusionSchemaIndexProviderCompatibilitySuiteTest.java
@@ -33,15 +33,14 @@
 import org.neo4j.logging.NullLogProvider;
 
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
-import static org.neo4j.kernel.configuration.Config.embeddedDefaults;
 
 public class FusionSchemaIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite
 {
     @Override
     protected SchemaIndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir )
     {
         NullLogProvider logProvider = NullLogProvider.getInstance();
-        Config config = embeddedDefaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.TRUE ) );
+        Config config = Config.defaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.TRUE ) );
         return NativeLuceneFusionSchemaIndexProviderFactory
                 .newInstance( pageCache, graphDbDir, fs, logProvider, config, OperationalMode.single,
                         RecoveryCleanupWorkCollector.IMMEDIATE );

diff --git a/...ava/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderCompatibilitySuiteTest.java b/...ava/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexProviderCompatibilitySuiteTest.java
@@ -32,7 +32,6 @@
 import org.neo4j.logging.NullLogProvider;
 
 import static org.neo4j.helpers.collection.MapUtil.stringMap;
-import static org.neo4j.kernel.configuration.Config.embeddedDefaults;
 
 public class LuceneSchemaIndexProviderCompatibilitySuiteTest extends IndexProviderCompatibilityTestSuite
 {
@@ -41,7 +40,7 @@ protected LuceneSchemaIndexProvider createIndexProvider( PageCache pageCache, Fi
     {
         DirectoryFactory.InMemoryDirectoryFactory directoryFactory = new DirectoryFactory.InMemoryDirectoryFactory();
         NullLogProvider logging = NullLogProvider.getInstance();
-        Config config = embeddedDefaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.FALSE ) );
+        Config config = Config.defaults( stringMap( GraphDatabaseSettings.enable_native_schema_index.name(), Settings.FALSE ) );
         OperationalMode mode = OperationalMode.single;
         return LuceneSchemaIndexProviderFactory.create( fs, graphDbDir, logging, config, mode );
     }