commit eb9f77d50d4b14c2805fd0888029281d93bd16cd
author Jian Li <pyguni@gmail.com> Tue Feb 20 11:25:45 2018 +0900
committer Jian Li <pyguni@gmail.com> Tue Feb 20 05:08:43 2018 +0000
tree 95a72a211882ee456dc1a947714e5a029816e60d
parent 091d8d227c7138c3660b61ac7ee9b04c52e06308

Refactor: remove duplicated code snippet w modelEntityToJson method

Change-Id: I047c6dda433d76eeb0a761ba0e1525b0dc6a5d5f

apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java

diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
index 4cd216d..9342bca 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackSecurityGroupListCommand.java
@@ -18,13 +18,11 @@
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.common.collect.Lists;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService;
-import org.openstack4j.core.transport.ObjectMapperSingleton;
 import org.openstack4j.model.network.SecurityGroup;
 import org.openstack4j.openstack.networking.domain.NeutronSecurityGroup;
 
@@ -32,6 +30,7 @@
 import java.util.List;
 
 import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static org.onosproject.openstacknetworking.util.OpenstackUtil.modelEntityToJson;
 
 /**
  * Lists OpenStack security groups.
@@ -72,19 +71,8 @@
     private JsonNode json(List<SecurityGroup> securityGroups) {
         ArrayNode result = mapper().enable(INDENT_OUTPUT).createArrayNode();
         for (SecurityGroup sg: securityGroups) {
-            result.add(writeSecurityGroup(sg));
+            result.add(modelEntityToJson(sg, NeutronSecurityGroup.class));
         }
         return result;
     }
-
-    private ObjectNode writeSecurityGroup(SecurityGroup sg) {
-        try {
-            String strSg = ObjectMapperSingleton.getContext(NeutronSecurityGroup.class)
-                    .writerFor(NeutronSecurityGroup.class)
-                    .writeValueAsString(sg);
-            return (ObjectNode) mapper().readTree(strSg.getBytes());
-        } catch (Exception e) {
-            throw new IllegalArgumentException();
-        }
-    }
 }