[2/2] mesos git commit: Required jsonifying of generic protobuf to be explicit opt-in [mesos].

[mp...@apache.org]

Required jsonifying of generic protobuf to be explicit opt-in [mesos].

Review: https://reviews.apache.org/r/43939/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b91a740f
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b91a740f
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b91a740f

Branch: refs/heads/master
Commit: b91a740fb3c6deca4b8f1ab6a7d83decf144b5fb
Parents: 1994504
Author: Michael Park <mp...@apache.org>
Authored: Sat Feb 27 18:12:13 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Sat Feb 27 18:16:28 2016 -0800

----------------------------------------------------------------------
 src/common/http.cpp | 18 ++++++++++++------
 src/master/http.cpp |  4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/b91a740f/src/common/http.cpp
----------------------------------------------------------------------
diff --git a/src/common/http.cpp b/src/common/http.cpp
index f8a0441..be8538f 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -417,11 +417,11 @@ void json(JSON::ObjectWriter* writer, const Task& task)
   }
 
   if (task.has_discovery()) {
-    writer->field("discovery", task.discovery());
+    writer->field("discovery", JSON::Protobuf(task.discovery()));
   }
 
   if (task.has_container()) {
-    writer->field("container", task.container());
+    writer->field("container", JSON::Protobuf(task.container()));
   }
 }
 
@@ -463,7 +463,7 @@ void json(JSON::ObjectWriter* writer, const CommandInfo& command)
   writer->field("argv", command.arguments());
 
   if (command.has_environment()) {
-    writer->field("environment", command.environment());
+    writer->field("environment", JSON::Protobuf(command.environment()));
   }
 
   writer->field("uris", [&command](JSON::ArrayWriter* writer) {
@@ -484,7 +484,7 @@ void json(JSON::ObjectWriter* writer, const ContainerStatus& status)
   }
 
   if (status.has_cgroup_info()) {
-    writer->field("cgroup_info", status.cgroup_info());
+    writer->field("cgroup_info", JSON::Protobuf(status.cgroup_info()));
   }
 }
 
@@ -501,7 +501,9 @@ void json(JSON::ObjectWriter* writer, const ExecutorInfo& executorInfo)
 
 void json(JSON::ArrayWriter* writer, const Labels& labels)
 {
-  json(writer, labels.labels());
+  foreach (const Label& label, labels.labels()) {
+    writer->element(JSON::Protobuf(label));
+  }
 }
 
 
@@ -520,7 +522,11 @@ void json(JSON::ObjectWriter* writer, const NetworkInfo& info)
   }
 
   if (info.ip_addresses().size() > 0) {
-    writer->field("ip_addresses", info.ip_addresses());
+    writer->field("ip_addresses", [&info](JSON::ArrayWriter* writer) {
+      foreach (const NetworkInfo::IPAddress& ipAddress, info.ip_addresses()) {
+        writer->element(JSON::Protobuf(ipAddress));
+      }
+    });
   }
 }
 

http://git-wip-us.apache.org/repos/asf/mesos/blob/b91a740f/src/master/http.cpp
----------------------------------------------------------------------
diff --git a/src/master/http.cpp b/src/master/http.cpp
index f3ce1aa..22f52f4 100644
--- a/src/master/http.cpp
+++ b/src/master/http.cpp
@@ -255,11 +255,11 @@ void json(JSON::ObjectWriter* writer, const Full<Framework>& full)
         }
 
         if (taskInfo.has_discovery()) {
-          writer->field("discovery", taskInfo.discovery());
+          writer->field("discovery", JSON::Protobuf(taskInfo.discovery()));
         }
 
         if (taskInfo.has_container()) {
-          writer->field("container", taskInfo.container());
+          writer->field("container", JSON::Protobuf(taskInfo.container()));
         }
       });
     }