--- a/plugins/vm-jmx/common/pom.xml	Thu May 25 14:03:10 2017 -0400
+++ b/plugins/vm-jmx/common/pom.xml	Thu May 25 14:03:41 2017 -0400
@@ -107,5 +107,10 @@
       <artifactId>thermostat-storage-core</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${gson.version}</version>
+    </dependency>
   </dependencies>
 </project>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/vm-jmx/common/src/main/java/com/redhat/thermostat/vm/jmx/common/internal/JmxNotificationTypeAdapter.java	Thu May 25 14:03:41 2017 -0400
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2012-2017 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.vm.jmx.common.internal;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import com.redhat.thermostat.vm.jmx.common.JmxNotification;
+
+import java.io.IOException;
+
+public class JmxNotificationTypeAdapter extends TypeAdapter<JmxNotification> {
+
+    private static final String TYPE_LONG = "$numberLong";
+    private static final String TIMESTAMP = "timeStamp";
+    private static final String VM_ID = "vmId";
+    private static final String AGENT_ID = "agentId";
+    private static final String SOURCE_BACKEND = "sourceBackend";
+    private static final String SOURCE_DETAILS = "sourceDetails";
+    private static final String CONTENTS = "contents";
+
+    @Override
+    public JmxNotification read(JsonReader in) throws IOException {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void write(JsonWriter out, JmxNotification j) throws IOException {
+        out.beginObject();
+        out.name(TIMESTAMP);
+        writeLong(out, j.getTimeStamp());
+        out.name(VM_ID);
+        out.value(j.getVmId());
+        out.name(AGENT_ID);
+        out.value(j.getAgentId());
+        out.name(SOURCE_BACKEND);
+        out.value(j.getSourceBackend());
+        out.name(SOURCE_DETAILS);
+        out.value(j.getSourceDetails());
+        out.name(CONTENTS);
+        out.value(j.getContents());
+        out.endObject();
+    }
+
+    private void writeLong(JsonWriter out, long value) throws IOException {
+        // Write MongoDB representation of a Long
+        out.beginObject();
+        out.name(TYPE_LONG);
+        out.value(String.valueOf(value));
+        out.endObject();
+    }
+}

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/plugins/vm-jmx/common/src/test/java/com/redhat/thermostat/vm/jmx/common/internal/JmxNotificationTypeAdapterTest.java	Thu May 25 14:03:41 2017 -0400
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2012-2017 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.vm.jmx.common.internal;
+
+import com.google.gson.GsonBuilder;
+import com.google.gson.Gson;
+import com.redhat.thermostat.vm.jmx.common.JmxNotification;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class JmxNotificationTypeAdapterTest {
+
+    @Test
+    public void testJmxNotificationGetsSerializedCorrectly() {
+        GsonBuilder builder = new GsonBuilder();
+        builder.registerTypeAdapter(JmxNotification.class, new JmxNotificationTypeAdapter());
+        Gson gson = builder.create();
+        JmxNotification notification = new JmxNotification();
+        notification.setTimeStamp(123456789l);
+        notification.setContents("This is a notification");
+        notification.setSourceBackend("Non existent Backend");
+        notification.setSourceDetails("Non existent details");
+        notification.setVmId("0");
+        notification.setAgentId("0");
+        assertEquals("{\"timeStamp\":{\"$numberLong\":\"123456789\"},\"vmId\":\"0\",\"agentId\":\"0\",\"sourceBackend\":\"Non existent Backend\",\"sourceDetails\":\"Non existent details\",\"contents\":\"This is a notification\"}", gson.toJson(notification));
+    }
+
+}