core, dlm: Opaque: rename methods to properly indicate conversion step

Converting an Opaque to a byte[] or Base64-string may involve an
allocation, not just a mere cast/dereference.

Therefore, call these methods "toBytes" and toBase64".

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

Author: kohlschuetter

core/src/main/java/org/dcache/nfs/util/Opaque.java

@@ -31,9 +31,9 @@ public static Opaque forBytes(byte[] bytes) {
         return new OpaqueImpl(bytes.clone());
     }
 
-    byte[] asBytes();
+    byte[] toBytes();
 
-    String getBase64();
+    String toBase64();
 
     @Override
     int hashCode();
@@ -50,12 +50,12 @@ private OpaqueImpl(byte[] opaque) {
         }
 
         @Override
-        public byte[] asBytes() {
+        public byte[] toBytes() {
             return _opaque.clone();
         }
 
         @Override
-        public String getBase64() {
+        public String toBase64() {
             if (base64 == null) {
                 base64 = Base64.getEncoder().withoutPadding().encodeToString(_opaque);
             }
@@ -79,18 +79,18 @@ public boolean equals(Object o) {
             if (o instanceof OpaqueImpl) {
                 return Arrays.equals(_opaque, ((OpaqueImpl) o)._opaque);
             } else {
-                return Arrays.equals(_opaque, ((Opaque) o).asBytes());
+                return Arrays.equals(_opaque, ((Opaque) o).toBytes());
             }
         }
 
         /**
          * Returns a (potentially non-stable) debug string.
          * 
-         * @see #getBase64()
+         * @see #toBase64()
          */
         @Override
         public String toString() {
-            return super.toString() + "[" + getBase64() + "]";
+            return super.toString() + "[" + toBase64() + "]";
         }
     }
 }

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

@@ -113,7 +113,7 @@ protected void removeAll(Opaque objId, Collection<NlmLock> locks) {
     }
 
     private final String toKey(Opaque objId) {
-        return objId.getBase64();
+        return objId.toBase64();
     }
 
 }

core/src/main/java/org/dcache/nfs/vfs/FsCache.java

@@ -52,7 +52,7 @@ private static class FileChannelSupplier extends CacheLoader<Inode, FileChannel>
 
         @Override
         public FileChannel load(Inode inode) throws IOException {
-            String id = inode.getLockKey().getBase64();
+            String id = inode.getLockKey().toBase64();
             File dir = getAndCreateDirectory(id);
             File f = new File(dir, id);
             return new RandomAccessFile(f, "rw").getChannel();

core/src/main/java/org/dcache/nfs/vfs/Inode.java

@@ -145,12 +145,12 @@ public static Inode forFile(byte[] bytes) {
     }
 
     public static Inode forFileIdKey(Opaque key) {
-        return forFile(key.asBytes());
+        return forFile(key.toBytes());
     }
 
     @Deprecated(forRemoval = true)
     public byte[] getFileId() {
-        return opaqueKey.asBytes();
+        return opaqueKey.toBytes();
     }
 
     /**

dlm/src/main/java/org/dcache/nfs/v4/nlm/DistributedLockManager.java

@@ -134,7 +134,7 @@ protected void removeAll(Opaque objId, Collection<NlmLock> locks) {
     }
 
     private static String objIdToKey(Opaque objId) {
-      return objId.getBase64();
+      return objId.toBase64();
     }
 
 }