commit 091d8d227c7138c3660b61ac7ee9b04c52e06308
author Jian Li <pyguni@gmail.com> Tue Feb 20 10:42:06 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Feb 20 04:11:23 2018 +0000
tree 259994f7e81558a475c9b7fe2a0a28aca792ae91
parent 04c40ccfb3c5e22e8b25f891cb9390dd585529ef

Refactor: remove duplicated code snippet w jsonToModelEntity method

Change-Id: I9d8ba515cf36ce3536c41802113cdb11c157a5e5

apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
index 5959101..0f6f729 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java
@@ -15,11 +15,9 @@
  */
 package org.onosproject.openstacknetworking.web;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import org.onlab.osgi.DefaultServiceDirectory;
 import org.onosproject.openstacknetworking.api.OpenstackRouterAdminService;
 import org.onosproject.rest.AbstractWebResource;
-import org.openstack4j.core.transport.ObjectMapperSingleton;
 import org.openstack4j.openstack.networking.domain.NeutronRouter;
 import org.openstack4j.openstack.networking.domain.NeutronRouterInterface;
 import org.slf4j.Logger;
@@ -39,10 +37,10 @@
 import javax.ws.rs.core.UriInfo;
 import java.io.InputStream;
 
-import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
 import static javax.ws.rs.core.Response.created;
 import static javax.ws.rs.core.Response.noContent;
 import static javax.ws.rs.core.Response.status;
+import static org.onosproject.openstacknetworking.util.OpenstackUtil.jsonToModelEntity;
 
 /**
  * Handles REST API call of Neturon L3 plugin.
@@ -76,7 +74,9 @@
     public Response createRouter(InputStream input) {
         log.trace(String.format(MESSAGE_ROUTER, "CREATE"));
 
-        final NeutronRouter osRouter = readRouter(input);
+        final NeutronRouter osRouter = (NeutronRouter)
+                            jsonToModelEntity(input, NeutronRouter.class);
+
         adminService.createRouter(osRouter);
 
         UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
@@ -102,7 +102,9 @@
     public Response updateRouter(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE_ROUTER, "UPDATE " + id));
 
-        final NeutronRouter osRouter = readRouter(input);
+        final NeutronRouter osRouter = (NeutronRouter)
+                            jsonToModelEntity(input, NeutronRouter.class);
+
         osRouter.setId(id);
         adminService.updateRouter(osRouter);
 
@@ -125,7 +127,9 @@
     public Response addRouterInterface(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE_ROUTER_IFACE, "UPDATE " + id));
 
-        final NeutronRouterInterface osRouterIface = readRouterInterface(input);
+        final NeutronRouterInterface osRouterIface = (NeutronRouterInterface)
+                        jsonToModelEntity(input, NeutronRouterInterface.class);
+
         adminService.addRouterInterface(osRouterIface);
 
         return status(Response.Status.OK).build();
@@ -147,7 +151,9 @@
     public Response removeRouterInterface(@PathParam("id") String id, InputStream input) {
         log.trace(String.format(MESSAGE_ROUTER_IFACE, "DELETE " + id));
 
-        final NeutronRouterInterface osRouterIface = readRouterInterface(input);
+        final NeutronRouterInterface osRouterIface = (NeutronRouterInterface)
+                        jsonToModelEntity(input, NeutronRouterInterface.class);
+
         adminService.removeRouterInterface(osRouterIface.getPortId());
 
         return status(Response.Status.OK).build();
@@ -168,28 +174,4 @@
         adminService.removeRouter(id);
         return noContent().build();
     }
-
-    private NeutronRouter readRouter(InputStream input) {
-        try {
-            JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
-            log.trace(mapper().writeValueAsString(jsonTree));
-            return ObjectMapperSingleton.getContext(NeutronRouter.class)
-                    .readerFor(NeutronRouter.class)
-                    .readValue(jsonTree);
-        } catch (Exception e) {
-            throw new IllegalArgumentException();
-        }
-    }
-
-    private NeutronRouterInterface readRouterInterface(InputStream input) {
-        try {
-            JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
-            log.trace(mapper().writeValueAsString(jsonTree));
-            return ObjectMapperSingleton.getContext(NeutronRouterInterface.class)
-                    .readerFor(NeutronRouterInterface.class)
-                    .readValue(jsonTree);
-        } catch (Exception e) {
-            throw new IllegalArgumentException();
-        }
-    }
 }