Merge pull request #2723 from joeshannon/table-types

Add missing types to PVA table decoding

Author: kasemir

core/pv/src/main/java/org/phoebus/pv/pva/PVAStructureHelper.java

@@ -7,16 +7,21 @@
  ******************************************************************************/
 package org.phoebus.pv.pva;
 
+import static java.util.stream.Collectors.toList;
+import static java.util.stream.IntStream.range;
 import static org.phoebus.pv.pva.Decoders.decodeAlarm;
 import static org.phoebus.pv.pva.Decoders.decodeTime;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
 import org.epics.pva.data.PVAArray;
 import org.epics.pva.data.PVABool;
+import org.epics.pva.data.PVABoolArray;
 import org.epics.pva.data.PVAByteArray;
 import org.epics.pva.data.PVAData;
 import org.epics.pva.data.PVADoubleArray;
@@ -30,10 +35,17 @@
 import org.epics.pva.data.PVAStructure;
 import org.epics.pva.data.PVAStructureArray;
 import org.epics.pva.data.PVAUnion;
+import org.epics.util.array.ArrayBoolean;
+import org.epics.util.array.ArrayByte;
 import org.epics.util.array.ArrayDouble;
 import org.epics.util.array.ArrayFloat;
 import org.epics.util.array.ArrayInteger;
+import org.epics.util.array.ArrayLong;
+import org.epics.util.array.ArrayShort;
+import org.epics.util.array.ArrayUByte;
 import org.epics.util.array.ArrayUInteger;
+import org.epics.util.array.ArrayULong;
+import org.epics.util.array.ArrayUShort;
 import org.epics.vtype.Alarm;
 import org.epics.vtype.AlarmSeverity;
 import org.epics.vtype.AlarmStatus;
@@ -203,6 +215,45 @@ else if (column instanceof PVAStringArray)
                 types.add(String.class);
                 values.add(Arrays.asList(typed.get()));
             }
+            else if (column instanceof PVAShortArray)
+            {
+                final PVAShortArray typed = (PVAShortArray)column;
+                types.add(Short.TYPE);
+                if (typed.isUnsigned())
+                    values.add(ArrayUShort.of(typed.get()));
+                else
+                    values.add(ArrayShort.of(typed.get()));
+            }
+            else if (column instanceof PVALongArray)
+            {
+                final PVALongArray typed = (PVALongArray)column;
+                types.add(Long.TYPE);
+                if (typed.isUnsigned())
+                    values.add(ArrayULong.of(typed.get()));
+                else
+                    values.add(ArrayLong.of(typed.get()));
+            }
+            else if (column instanceof PVAByteArray)
+            {
+                final PVAByteArray typed = (PVAByteArray)column;
+                types.add(Byte.TYPE);
+                if (typed.isUnsigned())
+                    values.add(ArrayUByte.of(typed.get()));
+                else
+                    values.add(ArrayByte.of(typed.get()));
+            }
+            else if (column instanceof PVABoolArray)
+            {
+                final PVABoolArray typed = (PVABoolArray)column;
+                types.add(Boolean.TYPE);
+                boolean[] data = typed.get();
+                // Convert to boxed Integer to add to List
+                values.add(range(0, data.length).mapToObj(i -> data[i]).collect(toList()));
+            }
+            else 
+            {
+            	throw new RuntimeException("Could not decode table column of type: " + column.getClass());
+            }
         }
 
         return VTable.of(types, names, values);