PR comment: Change method name SchemaIndex#providerName -> SchemaInde…

…x#providerIdentifier

community/community-it/consistency-it/src/test/java/org/neo4j/consistency/ConsistencyCheckServiceIntegrationTest.java

@@ -252,7 +252,7 @@ public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider()
         String propKey = "propKey";
 
         // Given a lucene index
-        GraphDatabaseService db = getGraphDatabaseService( storeDir, defaultSchemaProvider, LUCENE10.providerName() );
+        GraphDatabaseService db = getGraphDatabaseService( storeDir, defaultSchemaProvider, LUCENE10.providerIdentifier() );
         createIndex( db, label, propKey );
         try ( Transaction tx = db.beginTx() )
         {
@@ -264,7 +264,7 @@ public void oldLuceneSchemaIndexShouldBeConsideredConsistentWithFusionProvider()
 
         ConsistencyCheckService service = new ConsistencyCheckService();
         Config configuration =
-                Config.defaults( settings( defaultSchemaProvider, NATIVE20.providerName() ) );
+                Config.defaults( settings( defaultSchemaProvider, NATIVE20.providerIdentifier() ) );
         Result result = runFullConsistencyCheck( service, configuration, testDirectory.databaseDir() );
         assertTrue( result.isSuccessful() );
     }

community/community-it/dbms-it/src/test/java/org/neo4j/commandline/dbms/MemoryRecommendationsCommandTest.java

@@ -245,7 +245,7 @@ private static void createDatabaseWithNativeIndexes( File storeDir, String datab
         {
             GraphDatabaseService db =
                     new TestGraphDatabaseFactory().newEmbeddedDatabaseBuilder( storeDir )
-                            .setConfig( default_schema_provider, schemaIndex.providerName() )
+                            .setConfig( default_schema_provider, schemaIndex.providerIdentifier() )
                             .setConfig( active_database, databaseName )
                             .newGraphDatabase();
             String key = "key-" + schemaIndex.name();

community/community-it/index-it/src/test/java/org/neo4j/index/impl/lucene/explicit/NonUniqueIndexTest.java

@@ -177,12 +177,12 @@ private static IndexProvider selectIndexProvider( PageCache pageCache, File data
     {
         String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider );
         RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE;
-        if ( LUCENE10.providerName().equals( defaultSchemaProvider ) )
+        if ( LUCENE10.providerIdentifier().equals( defaultSchemaProvider ) )
         {
             return LuceneIndexProviderFactory
                     .newInstance( pageCache, databaseDirectory, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector );
         }
-        else if ( NATIVE10.providerName().equals( defaultSchemaProvider ) )
+        else if ( NATIVE10.providerIdentifier().equals( defaultSchemaProvider ) )
         {
             return NativeLuceneFusionIndexProviderFactory10
                     .create( pageCache, databaseDirectory, fs, monitor, config, operationalMode, recoveryCleanupWorkCollector );

community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/DefaultSchemaIndexConfigTest.java

@@ -63,7 +63,7 @@ public void shouldUseConfiguredIndexProviderLucene() throws IndexNotFoundKernelE
     {
         // given
         GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider,
-                GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName() ).newGraphDatabase();
+                GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier() ).newGraphDatabase();
 
         // when
         createIndex( db );
@@ -77,7 +77,7 @@ public void shouldUseConfiguredIndexProviderNative10() throws IndexNotFoundKerne
     {
         // given
         GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider,
-                GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName() ).newGraphDatabase();
+                GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier() ).newGraphDatabase();
 
         // when
         createIndex( db );
@@ -91,7 +91,7 @@ public void shouldUseConfiguredIndexProviderNative20() throws IndexNotFoundKerne
     {
         // given
         GraphDatabaseService db = dbBuilder.setConfig( GraphDatabaseSettings.default_schema_provider,
-                GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() ).newGraphDatabase();
+                GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() ).newGraphDatabase();
 
         // when
         createIndex( db );

community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexIT.java

@@ -50,7 +50,7 @@ public class FusionIndexIT
 {
     @Rule
     public DatabaseRule db = new EmbeddedDatabaseRule()
-            .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() );
+            .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() );
 
     private File databaseDirectory;
     private final Label label = Label.label( "label" );

community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider10CompatibilitySuiteTest.java

@@ -39,7 +39,7 @@ public class FusionIndexProvider10CompatibilitySuiteTest extends IndexProviderCo
     protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir )
     {
         IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY;
-        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE10.providerName() ) );
+        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE10.providerIdentifier() ) );
         OperationalMode mode = OperationalMode.single;
         RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE;
         return NativeLuceneFusionIndexProviderFactory10.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector );

community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/FusionIndexProvider20CompatibilitySuiteTest.java

@@ -39,7 +39,7 @@ public class FusionIndexProvider20CompatibilitySuiteTest extends IndexProviderCo
     protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir )
     {
         IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY;
-        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE20.providerName() ) );
+        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE20.providerIdentifier() ) );
         OperationalMode mode = OperationalMode.single;
         RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE;
         return NativeLuceneFusionIndexProviderFactory20.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector );

community/community-it/index-it/src/test/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderCompatibilitySuiteTest.java

@@ -39,7 +39,7 @@ public class LuceneIndexProviderCompatibilitySuiteTest extends IndexProviderComp
     protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir )
     {
         IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY;
-        Config config = Config.defaults( stringMap( default_schema_provider.name(), LUCENE10.providerName() ) );
+        Config config = Config.defaults( stringMap( default_schema_provider.name(), LUCENE10.providerIdentifier() ) );
         OperationalMode mode = OperationalMode.single;
         RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE;
         return LuceneIndexProviderFactory.newInstance( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector );

community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/IndexCreateIT.java

@@ -91,7 +91,7 @@ void shouldCreateWithSpecificExistingProviderName( IndexCreator creator ) throws
         {
             // given
             SchemaWrite schemaWrite = schemaWriteInNewTransaction();
-            String provider = indexSetting.providerName();
+            String provider = indexSetting.providerIdentifier();
             LabelSchemaDescriptor descriptor = forLabel( labelId++, 0 );
             creator.create( schemaWrite, descriptor, provider );
 

community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/index/schema/NativeStringIndexingIT.java

@@ -58,7 +58,7 @@ public class NativeStringIndexingIT
 
     @Rule
     public final DatabaseRule db = new EmbeddedDatabaseRule()
-            .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() );
+            .withSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() );
     @Rule
     public final RandomRule random = new RandomRule();
 

community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorLuceneTest.java

@@ -29,7 +29,7 @@ public class NodeValueIndexCursorLuceneTest extends AbstractNodeValueIndexCursor
     public ReadTestSupport newTestSupport()
     {
         ReadTestSupport readTestSupport = new ReadTestSupport();
-        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, LUCENE10.providerName() );
+        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, LUCENE10.providerIdentifier() );
         return readTestSupport;
     }
 

community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative10Test.java

@@ -27,7 +27,7 @@ public class NodeValueIndexCursorNative10Test extends AbstractNodeValueIndexCurs
     public ReadTestSupport newTestSupport()
     {
         ReadTestSupport readTestSupport = new ReadTestSupport();
-        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName() );
+        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier() );
         return readTestSupport;
     }
 

community/community-it/index-it/src/test/java/org/neo4j/kernel/impl/newapi/NodeValueIndexCursorNative20Test.java

@@ -27,7 +27,7 @@ public class NodeValueIndexCursorNative20Test extends AbstractNodeValueIndexCurs
     public ReadTestSupport newTestSupport()
     {
         ReadTestSupport readTestSupport = new ReadTestSupport();
-        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName() );
+        readTestSupport.addSetting( GraphDatabaseSettings.default_schema_provider, GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier() );
         return readTestSupport;
     }
 

community/community-it/kernel-it/src/test/java/org/neo4j/kernel/api/index/GenericIndexProviderCompatibilitySuiteTest.java

@@ -38,7 +38,7 @@ public class GenericIndexProviderCompatibilitySuiteTest extends IndexProviderCom
     protected IndexProvider createIndexProvider( PageCache pageCache, FileSystemAbstraction fs, File graphDbDir )
     {
         IndexProvider.Monitor monitor = IndexProvider.Monitor.EMPTY;
-        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE_GBPTREE10.providerName() ) );
+        Config config = Config.defaults( stringMap( default_schema_provider.name(), NATIVE_GBPTREE10.providerIdentifier() ) );
         OperationalMode mode = OperationalMode.single;
         RecoveryCleanupWorkCollector recoveryCleanupWorkCollector = RecoveryCleanupWorkCollector.IMMEDIATE;
         return GenericNativeIndexProviderFactory.create( pageCache, graphDbDir, fs, monitor, config, mode, recoveryCleanupWorkCollector );

community/community-it/kernel-it/src/test/java/org/neo4j/unsafe/batchinsert/internal/BatchInsertIndexProviderTest.java

@@ -82,7 +82,7 @@ public BatchInsertIndexProviderTest( GraphDatabaseSettings.SchemaIndex schemaInd
     @Test
     public void batchInserterShouldUseConfiguredIndexProvider() throws Exception
     {
-        Map<String,String> config = stringMap( default_schema_provider.name(), schemaIndex.providerName() );
+        Map<String,String> config = stringMap( default_schema_provider.name(), schemaIndex.providerIdentifier() );
         BatchInserter inserter = newBatchInserter( config );
         inserter.createDeferredSchemaIndex( TestLabels.LABEL_ONE ).on( "key" ).create();
         inserter.shutdown();
@@ -97,8 +97,8 @@ public void batchInserterShouldUseConfiguredIndexProvider() throws Exception
             int labelId = tokenRead.nodeLabel( TestLabels.LABEL_ONE.name() );
             int propertyId = tokenRead.propertyKey( "key" );
             IndexReference index = schemaRead.index( labelId, propertyId );
-            assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerName().contains( index.providerKey() ) );
-            assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerName().contains( index.providerVersion() ) );
+            assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerIdentifier().contains( index.providerKey() ) );
+            assertTrue( unexpectedIndexProviderMessage( index ), schemaIndex.providerIdentifier().contains( index.providerVersion() ) );
             tx.success();
         }
         finally

community/community-it/kernel-it/src/test/java/recovery/RecoveryCleanupIT.java

@@ -155,7 +155,7 @@ public void scanStoreMustLogCrashPointerCleanupDuringRecovery() throws Exception
     public void nativeIndexMustLogCrashPointerCleanupDuringRecovery() throws Exception
     {
         // given
-        setTestConfig( GraphDatabaseSettings.default_schema_provider, NATIVE20.providerName() );
+        setTestConfig( GraphDatabaseSettings.default_schema_provider, NATIVE20.providerIdentifier() );
         dirtyDatabase();
 
         // when

community/kernel/src/main/java/org/neo4j/graphdb/factory/GraphDatabaseSettings.java

@@ -50,6 +50,10 @@
 import org.neo4j.logging.Level;
 import org.neo4j.logging.LogTimeZone;
 
+import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.LUCENE10;
+import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE10;
+import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE20;
+import static org.neo4j.graphdb.factory.GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10;
 import static org.neo4j.kernel.configuration.Settings.BOOLEAN;
 import static org.neo4j.kernel.configuration.Settings.BYTES;
 import static org.neo4j.kernel.configuration.Settings.DEFAULT;
@@ -567,7 +571,7 @@ public enum SchemaIndex
             this.providerName = providerName;
         }
 
-        public String providerName()
+        public String providerIdentifier()
         {
             return providerName;
         }
@@ -595,8 +599,8 @@ public String providerName()
             "- Controllable memory usage, due to being bound by the page cache" )
             public static final Setting<String> default_schema_provider =
             setting( "dbms.index.default_schema_provider",
-                    optionsIgnoreCase( SchemaIndex.NATIVE20.providerName(), SchemaIndex.NATIVE10.providerName(), SchemaIndex.LUCENE10.providerName(),
-                            SchemaIndex.NATIVE_GBPTREE10.providerName() ),
+                    optionsIgnoreCase( NATIVE20.providerIdentifier(), NATIVE10.providerIdentifier(), LUCENE10.providerIdentifier(),
+                            NATIVE_GBPTREE10.providerIdentifier() ),
                     null );
 
     @Description( "Location where Neo4j keeps the logical transaction logs." )

community/kernel/src/main/java/org/neo4j/kernel/configuration/GraphDatabaseConfigurationMigrator.java

@@ -127,7 +127,7 @@ public void setValueWithOldSetting( String value, Map<String,String> rawConfigur
                 if ( value.equals( Settings.FALSE ) )
                 {
                     rawConfiguration.putIfAbsent( GraphDatabaseSettings.default_schema_provider.name(),
-                            GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName() );
+                            GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier() );
                 }
             }
         } );

community/kernel/src/main/java/org/neo4j/kernel/impl/index/schema/GenericNativeIndexProviderFactory.java

@@ -88,7 +88,7 @@ public static GenericNativeIndexProvider create( PageCache pageCache, File store
     {
         String selectedSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider );
         int priority = PRIORITY;
-        if ( GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10.providerName().equals( selectedSchemaProvider ) )
+        if ( GraphDatabaseSettings.SchemaIndex.NATIVE_GBPTREE10.providerIdentifier().equals( selectedSchemaProvider ) )
         {
             priority = 100;
         }

community/kernel/src/test/java/org/neo4j/kernel/configuration/TestGraphDatabaseConfigurationMigrator.java

@@ -172,28 +172,28 @@ public void migrateEnableNativeSchemaIndex()
     {
         Map<String,String> migratedProperties = migrator.apply( stringMap( "unsupported.dbms.enable_native_schema_index", "false" ), getLog() );
         assertEquals( "Old property should be migrated to new",
-                migratedProperties, stringMap( "dbms.index.default_schema_provider", LUCENE10.providerName() ));
+                migratedProperties, stringMap( "dbms.index.default_schema_provider", LUCENE10.providerIdentifier() ));
 
         assertContainsWarningMessage("unsupported.dbms.enable_native_schema_index has been replaced with dbms.index.default_schema_provider.");
     }
 
     @Test
     public void skipMigrationOfEnableNativeSchemaIndexIfNotPresent()
     {
-        Map<String,String> migratedProperties = migrator.apply( stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ), getLog() );
-        assertEquals( "Nothing to migrate", migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ) );
+        Map<String,String> migratedProperties = migrator.apply( stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ), getLog() );
+        assertEquals( "Nothing to migrate", migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ) );
         logProvider.assertNoLoggingOccurred();
     }
 
     @Test
     public void skipMigrationOfEnableNativeSchemaIndexIfDefaultSchemaIndexConfigured()
     {
         Map<String,String> migratedProperties = migrator.apply( stringMap(
-                "dbms.index.default_schema_provider", NATIVE10.providerName(),
+                "dbms.index.default_schema_provider", NATIVE10.providerIdentifier(),
                 "unsupported.dbms.enable_native_schema_index", "false"
                 ), getLog() );
         assertEquals( "Should keep pre configured default schema index.",
-                migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerName() ) );
+                migratedProperties, stringMap( "dbms.index.default_schema_provider", NATIVE10.providerIdentifier() ) );
         assertContainsWarningMessage();
     }
 

community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/LuceneIndexProviderFactory.java

@@ -108,7 +108,7 @@ public static FusionIndexProvider newInstance( PageCache pageCache, File databas
 
         String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider );
         int priority = LuceneIndexProvider.PRIORITY;
-        if ( GraphDatabaseSettings.SchemaIndex.LUCENE10.providerName().equals( defaultSchemaProvider ) )
+        if ( GraphDatabaseSettings.SchemaIndex.LUCENE10.providerIdentifier().equals( defaultSchemaProvider ) )
         {
             priority = 100;
         }

community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory10.java

@@ -89,7 +89,7 @@ public static FusionIndexProvider create( PageCache pageCache, File databaseDire
 
         String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider );
         int priority = PRIORITY;
-        if ( GraphDatabaseSettings.SchemaIndex.NATIVE10.providerName().equals( defaultSchemaProvider ) )
+        if ( GraphDatabaseSettings.SchemaIndex.NATIVE10.providerIdentifier().equals( defaultSchemaProvider ) )
         {
             priority = 100;
         }

community/lucene-index/src/main/java/org/neo4j/kernel/api/impl/schema/NativeLuceneFusionIndexProviderFactory20.java

@@ -91,7 +91,7 @@ public static FusionIndexProvider create( PageCache pageCache, File databaseDire
 
         String defaultSchemaProvider = config.get( GraphDatabaseSettings.default_schema_provider );
         int priority = PRIORITY;
-        if ( GraphDatabaseSettings.SchemaIndex.NATIVE20.providerName().equals( defaultSchemaProvider ) )
+        if ( GraphDatabaseSettings.SchemaIndex.NATIVE20.providerIdentifier().equals( defaultSchemaProvider ) )
         {
             priority = 100;
         }