Various merges from develop (#3135)

* Merges from develop/1.14
* Fix doxygen warnings
* Fix spelling
* Fix doxygen ref
* Add braces
* Fix format
* Remove unused file

14 files changed, 37 insertions, 199 deletions

diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index f6d733f..7542e8e 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -82,6 +82,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     if (example STREQUAL "H5Ex_D_External")
       add_test (
@@ -97,6 +98,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
     endif ()
+    if (last_test)
+      set_tests_properties (JAVA_datasets-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_datasets-${example}-copy-objects
@@ -137,9 +141,10 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
           COMMAND ${CMAKE_COMMAND} -E remove
               ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
       )
+    endif ()
     set_tests_properties (JAVA_datasets-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_datasets-${example}
     )
-    endif ()
+    set (last_test "JAVA_datasets-${example}-clean-objects")
   endforeach ()
 endif ()
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index 75dab75..c77a715 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -67,12 +67,16 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     add_test (
         NAME JAVA_datatypes-${example}-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
+    if (last_test)
+      set_tests_properties (JAVA_datatypes-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_datatypes-${example}-copy-objects
@@ -107,5 +111,6 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
     set_tests_properties (JAVA_datatypes-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_datatypes-${example}
     )
+    set (last_test "JAVA_datatypes-${example}-clean-objects")
   endforeach ()
 endif ()
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 5393afd..01da53c 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -66,6 +66,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     if (NOT example STREQUAL "H5Ex_G_Iterate" AND NOT example STREQUAL "H5Ex_G_Visit")
       if (example STREQUAL "H5Ex_G_Compact")
@@ -88,6 +89,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
           COMMAND ${CMAKE_COMMAND} -E echo "${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5 exists"
       )
     endif ()
+    if (last_test)
+      set_tests_properties (JAVA_groups-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_groups-${example}-copy-objects
@@ -132,6 +136,9 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
       set_tests_properties (JAVA_groups-${example}-clean-objects PROPERTIES
           DEPENDS JAVA_groups-${example}
       )
+      set (last_test "JAVA_groups-${example}-clean-objects")
+    else ()
+      set (last_test "JAVA_groups-${example}")
     endif ()
   endforeach ()
 endif ()
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index b1c35bc..518bbf8 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -56,12 +56,16 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
   get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
   set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name}$<$<OR:$<CONFIG:Debug>,$<CONFIG:Developer>>:${CMAKE_DEBUG_POSTFIX}>;")
 
+  set (last_test "")
   foreach (example ${HDF_JAVA_EXAMPLES})
     add_test (
         NAME JAVA_intro-${example}-clear-objects
         COMMAND ${CMAKE_COMMAND} -E remove
             ${HDFJAVA_EXAMPLES_BINARY_DIR}/${example}.h5
     )
+    if (last_test)
+      set_tests_properties (JAVA_intro-${example}-clear-objects PROPERTIES DEPENDS ${last_test})
+    endif ()
 
     add_test (
         NAME JAVA_intro-${example}-copy-objects
@@ -97,6 +101,7 @@ if (BUILD_TESTING AND HDF5_TEST_EXAMPLES AND HDF5_TEST_SERIAL)
     set_tests_properties (JAVA_intro-${example}-clean-objects PROPERTIES
         DEPENDS JAVA_intro-${example}
     )
+    set (last_test "JAVA_intro-${example}-clean-objects")
   endforeach ()
 
 endif ()
diff --git a/java/src/Makefile.am b/java/src/Makefile.am
index 1a313e8..8820fd8 100644
--- a/java/src/Makefile.am
+++ b/java/src/Makefile.am
@@ -106,7 +106,6 @@ hdf5_java_JAVA =  \
 	${pkgpath}/structs/H5AC_cache_config_t.java \
 	${pkgpath}/H5.java  \
 	${pkgpath}/HDF5Constants.java  \
-	${pkgpath}/HDF5GroupInfo.java  \
 	${pkgpath}/HDFArray.java  \
 	${pkgpath}/HDFNativeData.java
 
diff --git a/java/src/hdf/hdf5lib/CMakeLists.txt b/java/src/hdf/hdf5lib/CMakeLists.txt
index e6072d9..b881cf7 100644
--- a/java/src/hdf/hdf5lib/CMakeLists.txt
+++ b/java/src/hdf/hdf5lib/CMakeLists.txt
@@ -99,7 +99,6 @@ set (HDF5_JAVADOC_HDF_HDF5_STRUCTS_SOURCES
 set (HDF5_JAVA_HDF_HDF5_SOURCES
     HDFArray.java
     HDF5Constants.java
-    HDF5GroupInfo.java
     HDFNativeData.java
     H5.java
 )
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 2da6ffa..601dc3f 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -13199,7 +13199,7 @@ public class H5 implements java.io.Serializable {
     /**
      * @ingroup JH5T
      *
-     * H5Tcreate creates a new dataype of the specified class with the specified number of bytes.
+     * H5Tcreate creates a new datatype of the specified class with the specified number of bytes.
      *
      * @param tclass
      *            IN: Class of datatype to create.
diff --git a/java/src/hdf/hdf5lib/HDF5GroupInfo.java b/java/src/hdf/hdf5lib/HDF5GroupInfo.java
deleted file mode 100644
index 50c7db0..0000000
--- a/java/src/hdf/hdf5lib/HDF5GroupInfo.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- * 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://www.hdfgroup.org/licenses.               *
- * If you do not have access to either file, you may request a copy from     *
- * help@hdfgroup.org.                                                        *
- * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-
-package hdf.hdf5lib;
-
-/**
- * <p>
- * This class is a container for the information reported about an HDF5 Object
- * from the H5Gget_obj_info() method.
- * <p>
- * The fileno and objno fields contain four values which uniquely identify an
- * object among those HDF5 files which are open: if all four values are the same
- * between two objects, then the two objects are the same (provided both files
- * are still open). The nlink field is the number of hard links to the object or
- * zero when information is being returned about a symbolic link (symbolic links
- * do not have hard links but all other objects always have at least one). The
- * type field contains the type of the object, one of H5G_GROUP, H5G_DATASET, or
- * H5G_LINK. The mtime field contains the modification time. If information is
- * being returned about a symbolic link then linklen will be the length of the
- * link value (the name of the pointed-to object with the null terminator);
- * otherwise linklen will be zero. Other fields may be added to this structure
- * in the future.
- *
- * @deprecated  Not for public use. It is not used by the library.
- *    This class assumes that an object can contain four values which uniquely identify an
- *    object among those HDF5 files which are open. This is no longer valid in future
- *    HDF5 releases.
- */
-
-@Deprecated
-public class HDF5GroupInfo {
-    long[] fileno;
-    long[] objno;
-    int nlink;
-    int type;
-    long mtime;
-    int linklen;
-
-    /**
-     * Container for the information reported about an HDF5 Object
-     * from the H5Gget_obj_info() method
-     */
-    public HDF5GroupInfo()
-    {
-        fileno  = new long[2];
-        objno   = new long[2];
-        nlink   = -1;
-        type    = -1;
-        mtime   = 0;
-        linklen = 0;
-    }
-
-    /**
-     * Sets the HDF5 group information. Used by the JHI5.
-     *
-     * @param fn
-     *            File id number
-     * @param on
-     *            Object id number
-     * @param nl
-     *            Number of links
-     * @param t
-     *            Type of the object
-     * @param mt
-     *            Modification time
-     * @param len
-     *            Length of link
-     **/
-    public void setGroupInfo(long[] fn, long[] on, int nl, int t, long mt, int len)
-    {
-        fileno  = fn;
-        objno   = on;
-        nlink   = nl;
-        type    = t;
-        mtime   = mt;
-        linklen = len;
-    }
-
-    /** Resets all the group information to defaults. */
-    public void reset()
-    {
-        fileno[0] = 0;
-        fileno[1] = 0;
-        objno[0]  = 0;
-        objno[1]  = 0;
-        nlink     = -1;
-        type      = -1;
-        mtime     = 0;
-        linklen   = 0;
-    }
-
-    /**
-     * fileno accessors
-     * @return the file number if successful
-     */
-    public long[] getFileno() { return fileno; }
-
-    /**
-     * accessors
-     * @return the object number if successful
-     */
-    public long[] getObjno() { return objno; }
-
-    /**
-     * accessors
-     * @return type of group if successful
-     */
-    public int getType() { return type; }
-
-    /**
-     * accessors
-     * @return the number of links in the group if successful
-     */
-    public int getNlink() { return nlink; }
-
-    /**
-     * accessors
-     * @return the modified time value if successful
-     */
-    public long getMtime() { return mtime; }
-
-    /**
-     * accessors
-     * @return a length of link name if successful
-     */
-    public int getLinklen() { return linklen; }
-
-    /**
-     * The fileno and objno fields contain four values which uniquely identify
-     * an object among those HDF5 files.
-     */
-    @Override
-    public boolean equals(Object obj)
-    {
-        if (!(obj instanceof HDF5GroupInfo)) {
-            return false;
-        }
-
-        HDF5GroupInfo target = (HDF5GroupInfo)obj;
-        if ((fileno[0] == target.fileno[0]) && (fileno[1] == target.fileno[1]) &&
-            (objno[0] == target.objno[0]) && (objno[1] == target.objno[1])) {
-            return true;
-        }
-        else {
-            return false;
-        }
-    }
-
-    /**
-     * Returns the object id.
-     *
-     * @return the object id
-     */
-    public long getOID() { return objno[0]; }
-
-    /**
-     * /** Converts this object to a String representation.
-     *
-     * @return a string representation of this object
-     */
-    @Override
-    public String toString()
-    {
-        String fileStr = "fileno=null";
-        String objStr  = "objno=null";
-
-        if (fileno != null) {
-            fileStr = "fileno[0]=" + fileno[0] + ",fileno[1]=" + fileno[1];
-        }
-
-        if (objno != null) {
-            objStr = "objno[0]=" + objno[0] + ",objno[1]=" + objno[1];
-        }
-
-        return getClass().getName() + "[" + fileStr + "," + objStr + ",type=" + type + ",nlink=" + nlink +
-            ",mtime=" + mtime + ",linklen=" + linklen + "]";
-    }
-}
diff --git a/java/src/hdf/hdf5lib/HDFArray.java b/java/src/hdf/hdf5lib/HDFArray.java
index 28d5117..637a896 100644
--- a/java/src/hdf/hdf5lib/HDFArray.java
+++ b/java/src/hdf/hdf5lib/HDFArray.java
@@ -455,6 +455,7 @@ public class HDFArray {
                     new HDF5JavaException("HDFArray: unsupported Object type: " + ArrayDescriptor.NT);
                 throw(ex);
             }
+            break;
         } // end of statement for arrays of boxed objects
         default:
             HDF5JavaException ex =
@@ -527,6 +528,7 @@ public class HDFArray {
                             new HDF5JavaException("HDFArray: unsupported Object type: " + ArrayDescriptor.NT);
                         throw(ex);
                     }
+                    break;
                 } // end of statement for arrays of boxed numerics
                 } // end of switch statement for arrays of primitives
 
diff --git a/java/src/jni/h5fImp.c b/java/src/jni/h5fImp.c
index 57b3cbe..2afccf1 100644
--- a/java/src/jni/h5fImp.c
+++ b/java/src/jni/h5fImp.c
@@ -683,7 +683,7 @@ Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlon
 
 done:
     return;
-}
+} /* end Java_hdf_hdf5lib_H5_H5Fset_1dset_1no_1attrs_1hint */
 
 /*
  * Class:     hdf_hdf5lib_H5
@@ -706,7 +706,7 @@ Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint(JNIEnv *env, jclass clss, jlon
 
 done:
     return bval;
-}
+} /* end Java_hdf_hdf5lib_H5_H5Fget_1dset_1no_1attrs_1hint */
 
 /*
  * Class:     hdf_hdf5lib_H5
diff --git a/java/src/jni/h5lImp.c b/java/src/jni/h5lImp.c
index 872382e..8b32215 100644
--- a/java/src/jni/h5lImp.c
+++ b/java/src/jni/h5lImp.c
@@ -277,7 +277,7 @@ done:
 JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Lget_1info(JNIEnv *env, jclass clss, jlong loc_id, jstring name, jlong access_id)
 {
-    H5L_info_t  infobuf;
+    H5L_info_t  infobuf  = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {0}};
     const char *linkName = NULL;
     jvalue      args[5];
     herr_t      status  = FAIL;
@@ -317,7 +317,7 @@ JNIEXPORT jobject JNICALL
 Java_hdf_hdf5lib_H5_H5Lget_1info_1by_1idx(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
                                           jint index_field, jint order, jlong link_n, jlong access_id)
 {
-    H5L_info_t  infobuf;
+    H5L_info_t  infobuf   = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {0}};
     const char *groupName = NULL;
     jvalue      args[5];
     herr_t      status  = FAIL;
@@ -408,7 +408,7 @@ JNIEXPORT jint JNICALL
 Java_hdf_hdf5lib_H5_H5Lget_1value(JNIEnv *env, jclass clss, jlong loc_id, jstring name,
                                   jobjectArray link_value, jlong access_id)
 {
-    H5L_info_t  infobuf;
+    H5L_info_t  infobuf   = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {0}};
     const char *file_name = NULL;
     const char *obj_name  = NULL;
     const char *linkName  = NULL;
@@ -498,7 +498,7 @@ Java_hdf_hdf5lib_H5_H5Lget_1value_1by_1idx(JNIEnv *env, jclass clss, jlong loc_i
                                            jint index_field, jint order, jlong link_n,
                                            jobjectArray link_value, jlong access_id)
 {
-    H5L_info_t  infobuf;
+    H5L_info_t  infobuf   = {H5L_TYPE_ERROR, FALSE, -1, H5T_CSET_ERROR, {0}};
     const char *file_name = NULL;
     const char *obj_name  = NULL;
     const char *grpName   = NULL;
diff --git a/java/src/jni/h5pDAPLImp.c b/java/src/jni/h5pDAPLImp.c
index 01108b3..666f47d 100644
--- a/java/src/jni/h5pDAPLImp.c
+++ b/java/src/jni/h5pDAPLImp.c
@@ -80,6 +80,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1chunk_1cache(JNIEnv *env, jclass clss, jlong dapl, j
     if (NULL != rdcc_nbytes)
         PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy,
                        "H5Pget_chunk_cache: nbytesArray array not pinned");
+    if (NULL == nbytesArray)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "nbytesArray should not be NULL after pinning");
 
     {
         /* direct cast (size_t *)variable fails on 32-bit environment */
diff --git a/java/src/jni/h5pFAPLImp.c b/java/src/jni/h5pFAPLImp.c
index f094aaf..80ed6c6 100644
--- a/java/src/jni/h5pFAPLImp.c
+++ b/java/src/jni/h5pFAPLImp.c
@@ -1252,6 +1252,8 @@ Java_hdf_hdf5lib_H5_H5Pget_1cache(JNIEnv *env, jclass clss, jlong plist, jintArr
     if (NULL != rdcc_nbytes)
         PIN_LONG_ARRAY(ENVONLY, rdcc_nbytes, nbytesArray, &isCopy,
                        "H5Pget_cache: nbytesArray array not pinned");
+    if (NULL == nbytesArray)
+        H5_NULL_ARGUMENT_ERROR(ENVONLY, "nbytesArray should not be NULL after pinning");
 
     {
         /* direct cast (size_t *)variable fails on 32-bit environment */
diff --git a/java/src/jni/h5tImp.c b/java/src/jni/h5tImp.c
index 692825e..3c4d165 100644
--- a/java/src/jni/h5tImp.c
+++ b/java/src/jni/h5tImp.c
@@ -1659,7 +1659,7 @@ Java_hdf_hdf5lib_H5_H5Tflush(JNIEnv *env, jclass clss, jlong loc_id)
 
 done:
     return;
-}
+} /* end Java_hdf_hdf5lib_H5_H5Tflush */
 
 /*
  * Class:     hdf_hdf5lib_H5