Fix #21 JsonConfig.IncludeNullValues for response

Add tests.
Up version to 1.0.26 ready for release.

Author: Layoric

src/AndroidClient/android/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
-version = "1.0.25"
+version = "1.0.26"
 
 android {
     compileSdkVersion 23

src/AndroidClient/client/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     testCompile 'org.mockito:mockito-core:1.9.5'
 }
 
-version = "1.0.25"
+version = "1.0.26"
 group = "net.servicestack"                                        // Maven Group ID for the artifact
 String packageId = "client"
 String groupID = group

src/AndroidClient/client/src/main/java/net/servicestack/client/Utils.java

@@ -548,11 +548,11 @@ public static ResponseStatus createResponseStatus(JsonObject obj) {
                 Object field = obj.get(key);
 
                 if (varName.toLowerCase().equals("errorcode")) {
-                    status.setErrorCode(jsonElementEntry.getValue().getAsString());
+                    status.setErrorCode(getAsStringOrNull(jsonElementEntry.getValue()));
                 } else if (varName.toLowerCase().equals("message")) {
-                    status.setMessage(jsonElementEntry.getValue().getAsString());
+                    status.setMessage(getAsStringOrNull(jsonElementEntry.getValue()));
                 } else if (varName.toLowerCase().equals("stacktrace")) {
-                    status.setStackTrace(jsonElementEntry.getValue().getAsString());
+                    status.setStackTrace(getAsStringOrNull(jsonElementEntry.getValue()));
                 } else if (varName.toLowerCase().equals("errors")) {
 
                     if (field instanceof JsonArray){
@@ -567,11 +567,11 @@ public static ResponseStatus createResponseStatus(JsonObject obj) {
                                 String fieldName = Utils.sanitizeVarName(fieldKey);
 
                                 if (fieldName.toLowerCase().equals("errorcode")) {
-                                    fieldError.setErrorCode(entry.getValue().getAsString());
+                                    fieldError.setErrorCode(getAsStringOrNull(entry.getValue()));
                                 } else if (fieldName.toLowerCase().equals("message")) {
-                                    fieldError.setMessage(entry.getValue().getAsString());
+                                    fieldError.setMessage(getAsStringOrNull(entry.getValue()));
                                 } else if (fieldName.toLowerCase().equals("fieldname")) {
-                                    fieldError.setFieldName(entry.getValue().getAsString());
+                                    fieldError.setFieldName(getAsStringOrNull(entry.getValue()));
                                 }
 
                             }
@@ -729,6 +729,10 @@ public static byte[] toBase64Bytes(byte[] source, int off, int len) {
         }
     }
 
+    private static String getAsStringOrNull(JsonElement jsonElement) {
+        return jsonElement.isJsonNull() ? null : jsonElement.getAsString();
+    }
+
     private final static byte EQUALS_SIGN = (byte)'=';
 
     private final static byte[] _STANDARD_ALPHABET = {

src/AndroidClient/client/src/test/java/net/servicestack/client/tests/UtilsTests.java

@@ -1,6 +1,8 @@
 package net.servicestack.client.tests;
 
+import com.google.gson.*;
 import junit.framework.TestCase;
+import net.servicestack.client.ResponseStatus;
 import net.servicestack.client.Utils;
 
 import java.text.SimpleDateFormat;
@@ -42,4 +44,20 @@ public void test_Can_parse_pre_UnixTime(){
         Date date = Utils.parseDate("\\/Date(-30610224000)\\/");
         assertEquals(new Date(-30610224000L), date);
     }
+
+    public void test_Can_parse_response_with_server_enabled_nulls() {
+        JsonObject jsonObject = new JsonParser().parse("{\n" +
+                "    \"ResponseStatus\": {\n" +
+                "        \"ErrorCode\": \"ModelNotFoundException\",\n" +
+                "        \"Message\": \"The specified model was not found\",\n" +
+                "        \"StackTrace\": null,\n" +
+                "        \"Errors\": [],\n" +
+                "        \"Meta\": null\n" +
+                "    }\n" +
+                "}").getAsJsonObject();
+        ResponseStatus responseStatus = Utils.createResponseStatus(jsonObject.get("ResponseStatus"));
+        assertEquals(responseStatus.getErrorCode(),"ModelNotFoundException");
+        assertEquals(responseStatus.getMessage(),"The specified model was not found");
+        assertEquals(responseStatus.getErrors().size(),0);
+    }
 }