Refactor: remove duplicated code snippet w modelEntityToJson method
Change-Id: I047c6dda433d76eeb0a761ba0e1525b0dc6a5d5f
diff --git a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
index 49483f1..401dddc 100644
--- a/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
+++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackNetworkListCommand.java
@@ -18,12 +18,10 @@
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.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.openstacknetworking.api.OpenstackNetworkService;
-import org.openstack4j.core.transport.ObjectMapperSingleton;
import org.openstack4j.model.network.Network;
import org.openstack4j.model.network.Subnet;
import org.openstack4j.openstack.networking.domain.NeutronNetwork;
@@ -33,6 +31,7 @@
import java.util.stream.Collectors;
import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static org.onosproject.openstacknetworking.util.OpenstackUtil.modelEntityToJson;
/**
* Lists OpenStack networks.
@@ -75,19 +74,8 @@
private JsonNode json(List<Network> networks) {
ArrayNode result = mapper().enable(INDENT_OUTPUT).createArrayNode();
for (Network net: networks) {
- result.add(writeNetwork(net));
+ result.add(modelEntityToJson(net, NeutronNetwork.class));
}
return result;
}
-
- private ObjectNode writeNetwork(Network net) {
- try {
- String strNet = ObjectMapperSingleton.getContext(NeutronNetwork.class)
- .writerFor(NeutronNetwork.class)
- .writeValueAsString(net);
- return (ObjectNode) mapper().readTree(strNet.getBytes());
- } catch (Exception e) {
- throw new IllegalStateException();
- }
- }
}