Fix KLVInputStream::readBatch()

#168

Author: palemieux

src/main/java/com/sandflow/smpte/klv/adapters/TripletValueAdapter.java

@@ -30,7 +30,7 @@
 /**
  * ULValueAdapter converts a UL to and from a KLV Triplet Value
  */
-public class ULValueAdapter extends TripletValueAdapter {
+public class ULValueAdapter {
 
     /**
      * Converts a KLV Triplet Value to a UL.

src/main/java/com/sandflow/smpte/klv/adapters/ULValueAdapter.java

@@ -26,9 +26,7 @@
 package com.sandflow.smpte.mxf;
 
 import com.sandflow.smpte.klv.KLVInputStream;
-import com.sandflow.smpte.klv.adapters.TripletValueAdapter;
 import com.sandflow.smpte.klv.exceptions.KLVException;
-import com.sandflow.smpte.util.AUID;
 import com.sandflow.smpte.util.IDAU;
 import com.sandflow.smpte.util.UMID;
 import com.sandflow.smpte.util.UUID;
@@ -37,6 +35,7 @@
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.function.Function;
 
 /**
  * MXFInputStream allows MXF data structures to be read from an InputStream
@@ -125,8 +124,8 @@ public UMID readUMID() throws IOException, EOFException {
      * @throws KLVException
      * @throws IOException
      */
-    public <T, W extends TripletValueAdapter> Collection<T> readArray() throws KLVException, IOException {
-        return readBatch();
+    public <T> Collection<T> readArray(Function<byte[], T> converter) throws KLVException, IOException {
+        return readBatch(converter);
     }
 
     /**
@@ -138,7 +137,7 @@ public <T, W extends TripletValueAdapter> Collection<T> readArray() throws KLVEx
      * @throws KLVException
      * @throws IOException
      */
-    public <T, W extends TripletValueAdapter> Collection<T> readBatch() throws KLVException, IOException {
+    public <T> Collection<T> readBatch(Function<byte[], T> converter) throws KLVException, IOException {
         ArrayList<T> batch = new ArrayList<>();
         long itemcount = readUnsignedInt();
         long itemlength = readUnsignedInt();
@@ -148,7 +147,7 @@ public <T, W extends TripletValueAdapter> Collection<T> readBatch() throws KLVEx
         for (int i = 0; i < itemcount; i++) {
             byte[] value = new byte[(int) itemlength];
             read(value);
-            batch.add(W.<T>fromValue(value));
+            batch.add(converter.apply(value));
         }
         return batch;
     }

src/main/java/com/sandflow/smpte/mxf/MXFInputStream.java

@@ -126,7 +126,7 @@ public static PartitionPack fromTriplet(Triplet triplet) throws KLVException {
 
             pp.setOperationalPattern(kis.readUL());
 
-            pp.setEssenceContainers(kis.<UL, ULValueAdapter>readBatch());
+            pp.setEssenceContainers(kis.readBatch(ULValueAdapter::fromValue));
 
         } catch (IOException e) {
             throw new KLVException(e);