Fix: Convert PersistentBag to ArrayList in CollectionConverterCompatibility

Author: ChathuniSoori

api-2.0/src/main/java/org/openmrs/module/metadatasharing/serializer/converter/CollectionConverterCompatibility2_0.java

@@ -45,22 +45,25 @@ public boolean canConvert(Class type) {
 	}
 
 	@Override
-	public void marshal(Object source, HierarchicalStreamWriter writer,
-			MarshallingContext context, ConverterLookup converterLookup) {
-		
-		if (source instanceof PersistentList) {
-			source = new ArrayList((Collection) source);
-		} else if (source instanceof PersistentMap) {
-			source = new HashMap((Map) source);
-		} else if (source instanceof PersistentSortedMap) {
-			source = new TreeMap((SortedMap) source);
-		} else if (source instanceof PersistentSortedSet) {
-			source = new TreeSet((SortedSet) source);
-		} else if (source instanceof PersistentSet) {
-			source = new HashSet((Set) source);
-		}
-		
-		// delegate the collection to the appropriate converter
-		converterLookup.lookupConverterForType(source.getClass()).marshal(source, writer, context);
-	}
+public void marshal(Object source, HierarchicalStreamWriter writer,
+                    MarshallingContext context, ConverterLookup converterLookup) {
+
+    if (source instanceof PersistentBag) {
+        source = new ArrayList<>((Collection<?>) source);
+    } else if (source instanceof PersistentList) {
+        source = new ArrayList<>((Collection<?>) source);
+    } else if (source instanceof PersistentMap) {
+        source = new HashMap<>((Map<?, ?>) source);
+    } else if (source instanceof PersistentSortedMap) {
+        source = new TreeMap<>((SortedMap<?, ?>) source);
+    } else if (source instanceof PersistentSortedSet) {
+        source = new TreeSet<>((SortedSet<?>) source);
+    } else if (source instanceof PersistentSet) {
+        source = new HashSet<>((Set<?>) source);
+    }
+
+    // Delegate to appropriate converter
+    converterLookup.lookupConverterForType(source.getClass()).marshal(source, writer, context);
+}
+
 }