core: Make SimpleLm use AbstractLockManager2

SimpleLm used to create new Base64-strings upon toKey(byte[]), which is
suboptimal.

Use Opaque.getBase64 instead.

Related: #149
Signed-off-by: Christian Kohlschütter <[email protected]>

Author: kohlschuetter

core/src/main/java/org/dcache/nfs/v4/nlm/SimpleLm.java

@@ -20,21 +20,22 @@
 package org.dcache.nfs.v4.nlm;
 
 import java.util.ArrayList;
-import java.util.Base64;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.Lock;
 
+import org.dcache.nfs.util.Opaque;
+
 import com.google.common.util.concurrent.Striped;
 
 /**
  * Simple non-distributed implementation of {@link LockManager}.
  *
  * @since 0.14
  */
-public class SimpleLm extends AbstractLockManager {
+public class SimpleLm extends AbstractLockManager2 {
 
     /*
      * Use {@link Striped} here to split synchronized block on file locks into multiple partitions to increase
@@ -60,26 +61,26 @@ public SimpleLm(int concurrency) {
     private final ConcurrentHashMap<String, List<NlmLock>> locks = new ConcurrentHashMap<>();
 
     @Override
-    protected Lock getObjectLock(byte[] objId) {
+    protected Lock getObjectLock(Opaque objId) {
         String key = toKey(objId);
         return objLock.get(key);
     }
 
     @Override
-    protected Collection<NlmLock> getActiveLocks(byte[] objId) {
+    protected Collection<NlmLock> getActiveLocks(Opaque objId) {
         String key = toKey(objId);
         return locks.getOrDefault(key, Collections.emptyList());
     }
 
     @Override
-    protected void add(byte[] objId, NlmLock lock) {
+    protected void add(Opaque objId, NlmLock lock) {
         String key = toKey(objId);
         Collection<NlmLock> l = locks.computeIfAbsent(key, k -> new ArrayList<>());
         l.add(lock);
     }
 
     @Override
-    protected boolean remove(byte[] objId, NlmLock lock) {
+    protected boolean remove(Opaque objId, NlmLock lock) {
         String key = toKey(objId);
         Collection<NlmLock> l = locks.get(key);
         boolean isRemoved = false;
@@ -93,14 +94,14 @@ protected boolean remove(byte[] objId, NlmLock lock) {
     }
 
     @Override
-    protected void addAll(byte[] objId, Collection<NlmLock> locks) {
+    protected void addAll(Opaque objId, Collection<NlmLock> locks) {
         String key = toKey(objId);
         Collection<NlmLock> l = this.locks.computeIfAbsent(key, k -> new ArrayList<>());
         l.addAll(locks);
     }
 
     @Override
-    protected void removeAll(byte[] objId, Collection<NlmLock> locks) {
+    protected void removeAll(Opaque objId, Collection<NlmLock> locks) {
         String key = toKey(objId);
         Collection<NlmLock> l = this.locks.get(key);
         if (l != null) {
@@ -111,8 +112,8 @@ protected void removeAll(byte[] objId, Collection<NlmLock> locks) {
         }
     }
 
-    private final String toKey(byte[] objId) {
-        return Base64.getEncoder().encodeToString(objId);
+    private final String toKey(Opaque objId) {
+        return objId.getBase64();
     }
 
 }