Merge pull request #103 from geniejhang/master

ArrayBuilder is created by factory.

Author: shroffk

epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/JsonArrays.java

@@ -257,7 +257,7 @@ public static List<Instant> toListTimestamp(JsonArray array) {
      * @return an array of strings
      */
     public static JsonArrayBuilder fromListString(List<String> list) {
-        JsonArrayBuilder b = Json.createArrayBuilder();
+        JsonArrayBuilder b = JsonVTypeBuilder.factory.createArrayBuilder();
         for (String element : list) {
             // TODO: Not clear how to handle nulls. Converting them to empty strings.
             if (element == null) {
@@ -275,7 +275,7 @@ public static JsonArrayBuilder fromListString(List<String> list) {
      * @return an array
      */
     public static JsonArrayBuilder fromListTimestamp(List<Instant> list) {
-        JsonArrayBuilder b = Json.createArrayBuilder();
+        JsonArrayBuilder b = JsonVTypeBuilder.factory.createArrayBuilder();
         for (Instant element : list) {
             if (element == null) {
                 b.addNull();
@@ -293,7 +293,7 @@ public static JsonArrayBuilder fromListTimestamp(List<Instant> list) {
      * @return an array of numbers
      */
     public static JsonArrayBuilder fromListNumber(ListNumber list) {
-        JsonArrayBuilder b = Json.createArrayBuilder();
+        JsonArrayBuilder b = JsonVTypeBuilder.factory.createArrayBuilder();
         if (list instanceof ListInteger || list instanceof ListUShort || list instanceof ListShort || list instanceof ListUByte || list instanceof ListByte) {
             for (int i = 0; i < list.size(); i++) {
                 b.add(list.getInt(i));

epics-vtype/vtype-json/src/main/java/org/epics/vtype/json/JsonVTypeBuilder.java

@@ -34,7 +34,7 @@
  */
 class JsonVTypeBuilder implements JsonObjectBuilder {
 
-    private static final JsonBuilderFactory factory = Json.createBuilderFactory(Collections.emptyMap());
+    public static final JsonBuilderFactory factory = Json.createBuilderFactory(Collections.emptyMap());
     private final JsonObjectBuilder builder = factory.createObjectBuilder();
 
     @Override
@@ -161,7 +161,7 @@ public JsonVTypeBuilder addListString(String string, List<String> ls) {
     }
 
     public JsonVTypeBuilder addListColumnType(String string, List<Class<?>> ls) {
-        JsonArrayBuilder b = Json.createArrayBuilder();
+        JsonArrayBuilder b = factory.createArrayBuilder();
         for (Class<?> element : ls) {
             if (element.equals(String.class)) {
                 b.add("String");
@@ -193,7 +193,7 @@ public JsonVTypeBuilder addListNumber(String string, ListNumber ln) {
     }
 
     public JsonVTypeBuilder addListBoolean(String string, ListBoolean lb) {
-        JsonArrayBuilder b = Json.createArrayBuilder();
+        JsonArrayBuilder b = factory.createArrayBuilder();
         for (int i = 0; i < lb.size(); i++) {
             b.add(lb.getBoolean(i));
         }