Implement getDataAsByteBuffer(ByteOrder order) for non-integral array classes

Add tests for getDataAsByteBuffer. Also, fix bug when getting a section
of an ArrayString.

Fixes #1592

Author: lesserwhirls

cdm/core/src/main/java/ucar/ma2/ArrayByte.java

@@ -1,7 +1,8 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.ma2;
 
 import java.nio.ByteBuffer;
@@ -120,8 +121,11 @@ public ByteBuffer getDataAsByteBuffer() {
   }
 
   @Override
-  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {// order irrelevant here
-    return ByteBuffer.wrap((byte[]) get1DJavaArray(getDataType()));
+  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {
+    ByteBuffer bb = ByteBuffer.wrap((byte[]) get1DJavaArray(getDataType()));
+    if (order != null)
+      bb.order(order);
+    return bb;
   }
 
   /**

cdm/core/src/main/java/ucar/ma2/ArrayChar.java

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.ma2;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.Iterator;
 
 /**
@@ -137,10 +139,16 @@ protected void copyTo1DJavaArray(IndexIterator iter, Object javaArray) {
    */
   @Override
   public ByteBuffer getDataAsByteBuffer() {
-    ByteBuffer bb = ByteBuffer.allocate((int) getSize());
-    resetLocalIterator();
-    while (hasNext())
-      bb.put(nextByte());
+    return getDataAsByteBuffer(null);
+  }
+
+  @Override
+  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {
+    ByteBuffer bb = super.getDataAsByteBuffer((int) getSize(), order);
+    char[] ja = (char[]) get1DJavaArray(DataType.CHAR);
+    for (char c : ja) {
+      bb.put((byte) c);
+    }
     return bb;
   }
 

cdm/core/src/main/java/ucar/ma2/ArrayDouble.java

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.ma2;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.DoubleBuffer;
 
 /**
@@ -115,9 +117,14 @@ protected void copyTo1DJavaArray(IndexIterator iter, Object javaArray) {
 
   @Override
   public ByteBuffer getDataAsByteBuffer() {
-    ByteBuffer bb = ByteBuffer.allocate((int) (8 * getSize()));
+    return getDataAsByteBuffer(null);
+  }
+
+  @Override
+  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {
+    ByteBuffer bb = super.getDataAsByteBuffer((int) (8 * getSize()), order);
     DoubleBuffer ib = bb.asDoubleBuffer();
-    ib.put((double[]) get1DJavaArray(DataType.DOUBLE)); // make sure its in canonical order
+    ib.put((double[]) get1DJavaArray(DataType.DOUBLE));
     return bb;
   }
 

cdm/core/src/main/java/ucar/ma2/ArrayFloat.java

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.ma2;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.FloatBuffer;
 
 /**
@@ -118,9 +120,14 @@ protected void copyTo1DJavaArray(IndexIterator iter, Object javaArray) {
 
   @Override
   public ByteBuffer getDataAsByteBuffer() {
-    ByteBuffer bb = ByteBuffer.allocate((int) (4 * getSize()));
+    return getDataAsByteBuffer(null);
+  }
+
+  @Override
+  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {
+    ByteBuffer bb = super.getDataAsByteBuffer((int) (4 * getSize()), order);
     FloatBuffer ib = bb.asFloatBuffer();
-    ib.put((float[]) get1DJavaArray(DataType.FLOAT)); // make sure its in canonical order
+    ib.put((float[]) get1DJavaArray(DataType.FLOAT));
     return bb;
   }
 

cdm/core/src/main/java/ucar/ma2/ArrayString.java

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) 1998-2018 University Corporation for Atmospheric Research/Unidata
+ * Copyright (c) 1998-2026 University Corporation for Atmospheric Research/Unidata
  * See LICENSE for license information.
  */
+
 package ucar.ma2;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.CharBuffer;
 
 /**
@@ -122,15 +124,21 @@ protected void copyTo1DJavaArray(IndexIterator iter, Object javaArray) {
 
   @Override
   public ByteBuffer getDataAsByteBuffer() {
+    return getDataAsByteBuffer(null);
+  }
+
+  @Override
+  public ByteBuffer getDataAsByteBuffer(ByteOrder order) {
     // Store strings as null terminated character sequences
+    Object[] ja = (Object[]) get1DJavaArray(DataType.STRING);
     int totalsize = 0;
-    for (String aStorage : storage)
-      totalsize += (aStorage.length() + 1); // 1 for null terminator
-    ByteBuffer bb = ByteBuffer.allocate(2 * totalsize);
+    for (Object s : ja)
+      totalsize += (((String) s).length() + 1); // 1 for null terminator
+    ByteBuffer bb = super.getDataAsByteBuffer(2 * totalsize, order);
     CharBuffer cb = bb.asCharBuffer();
     // Concatenate
-    for (String s : storage) {
-      cb.append(s);
+    for (Object s : ja) {
+      cb.append((String) s);
       cb.append('\0');
     }
     return bb;