Removed NeoStoreInjectedTransactionValidator

This class was just a thin unnecessary wrapper around IntegrityValidator.
Injection of commands into transaction was a JTA concept that is no longer
relevant.

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

@@ -153,7 +153,6 @@
 import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 import org.neo4j.kernel.impl.transaction.state.NeoStoreFileListing;
 import org.neo4j.kernel.impl.transaction.state.NeoStoreIndexStoreView;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
 import org.neo4j.kernel.impl.transaction.state.NeoStoreTransactionContextFactory;
 import org.neo4j.kernel.impl.transaction.state.NeoStoresSupplier;
 import org.neo4j.kernel.impl.transaction.state.PropertyLoader;
@@ -1042,9 +1041,8 @@ private KernelModule buildKernel( IntegrityValidator integrityValidator, Transac
             UpdateableSchemaState updateableSchemaState, LabelScanStore labelScanStore,
             SchemaIndexProviderMap schemaIndexProviderMap, ProcedureCache procedureCache )
     {
-        NeoStoreInjectedTransactionValidator validator = new NeoStoreInjectedTransactionValidator( integrityValidator );
         TransactionCommitProcess transactionCommitProcess = commitProcessFactory.create( appender, storeApplier,
-                validator, indexUpdatesValidator, config );
+                integrityValidator, indexUpdatesValidator, config );
 
         /*
          * This is used by legacy indexes and constraint indexes whenever a transaction is to be spawned

community/kernel/src/main/java/org/neo4j/kernel/impl/api/CommitProcessFactory.java

@@ -22,11 +22,10 @@
 import org.neo4j.kernel.configuration.Config;
 import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator;
 import org.neo4j.kernel.impl.transaction.log.TransactionAppender;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 public interface CommitProcessFactory
 {
     TransactionCommitProcess create( TransactionAppender appender, TransactionRepresentationStoreApplier storeApplier,
-            NeoStoreInjectedTransactionValidator txValidator, IndexUpdatesValidator indexUpdatesValidator,
-            Config config );
+            IntegrityValidator integrityValidator, IndexUpdatesValidator indexUpdatesValidator, Config config );
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactory.java

@@ -28,13 +28,13 @@
 import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier;
 import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator;
 import org.neo4j.kernel.impl.transaction.log.TransactionAppender;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 public class CommunityCommitProcessFactory implements CommitProcessFactory
 {
     @Override
     public TransactionCommitProcess create( TransactionAppender appender,
-            TransactionRepresentationStoreApplier storeApplier, NeoStoreInjectedTransactionValidator txValidator,
+            TransactionRepresentationStoreApplier storeApplier, IntegrityValidator integrityValidator,
             IndexUpdatesValidator indexUpdatesValidator, Config config )
     {
         if ( config.get( GraphDatabaseSettings.read_only ) )

community/kernel/src/test/java/org/neo4j/kernel/impl/factory/CommunityCommitProcessFactoryTest.java

@@ -29,7 +29,7 @@
 import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier;
 import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator;
 import org.neo4j.kernel.impl.transaction.log.TransactionAppender;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertThat;
@@ -46,7 +46,7 @@ public void createReadOnlyCommitProcess()
         Config config = new Config( stringMap( GraphDatabaseSettings.read_only.name(), "true" ) );
 
         TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ),
-                mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ),
+                mock( TransactionRepresentationStoreApplier.class ), mock( IntegrityValidator.class ),
                 mock( IndexUpdatesValidator.class ), config );
 
         assertThat( commitProcess, instanceOf( ReadOnlyTransactionCommitProcess.class ) );
@@ -58,7 +58,7 @@ public void createRegularCommitProcess()
         CommunityCommitProcessFactory factory = new CommunityCommitProcessFactory();
 
         TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ),
-                mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ),
+                mock( TransactionRepresentationStoreApplier.class ), mock( IntegrityValidator.class ),
                 mock( IndexUpdatesValidator.class ), new Config() );
 
         assertThat( commitProcess, instanceOf( TransactionRepresentationCommitProcess.class ) );

enterprise/ha/src/main/java/org/neo4j/kernel/ha/MasterTransactionCommitProcess.java

@@ -24,9 +24,9 @@
 import org.neo4j.kernel.impl.api.TransactionApplicationMode;
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
 import org.neo4j.kernel.impl.locking.LockGroup;
-import org.neo4j.kernel.impl.transaction.tracing.CommitEvent;
 import org.neo4j.kernel.impl.transaction.TransactionRepresentation;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
+import org.neo4j.kernel.impl.transaction.tracing.CommitEvent;
 
 /**
  * Commit process on the master side in HA, where transactions either comes in from slaves committing,
@@ -35,12 +35,12 @@
 public class MasterTransactionCommitProcess implements TransactionCommitProcess
 {
     private final TransactionPropagator pusher;
-    private final NeoStoreInjectedTransactionValidator validator;
+    private final IntegrityValidator validator;
     private final TransactionCommitProcess inner;
 
     public MasterTransactionCommitProcess( TransactionCommitProcess commitProcess,
                                            TransactionPropagator pusher,
-                                           NeoStoreInjectedTransactionValidator validator )
+                                           IntegrityValidator validator )
     {
         this.inner = commitProcess;
         this.pusher = pusher;
@@ -51,7 +51,7 @@ public MasterTransactionCommitProcess( TransactionCommitProcess commitProcess,
     public long commit( TransactionRepresentation representation, LockGroup locks, CommitEvent commitEvent,
                         TransactionApplicationMode mode ) throws TransactionFailureException
     {
-        validator.assertInjectionAllowed( representation.getLatestCommittedTxWhenStarted() );
+        validator.validateTransactionStartKnowledge( representation.getLatestCommittedTxWhenStarted() );
 
         long result = inner.commit( representation, locks, commitEvent, mode );
 

enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/modeswitch/CommitProcessSwitcher.java

@@ -26,7 +26,7 @@
 import org.neo4j.kernel.ha.com.master.Master;
 import org.neo4j.kernel.ha.transaction.TransactionPropagator;
 import org.neo4j.kernel.impl.api.TransactionCommitProcess;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 public class CommitProcessSwitcher extends AbstractComponentSwitcher<TransactionCommitProcess>
 {
@@ -35,10 +35,10 @@ public class CommitProcessSwitcher extends AbstractComponentSwitcher<Transaction
 
     public CommitProcessSwitcher( TransactionPropagator pusher, Master master,
             DelegateInvocationHandler<TransactionCommitProcess> delegate, RequestContextFactory requestContextFactory,
-            NeoStoreInjectedTransactionValidator validator, TransactionCommitProcess innerCommitProcess )
+            IntegrityValidator integrityValidator, TransactionCommitProcess innerCommitProcess )
     {
         super( delegate );
-        this.masterImpl = new MasterTransactionCommitProcess( innerCommitProcess, pusher, validator );
+        this.masterImpl = new MasterTransactionCommitProcess( innerCommitProcess, pusher, integrityValidator );
         this.slaveImpl = new SlaveTransactionCommitProcess( master, requestContextFactory );
     }
 

enterprise/ha/src/main/java/org/neo4j/kernel/ha/factory/HighlyAvailableCommitProcessFactory.java

@@ -34,7 +34,7 @@
 import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier;
 import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator;
 import org.neo4j.kernel.impl.transaction.log.TransactionAppender;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 import static java.lang.reflect.Proxy.newProxyInstance;
 
@@ -59,7 +59,7 @@ class HighlyAvailableCommitProcessFactory implements CommitProcessFactory
 
     @Override
     public TransactionCommitProcess create( TransactionAppender appender,
-            TransactionRepresentationStoreApplier storeApplier, NeoStoreInjectedTransactionValidator txValidator,
+            TransactionRepresentationStoreApplier storeApplier, IntegrityValidator integrityValidator,
             IndexUpdatesValidator indexUpdatesValidator, Config config )
     {
         if ( config.get( GraphDatabaseSettings.read_only ) )
@@ -71,7 +71,7 @@ public TransactionCommitProcess create( TransactionAppender appender,
                 indexUpdatesValidator );
 
         CommitProcessSwitcher commitProcessSwitcher = new CommitProcessSwitcher( transactionPropagator,
-                master, commitProcessDelegate, requestContextFactory, txValidator, commitProcess );
+                master, commitProcessDelegate, requestContextFactory, integrityValidator, commitProcess );
 
         componentSwitcherContainer.add( commitProcessSwitcher );
 

enterprise/ha/src/test/java/org/neo4j/kernel/ha/factory/HighlyAvailableCommitProcessFactoryTest.java

@@ -35,7 +35,7 @@
 import org.neo4j.kernel.impl.api.TransactionRepresentationStoreApplier;
 import org.neo4j.kernel.impl.api.index.IndexUpdatesValidator;
 import org.neo4j.kernel.impl.transaction.log.TransactionAppender;
-import org.neo4j.kernel.impl.transaction.state.NeoStoreInjectedTransactionValidator;
+import org.neo4j.kernel.impl.transaction.state.IntegrityValidator;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.not;
@@ -55,7 +55,7 @@ public void createReadOnlyCommitProcess()
         Config config = new Config( stringMap( GraphDatabaseSettings.read_only.name(), "true" ) );
 
         TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ),
-                mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ),
+                mock( TransactionRepresentationStoreApplier.class ), mock( IntegrityValidator.class ),
                 mock( IndexUpdatesValidator.class ), config );
 
         assertThat( commitProcess, instanceOf( ReadOnlyTransactionCommitProcess.class ) );
@@ -69,7 +69,7 @@ public void createRegularCommitProcess()
                 mock( RequestContextFactory.class ) );
 
         TransactionCommitProcess commitProcess = factory.create( mock( TransactionAppender.class ),
-                mock( TransactionRepresentationStoreApplier.class ), mock( NeoStoreInjectedTransactionValidator.class ),
+                mock( TransactionRepresentationStoreApplier.class ), mock( IntegrityValidator.class ),
                 mock( IndexUpdatesValidator.class ), new Config() );
 
         assertThat( commitProcess, not( instanceOf( ReadOnlyTransactionCommitProcess.class ) ) );