commit 68e8dd66617f5f145b4d388b163ac4052b88b3d8
author Jonathan Hart <jono@onlab.us> Tue Aug 26 18:06:23 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:25 2014 -0700
tree 5452f476b73f2b0a7a5585789b7740c419e1d108
parent b0d8624f62b1f4e0c44991e255a9bdfbf0c5a250

Hook up the Intent and Flow REST APIs to the modules/services.

This involved some slight changes to the way the intent service is registered
with the Floodlight module framework. Also FlowManagerModule is now registered
in the services file.

Change-Id: I6a97599e625c385a07996e03236fe94af4705650

src/main/java/net/floodlightcontroller/restserver/CustomSerializerHelper.java

diff --git a/src/main/java/net/floodlightcontroller/restserver/CustomSerializerHelper.java b/src/main/java/net/floodlightcontroller/restserver/CustomSerializerHelper.java
index 9810563..8f99be0 100644
--- a/src/main/java/net/floodlightcontroller/restserver/CustomSerializerHelper.java
+++ b/src/main/java/net/floodlightcontroller/restserver/CustomSerializerHelper.java
@@ -24,7 +24,6 @@
  * used on the class in different contexts.
  */
 public class CustomSerializerHelper {
-    private final ObjectMapper mapper;
     private final SimpleModule customSerializerModule;
     private CustomSerializerFactory sf;
 
@@ -32,9 +31,7 @@
      * Constructor.
      */
     public CustomSerializerHelper() {
-        mapper = new ObjectMapper();
         customSerializerModule = new SimpleModule("custom-serializers", new Version(1, 0, 0, null));
-        mapper.registerModule(customSerializerModule);
         sf =  new CustomSerializerFactory();
     }
 
@@ -58,9 +55,12 @@
      * @return a representation with the custom serializers applied
      */
     public Representation applySerializers(JacksonRepresentation<?> jacksonRepresentation) {
+        ObjectMapper mapper = jacksonRepresentation.getObjectMapper();
+
         mapper.registerModule(customSerializerModule);
-        jacksonRepresentation.setObjectMapper(mapper);
         mapper.setSerializerFactory(sf);
+        jacksonRepresentation.setObjectMapper(mapper);
+
         return jacksonRepresentation;
     }
 }