Merge pull request #1920 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop

* commit '05f49d5ffdbd4cf9e967d60a3a0efd0ca7f2c820': (22 commits)
  HDFFV-10854 add release note for windows
  Fix get home dir for windows
  Use variable for test output
  Allow tests to dump output if not comparing
  revert as CHECK will first check for exception
  Clear exception for getting JNI string to clear the exception
  Correct Windows check
  revert windows change
  Windows ssl headers are not in system loacation
  Add include dirs and default lib for windows
  Add policy to use <package>_ROOT
  Add statement for label if code unimplemented
  Update Windows require for CURL to CMake 3.13
  Fix unused var
  Add updated find module for earlier CMake versions
  Correct label and var names
  Add back missing java implementation
  use h5test.h
  add test library
  special windows override
  ...

2 files changed, 14 insertions, 12 deletions

diff --git a/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java b/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java
index c13473c..9fcff2e 100644
--- a/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5FD_hdfs_fapl_t.java
@@ -23,14 +23,14 @@ import java.io.Serializable;
  * Used for the access of files hosted on the Hadoop Distributed File System.
  */
 
-@SuppressWarnings("serial") // mute default serialUID warnings until someone knowledgeable comes along or something breaks horribly
 public class H5FD_hdfs_fapl_t implements Serializable {
+    private static final long serialVersionUID = 2072473407027648309L;
 
-    private long   version;
+    private int    version;
     private String namenode_name;
+    private int    namenode_port;
     private String user_name;
     private String kerberos_ticket_cache;
-    private int    namenode_port;
     private int    stream_buffer_size;
 
     /*
diff --git a/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java b/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java
index 881aad3..a899e10 100644
--- a/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java
+++ b/java/src/hdf/hdf5lib/structs/H5FD_ros3_fapl_t.java
@@ -17,13 +17,14 @@ package hdf.hdf5lib.structs;
 import java.io.Serializable;
 
 /*
- * Java representation of the ROS3 VFD file access property list (fapl) 
+ * Java representation of the ROS3 VFD file access property list (fapl)
  * structure.
  *
  * Used for the access of files hosted remotely on S3 by Amazon.
- * 
+ *
  * For simplicity, implemented assuming that all ROS3 fapls have components:
  * - version
+ * - authenticate
  * - aws_region
  * - secret_id
  * - secret_key
@@ -38,14 +39,15 @@ import java.io.Serializable;
  *     H5FD_ros3_fapl_v2_t (extends super with Version 2 components)
  *     and so on, for each version
  *
- *     "super" is passed around, and is version-checked and re-cast as 
+ *     "super" is passed around, and is version-checked and re-cast as
  *     appropriate
  */
 
-@SuppressWarnings("serial") // mute default serialUID warnings until someone knowledgeable comes along or something breaks horribly
 public class H5FD_ros3_fapl_t implements Serializable {
+    private static final long serialVersionUID = 8985533001471224030L;
 
-    private long   version;
+    private int   version;
+    private boolean authenticate;
     private String aws_region;
     private String secret_id;
     private String secret_key;
@@ -111,10 +113,10 @@ public class H5FD_ros3_fapl_t implements Serializable {
     @Override
     public String toString() {
     return "H5FD_ros3_fapl_t (Version:" + this.version + ") {" +
-           "\n    aws_region : " + this.aws_region +
-           "\n    secret_id  : " + this.secret_id + 
-           "\n    secret_key : " + this.secret_key +
-           "\n}\n";
+            "\n    aws_region : " + this.aws_region +
+            "\n    secret_id  : " + this.secret_id +
+            "\n    secret_key : " + this.secret_key +
+            "\n}\n";
     }
 }