core: Rearrange some Inode/FileHandle method internals

Clean-up of previous changes.

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

Author: kohlschuetter

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

@@ -77,15 +77,15 @@ public int getGeneration() {
     }
 
     public int getExportIdx() {
-        return super.getExportIdx();
+        return exportIndex();
     }
 
     public int getType() {
         return super.getType();
     }
 
     public byte[] getFsOpaque() {
-        return super.getFsOpaque();
+        return getFileId();
     }
 
     public byte[] bytes() {

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

@@ -146,21 +146,11 @@ protected int getGeneration() {
         return generation;
     }
 
-    @Deprecated(forRemoval = true)
-    protected int getExportIdx() {
-        return exportIdx;
-    }
-
     @Deprecated(forRemoval = true)
     protected int getType() {
         return type;
     }
 
-    @Deprecated(forRemoval = true)
-    protected byte[] getFsOpaque() {
-        return fs_opaque;
-    }
-
     @Override
     public String toString() {
         return BaseEncoding.base16().lowerCase().encode(nfsHandle);
@@ -186,7 +176,7 @@ public static Inode forFile(byte[] bytes) {
     }
 
     public byte[] getFileId() {
-        return getFsOpaque();
+        return fs_opaque;
     }
 
     public byte[] toNfsHandle() {
@@ -226,14 +216,13 @@ public boolean equals(Object obj) {
     }
 
     public boolean isPseudoInode() {
-        return getType() == 1;
+        return type == 1;
     }
 
     public int exportIndex() {
-        return getExportIdx();
+        return exportIdx;
     }
 
-    @Deprecated
     public int handleVersion() {
         return version;
     }