diff --git a/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseBuilderTestTools.java b/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseBuilderTestTools.java index f3be84dca4f81..2806728461f28 100644 --- a/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseBuilderTestTools.java +++ b/community/kernel/src/test/java/org/neo4j/graphdb/factory/GraphDatabaseBuilderTestTools.java @@ -31,9 +31,4 @@ public static Config createConfigCopy( GraphDatabaseBuilder builder ) { return new Config( builder.getRawConfig() ); } - - public static void clearConfig( GraphDatabaseBuilder builder ) - { - builder.getRawConfig().clear(); - } } diff --git a/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java b/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java index ee5cebd44d760..47b246ec2bdee 100644 --- a/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java +++ b/community/kernel/src/test/java/org/neo4j/helpers/Configuration.java @@ -40,11 +40,7 @@ public Config config( Class... settingsClasses ) public Configuration with( Setting setting, String value ) { - return with( setting.name(), value ); - } - - public Configuration with( String key, String value ) - { + String key = setting.name(); if ( value == null ) { configuration.remove( key ); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java index bfc24849a832b..a6f42f48b0dc1 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/RelationshipGroupStoreTest.java @@ -19,11 +19,6 @@ */ package org.neo4j.kernel.impl.store; -import org.junit.After; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; - import java.io.File; import java.util.HashMap; import java.util.HashSet; @@ -31,6 +26,11 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; + import org.neo4j.graphdb.Node; import org.neo4j.graphdb.Relationship; import org.neo4j.graphdb.Transaction; @@ -39,10 +39,10 @@ import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.MyRelTypes; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageEngine; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.NodeRecord; import org.neo4j.kernel.impl.store.record.Record; import org.neo4j.kernel.impl.store.record.RelationshipGroupRecord; @@ -52,14 +52,14 @@ import org.neo4j.test.PageCacheRule; import org.neo4j.test.TargetDirectory; +import static java.lang.Integer.parseInt; +import static java.util.Arrays.asList; + import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertThat; -import static java.lang.Integer.parseInt; -import static java.util.Arrays.asList; - import static org.neo4j.kernel.impl.store.RecordStore.getRecord; import static org.neo4j.kernel.impl.store.record.RecordLoad.NORMAL; @@ -168,15 +168,10 @@ private StoreFactory factory( Integer customThreshold, PageCache pageCache ) { customConfig.put( GraphDatabaseSettings.dense_node_threshold.name(), "" + customThreshold ); } - return new StoreFactory( directory, config( customConfig ), new DefaultIdGeneratorFactory( fs ), pageCache, + return new StoreFactory( directory, new Config( customConfig ), new DefaultIdGeneratorFactory( fs ), pageCache, fs, NullLogProvider.getInstance() ); } - private Config config( Map customConfig ) - { - return new Config( customConfig ); - } - @Test public void makeSureRelationshipGroupsNextAndPrevGetsAssignedCorrectly() throws Exception { diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java index 575f660aaaedd..3d09dba794ca0 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/TestArrayStore.java @@ -19,28 +19,26 @@ */ package org.neo4j.kernel.impl.store; -import org.junit.After; -import org.junit.Before; -import org.junit.ClassRule; -import org.junit.Rule; -import org.junit.Test; - import java.io.File; import java.lang.reflect.Array; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Map; + +import org.junit.After; +import org.junit.Before; +import org.junit.ClassRule; +import org.junit.Rule; +import org.junit.Test; import org.neo4j.helpers.UTF8; import org.neo4j.helpers.collection.IteratorUtil; -import org.neo4j.helpers.collection.MapUtil; import org.neo4j.helpers.collection.Pair; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; -import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.configuration.Config; +import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; import org.neo4j.kernel.impl.store.record.DynamicRecord; import org.neo4j.kernel.impl.util.Bits; import org.neo4j.logging.NullLogProvider; @@ -64,12 +62,10 @@ public class TestArrayStore public void before() throws Exception { File dir = testDirectory.graphDbDir(); - Map configParams = MapUtil.stringMap(); - Config config = new Config( configParams ); DefaultFileSystemAbstraction fs = new DefaultFileSystemAbstraction(); DefaultIdGeneratorFactory idGeneratorFactory = new DefaultIdGeneratorFactory( fs ); PageCache pageCache = pageCacheRule.getPageCache( fs ); - StoreFactory factory = new StoreFactory( dir, config, idGeneratorFactory, pageCache, fs, + StoreFactory factory = new StoreFactory( dir, new Config(), idGeneratorFactory, pageCache, fs, NullLogProvider.getInstance() ); neoStores = factory.openAllNeoStores( true ); arrayStore = neoStores.getPropertyStore().getArrayStore(); diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java index 19f1a7fc8b9ae..067dfcd2a3604 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/store/UpgradeStoreIT.java @@ -19,11 +19,6 @@ */ package org.neo4j.kernel.impl.store; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Rule; -import org.junit.Test; - import java.io.File; import java.io.IOException; import java.io.RandomAccessFile; @@ -33,6 +28,11 @@ import java.util.HashMap; import java.util.Map; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Rule; +import org.junit.Test; + import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.TransactionFailureException; import org.neo4j.graphdb.factory.GraphDatabaseBuilder; @@ -62,6 +62,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import static org.neo4j.helpers.collection.IteratorUtil.first; import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.AbstractNeo4jTestCase.deleteFileOrDirectory; @@ -371,7 +372,6 @@ IdType.RELATIONSHIP_TYPE_TOKEN_NAME, new DefaultIdGeneratorFactory( fs ), pageCa private static class RelationshipTypeTokenStoreWithOneOlderVersion extends RelationshipTypeTokenStore { - private static final Config config = new Config( stringMap() ); private boolean versionCalled; public RelationshipTypeTokenStoreWithOneOlderVersion( @@ -380,8 +380,8 @@ public RelationshipTypeTokenStoreWithOneOlderVersion( FileSystemAbstraction fs, PageCache pageCache ) { - super( fileName, config, new NoLimitIdGeneratorFactory( fs ), pageCache, NullLogProvider.getInstance(), - stringStore, select(config, NullLogService.getInstance() ) ); + super( fileName, new Config(), new NoLimitIdGeneratorFactory( fs ), pageCache, + NullLogProvider.getInstance(), stringStore, select(new Config(), NullLogService.getInstance() ) ); } @Override diff --git a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java index 60f0b3e0be3d1..cd9eef37dac42 100644 --- a/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java +++ b/community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java @@ -22,18 +22,14 @@ import java.io.File; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Map; import java.util.function.Predicate; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.graphdb.mockfs.EphemeralFileSystemAbstraction; import org.neo4j.helpers.UTF8; import org.neo4j.helpers.collection.Iterables; -import org.neo4j.helpers.collection.MapUtil; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.fs.StoreChannel; -import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.storageengine.impl.recordstorage.RecordStorageCommandReaderFactory; import org.neo4j.kernel.impl.store.MetaDataStore; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimit; @@ -57,16 +53,6 @@ public class MigrationTestUtils { - public static Config defaultConfig() - { - return defaultConfig( MapUtil.stringMap() ); - } - - public static Config defaultConfig( Map inputParams ) - { - return new Config( inputParams, GraphDatabaseSettings.class ); - } - public static int[] makeLongArray() { int[] longArray = new int[100]; diff --git a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java index 67880b02c5f64..d92722a7f6c89 100644 --- a/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/DatabaseRule.java @@ -228,11 +228,6 @@ public Config getConfigCopy() return GraphDatabaseBuilderTestTools.createConfigCopy( databaseBuilder ); } - public void resetConfig() - { - GraphDatabaseBuilderTestTools.clearConfig( databaseBuilder ); - } - /** * {@link DatabaseRule} now implements {@link GraphDatabaseAPI} directly, so no need. Also for ensuring * a lazily started database is created, use {@link #ensureStarted()} instead. diff --git a/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java b/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java index e8dec9be394be..ba447234bb756 100644 --- a/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java +++ b/community/kernel/src/test/java/org/neo4j/test/NeoStoreDataSourceRule.java @@ -75,8 +75,7 @@ public NeoStoreDataSource getDataSource( File storeDir, FileSystemAbstraction fs dataSource.stop(); dataSource.shutdown(); } - final Config config = new Config( stringMap( additionalConfig ), - GraphDatabaseSettings.class ); + final Config config = new Config( stringMap( additionalConfig ), GraphDatabaseSettings.class ); Locks locks = mock( Locks.class ); when( locks.newClient() ).thenReturn( mock( Locks.Client.class ) ); diff --git a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java index 068808399a2a0..fb6d87c6f2633 100644 --- a/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java +++ b/community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneSchemaIndexBuilder.java @@ -22,18 +22,13 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; -import java.util.Map; - import org.neo4j.function.Factory; -import org.neo4j.graphdb.factory.GraphDatabaseSettings; import org.neo4j.kernel.api.impl.index.IndexWriterConfigs; import org.neo4j.kernel.api.impl.index.builder.AbstractLuceneIndexBuilder; import org.neo4j.kernel.api.index.IndexConfiguration; import org.neo4j.kernel.configuration.Config; import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig; -import static org.neo4j.helpers.collection.MapUtil.stringMap; - /** * Helper builder class to simplify construction and instantiation of lucene schema indexes. * Most of the values already have most useful default value, that still can be overridden by corresponding @@ -74,20 +69,6 @@ public LuceneSchemaIndexBuilder withSamplingConfig( IndexSamplingConfig sampling return this; } - /** - * Specify lucene schema index sampling buffer size - * - * @param size sampling buffer size - * @return index builder - */ - public LuceneSchemaIndexBuilder withSamplingBufferSize( int size ) - { - Map params = stringMap( GraphDatabaseSettings.index_sampling_buffer_size.name(), size + "" ); - Config config = new Config( params ); - this.samplingConfig = new IndexSamplingConfig( config ); - return this; - } - /** * Specify lucene schema index config * diff --git a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/TestOnlyEdgeDiscoveryService.java b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/TestOnlyEdgeDiscoveryService.java index 4da85881358f8..0e5541868f964 100644 --- a/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/TestOnlyEdgeDiscoveryService.java +++ b/enterprise/core-edge/src/test/java/org/neo4j/coreedge/discovery/TestOnlyEdgeDiscoveryService.java @@ -38,7 +38,7 @@ public TestOnlyEdgeDiscoveryService( Config config, TestOnlyDiscoveryServiceFact private InstanceId toEdge( Config config ) { - return new InstanceId( Integer.valueOf( config.getParams().get( ClusterSettings.server_id.name() ) ) ); + return config.get( ClusterSettings.server_id ); } @Override diff --git a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java index 144eb568a3eac..3a17722ac0775 100644 --- a/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java +++ b/enterprise/neo4j-enterprise/src/test/java/upgrade/StoreMigratorFrom20IT.java @@ -19,19 +19,18 @@ */ package upgrade; +import java.io.File; +import java.io.IOException; + import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.io.File; -import java.io.IOException; - import org.neo4j.consistency.checking.full.ConsistencyCheckIncompleteException; import org.neo4j.graphdb.GraphDatabaseService; import org.neo4j.graphdb.factory.GraphDatabaseFactory; import org.neo4j.graphdb.factory.GraphDatabaseSettings; -import org.neo4j.helpers.collection.MapUtil; import org.neo4j.io.fs.DefaultFileSystemAbstraction; import org.neo4j.io.fs.FileSystemAbstraction; import org.neo4j.io.pagecache.PageCache; @@ -49,7 +48,6 @@ import org.neo4j.kernel.impl.store.StoreFactory; import org.neo4j.kernel.impl.store.format.lowlimit.LowLimit; import org.neo4j.kernel.impl.store.id.DefaultIdGeneratorFactory; -import org.neo4j.kernel.impl.storemigration.MigrationTestUtils; import org.neo4j.kernel.impl.storemigration.StoreUpgrader; import org.neo4j.kernel.impl.storemigration.StoreVersionCheck; import org.neo4j.kernel.impl.storemigration.UpgradableDatabase; @@ -66,6 +64,7 @@ import static upgrade.StoreMigratorTestUtil.buildClusterWithMasterDirIn; import static org.neo4j.consistency.store.StoreAssertions.assertConsistentStore; +import static org.neo4j.helpers.collection.MapUtil.stringMap; import static org.neo4j.kernel.impl.ha.ClusterManager.allSeesAllAsAvailable; import static org.neo4j.kernel.impl.storemigration.MigrationTestUtils.find20FormatStoreDirectory; @@ -76,7 +75,7 @@ public class StoreMigratorFrom20IT @Rule public final PageCacheRule pageCacheRule = new PageCacheRule(); - private final Config config = MigrationTestUtils.defaultConfig(); + private final Config config = new Config( stringMap(), GraphDatabaseSettings.class ); private final FileSystemAbstraction fs = new DefaultFileSystemAbstraction(); private final ListAccumulatorMigrationProgressMonitor monitor = new ListAccumulatorMigrationProgressMonitor(); private StoreFactory storeFactory; @@ -195,7 +194,7 @@ public static void verifyNeoStore( NeoStores neoStores ) private StoreUpgrader upgrader( SchemaIndexMigrator indexMigrator, StoreMigrator storeMigrator ) { - Config allowUpgrade = new Config( MapUtil.stringMap( GraphDatabaseSettings + Config allowUpgrade = new Config( stringMap( GraphDatabaseSettings .allow_store_upgrade.name(), "true" ) ); StoreUpgrader upgrader = new StoreUpgrader( upgradableDatabase, monitor, allowUpgrade, fs, NullLogProvider.getInstance() );