Rename PropertyAccessor to NodePropertyAccessor

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

@@ -109,8 +109,8 @@ public void shouldEnforceUniqueConstraintsDirectly() throws Exception
                         IndexEntryUpdate.add( nodeId2, descriptor.schema(), value1, value2 ) ) );
                 try
                 {
-                    NodePropertyAccessor propertyAccessor =
-                            new NodePropertyAccessor( nodeId1, descriptor.schema(), value1, value2 );
+                    TestNodePropertyAccessor propertyAccessor =
+                            new TestNodePropertyAccessor( nodeId1, descriptor.schema(), value1, value2 );
                     propertyAccessor.addNode( nodeId2, descriptor.schema(), value1, value2 );
                     p.verifyDeferredConstraints( propertyAccessor );
 
@@ -138,8 +138,8 @@ public void shouldNotRestrictUpdatesDifferingOnSecondProperty() throws Exception
                         IndexEntryUpdate.add( nodeId1, descriptor.schema(), value1, value2 ),
                         IndexEntryUpdate.add( nodeId2, descriptor.schema(), value1, value3 ) ) );
 
-                NodePropertyAccessor propertyAccessor =
-                        new NodePropertyAccessor( nodeId1, descriptor.schema(), value1, value2 );
+                TestNodePropertyAccessor propertyAccessor =
+                        new TestNodePropertyAccessor( nodeId1, descriptor.schema(), value1, value2 );
                 propertyAccessor.addNode( nodeId2, descriptor.schema(), value1, value3 );
 
                 // then this should pass fine

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

@@ -299,8 +299,8 @@ public void shouldProvidePopulatorThatEnforcesUniqueConstraints() throws Excepti
                     p.add( Arrays.asList(
                             add( nodeId1, descriptor.schema(), value ),
                             add( nodeId2, descriptor.schema(), value ) ) );
-                    NodePropertyAccessor propertyAccessor =
-                            new NodePropertyAccessor( nodeId1, descriptor.schema(), value );
+                    TestNodePropertyAccessor propertyAccessor =
+                            new TestNodePropertyAccessor( nodeId1, descriptor.schema(), value );
                     propertyAccessor.addNode( nodeId2, descriptor.schema(), value );
                     p.verifyDeferredConstraints( propertyAccessor );
 

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

@@ -45,7 +45,7 @@
 import org.neo4j.kernel.api.index.IndexPopulator;
 import org.neo4j.kernel.api.index.IndexProvider;
 import org.neo4j.kernel.api.index.IndexUpdater;
-import org.neo4j.kernel.api.index.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
 import org.neo4j.kernel.extension.KernelExtensionFactory;
@@ -214,12 +214,12 @@ public void add( Collection<? extends IndexEntryUpdate<?>> updates )
         }
 
         @Override
-        public void verifyDeferredConstraints( PropertyAccessor propertyAccessor )
+        public void verifyDeferredConstraints( NodePropertyAccessor nodePropertyAccessor )
         {
         }
 
         @Override
-        public IndexUpdater newPopulatingUpdater( PropertyAccessor propertyAccessor )
+        public IndexUpdater newPopulatingUpdater( NodePropertyAccessor nodePropertyAccessor )
         {
             return newUpdater( IndexUpdateMode.ONLINE );
         }

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

@@ -44,7 +44,7 @@
 import org.neo4j.internal.kernel.api.exceptions.KernelException;
 import org.neo4j.internal.kernel.api.exceptions.schema.SchemaKernelException;
 import org.neo4j.internal.kernel.api.schema.LabelSchemaDescriptor;
-import org.neo4j.kernel.api.index.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
 import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
@@ -179,7 +179,7 @@ public void rollBackIndexRuleShouldNotBeCommitted() throws Exception
     public void shouldBeAbleToRemoveAConstraintIndexWithoutOwner() throws Exception
     {
         // given
-        PropertyAccessor propertyAccessor = mock( PropertyAccessor.class );
+        NodePropertyAccessor propertyAccessor = mock( NodePropertyAccessor.class );
         AssertableLogProvider logProvider = new AssertableLogProvider();
         ConstraintIndexCreator creator = new ConstraintIndexCreator( () -> kernel, indexingService, propertyAccessor, logProvider );
 

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

@@ -52,7 +52,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.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.api.labelscan.NodeLabelUpdate;
 import org.neo4j.kernel.api.schema.RelationTypeSchemaDescriptor;
 import org.neo4j.kernel.api.schema.SchemaDescriptorFactory;
@@ -567,7 +567,7 @@ void add( IndexEntryUpdate<?> update )
         }
 
         @Override
-        public IndexUpdater newPopulatingUpdater( PropertyAccessor propertyAccessor )
+        public IndexUpdater newPopulatingUpdater( NodePropertyAccessor nodePropertyAccessor )
         {
             return new IndexUpdater()
             {
@@ -638,7 +638,7 @@ void add( IndexEntryUpdate<?> update )
         }
 
         @Override
-        public IndexUpdater newPopulatingUpdater( PropertyAccessor propertyAccessor )
+        public IndexUpdater newPopulatingUpdater( NodePropertyAccessor nodePropertyAccessor )
         {
             return new IndexUpdater()
             {

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

@@ -64,7 +64,7 @@
 import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException;
 import org.neo4j.kernel.api.index.IndexPopulator;
 import org.neo4j.kernel.api.index.IndexProvider;
-import org.neo4j.kernel.api.index.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
@@ -931,7 +931,7 @@ public void shouldRunIndexPopulationJobAtShutdown() throws Throwable
         verify( populator ).create();
         verify( populator ).add( argThat( matchesCollection( add( nodeId, internalIndex.schema(),
                 Values.of( "Jakewins" ) ) ) ) );
-        verify( populator ).verifyDeferredConstraints( any( PropertyAccessor.class ) );
+        verify( populator ).verifyDeferredConstraints( any( NodePropertyAccessor.class ) );
         verify( populator ).close( true );
         verify( provider ).stop();
         verify( provider ).shutdown();
@@ -965,7 +965,7 @@ public void shouldRunConstraintPopulationJobAtShutdown() throws Throwable
         verify( provider ).getPopulator( any( StoreIndexDescriptor.class ), any( IndexSamplingConfig.class ) );
         verify( populator ).create();
         verify( populator ).add( argThat( matchesCollection( add( nodeId, internalUniqueIndex.schema(), Values.of( "Jakewins" ) ) ) ) );
-        verify( populator ).verifyDeferredConstraints( any( PropertyAccessor.class ) );
+        verify( populator ).verifyDeferredConstraints( any( NodePropertyAccessor.class ) );
         verify( populator ).close( true );
         verify( provider ).stop();
         verify( provider ).shutdown();
@@ -1001,7 +1001,7 @@ public void shouldRepopulatePreexistingIndexed() throws Throwable
         verify( populator ).add( argThat( matchesCollection(
                 add( jakewins, internalIndex.schema(), Values.of( "Jakewins" ) ),
                 add( boggle, internalIndex.schema(), Values.of( "b0ggl3" ) ) ) ) );
-        verify( populator ).verifyDeferredConstraints( any( PropertyAccessor.class ) );
+        verify( populator ).verifyDeferredConstraints( any( NodePropertyAccessor.class ) );
         verify( populator ).close( true );
         verify( provider ).stop();
         verify( provider ).shutdown();

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/ConsistencyCheckTasks.java

@@ -42,13 +42,13 @@
 import org.neo4j.helpers.collection.BoundedIterable;
 import org.neo4j.helpers.progress.ProgressMonitorFactory;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
+import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
 import org.neo4j.kernel.impl.index.labelscan.NativeLabelScanStore;
 import org.neo4j.kernel.impl.store.RecordStore;
 import org.neo4j.kernel.impl.store.Scanner;
 import org.neo4j.kernel.impl.store.SchemaStorage;
 import org.neo4j.kernel.impl.store.StoreAccess;
 import org.neo4j.kernel.impl.store.record.AbstractBaseRecord;
-import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
 
 import static java.lang.String.format;
 import static org.neo4j.consistency.checking.full.MultiPassStore.ARRAYS;
@@ -138,7 +138,7 @@ public List<ConsistencyCheckerTask> createTasksForFullCheck( boolean checkLabelS
             tasks.add( create( "RelationshipGroupStore-RelGrp", nativeStores.getRelationshipGroupStore(),
                     relGrpProcessor, ROUND_ROBIN ) );
 
-            PropertyReader propertyReader = new PropertyReader( nativeStores );
+            NodePropertyReader propertyReader = new NodePropertyReader( nativeStores );
             tasks.add( recordScanner( CheckStage.Stage8_PS_Props.name(),
                     new IterableStore<>( nativeStores.getNodeStore(), true ),
                     new PropertyAndNode2LabelIndexProcessor( reporter, checkIndexes ? indexes : null,

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyReader.java → community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/NodePropertyReader.java

@@ -24,7 +24,7 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.neo4j.kernel.api.index.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.impl.store.NodeStore;
 import org.neo4j.kernel.impl.store.PropertyStore;
 import org.neo4j.kernel.impl.store.StoreAccess;
@@ -37,12 +37,12 @@
 
 import static org.neo4j.kernel.impl.store.record.RecordLoad.FORCE;
 
-public class PropertyReader implements PropertyAccessor
+public class NodePropertyReader implements NodePropertyAccessor
 {
     private final PropertyStore propertyStore;
     private final NodeStore nodeStore;
 
-    public PropertyReader( StoreAccess storeAccess )
+    public NodePropertyReader( StoreAccess storeAccess )
     {
         this.propertyStore = storeAccess.getRawNeoStores().getPropertyStore();
         this.nodeStore = storeAccess.getRawNeoStores().getNodeStore();

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNode2LabelIndexProcessor.java

@@ -46,7 +46,7 @@ public class PropertyAndNode2LabelIndexProcessor extends RecordProcessor.Adapter
 
     public PropertyAndNode2LabelIndexProcessor( ConsistencyReporter reporter,
             IndexAccessors indexes,
-            PropertyReader propertyReader,
+            NodePropertyReader propertyReader,
             CacheAccess cacheAccess,
             Function<NodeRecord,MandatoryProperties.Check<NodeRecord,ConsistencyReport.NodeConsistencyReport>> mandatoryProperties )
     {

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java

@@ -41,8 +41,8 @@
 import org.neo4j.internal.kernel.api.IndexQuery;
 import org.neo4j.internal.kernel.api.schema.SchemaDescriptor;
 import org.neo4j.kernel.api.exceptions.index.IndexNotApplicableKernelException;
-import org.neo4j.kernel.impl.api.LookupFilter;
 import org.neo4j.kernel.api.schema.index.StoreIndexDescriptor;
+import org.neo4j.kernel.impl.api.LookupFilter;
 import org.neo4j.kernel.impl.store.record.NodeRecord;
 import org.neo4j.kernel.impl.store.record.PropertyBlock;
 import org.neo4j.kernel.impl.store.record.PropertyRecord;
@@ -59,10 +59,10 @@
 public class PropertyAndNodeIndexedCheck implements RecordCheck<NodeRecord, ConsistencyReport.NodeConsistencyReport>
 {
     private final IndexAccessors indexes;
-    private final PropertyReader propertyReader;
+    private final NodePropertyReader propertyReader;
     private final CacheAccess cacheAccess;
 
-    public PropertyAndNodeIndexedCheck( IndexAccessors indexes, PropertyReader propertyReader, CacheAccess cacheAccess )
+    public PropertyAndNodeIndexedCheck( IndexAccessors indexes, NodePropertyReader propertyReader, CacheAccess cacheAccess )
     {
         this.indexes = indexes;
         this.propertyReader = propertyReader;

community/kernel/src/main/java/org/neo4j/kernel/NeoStoreDataSource.java

@@ -43,7 +43,7 @@
 import org.neo4j.kernel.api.InwardKernel;
 import org.neo4j.kernel.api.explicitindex.AutoIndexing;
 import org.neo4j.kernel.api.index.IndexProvider;
-import org.neo4j.kernel.api.index.PropertyAccessor;
+import org.neo4j.kernel.api.index.NodePropertyAccessor;
 import org.neo4j.kernel.api.labelscan.LabelScanStore;
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.extension.dependency.AllByPrioritySelectionStrategy;
@@ -443,7 +443,7 @@ public void start() throws IOException
             );
 
             // At the time of writing this comes from the storage engine (IndexStoreView)
-            PropertyAccessor propertyAccessor = dependencies.resolveDependency( PropertyAccessor.class );
+            NodePropertyAccessor nodePropertyAccessor = dependencies.resolveDependency( NodePropertyAccessor.class );
 
             final NeoStoreKernelModule kernelModule = buildKernel(
                     logFiles,
@@ -455,8 +455,7 @@ public void start() throws IOException
                     indexConfigStore,
                     transactionIdStore,
                     availabilityGuard,
-                    clock,
-                    propertyAccessor );
+                    clock, nodePropertyAccessor );
 
             kernelModule.satisfyDependencies( dependencies );
 
@@ -632,7 +631,7 @@ private void buildRecovery(
     private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender appender,
             IndexingService indexingService, DatabaseSchemaState databaseSchemaState, LabelScanStore labelScanStore,
             StorageEngine storageEngine, IndexConfigStore indexConfigStore, TransactionIdStore transactionIdStore,
-            AvailabilityGuard availabilityGuard, SystemNanoClock clock, PropertyAccessor propertyAccessor )
+            AvailabilityGuard availabilityGuard, SystemNanoClock clock, NodePropertyAccessor nodePropertyAccessor )
     {
         AtomicReference<CpuClock> cpuClockRef = setupCpuClockAtomicReference();
         AtomicReference<HeapAllocation> heapAllocationRef = setupHeapAllocationAtomicReference();
@@ -646,7 +645,7 @@ private NeoStoreKernelModule buildKernel( LogFiles logFiles, TransactionAppender
          */
         Supplier<Kernel> kernelProvider = () -> kernelModule.kernelAPI();
 
-        ConstraintIndexCreator constraintIndexCreator = new ConstraintIndexCreator( kernelProvider, indexingService, propertyAccessor, logProvider );
+        ConstraintIndexCreator constraintIndexCreator = new ConstraintIndexCreator( kernelProvider, indexingService, nodePropertyAccessor, logProvider );
 
         ExplicitIndexStore explicitIndexStore = new ExplicitIndexStore( config,
                 indexConfigStore, kernelProvider, explicitIndexProviderLookup );

community/kernel/src/main/java/org/neo4j/kernel/api/index/IndexAccessor.java

@@ -30,7 +30,6 @@
 import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException;
 import org.neo4j.kernel.impl.api.index.IndexUpdateMode;
 import org.neo4j.kernel.impl.api.index.updater.SwallowingIndexUpdater;
-import org.neo4j.kernel.impl.util.Validator;
 import org.neo4j.storageengine.api.schema.IndexReader;
 import org.neo4j.values.storable.Value;
 
@@ -110,12 +109,12 @@ public interface IndexAccessor extends Closeable
      * Verifies that each value in this index is unique.
      * Index is guaranteed to not change while this call executes.
      *
-     * @param propertyAccessor {@link PropertyAccessor} for accessing properties from database storage
+     * @param nodePropertyAccessor {@link NodePropertyAccessor} for accessing properties from database storage
      * in the event of conflicting values.
      * @throws IndexEntryConflictException for first detected uniqueness conflict, if any.
      * @throws IOException on error reading from source files.
      */
-    void verifyDeferredConstraints( PropertyAccessor propertyAccessor ) throws IndexEntryConflictException, IOException;
+    void verifyDeferredConstraints( NodePropertyAccessor nodePropertyAccessor ) throws IndexEntryConflictException, IOException;
 
     /**
      * @return true if index was not shutdown properly and its internal state is dirty, false otherwise
@@ -195,7 +194,7 @@ public ResourceIterator<File> snapshotFiles()
         }
 
         @Override
-        public void verifyDeferredConstraints( PropertyAccessor propertyAccessor )
+        public void verifyDeferredConstraints( NodePropertyAccessor nodePropertyAccessor )
         {
         }
 
@@ -270,10 +269,10 @@ public String toString()
         }
 
         @Override
-        public void verifyDeferredConstraints( PropertyAccessor propertyAccessor )
+        public void verifyDeferredConstraints( NodePropertyAccessor nodePropertyAccessor )
                 throws IndexEntryConflictException, IOException
         {
-            delegate.verifyDeferredConstraints( propertyAccessor );
+            delegate.verifyDeferredConstraints( nodePropertyAccessor );
         }
 
         @Override