Revert "Merge branch '2.2' into 2.3"

This reverts commit db86084, reversing
changes made to 4c307e3.

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/locking/LegacyDeadlockCompatibility.java

community/cypher/cypher/src/main/scala/org/neo4j/cypher/ExecutionEngine.scala

@@ -115,7 +115,6 @@ class ExecutionEngine(graph: GraphDatabaseService, logProvider: LogProvider = Nu
   def execute(query: String, params: Map[String, Any], session: QuerySession): ExtendedExecutionResult = {
     executionMonitor.startQueryExecution(session, query)
     val (preparedPlanExecution, txInfo) = planQuery(query)
-    txBridge.getKernelTransactionBoundToThisThread( true ).setDescription("\"" + query + "\"")
     preparedPlanExecution.execute(graphAPI, txInfo, params, session)
   }
 

community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v2_3/LazyTest.scala

@@ -42,7 +42,7 @@ import org.neo4j.cypher.internal.{ExecutionPlan, CypherCompiler => Compiler}
 import org.neo4j.graphdb.Traverser.Order
 import org.neo4j.graphdb._
 import org.neo4j.kernel.GraphDatabaseAPI
-import org.neo4j.kernel.api.{KernelTransaction,ReadOperations, Statement}
+import org.neo4j.kernel.api.{ReadOperations, Statement}
 import org.neo4j.kernel.impl.api.OperationsFacade
 import org.neo4j.kernel.impl.core.{NodeManager, NodeProxy, ThreadToStatementContextBridge}
 import org.neo4j.kernel.impl.transaction.log.TransactionIdStore
@@ -205,7 +205,6 @@ class LazyTest extends ExecutionEngineFunSuite {
       def answer( invocation: InvocationOnMock ): NodeProxy = new NodeProxy( null, invocation.getArguments( )( 0 ).asInstanceOf[Long] )
     })
     when(bridge.get()).thenReturn(fakeStatement)
-    when(bridge.getKernelTransactionBoundToThisThread(true)).thenReturn(mock[KernelTransaction])
     when(fakeStatement.readOperations()).thenReturn(fakeReadStatement)
     when(fakeStatement.dataWriteOperations()).thenReturn(fakeDataStatement)
     when(fakeGraph.getDependencyResolver).thenReturn(dependencies)

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

@@ -129,11 +129,4 @@ interface CloseListener
      * @param listener {@link CloseListener} to get these notifications.
      */
     void registerCloseListener( CloseListener listener );
-
-    /**
-     * Add a description of this transaction to make user-facing messages more helpful. For instance, this could be set to
-     * the current query string being executed.
-     * @param description
-     */
-    void setDescription( String description );
 }

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

@@ -226,7 +226,6 @@ public KernelTransactionImplementation( StatementOperationParts operations,
     public KernelTransactionImplementation initialize( long lastCommittedTx )
     {
         assert locks != null : "This transaction has been disposed off, it should not be used.";
-        this.locks.description("Core API transaction"); // Default to this. Cypher will override this description for each query
         this.terminated = closing = closed = failure = success = false;
         this.transactionType = TransactionType.ANY;
         this.hooksState = null;
@@ -1115,10 +1114,4 @@ public void registerCloseListener( CloseListener listener )
         assert closeListener == null;
         closeListener = listener;
     }
-
-    @Override
-    public void setDescription( String description )
-    {
-        locks.description( description );
-    }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/locking/Locks.java

@@ -74,15 +74,6 @@ interface ResourceType
 
     interface Client extends AutoCloseable
     {
-        /**
-         * Give this client a user-friendly description to use in error messages and introspection, ideally one that can be traced back to a user operation
-         * (eg. a truncated version of a cypher query, for instance)
-         */
-        Client description( String desc );
-
-        /** Get a description of this client, to help users understand what operation the client represents. */
-        String description();
-
         /**
          * Can be grabbed when there are no locks or only share locks on a resource. If the lock cannot be acquired,
          * behavior is specified by the {@link WaitStrategy} for the given {@link ResourceType}.
@@ -123,7 +114,6 @@ interface Client extends AutoCloseable
 
         /** For slave transactions, this tracks an identifier for the lock session running on the master */
         int getLockSessionId();
-
     }
 
     /**

community/kernel/src/main/java/org/neo4j/kernel/impl/locking/NoOpClient.java

@@ -21,17 +21,6 @@
 
 public class NoOpClient implements Locks.Client
 {
-    public Locks.Client description( String desc )
-    {
-        return this;
-    }
-
-    @Override
-    public String description()
-    {
-        return this.toString();
-    }
-
     @Override
     public void acquireShared( Locks.ResourceType resourceType, long resourceId ) throws AcquireLockTimeoutException
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/CommunityLockClient.java

@@ -59,17 +59,6 @@ public CommunityLockClient( LockManagerImpl manager )
         this.manager = manager;
     }
 
-    public Locks.Client description( String desc )
-    {
-        return this;
-    }
-
-    @Override
-    public String description()
-    {
-        return toString();
-    }
-
     @Override
     public void acquireShared( Locks.ResourceType resourceType, long resourceId )
     {

community/kernel/src/main/java/org/neo4j/kernel/impl/util/collection/TimedRepository.java

@@ -25,11 +25,12 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.neo4j.function.Consumer;
-import org.neo4j.function.Function;
+import org.neo4j.function.Factory;
 import org.neo4j.helpers.Clock;
 
 import static java.lang.String.format;
 import static java.lang.System.currentTimeMillis;
+
 import static org.neo4j.helpers.Format.duration;
 
 /**
@@ -43,7 +44,7 @@
 public class TimedRepository<KEY, VALUE> implements Runnable
 {
     private final ConcurrentMap<KEY, Entry> repo = new ConcurrentHashMap<>();
-    private final Function<KEY, VALUE> factory;
+    private final Factory<VALUE> factory;
     private final Consumer<VALUE> reaper;
     private final long timeout;
     private final Clock clock;
@@ -96,7 +97,7 @@ public String toString()
         }
     }
 
-    public TimedRepository( Function<KEY, VALUE> provider, Consumer<VALUE> reaper, long timeout, Clock clock )
+    public TimedRepository( Factory<VALUE> provider, Consumer<VALUE> reaper, long timeout, Clock clock )
     {
         this.factory = provider;
         this.reaper = reaper;
@@ -106,7 +107,7 @@ public TimedRepository( Function<KEY, VALUE> provider, Consumer<VALUE> reaper, l
 
     public void begin( KEY key ) throws ConcurrentAccessException
     {
-        VALUE instance = factory.apply( key );
+        VALUE instance = factory.newInstance();
         Entry existing;
         if ( (existing = repo.putIfAbsent( key, new Entry( instance ) )) != null )
         {

community/kernel/src/test/java/org/neo4j/graphdb/GraphDatabaseShutdownTest.java

@@ -19,23 +19,25 @@
  */
 package org.neo4j.graphdb;
 
-import org.junit.Test;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Future;
 
+import org.junit.Test;
+
 import org.neo4j.kernel.GraphDatabaseAPI;
 import org.neo4j.kernel.impl.locking.LockCountVisitor;
 import org.neo4j.kernel.impl.locking.Locks;
 import org.neo4j.test.TestGraphDatabaseFactory;
 
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static java.util.concurrent.TimeUnit.SECONDS;
+
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertThat;
+
 import static org.neo4j.graphdb.DynamicLabel.label;
 import static org.neo4j.helpers.Exceptions.rootCause;
 

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

@@ -212,12 +212,6 @@ public void markForTermination()
                 public void registerCloseListener( CloseListener listener )
                 {
                 }
-
-                @Override
-                public void setDescription( String description )
-                {
-
-                }
             };
         }