[controller] Remove deprecated controller interface (project-chip#5392)

Now that all controller applications have been migrated to the new CHIP controller interface, the deprecated controller classes can be removed.
nemik · Mar 16, 2021 · 43bb001 · 43bb001
1 parent c715269
commit 43bb001
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 476 deletions.
diff --git a/docs/dots/Rendezvous/RendezvousSessionGeneral.dot b/docs/dots/Rendezvous/RendezvousSessionGeneral.dot
@@ -6,7 +6,7 @@ digraph RendezvousSession
   subgraph cluster_controller {
     label=<<b>Controller</b>>
 
-    ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
+    DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
   }
 
   # This section represents device-only elements
@@ -29,9 +29,9 @@ digraph RendezvousSession
   # Main relationships
   #############################
   RendezvousParameters [shape=ellipse, URL="@ref chip::RendezvousParameters"]
-  RendezvousParameters -> { ChipDeviceController, RendezvousDeviceDelegate} [arrowhead=none]
+  RendezvousParameters -> { DeviceCommissioner, RendezvousDeviceDelegate} [arrowhead=none]
 
-  {ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
+  {DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
   RendezvousSession -> TransportBle
   RendezvousSession -> TransportInet [style=dashed, color=gray]
 }
diff --git a/docs/dots/Rendezvous/RendezvousSessionInit.dot b/docs/dots/Rendezvous/RendezvousSessionInit.dot
@@ -7,7 +7,7 @@ digraph RendezvousSession
     label=<<b>Controller</b>>
     node [fillcolor="white:gray", gradientangle=90]
 
-    ChipDeviceController [shape=record label=<{ChipDeviceController|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::DeviceController::ChipDeviceController"]
+    DeviceCommissioner [shape=record label=<{DeviceCommissioner|<font point-size="11">RendezvousSessionDelegate</font>}>, URL="@ref chip::Controller::DeviceCommissioner"]
   }
 
   # This section represents device-only elements
@@ -66,7 +66,7 @@ digraph RendezvousSession
   #############################
   # Main relationships
   #############################
-  {ChipDeviceController, RendezvousDeviceDelegate} -> RendezvousSession
+  {DeviceCommissioner, RendezvousDeviceDelegate} -> RendezvousSession
 
   RendezvousSession -> HasDiscriminator
 

diff --git a/src/controller/BUILD.gn b/src/controller/BUILD.gn
@@ -29,8 +29,6 @@ static_library("controller") {
     "CHIPDevice.h",
     "CHIPDeviceController.cpp",
     "CHIPDeviceController.h",
-    "CHIPDeviceController_deprecated.cpp",
-    "CHIPDeviceController_deprecated.h",
     "DeviceAddressUpdater.cpp",
     "DeviceAddressUpdater.h",
   ]

diff --git a/src/controller/CHIPDeviceController_deprecated.cpp b/src/controller/CHIPDeviceController_deprecated.cpp