Fixing the handling of String and StringArrays

Author: shroffk

gpclient/gpclient-ca/src/main/java/org/epics/gpclient/datasource/ca/types/CAVTypeAdapterSet.java

@@ -7,6 +7,7 @@
 import org.epics.vtype.VFloat;
 import org.epics.vtype.VInt;
 import org.epics.vtype.VString;
+import org.epics.vtype.VStringArray;
 import org.epics.vtype.VShort;
 import org.epics.vtype.VEnum;
 import org.epics.vtype.VIntArray;
@@ -35,8 +36,10 @@
 import gov.aps.jca.dbr.*;
 
 import java.text.NumberFormat;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
 import java.util.regex.Pattern;
 
@@ -222,7 +225,7 @@ public VString createValue(DBR rawMessage, DBR metadata, CAConnectionPayload con
             } else {
                 timestamp = CADataUtils.timestampOf(message.getTimeStamp());
             }
-            return VString.of(String.valueOf(message.getStringValue()), alarm, timestamp);
+            return VString.of(String.valueOf(message.getStringValue()[0]), alarm, timestamp);
         }
     };
 
@@ -438,6 +441,28 @@ public VIntArray createValue(DBR value, DBR rawMetadata, CAConnectionPayload con
             return VIntArray.of(data, alarm, timestamp, display);
         }
     };
+    
+    // DBR_TIME_String -> VString
+    final static CATypeAdapter DBRStringToVStringArray = new CATypeAdapter(VStringArray.class, DBR_TIME_String.TYPE, null, false) {
+
+        @Override
+        public VStringArray createValue(DBR rawMessage, DBR metadata, CAConnectionPayload connPayload) {
+            DBR_TIME_String message = (DBR_TIME_String)rawMessage;
+            Alarm alarm;
+            if (!connPayload.isChannelConnected()) {
+                alarm = Alarm.disconnected();
+            } else {
+                alarm = CADataUtils.fromEpics(message.getSeverity());
+            }
+            Time timestamp;
+            if (!connPayload.isChannelConnected()) {
+                timestamp = Time.of(connPayload.getEventTime());
+            } else {
+                timestamp = CADataUtils.timestampOf(message.getTimeStamp());
+            }
+            return VStringArray.of(Arrays.asList(message.getStringValue()), alarm, timestamp);
+        }
+    };
 
     private static final Set<CATypeAdapter> converters;
 
@@ -459,6 +484,7 @@ public VIntArray createValue(DBR value, DBR rawMetadata, CAConnectionPayload con
         newFactories.add(DBRByteToVByteArray);
         newFactories.add(DBRShortToVShortArray);
         newFactories.add(DBRIntToVIntArray);
+        newFactories.add(DBRStringToVStringArray);
         converters = Collections.unmodifiableSet(newFactories);
     }