Squashed commit of the token_refactoring branch:

6 files changed, 191 insertions, 33 deletions

diff --git a/java/src/hdf/hdf5lib/structs/H5L_info_t.java b/java/src/hdf/hdf5lib/structs/H5L_info_t.java
index 3bbb189..377e617 100644
--- a/java/src/hdf/hdf5lib/structs/H5L_info_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5L_info_t.java
@@ -15,22 +15,39 @@ package hdf.hdf5lib.structs;
 
 import java.io.Serializable;
 
-//Information struct for link (for H5Lget_info/H5Lget_info_by_idx)
-public class H5L_info_t implements Serializable{
+import hdf.hdf5lib.HDF5Constants;
+
+// Information struct for link (for H5Lget_info/H5Lget_info_by_idx)
+public class H5L_info_t implements Serializable {
     private static final long serialVersionUID = -4754320605310155033L;
-    public int     type;
-    public boolean corder_valid;
-    public long    corder;
-    public int     cset;
-    public long    address_val_size;
+    public int         type;
+    public boolean     corder_valid;
+    public long        corder;
+    public int         cset;
+    public H5O_token_t token;
+    public long        val_size;
+
+    // Constructor for using object token portion of C union
+    H5L_info_t (int type, boolean corder_valid, long corder,
+        int cset, H5O_token_t token)
+    {
+        this.type = type;
+        this.corder_valid = corder_valid;
+        this.corder = corder;
+        this.cset = cset;
+        this.token = token;
+        this.val_size = -1;
+    }
 
+    // Constructor for using val_size portion of C union
     H5L_info_t (int type, boolean corder_valid, long corder,
-        int cset, long address_val_size)
+        int cset, long val_size)
     {
         this.type = type;
         this.corder_valid = corder_valid;
         this.corder = corder;
         this.cset = cset;
-        this.address_val_size = address_val_size;
+        this.token = HDF5Constants.H5O_TOKEN_UNDEF;
+        this.val_size = val_size;
     }
 }
diff --git a/java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java b/java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java
index a39c1ed..8d0cc24 100644
--- a/java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5O_hdr_info_t.java
@@ -16,7 +16,7 @@ package hdf.hdf5lib.structs;
 import java.io.Serializable;
 
 // Information struct for object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx)
-public class H5O_hdr_info_t implements Serializable{
+public class H5O_hdr_info_t implements Serializable {
     private static final long serialVersionUID = 7883826382952577189L;
     public int version;       /* Version number of header format in file */
     public int nmesgs;        /* Number of object header messages */
@@ -44,4 +44,38 @@ public class H5O_hdr_info_t implements Serializable{
         this.mesg_present = mesg_present;
         this.mesg_shared = mesg_shared;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof H5O_hdr_info_t))
+            return false;
+
+        H5O_hdr_info_t info = (H5O_hdr_info_t) o;
+
+        if (this.version != info.version)
+        	return false;
+        if (this.nmesgs != info.nmesgs)
+        	return false;
+        if (this.nchunks != info.nchunks)
+        	return false;
+        if (this.flags != info.flags)
+        	return false;
+        if (this.space_total != info.space_total)
+        	return false;
+        if (this.space_meta != info.space_meta)
+        	return false;
+        if (this.space_mesg != info.space_mesg)
+        	return false;
+        if (this.space_free != info.space_free)
+        	return false;
+        if (this.mesg_present != info.mesg_present)
+        	return false;
+        if (this.mesg_shared != info.mesg_shared)
+        	return false;        
+
+        return true;
+    }
 }
diff --git a/java/src/hdf/hdf5lib/structs/H5O_info_t.java b/java/src/hdf/hdf5lib/structs/H5O_info_t.java
index ac32f6a..6a26a10 100644
--- a/java/src/hdf/hdf5lib/structs/H5O_info_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5O_info_t.java
@@ -15,38 +15,30 @@ package hdf.hdf5lib.structs;
 
 import java.io.Serializable;
 
-//Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx)
-public class H5O_info_t implements Serializable{
+// Information struct for object (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx)
+public class H5O_info_t implements Serializable {
     private static final long serialVersionUID = 4691681163544054518L;
-    public long   fileno;     /* File number that object is located in */
-    public long   addr;       /* Object address in file   */
-    public int    type;       /* Basic object type (group, dataset, etc.) */
-    public int    rc;         /* Reference count of object    */
-    public long   atime;      /* Access time          */
-    public long   mtime;      /* Modification time        */
-    public long   ctime;      /* Change time          */
-    public long   btime;      /* Birth time           */
-    public long   num_attrs;  /* # of attributes attached to object */
-    public H5O_hdr_info_t   hdr;            /* Object header information */
-    /* Extra metadata storage for obj & attributes */
-    public H5_ih_info_t     meta_size_obj;  /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */
-    public H5_ih_info_t     meta_size_attr; /* v2 B-tree & heap for attributes */
+    public long        fileno;     /* File number that object is located in */
+    public H5O_token_t token;      /* Object token in file */
+    public int         type;       /* Basic object type (group, dataset, etc.) */
+    public int         rc;         /* Reference count of object    */
+    public long        atime;      /* Access time          */
+    public long        mtime;      /* Modification time        */
+    public long        ctime;      /* Change time          */
+    public long        btime;      /* Birth time           */
+    public long        num_attrs;  /* # of attributes attached to object */
 
-    public H5O_info_t (long fileno, long addr, int type,
-        int rc, long num_attrs, long atime, long mtime, long ctime, long btime,
-        H5O_hdr_info_t hdr, H5_ih_info_t meta_size_obj, H5_ih_info_t meta_size_attr)
+    public H5O_info_t (long fileno, H5O_token_t token, int type,
+        int rc, long atime, long mtime, long ctime, long btime, long num_attrs)
     {
         this.fileno = fileno;
-        this.addr = addr;
+        this.token = token;
         this.type = type;
         this.rc = rc;
-        this.num_attrs = num_attrs;
         this.atime = atime;
         this.mtime = mtime;
         this.ctime = ctime;
         this.btime = btime;
-        this.hdr = hdr;
-        this.meta_size_obj = meta_size_obj;
-        this.meta_size_attr = meta_size_attr;
+        this.num_attrs = num_attrs;
     }
 }
diff --git a/java/src/hdf/hdf5lib/structs/H5O_native_info_t.java b/java/src/hdf/hdf5lib/structs/H5O_native_info_t.java
new file mode 100644
index 0000000..4e80849
--- /dev/null
+++ b/java/src/hdf/hdf5lib/structs/H5O_native_info_t.java
@@ -0,0 +1,52 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+package hdf.hdf5lib.structs;
+
+import java.io.Serializable;
+
+// Information struct for native HDF5 object info, such as object header metadata (for H5Oget_info/H5Oget_info_by_name/H5Oget_info_by_idx).
+public class H5O_native_info_t implements Serializable {
+    private static final long serialVersionUID = 7883826382952577189L;
+
+    public H5O_hdr_info_t hdr_info; /* Object header information */
+
+    /* Extra metadata storage for obj & attributes */
+    public H5_ih_info_t obj_info;   /* v1/v2 B-tree & local/fractal heap for groups, B-tree for chunked datasets */ 
+    public H5_ih_info_t attr_info;  /* v2 B-tree & heap for attributes */
+
+    H5O_native_info_t (H5O_hdr_info_t oheader_info, H5_ih_info_t obj_info, H5_ih_info_t attr_info)
+    {
+        this.hdr_info = oheader_info;
+        this.obj_info = obj_info;
+        this.attr_info = attr_info;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof H5O_native_info_t))
+            return false;
+
+        H5O_native_info_t info = (H5O_native_info_t) o;
+
+        if (!this.hdr_info.equals(info.hdr_info)
+         || !this.obj_info.equals(info.obj_info)
+         || !this.attr_info.equals(info.attr_info))
+        	return false;
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/java/src/hdf/hdf5lib/structs/H5O_token_t.java b/java/src/hdf/hdf5lib/structs/H5O_token_t.java
new file mode 100644
index 0000000..8ec0b7f
--- /dev/null
+++ b/java/src/hdf/hdf5lib/structs/H5O_token_t.java
@@ -0,0 +1,45 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+package hdf.hdf5lib.structs;
+
+import java.io.Serializable;
+import java.util.Arrays;
+
+import hdf.hdf5lib.HDF5Constants;
+
+// Object token, which is a unique and permanent identifier, for an HDF5 object within a container.
+public class H5O_token_t implements Serializable {
+    private static final long serialVersionUID = -4754320605310155032L;
+    public byte[] data;
+
+    H5O_token_t (byte[] data) {
+        this.data = data;
+    }
+
+    public boolean isUndefined() {
+        return this.equals(HDF5Constants.H5O_TOKEN_UNDEF);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof H5O_token_t))
+            return false;
+
+        H5O_token_t token = (H5O_token_t) o;
+
+        return Arrays.equals(this.data, token.data);
+    }
+}
\ No newline at end of file
diff --git a/java/src/hdf/hdf5lib/structs/H5_ih_info_t.java b/java/src/hdf/hdf5lib/structs/H5_ih_info_t.java
index ea36d85..7159f02 100644
--- a/java/src/hdf/hdf5lib/structs/H5_ih_info_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5_ih_info_t.java
@@ -26,4 +26,22 @@ public class H5_ih_info_t implements Serializable {
         this.index_size = index_size;
         this.heap_size = heap_size;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)
+            return true;
+
+        if (!(o instanceof H5_ih_info_t))
+            return false;
+
+        H5_ih_info_t info = (H5_ih_info_t) o;
+
+        if (this.index_size != info.index_size)
+        	return false;
+        if (this.heap_size != info.heap_size)
+        	return false;
+
+        return true;
+    }
 }