Merge pull request #542 from pkornowski/MOTECH-3170

MOTECH-3170: Added deserializer to OpenMRS Observation.

Author: pkornowski

openmrs/src/main/java/org/motechproject/openmrs/domain/Observation.java

@@ -8,12 +8,15 @@
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
+import org.motechproject.openmrs.util.JsonUtils;
 
 import java.lang.reflect.Type;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 /**
@@ -236,6 +239,20 @@ public JsonElement serialize(Observation observation, Type typeOfSrc, JsonSerial
         }
     }
 
+    public static class ObservationDeserializer implements JsonDeserializer<Observation> {
+        @Override
+        public Observation deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
+            return (Observation) JsonUtils.readJsonWithAdapters(json.toString(), Observation.class, getValueAdapter());
+        }
+
+        private Map<Type, Object> getValueAdapter() {
+            Map<Type, Object> valueAdapter = new HashMap<>();
+            valueAdapter.put(Observation.ObservationValue.class, new Observation.ObservationValueDeserializer());
+
+            return valueAdapter;
+        }
+    }
+
     /**
      * Represents a single value of the observation.
      */
@@ -312,8 +329,12 @@ public ObservationValue deserialize (JsonElement json, Type typeOfT, JsonDeseria
 
             if (json.isJsonObject()) {
                 JsonObject jsonObject = json.getAsJsonObject();
-                observationValue.setDisplay(jsonObject.get(DISPLAY_KEY).getAsString());
-                observationValue.setUuid(jsonObject.get(UUID_KEY).getAsString());
+                if (jsonObject.has(DISPLAY_KEY)) {
+                    observationValue.setDisplay(jsonObject.get(DISPLAY_KEY).getAsString());
+                }
+                if (jsonObject.has(UUID_KEY)) {
+                    observationValue.setUuid(jsonObject.get(UUID_KEY).getAsString());
+                }
             } else if (json.isJsonPrimitive()) {
                 JsonPrimitive jsonPrimitive = json.getAsJsonPrimitive();
                 observationValue.setDisplay(jsonPrimitive.getAsString());

openmrs/src/main/java/org/motechproject/openmrs/resource/impl/EncounterResourceImpl.java

@@ -99,16 +99,24 @@ private Gson buildGsonWithAdaptersSerialize() {
 
     private Gson buildGsonWithAdaptersDeserialize() {
         return new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
                 .registerTypeAdapter(Encounter.class, new Encounter.EncounterDeserializer())
                 .create();
     }
 
+    private Gson buildGsonWithAdaptersDeserializeV112() {
+        return new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+                .registerTypeAdapter(Observation.class, new Observation.ObservationDeserializer())
+                .create();
+    }
+
     private Encounter checkVersionAndSetEncounter(Config config, String responseJson) {
         Encounter createdEncounter;
         if (OPENMRS_V19.equals(config.getOpenMrsVersion())) {
             createdEncounter = buildGsonWithAdaptersDeserialize().fromJson(responseJson, Encounter.class);
         } else {
-            createdEncounter = (Encounter) JsonUtils.readJson(responseJson, Encounter.class);
+            createdEncounter = buildGsonWithAdaptersDeserializeV112().fromJson(responseJson, Encounter.class);
         }
         return createdEncounter;
     }

openmrs/src/test/resources/json/encounter/encounter-by-patient-response-v1-12.json

@@ -2,7 +2,7 @@
   "results":[
     {
       "uuid":"446d0bec-5e65-4f25-aacd-ee7da78ec616",
-      "encounterDatetime":"2012-06-03T00:00:00.000Z",
+      "encounterDatetime":"2012-06-03T00:00:00.000+0000",
       "patient":{
         "uuid":"71ba40ce-b638-494f-b284-556f0f77955f"
       },

openmrs/src/test/resources/json/encounter/encounter-by-patient-response-v1-9.json

@@ -2,7 +2,7 @@
   "results":[
     {
       "uuid":"446d0bec-5e65-4f25-aacd-ee7da78ec616",
-      "encounterDatetime":"2012-06-03T00:00:00.000Z",
+      "encounterDatetime":"2012-06-03T00:00:00.000+0000",
       "patient":{
         "uuid":"71ba40ce-b638-494f-b284-556f0f77955f"
       },

openmrs/src/test/resources/json/encounter/encounter-list-results.json

@@ -2,7 +2,7 @@
   "results":[
     {
       "uuid":"446d0bec-5e65-4f25-aacd-ee7da78ec616",
-      "encounterDatetime":"2012-06-03T00:00:00.000Z",
+      "encounterDatetime":"2012-06-03T00:00:00.000+0000",
       "patient":{
         "uuid":"71ba40ce-b638-494f-b284-556f0f77955f"
       },