Remove SessionHandle.{h,cpp} and replace includes with Session.h (#26549

) * Remove SessionHandle.{h,cpp} and replace includes with Session * Restyled by clang-format --------- Co-authored-by: Andrei Litvin <andreilitvin@google.com> Co-authored-by: Restyled.io <commits@restyled.io>
project-chip · May 16, 2023 · a4ebc80 · a4ebc80
1 parent df615a6
commit a4ebc80
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 48 deletions.
diff --git a/src/app/InteractionModelTimeout.h b/src/app/InteractionModelTimeout.h
@@ -19,7 +19,6 @@
 
 #include <system/SystemClock.h>
 #include <transport/Session.h>
-#include <transport/SessionHandle.h>
 
 namespace chip {
 namespace app {

diff --git a/src/app/OperationalSessionSetupPool.h b/src/app/OperationalSessionSetupPool.h
@@ -20,7 +20,7 @@
 #include <app/CASESessionManager.h>
 #include <app/OperationalSessionSetup.h>
 #include <lib/support/Pool.h>
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 
 namespace chip {
 

diff --git a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h
@@ -25,7 +25,7 @@
 #include <app/data-model/NullObject.h>
 #include <messaging/ExchangeMgr.h>
 #include <platform/CHIPDeviceLayer.h>
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h
@@ -22,7 +22,7 @@
 #include <controller/CHIPDeviceController.h>
 #include <lib/core/ReferenceCounted.h>
 #include <messaging/ExchangeMgr.h>
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/src/protocols/secure_channel/SessionEstablishmentDelegate.h b/src/protocols/secure_channel/SessionEstablishmentDelegate.h
@@ -26,7 +26,7 @@
 #pragma once
 
 #include <system/SystemPacketBuffer.h>
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 #include <transport/raw/MessageHeader.h>
 #include <transport/raw/PeerAddress.h>
 

diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn
@@ -39,8 +39,6 @@ static_library("transport") {
     "Session.cpp",
     "Session.h",
     "SessionDelegate.h",
-    "SessionHandle.cpp",
-    "SessionHandle.h",
     "SessionHolder.cpp",
     "SessionHolder.h",
     "SessionManager.cpp",

diff --git a/src/transport/MessageCounterManagerInterface.h b/src/transport/MessageCounterManagerInterface.h
@@ -18,7 +18,7 @@
 #pragma once
 
 #include <transport/SecureSession.h>
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 
 namespace chip {
 namespace Transport {

diff --git a/src/transport/SessionHandle.cpp b/src/transport/SessionHandle.cpp
diff --git a/src/transport/SessionHandle.h b/src/transport/SessionHandle.h
diff --git a/src/transport/SessionManager.h b/src/transport/SessionManager.h
@@ -42,8 +42,8 @@
 #include <transport/GroupSession.h>
 #include <transport/MessageCounterManagerInterface.h>
 #include <transport/SecureSessionTable.h>
+#include <transport/Session.h>
 #include <transport/SessionDelegate.h>
-#include <transport/SessionHandle.h>
 #include <transport/SessionHolder.h>
 #include <transport/SessionMessageDelegate.h>
 #include <transport/TransportMgr.h>

diff --git a/src/transport/SessionMessageDelegate.h b/src/transport/SessionMessageDelegate.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <transport/SessionHandle.h>
+#include <transport/Session.h>
 #include <transport/raw/MessageHeader.h>
 
 namespace chip {