Refactor: remove duplicated code snippet w jsonToModelEntity method
Change-Id: I9d8ba515cf36ce3536c41802113cdb11c157a5e5
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
index fb6192c..79bc676 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java
@@ -19,11 +19,9 @@
* Handles Rest API call from Neutron ML2 plugin.
*/
-import com.fasterxml.jackson.databind.JsonNode;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onosproject.openstacknetworking.api.OpenstackNetworkAdminService;
import org.onosproject.rest.AbstractWebResource;
-import org.openstack4j.core.transport.ObjectMapperSingleton;
import org.openstack4j.openstack.networking.domain.NeutronSubnet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,10 +40,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;
@Path("subnets")
public class OpenstackSubnetWebResource extends AbstractWebResource {
@@ -74,7 +72,9 @@
public Response createSubnet(InputStream input) {
log.trace(String.format(MESSAGE, "CREATE"));
- final NeutronSubnet subnet = readSubnet(input);
+ final NeutronSubnet subnet = (NeutronSubnet)
+ jsonToModelEntity(input, NeutronSubnet.class);
+
adminService.createSubnet(subnet);
UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
.path(SUBNETS)
@@ -100,7 +100,9 @@
public Response updateSubnet(@PathParam("id") String id, InputStream input) {
log.trace(String.format(MESSAGE, "UPDATE " + id));
- final NeutronSubnet subnet = readSubnet(input);
+ final NeutronSubnet subnet = (NeutronSubnet)
+ jsonToModelEntity(input, NeutronSubnet.class);
+
adminService.updateSubnet(subnet);
return status(Response.Status.OK).build();
@@ -122,16 +124,4 @@
adminService.removeSubnet(id);
return noContent().build();
}
-
- private NeutronSubnet readSubnet(InputStream input) {
- try {
- JsonNode jsonTree = mapper().enable(INDENT_OUTPUT).readTree(input);
- log.trace(mapper().writeValueAsString(jsonTree));
- return ObjectMapperSingleton.getContext(NeutronSubnet.class)
- .readerFor(NeutronSubnet.class)
- .readValue(jsonTree);
- } catch (Exception e) {
- throw new IllegalArgumentException();
- }
- }
}