core: Move FileHandle-specific logic back from Inode

Move the FileHandle-specific methods that were previously moved to Inode
back to FileHandle, which is now deprecated.

Adjust FileHandleTest, and add a new test case that does call the Inode
constructor directly instead of FileHandleBuilder.

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

Author: kohlschuetter

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

@@ -63,4 +63,32 @@ public FileHandle build() {
             return build(fs_opaque);
         }
     }
+
+    public int getVersion() {
+        return handleVersion();
+    }
+
+    public int getMagic() {
+        return super.getMagic();
+    }
+
+    public int getGeneration() {
+        return super.getGeneration();
+    }
+
+    public int getExportIdx() {
+        return super.getExportIdx();
+    }
+
+    public int getType() {
+        return super.getType();
+    }
+
+    public byte[] getFsOpaque() {
+        return super.getFsOpaque();
+    }
+
+    public byte[] bytes() {
+        return toNfsHandle();
+    }
 }

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

@@ -130,48 +130,34 @@ public Inode(byte[] bytes) {
         }
     }
 
-    public int getVersion() {
-        return version;
-    }
-
-    public int getMagic() {
+    @Deprecated(forRemoval = true)
+    protected int getMagic() {
         return magic;
     }
 
-    public int getGeneration() {
+    @Deprecated(forRemoval = true)
+    protected int getGeneration() {
         return generation;
     }
 
-    public int getExportIdx() {
+    @Deprecated(forRemoval = true)
+    protected int getExportIdx() {
         return exportIdx;
     }
 
-    public int getType() {
+    @Deprecated(forRemoval = true)
+    protected int getType() {
         return type;
     }
 
-    public byte[] getFsOpaque() {
+    @Deprecated(forRemoval = true)
+    protected byte[] getFsOpaque() {
         return fs_opaque;
     }
 
-    public byte[] bytes() {
-        int len = fs_opaque.length + MIN_LEN;
-        byte[] bytes = new byte[len];
-        ByteBuffer b = ByteBuffer.wrap(bytes);
-        b.order(ByteOrder.BIG_ENDIAN);
-
-        b.putInt(version << 24 | magic);
-        b.putInt(generation);
-        b.putInt(exportIdx);
-        b.put((byte) type);
-        b.put((byte) fs_opaque.length);
-        b.put(fs_opaque);
-        return bytes;
-    }
-
     @Override
     public String toString() {
-        return BaseEncoding.base16().lowerCase().encode(this.bytes());
+        return BaseEncoding.base16().lowerCase().encode(this.toNfsHandle());
     }
 
     private static boolean arrayEquals(byte[] a1, byte[] a2, int len) {
@@ -198,12 +184,23 @@ public byte[] getFileId() {
     }
 
     public byte[] toNfsHandle() {
-        return bytes();
-    }
+        int len = fs_opaque.length + MIN_LEN;
+        byte[] bytes = new byte[len];
+        ByteBuffer b = ByteBuffer.wrap(bytes);
+        b.order(ByteOrder.BIG_ENDIAN);
+
+        b.putInt(version << 24 | magic);
+        b.putInt(generation);
+        b.putInt(exportIdx);
+        b.put((byte) type);
+        b.put((byte) fs_opaque.length);
+        b.put(fs_opaque);
+        return bytes;
+     }
 
     @Override
     public int hashCode() {
-        return Arrays.hashCode(bytes());
+        return Arrays.hashCode(toNfsHandle());
     }
 
     @Override
@@ -215,7 +212,7 @@ public boolean equals(Object obj) {
             return false;
         }
         final Inode other = (Inode) obj;
-        return Arrays.equals(bytes(), other.bytes());
+        return Arrays.equals(toNfsHandle(), other.toNfsHandle());
     }
 
     public boolean isPseudoInode() {
@@ -226,7 +223,8 @@ public int exportIndex() {
         return getExportIdx();
     }
 
+    @Deprecated
     public int handleVersion() {
-        return getVersion();
+        return version;
     }
 }

core/src/test/java/org/dcache/nfs/vfs/FileHandleTest.java

@@ -79,15 +79,15 @@ public void testBuilder() {
 
     @Test
     public void testFileHandleConstructor() {
-        Inode fh = new Inode(0, "/export/data".hashCode(), 0, "0:INODE:0000C37233174392456EB83E44844E8D28D6:0".getBytes(
+        Inode inode = new Inode(0, "/export/data".hashCode(), 0, "0:INODE:0000C37233174392456EB83E44844E8D28D6:0".getBytes(
                 US_ASCII));
 
         assertEquals(
                 "01caffee00000000ea15b996002e303a494e4f44453a3030303043333732333331373433393234353645423833453434383434453844323844363a30",
-                fh.toString());
+                inode.toString());
         assertArrayEquals(BaseEncoding.base16().lowerCase().decode(
                 "01caffee00000000ea15b996002e303a494e4f44453a3030303043333732333331373433393234353645423833453434383434453844323844363a30"),
-                fh.bytes());
+                inode.toNfsHandle());
     }
 
     @Test