Merge pull request #10 from GDLMadushanka/json

Handle null values in JSON to CSV conversion.
wso2-extensions · Dec 21, 2021 · aae00e9 · aae00e9
2 parents 98bd092 + dd9ccbb
commit aae00e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.module</groupId>
     <artifactId>mediation-csv-module</artifactId>
-    <version>1.0.2</version>
+    <version>1.0.3</version>
     <packaging>jar</packaging>
     <name>WSO2 Carbon - Connector For csvConnector</name>
     <url>http://wso2.org</url>
@@ -265,7 +265,7 @@
                             <goal>attached</goal>
                         </goals>
                         <configuration>
-                            <finalName>${connector.name}-connector-1.0.1</finalName>
+                            <finalName>${connector.name}-connector-1.0.3</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <filters>
                                 <filter>src/main/assembly/filter.properties</filter>

diff --git a/src/main/java/org/wso2/carbon/module/csv/JsonToCsvTransformer.java b/src/main/java/org/wso2/carbon/module/csv/JsonToCsvTransformer.java
@@ -20,6 +20,7 @@
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 import com.google.gson.JsonObject;
 import org.apache.commons.lang.StringUtils;
 import org.wso2.carbon.module.core.SimpleMediator;
@@ -48,7 +49,11 @@ public void mediate(SimpleMessageContext mc) {
                     List<String> csvEntry = new ArrayList<>();
                     Set<Map.Entry<String, JsonElement>> entries = obj.entrySet();
                     for (Map.Entry<String, JsonElement> elementEntry : entries) {
-                        csvEntry.add(elementEntry.getValue().getAsString());
+                        if (elementEntry.getValue() instanceof JsonNull) {
+                            csvEntry.add("");
+                        } else {
+                            csvEntry.add(elementEntry.getValue().getAsString());
+                        }
                     }
 
                     return csvEntry.toArray(new String[]{});