ClientAdapter

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

@@ -94,7 +94,7 @@ public int compareTo( Resource o )
         }
     }
 
-    // TODO the state in this class is quite unoptimized, please do so
+    // TODO the state keeping in this class is quite unoptimized, please do so
     private static class DeferringLockClient implements Client
     {
         private final Client clientDelegate;

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

@@ -135,4 +135,19 @@ interface Client extends AutoCloseable
 
     /** Visit all held locks. */
     void accept(Visitor visitor);
+
+    public abstract class ClientAdapter implements Client
+    {
+        @Override
+        public void prepare()
+        {
+            // Nothing to prepare
+        }
+
+        @Override
+        public Client delegate()
+        {
+            return this;
+        }
+    }
 }

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

@@ -19,7 +19,7 @@
  */
 package org.neo4j.kernel.impl.locking;
 
-public class NoOpClient implements Locks.Client
+public class NoOpClient extends Locks.ClientAdapter
 {
     public static final Locks.Client NO_LOCKS = new NoOpClient();
 
@@ -60,11 +60,6 @@ public void releaseAll()
     {
     }
 
-    @Override
-    public void prepare()
-    {
-    }
-
     @Override
     public void stop()
     {
@@ -80,10 +75,4 @@ public int getLockSessionId()
     {
         return -1;
     }
-
-    @Override
-    public Locks.Client delegate()
-    {
-        return this;
-    }
 }

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

@@ -38,7 +38,7 @@
 // Please note. Except separate test cases for particular classes related to community locking
 // see also org.neo4j.kernel.impl.locking.community.CommunityLocksCompatibility test suite
 
-public class CommunityLockClient implements Locks.Client
+public class CommunityLockClient extends Locks.ClientAdapter
 {
     private final LockManagerImpl manager;
     private final LockTransaction lockTransaction = new LockTransaction();
@@ -254,12 +254,6 @@ public void releaseAll()
         }
     }
 
-    @Override
-    public void prepare()
-    {
-        // Do nothing
-    }
-
     @Override
     public void stop()
     {
@@ -312,12 +306,6 @@ public int getLockSessionId()
         return lockTransaction.getId();
     }
 
-    @Override
-    public Locks.Client delegate()
-    {
-        return this;
-    }
-
     private PrimitiveLongObjectMap<LockResource> localShared( Locks.ResourceType resourceType )
     {
         PrimitiveLongObjectMap<LockResource> map = sharedLocks.get( resourceType.typeId() );

enterprise/ha/src/main/java/org/neo4j/kernel/ha/lock/SlaveLocksClient.java

@@ -50,7 +50,7 @@
  * with the master for certain types of locks. If you grab a lock on a node, for instance, this class will grab a
  * cluster-global lock by talking to the master machine, and then grab that same lock locally before returning.
  */
-class SlaveLocksClient implements Locks.Client
+class SlaveLocksClient extends Locks.ClientAdapter
 {
     private final Master master;
     private final Locks.Client client;

enterprise/kernel/src/main/java/org/neo4j/kernel/impl/enterprise/lock/forseti/ForsetiClient.java

@@ -47,7 +47,7 @@
  * local fields how many times the lock has been grabbed, such that it will only grab and release the lock once from the
  * global lock manager.
  */
-public class ForsetiClient implements Locks.Client
+public class ForsetiClient extends Locks.ClientAdapter
 {
     /** Id for this client */
     private final int clientId;
@@ -484,12 +484,6 @@ public void releaseAll()
         }
     }
 
-    @Override
-    public void prepare()
-    {
-        // Do nothing
-    }
-
     private void releaseAllClientLocks()
     {
         // Force the release of all locks held.
@@ -572,12 +566,6 @@ public int getLockSessionId()
         return clientId;
     }
 
-    @Override
-    public Locks.Client delegate()
-    {
-        return this;
-    }
-
     public int waitListSize()
     {
         return waitList.size();