Feature toggles now static final, rename termination reason method

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

@@ -343,6 +343,11 @@ boolean applicable( DiagnosticsPhase phase )
 
     public static final String DEFAULT_DATA_SOURCE_NAME = "nioneodb";
 
+    private static final boolean takePropertyReadLocks = FeatureToggles.flag(
+            NeoStoreDataSource.class, "propertyReadLocks", false );
+    private static final boolean safeIdBuffering = FeatureToggles.flag(
+            NeoStoreDataSource.class, "safeIdBuffering", true );
+
     private final Monitors monitors;
     private final Tracers tracers;
 
@@ -534,7 +539,6 @@ public void transactionRecovered( long txId )
             LegacyIndexApplierLookup legacyIndexApplierLookup =
                     dependencies.satisfyDependency( new LegacyIndexApplierLookup.Direct( legacyIndexProviderLookup ) );
 
-            boolean safeIdBuffering = FeatureToggles.flag( getClass(), "safeIdBuffering", true );
             if ( safeIdBuffering )
             {
                 // This buffering id generator factory will have properly buffering id generators injected into
@@ -851,8 +855,7 @@ public StoreReadLayer storeLayer()
 
     private Factory<StoreStatement> storeStatementFactory( final NeoStores neoStores )
     {
-        final LockService lockService = FeatureToggles.flag( getClass(), "propertyReadLocks", false ) ?
-                this.lockService : NO_LOCK_SERVICE;
+        final LockService lockService = takePropertyReadLocks ? this.lockService : NO_LOCK_SERVICE;
         return new Factory<StoreStatement>()
         {
             @Override

community/kernel/src/main/java/org/neo4j/kernel/api/KernelTransaction.java

@@ -115,7 +115,7 @@ interface CloseListener
     /**
      * @return {@link Status} if {@link #markForTermination(Status)} has been invoked, otherwise {@code null}.
      */
-    Status terminationReason();
+    Status getReasonIfTerminated();
 
     /**
      * Marks this transaction for termination, such that it cannot commit successfully and will try to be

community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/Status.java

@@ -122,7 +122,7 @@ enum Transaction implements Status
                 " and so this transaction was rolled back although it may have looked like it was going to be " +
                 "committed" ),
         Outdated( TransientError, "Transaction has seen state which has been invalidated by applied updates while " +
-                "transaction was active. Transaction should succeed if retried." ),
+                "transaction was active. Transaction may succeed if retried." ),
         LockClientStopped( TransientError, "Lock client is stopped, no more locks can be acquired." ),
         Terminated( TransientError, "Explicitly terminated by the user." )
         ;

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

@@ -128,7 +128,7 @@ void assertOpen()
             throw new NotInTransactionException( "The statement has been closed." );
         }
 
-        Status terminationReason = transaction.terminationReason();
+        Status terminationReason = transaction.getReasonIfTerminated();
         if ( terminationReason != null )
         {
             throw new TransactionTerminatedException( terminationReason );

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

@@ -286,7 +286,7 @@ public void failure()
     }
 
     @Override
-    public Status terminationReason()
+    public Status getReasonIfTerminated()
     {
         return terminationReason;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/core/ThreadToStatementContextBridge.java

@@ -71,7 +71,7 @@ private void assertInUnterminatedTransaction( TopLevelTransaction transaction )
         {
             throw new NotInTransactionException();
         }
-        Status terminationReason = transaction.getTransaction().terminationReason();
+        Status terminationReason = transaction.getTransaction().getReasonIfTerminated();
         if ( terminationReason != null )
         {
             throw new TransactionTerminatedException( terminationReason );

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelStatementTest.java

@@ -70,7 +70,7 @@ public void shouldCloseOpenedLabelScanReader() throws Exception
     public void shouldThrowTerminateExceptionWhenTransactionTerminated() throws Exception
     {
         KernelTransactionImplementation transaction = mock( KernelTransactionImplementation.class );
-        when( transaction.terminationReason() ).thenReturn( Status.General.UnknownFailure );
+        when( transaction.getReasonIfTerminated() ).thenReturn( Status.General.UnknownFailure );
 
         KernelStatement statement = new KernelStatement(
             transaction, mock( IndexReaderFactory.class ),

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionImplementationTest.java

@@ -177,7 +177,7 @@ public void shouldRollbackOnClosingSuccessfulButTerminatedTransaction() throws E
         {
             // WHEN
             transaction.markForTermination( Status.General.UnknownFailure );
-            assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+            assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
         }
 
         // THEN
@@ -194,7 +194,7 @@ public void shouldRollbackOnClosingTerminatedButSuccessfulTransaction() throws E
         transaction.markForTermination( Status.General.UnknownFailure );
         transaction.success();
 
-        assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+        assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
 
         try
         {
@@ -220,7 +220,7 @@ public void shouldNotDowngradeFailureState() throws Exception
             // WHEN
             transaction.markForTermination( Status.General.UnknownFailure );
             transaction.failure();
-            assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+            assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
         }
 
         // THEN
@@ -434,7 +434,7 @@ public void markForTerminationNotInitializedTransaction()
 
         transaction.markForTermination( Status.General.UnknownFailure );
 
-        assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+        assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
     }
 
     @Test
@@ -448,7 +448,7 @@ public void markForTerminationInitializedTransaction()
 
         transaction.markForTermination( Status.General.UnknownFailure );
 
-        assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+        assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
         verify( client ).stop();
     }
 
@@ -465,7 +465,7 @@ public void markForTerminationTerminatedTransaction()
         transaction.markForTermination( Status.General.UnknownFailure );
         transaction.markForTermination( Status.General.UnknownFailure );
 
-        assertEquals( Status.General.UnknownFailure, transaction.terminationReason() );
+        assertEquals( Status.General.UnknownFailure, transaction.getReasonIfTerminated() );
         verify( client ).stop();
         verify( transactionMonitor ).transactionTerminated();
     }
@@ -572,7 +572,7 @@ public void txMarkedForBothSuccessAndFailureThrowsOnClose()
     public void initializedTransactionShouldHaveNoTerminationReason() throws Exception
     {
         KernelTransactionImplementation tx = newInitializedTransaction();
-        assertNull( tx.terminationReason() );
+        assertNull( tx.getReasonIfTerminated() );
     }
 
     @Test
@@ -581,7 +581,7 @@ public void shouldReportCorrectTerminationReason() throws Exception
         Status status = Status.Transaction.Terminated;
         KernelTransactionImplementation tx = newInitializedTransaction();
         tx.markForTermination( status );
-        assertSame( status, tx.terminationReason() );
+        assertSame( status, tx.getReasonIfTerminated() );
     }
 
     @Test
@@ -590,7 +590,7 @@ public void closedTransactionShouldHaveNoTerminationReason() throws Exception
         KernelTransactionImplementation tx = newInitializedTransaction();
         tx.markForTermination( Status.Transaction.Terminated );
         tx.close();
-        assertNull( tx.terminationReason() );
+        assertNull( tx.getReasonIfTerminated() );
     }
 
     private final NeoStores neoStores = mock( NeoStores.class );

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionTerminationTest.java

@@ -84,7 +84,7 @@ public void accept( TestKernelTransaction tx )
                     public void accept( TestKernelTransaction tx )
                     {
                         close( tx );
-                        assertNull( tx.terminationReason() );
+                        assertNull( tx.getReasonIfTerminated() );
                         tx.initialize();
                     }
                 }
@@ -422,13 +422,13 @@ void assertRolledBack()
 
         void assertTerminated()
         {
-            assertEquals( Status.Transaction.MarkedAsFailed, terminationReason() );
+            assertEquals( Status.Transaction.MarkedAsFailed, getReasonIfTerminated() );
             assertTrue( monitor.terminated );
         }
 
         void assertNotTerminated()
         {
-            assertNull( terminationReason() );
+            assertNull( getReasonIfTerminated() );
             assertFalse( monitor.terminated );
         }
     }

community/kernel/src/test/java/org/neo4j/kernel/impl/api/KernelTransactionsTest.java

@@ -122,7 +122,7 @@ public void shouldDisposeTransactionsWhenAsked() throws Exception
         assertThat( postDispose, not( equalTo( first ) ) );
         assertThat( postDispose, not( equalTo( second ) ) );
 
-        assertTrue( leftOpen.terminationReason() != null );
+        assertTrue( leftOpen.getReasonIfTerminated() != null );
     }
 
     @Test

community/kernel/src/test/java/org/neo4j/kernel/impl/api/constraints/ConstraintIndexCreatorTest.java

@@ -198,7 +198,7 @@ public boolean isOpen()
                 }
 
                 @Override
-                public Status terminationReason()
+                public Status getReasonIfTerminated()
                 {
                     return null;
                 }