Add the new "type" field to internal data model of Java Cloud Debugger. The type is neither populated nor sent to the backend at this point.

vladlf · vladlf · commit 89cbfcdfdfd8 · 2015-11-25T12:45:19.000-08:00
------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=108622446
diff --git a/src/agent/model.h b/src/agent/model.h
@@ -64,6 +64,7 @@ struct SourceLocationModel {
 struct VariableModel {
   string name;
   Nullable<string> value;
+  string type;
   Nullable<uint64> var_table_index;
   std::vector<std::unique_ptr<VariableModel>> members;
   std::unique_ptr<StatusMessageModel> status;
diff --git a/src/agent/model_json.cc b/src/agent/model_json.cc
@@ -401,6 +401,10 @@ static void SerializeModel(
     (*root)["value"] = Json::Value(model.value.value());
   }
 
+  if (!model.type.empty()) {
+    (*root)["type"] = Json::Value(model.type);
+  }
+
   if (model.var_table_index.has_value()) {
     (*root)["varTableIndex"] =
         Json::Value(static_cast<int>(model.var_table_index.value()));
@@ -429,6 +433,13 @@ std::unique_ptr<VariableModel> DeserializeModel<VariableModel>(
     model->value.clear();
   }
 
+  // Type.
+  if (root.isMember("type")) {
+    model->type = JsonCppGetString(root, "type");
+  } else {
+    model->type.clear();
+  }
+
   // Reference to object in "variable_table".
   if (root.isMember("varTableIndex")) {
     model->var_table_index = JsonCppGetInt(root, "varTableIndex", -1);
diff --git a/src/agent/model_util.h b/src/agent/model_util.h
@@ -161,6 +161,7 @@ class VariableBuilder {
   explicit VariableBuilder(const VariableModel& source) {
     data_->name = source.name;
     data_->value = source.value;
+    data_->type = source.type;
     data_->var_table_index = source.var_table_index;
 
     data_->members.reserve(source.members.size());
@@ -197,6 +198,16 @@ class VariableBuilder {
     return *this;
   }
 
+  VariableBuilder& set_type(string type) {
+    data_->type = std::move(type);
+    return *this;
+  }
+
+  VariableBuilder& clear_type() {
+    data_->type.clear();
+    return *this;
+  }
+
   VariableBuilder& set_var_table_index(int var_table_index) {
     data_->var_table_index = var_table_index;
     return *this;
