Rename SchemaIndexProvider to IndexProvider.

community/consistency-check/src/main/java/org/neo4j/consistency/ConsistencyCheckService.java

@@ -65,7 +65,7 @@
 
 import static java.lang.String.format;
 import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.instantiateKernelExtensions;
-import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadSchemaIndexProviders;
+import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadIndexProviders;
 import static org.neo4j.io.file.Files.createOrOpenAsOuputStream;
 import static org.neo4j.kernel.configuration.Settings.TRUE;
 import static org.neo4j.kernel.impl.factory.DatabaseInfo.COMMUNITY;
@@ -239,7 +239,7 @@ fileSystem, config, new SimpleLogService( logProvider, logProvider ), pageCache,
         {
             life.start();
 
-            SchemaIndexProviderMap indexes = loadSchemaIndexProviders( extensions );
+            SchemaIndexProviderMap indexes = loadIndexProviders( extensions );
 
             LabelScanStore labelScanStore =
                     new NativeLabelScanStore( pageCache, storeDir, FullStoreChangeStream.EMPTY, true, monitors,

community/consistency-check/src/main/java/org/neo4j/consistency/checking/index/IndexAccessors.java

@@ -30,7 +30,7 @@
 
 import org.neo4j.internal.kernel.api.InternalIndexState;
 import org.neo4j.kernel.api.index.IndexAccessor;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.impl.api.index.SchemaIndexProviderMap;
 import org.neo4j.kernel.impl.api.index.sampling.IndexSamplingConfig;
 import org.neo4j.kernel.impl.store.RecordStore;
@@ -88,7 +88,7 @@ public IndexAccessors( SchemaIndexProviderMap providers,
         }
     }
 
-    private SchemaIndexProvider provider( SchemaIndexProviderMap providers, IndexRule indexRule )
+    private IndexProvider provider( SchemaIndexProviderMap providers, IndexRule indexRule )
     {
         return providers.apply( indexRule.getProviderDescriptor() );
     }

community/consistency-check/src/main/java/org/neo4j/consistency/internal/SchemaIndexExtensionLoader.java

@@ -25,7 +25,7 @@
 import org.neo4j.index.internal.gbptree.RecoveryCleanupWorkCollector;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.io.pagecache.PageCache;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
 import org.neo4j.kernel.extension.KernelExtensions;
@@ -41,15 +41,15 @@
 import org.neo4j.kernel.monitoring.Monitors;
 
 /**
- * Utility for loading {@link SchemaIndexProvider} instances from {@link KernelExtensions}.
+ * Utility for loading {@link IndexProvider} instances from {@link KernelExtensions}.
  */
 public class SchemaIndexExtensionLoader
 {
-    public static SchemaIndexProviderMap loadSchemaIndexProviders( KernelExtensions extensions )
+    public static SchemaIndexProviderMap loadIndexProviders( KernelExtensions extensions )
     {
-        AllByPrioritySelectionStrategy<SchemaIndexProvider> indexProviderSelection = new AllByPrioritySelectionStrategy<>();
-        SchemaIndexProvider defaultIndexProvider =
-                extensions.resolveDependency( SchemaIndexProvider.class, indexProviderSelection );
+        AllByPrioritySelectionStrategy<IndexProvider> indexProviderSelection = new AllByPrioritySelectionStrategy<>();
+        IndexProvider defaultIndexProvider =
+                extensions.resolveDependency( IndexProvider.class, indexProviderSelection );
         return new DefaultSchemaIndexProviderMap( defaultIndexProvider,
                 indexProviderSelection.lowerPrioritizedCandidates() );
     }

community/consistency-check/src/test/java/org/neo4j/consistency/checking/GraphStoreFixture.java

@@ -93,7 +93,7 @@
 import static java.lang.System.currentTimeMillis;
 import static org.neo4j.consistency.ConsistencyCheckService.defaultConsistencyCheckThreadsNumber;
 import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.instantiateKernelExtensions;
-import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadSchemaIndexProviders;
+import static org.neo4j.consistency.internal.SchemaIndexExtensionLoader.loadIndexProviders;
 
 public abstract class GraphStoreFixture extends ConfigurablePageCacheRule implements TestRule
 {
@@ -217,7 +217,7 @@ private SchemaIndexProviderMap createIndexes( PageCache pageCache, FileSystemAbs
         LogService logService = new SimpleLogService( logProvider, logProvider );
         KernelExtensions extensions = life.add( instantiateKernelExtensions( storeDir, fileSystem, config, logService,
                 pageCache, RecoveryCleanupWorkCollector.IGNORE, DatabaseInfo.COMMUNITY, monitors ) );
-        return loadSchemaIndexProviders( extensions );
+        return loadIndexProviders( extensions );
     }
 
     public File directory()

community/consistency-check/src/test/java/org/neo4j/consistency/checking/IndexConsistencyIT.java

@@ -39,7 +39,7 @@
 import org.neo4j.io.fs.DefaultFileSystemAbstraction;
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.configuration.Config;
-import org.neo4j.kernel.impl.index.schema.fusion.FusionSchemaIndexProvider;
+import org.neo4j.kernel.impl.index.schema.fusion.FusionIndexProvider;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.CheckPointer;
 import org.neo4j.kernel.impl.transaction.log.checkpoint.SimpleTriggerInfo;
 import org.neo4j.logging.AssertableLogProvider;
@@ -81,7 +81,7 @@ public void reportNotCleanNativeIndex() throws IOException, ConsistencyCheckInco
         someData();
         resolveComponent( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) );
         File indexesCopy = new File( storeDir, "indexesCopy" );
-        File indexSources = resolveComponent( FusionSchemaIndexProvider.class ).directoryStructure().rootDirectory();
+        File indexSources = resolveComponent( FusionIndexProvider.class ).directoryStructure().rootDirectory();
         copyRecursively( indexSources, indexesCopy, SOURCE_COPY_FILE_FILTER );
 
         try ( Transaction tx = db.beginTx() )
@@ -107,7 +107,7 @@ public void reportNotCleanNativeIndexWithCorrectData() throws IOException, Consi
         someData();
         resolveComponent( CheckPointer.class ).forceCheckPoint( new SimpleTriggerInfo( "forcedCheckpoint" ) );
         File indexesCopy = new File( storeDir, "indexesCopy" );
-        File indexSources = resolveComponent( FusionSchemaIndexProvider.class ).directoryStructure().rootDirectory();
+        File indexSources = resolveComponent( FusionIndexProvider.class ).directoryStructure().rootDirectory();
         copyRecursively( indexSources, indexesCopy, SOURCE_COPY_FILE_FILTER );
 
         db.shutdownAndKeepStore();

community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRecordCheckTest.java

@@ -25,7 +25,7 @@
 import org.neo4j.consistency.report.ConsistencyReport;
 import org.neo4j.consistency.store.RecordAccessStub;
 import org.neo4j.kernel.api.exceptions.schema.MalformedSchemaRuleException;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.impl.store.SchemaStorage;
 import org.neo4j.kernel.impl.store.record.ConstraintRule;
 import org.neo4j.kernel.impl.store.record.DynamicRecord;
@@ -87,7 +87,7 @@ public void shouldReportInvalidLabelReferences() throws Exception
         int schemaRuleId = 0;
 
         DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) );
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
         IndexRule rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor );
         when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule );
 
@@ -108,7 +108,7 @@ public void shouldReportInvalidPropertyReferenceFromIndexRule() throws Exception
         int schemaRuleId = 0;
 
         DynamicRecord record = inUse( dynamicRecord( schemaRuleId ) );
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
         IndexRule rule = indexRule( schemaRuleId, labelId, propertyKeyId, providerDescriptor );
         when( checker().ruleAccess.loadSingleSchemaRule( schemaRuleId ) ).thenReturn( rule );
 
@@ -155,7 +155,7 @@ public void shouldReportUniquenessConstraintNotReferencingBack() throws Exceptio
         DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) );
         DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 );
         ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId2 );
@@ -185,7 +185,7 @@ public void shouldNotReportConstraintIndexRuleWithoutBackReference() throws Exce
 
         DynamicRecord record = inUse( dynamicRecord( ruleId ) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor );
 
@@ -264,7 +264,7 @@ public void shouldReportConstraintIndexNotReferencingBack() throws Exception
         DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) );
         DynamicRecord record2 = inUse( dynamicRecord( ruleId2) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 );
         ConstraintRule rule2 = uniquenessConstraintRule( ruleId2, labelId, propertyKeyId, ruleId1 );
@@ -296,7 +296,7 @@ public void shouldReportTwoConstraintIndexesReferencingSameConstraint() throws E
         DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) );
         DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 );
         IndexRule rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 );
@@ -323,7 +323,7 @@ public void shouldReportUnreferencedConstraintIndex() throws Exception
 
         DynamicRecord record = inUse( dynamicRecord( ruleId ) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule = constraintIndexRule( ruleId, labelId, propertyKeyId, providerDescriptor, (long) ruleId );
 
@@ -351,7 +351,7 @@ public void shouldReportTwoIndexRulesWithDuplicateContent() throws Exception
         DynamicRecord record1 = inUse( dynamicRecord( ruleId1 ) );
         DynamicRecord record2 = inUse( dynamicRecord( ruleId2 ) );
 
-        SchemaIndexProvider.Descriptor providerDescriptor = new SchemaIndexProvider.Descriptor( "in-memory", "1.0" );
+        IndexProvider.Descriptor providerDescriptor = new IndexProvider.Descriptor( "in-memory", "1.0" );
 
         IndexRule rule1 = constraintIndexRule( ruleId1, labelId, propertyKeyId, providerDescriptor, (long) ruleId1 );
         IndexRule rule2 = constraintIndexRule( ruleId2, labelId, propertyKeyId, providerDescriptor, (long) ruleId2 );

community/consistency-check/src/test/java/org/neo4j/consistency/checking/SchemaRuleUtil.java

@@ -19,7 +19,7 @@
  */
 package org.neo4j.consistency.checking;
 
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory;
 import org.neo4j.kernel.impl.store.record.ConstraintRule;
@@ -49,21 +49,21 @@ public static ConstraintRule relPropertyExistenceConstraintRule( long ruleId, in
                 ConstraintDescriptorFactory.existsForRelType( labelId, propertyId ) );
     }
 
-    public static IndexRule indexRule( long ruleId, int labelId, int propertyId, SchemaIndexProvider.Descriptor
+    public static IndexRule indexRule( long ruleId, int labelId, int propertyId, IndexProvider.Descriptor
             descriptor )
     {
         return IndexRule.indexRule( ruleId, IndexDescriptorFactory.forLabel( labelId, propertyId ), descriptor );
     }
 
     public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId,
-            SchemaIndexProvider.Descriptor descriptor, long constraintId )
+                                                 IndexProvider.Descriptor descriptor, long constraintId )
     {
         return IndexRule.constraintIndexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ),
                 descriptor, constraintId );
     }
 
     public static IndexRule constraintIndexRule( long ruleId, int labelId, int propertyId,
-            SchemaIndexProvider.Descriptor descriptor )
+            IndexProvider.Descriptor descriptor )
     {
         return IndexRule.indexRule( ruleId, IndexDescriptorFactory.uniqueForLabel( labelId, propertyId ),
                 descriptor );

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -69,7 +69,7 @@
 import org.neo4j.kernel.api.index.IndexEntryUpdate;
 import org.neo4j.kernel.api.index.IndexPopulator;
 import org.neo4j.kernel.api.index.IndexUpdater;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
 import org.neo4j.kernel.api.labelscan.LabelScanWriter;
 import org.neo4j.kernel.api.labelscan.NodeLabelUpdate;
@@ -154,7 +154,7 @@
 
 public class FullCheckIntegrationTest
 {
-    private static final SchemaIndexProvider.Descriptor DESCRIPTOR = new SchemaIndexProvider.Descriptor( "lucene", "1.0" );
+    private static final IndexProvider.Descriptor DESCRIPTOR = new IndexProvider.Descriptor( "lucene", "1.0" );
     private static final String PROP1 = "key1";
     private static final String PROP2 = "key2";
     private static final Object VALUE1 = "value1";

community/consistency-check/src/test/java/org/neo4j/consistency/report/ConsistencyReporterTest.java

@@ -53,7 +53,7 @@
 import org.neo4j.consistency.store.synthetic.IndexEntry;
 import org.neo4j.consistency.store.synthetic.LabelScanDocument;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.api.labelscan.NodeLabelRange;
 import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory;
 import org.neo4j.kernel.impl.store.record.AbstractBaseRecord;
@@ -390,7 +390,7 @@ private Object parameter( Class<?> type )
             if ( type == IndexRule.class )
             {
                 return IndexRule.indexRule( 1, IndexDescriptorFactory.forLabel( 2, 3 ),
-                        new SchemaIndexProvider.Descriptor( "provider", "version" ) );
+                        new IndexProvider.Descriptor( "provider", "version" ) );
             }
             if ( type == SchemaRule.class )
             {

community/jmx/src/test/java/org/neo4j/jmx/impl/StoreSizeBeanTest.java

@@ -36,8 +36,8 @@
 import org.neo4j.jmx.StoreSize;
 import org.neo4j.kernel.NeoStoreDataSource;
 import org.neo4j.kernel.api.index.IndexDirectoryStructure;
-import org.neo4j.kernel.api.index.SchemaIndexProvider;
-import org.neo4j.kernel.api.index.SchemaIndexProvider.Descriptor;
+import org.neo4j.kernel.api.index.IndexProvider;
+import org.neo4j.kernel.api.index.IndexProvider.Descriptor;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.ExplicitIndexProviderLookup;
@@ -82,8 +82,8 @@ public class StoreSizeBeanTest
     private final File storeDir = new File( "" );
     private final LogFiles logFiles = LogFilesBuilder.logFilesBasedOnlyBuilder( storeDir, fs ).build();
     private final ExplicitIndexProviderLookup explicitIndexProviderLookup = mock( ExplicitIndexProviderLookup.class );
-    private final SchemaIndexProvider schemaIndexProvider = mockedSchemaIndexProvider( "providah1" );
-    private final SchemaIndexProvider schemaIndexProvider2 = mockedSchemaIndexProvider( "providah" );
+    private final IndexProvider indexProvider = mockedIndexProvider( "providah1" );
+    private final IndexProvider indexProvider2 = mockedIndexProvider( "providah" );
     private final LabelScanStore labelScanStore = mock( LabelScanStore.class );
     private StoreSize storeSizeBean;
     private File storeDirAbsolute;
@@ -98,8 +98,8 @@ public void setUp()
         DataSourceManager dataSourceManager = new DataSourceManager();
         GraphDatabaseAPI db = mock( GraphDatabaseAPI.class );
         NeoStoreDataSource dataSource = mock( NeoStoreDataSource.class );
-        SchemaIndexProviderMap schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( schemaIndexProvider,
-                Collections.singleton( schemaIndexProvider2 ) );
+        SchemaIndexProviderMap schemaIndexProviderMap = new DefaultSchemaIndexProviderMap( indexProvider,
+                Collections.singleton( indexProvider2 ) );
 
         // Setup all dependencies
         Dependencies dependencies = new Dependencies();
@@ -122,9 +122,9 @@ public void setUp()
         storeSizeBean = (StoreSize) new StoreSizeBean().createMBean( data );
     }
 
-    private SchemaIndexProvider mockedSchemaIndexProvider( String name )
+    private IndexProvider mockedIndexProvider( String name )
     {
-        SchemaIndexProvider provider = mock( SchemaIndexProvider.class );
+        IndexProvider provider = mock( IndexProvider.class );
         when( provider.getProviderDescriptor() ).thenReturn( new Descriptor( name, "1" ) );
         return provider;
     }
@@ -261,14 +261,14 @@ public void shouldCountAllIndexFiles() throws Exception
             createFileOfSize( schemaIndex, 2 );
             IndexDirectoryStructure directoryStructure = mock( IndexDirectoryStructure.class );
             when( directoryStructure.rootDirectory() ).thenReturn( schemaIndex );
-            when( schemaIndexProvider.directoryStructure() ).thenReturn( directoryStructure );
+            when( indexProvider.directoryStructure() ).thenReturn( directoryStructure );
         }
         {
             File schemaIndex = new File( storeDir, "schemaIndex2" );
             createFileOfSize( schemaIndex, 3 );
             IndexDirectoryStructure directoryStructure = mock( IndexDirectoryStructure.class );
             when( directoryStructure.rootDirectory() ).thenReturn( schemaIndex );
-            when( schemaIndexProvider2.directoryStructure() ).thenReturn( directoryStructure );
+            when( indexProvider2.directoryStructure() ).thenReturn( directoryStructure );
         }
 
         // Label scan store