commit 2ddc411403ef18d0dcfacd45d48127182e8959c2
author Jonathan Hart <jono@onlab.us> Wed Sep 16 09:28:07 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Mon Sep 21 19:52:47 2015 +0000
tree 9c57ec56f5f9c5caabef2c67b713eb4ddbae80d6
parent 6e968e1d77c44c9d94bff59877d4ca34bac567f3

Pretty print the output of the netcfg command

Change-Id: Id76124517ff6ad1f8f607654cded3360b5981049

cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java

diff --git a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
index 5f2f86e..d99a183 100644
--- a/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/cfg/NetworkConfigCommand.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.cli.cfg;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -52,7 +53,7 @@
     @Override
     protected void execute() {
         service = get(NetworkConfigService.class);
-        JsonNode root = new ObjectMapper().createObjectNode();
+        JsonNode root = mapper.createObjectNode();
         if (isNullOrEmpty(subjectKey)) {
             addAll((ObjectNode) root);
         } else {
@@ -68,14 +69,19 @@
                 }
             }
         }
-        print("%s", root.toString());
+
+        try {
+            print("%s", mapper.writerWithDefaultPrettyPrinter().writeValueAsString(root));
+        } catch (JsonProcessingException e) {
+            throw new RuntimeException("Error writing JSON to string", e);
+        }
     }
 
     @SuppressWarnings("unchecked")
     private void addAll(ObjectNode root) {
         service.getSubjectClasses()
                 .forEach(sc -> {
-                    SubjectFactory sf = service.getSubjectFactory((Class) sc);
+                    SubjectFactory sf = service.getSubjectFactory(sc);
                     addSubjectClass(newObject(root, sf.subjectKey()), sf);
                 });
     }