commit 14b3e6e052de2e706cfa6f011c5db83fb6ca6e65
author Alex Vakulenko <avakulenko@google.com> Thu Dec 10 10:01:36 2015 -0800
committer Alex Vakulenko <avakulenko@google.com> Thu Dec 10 12:28:28 2015 -0800
tree 38cb77f038a3ff400bab5ed84f457bfe2524dc79
parent 3bd3ececdd8ab45b6b2e81c8fbbbe60c850c2a2c

Remove deprecated libweave APIs

With libweave old (commanddef/state) APIs officially deprecated, removed
their usage from weaved. In places when weaved loads legacy command/state
definitions for vendor daemons, this couldn't be done yet, so the
deprecated API warnings were temporary disabled in the make file.

Also removed D-Bus methods/properties to work with the legacy state
snapshot and instead exposed Components/Traits properties out of the daemon.

BUG: 25917706
Change-Id: I328aff526f284dc69560a7bd7907ad838c0365e2

buffet/manager.cc

diff --git a/buffet/manager.cc b/buffet/manager.cc
index 85a9024..4cfa902 100644
--- a/buffet/manager.cc
+++ b/buffet/manager.cc
@@ -236,8 +236,15 @@
   command_dispatcher_.reset(
       new DBusCommandDispacher{dbus_object_.GetObjectManager(), device_.get()});
 
+  device_->AddTraitDefsChangedCallback(
+      base::Bind(&Manager::OnTraitDefsChanged,
+                 weak_ptr_factory_.GetWeakPtr()));
   device_->AddStateChangedCallback(
-      base::Bind(&Manager::OnStateChanged, weak_ptr_factory_.GetWeakPtr()));
+      base::Bind(&Manager::OnComponentTreeChanged,
+                 weak_ptr_factory_.GetWeakPtr()));
+  device_->AddComponentTreeChangedCallback(
+      base::Bind(&Manager::OnComponentTreeChanged,
+                 weak_ptr_factory_.GetWeakPtr()));
 
   device_->AddGcdStateChangedCallback(
       base::Bind(&Manager::OnGcdStateChanged, weak_ptr_factory_.GetWeakPtr()));
@@ -315,13 +322,6 @@
   response->Return();
 }
 
-bool Manager::GetState(brillo::ErrorPtr* error, std::string* state) {
-  const base::DictionaryValue& json = device_->GetState();
-  base::JSONWriter::WriteWithOptions(
-      json, base::JSONWriter::OPTIONS_PRETTY_PRINT, state);
-  return true;
-}
-
 void Manager::AddCommand(DBusMethodResponsePtr<std::string> response,
                          const std::string& json_command) {
   std::string error_message;
@@ -352,12 +352,20 @@
   return message;
 }
 
-void Manager::OnStateChanged() {
-  const base::DictionaryValue& state = device_->GetState();
+void Manager::OnTraitDefsChanged() {
+  const base::DictionaryValue& state = device_->GetTraits();
   std::string json;
   base::JSONWriter::WriteWithOptions(
       state, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
-  dbus_adaptor_.SetState(json);
+  dbus_adaptor_.SetTraits(json);
+}
+
+void Manager::OnComponentTreeChanged() {
+  const base::DictionaryValue& state = device_->GetComponents();
+  std::string json;
+  base::JSONWriter::WriteWithOptions(
+      state, base::JSONWriter::OPTIONS_PRETTY_PRINT, &json);
+  dbus_adaptor_.SetComponents(json);
 }
 
 void Manager::OnGcdStateChanged(weave::GcdState state) {