From a4ebc80dde77a10a148cc1a63f782df74cec1686 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 15 May 2023 22:54:34 -0400 Subject: [PATCH] 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 Co-authored-by: Restyled.io --- src/app/InteractionModelTimeout.h | 1 - src/app/OperationalSessionSetupPool.h | 2 +- .../Framework/CHIP/MTRCallbackBridgeBase.h | 2 +- .../CHIP/MTRDeviceConnectionBridge.h | 2 +- .../SessionEstablishmentDelegate.h | 2 +- src/transport/BUILD.gn | 2 -- .../MessageCounterManagerInterface.h | 2 +- src/transport/SessionHandle.cpp | 18 ----------------- src/transport/SessionHandle.h | 20 ------------------- src/transport/SessionManager.h | 2 +- src/transport/SessionMessageDelegate.h | 2 +- 11 files changed, 7 insertions(+), 48 deletions(-) delete mode 100644 src/transport/SessionHandle.cpp delete mode 100644 src/transport/SessionHandle.h diff --git a/src/app/InteractionModelTimeout.h b/src/app/InteractionModelTimeout.h index d2b1e2b567a554..3511ed5412049d 100644 --- a/src/app/InteractionModelTimeout.h +++ b/src/app/InteractionModelTimeout.h @@ -19,7 +19,6 @@ #include #include -#include namespace chip { namespace app { diff --git a/src/app/OperationalSessionSetupPool.h b/src/app/OperationalSessionSetupPool.h index 8f40b37ebf5c4b..583c7e8d4cc64b 100644 --- a/src/app/OperationalSessionSetupPool.h +++ b/src/app/OperationalSessionSetupPool.h @@ -20,7 +20,7 @@ #include #include #include -#include +#include namespace chip { diff --git a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h index 6faa134a1e92a4..da8772f2464ace 100644 --- a/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h +++ b/src/darwin/Framework/CHIP/MTRCallbackBridgeBase.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h index bf7c8b7424277e..01d248102b692d 100644 --- a/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h +++ b/src/darwin/Framework/CHIP/MTRDeviceConnectionBridge.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include NS_ASSUME_NONNULL_BEGIN diff --git a/src/protocols/secure_channel/SessionEstablishmentDelegate.h b/src/protocols/secure_channel/SessionEstablishmentDelegate.h index 30cc8cac59f76b..dc73a0ffe6997d 100644 --- a/src/protocols/secure_channel/SessionEstablishmentDelegate.h +++ b/src/protocols/secure_channel/SessionEstablishmentDelegate.h @@ -26,7 +26,7 @@ #pragma once #include -#include +#include #include #include diff --git a/src/transport/BUILD.gn b/src/transport/BUILD.gn index 155326ab95eda1..a632f41af3a3d3 100644 --- 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 index f13810a31e3981..a5233359282fd0 100644 --- a/src/transport/MessageCounterManagerInterface.h +++ b/src/transport/MessageCounterManagerInterface.h @@ -18,7 +18,7 @@ #pragma once #include -#include +#include namespace chip { namespace Transport { diff --git a/src/transport/SessionHandle.cpp b/src/transport/SessionHandle.cpp deleted file mode 100644 index d31489c3b30599..00000000000000 --- a/src/transport/SessionHandle.cpp +++ /dev/null @@ -1,18 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include diff --git a/src/transport/SessionHandle.h b/src/transport/SessionHandle.h deleted file mode 100644 index c1b0aeeee0cb40..00000000000000 --- a/src/transport/SessionHandle.h +++ /dev/null @@ -1,20 +0,0 @@ -/* - * - * Copyright (c) 2021 Project CHIP Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#pragma once - -#include diff --git a/src/transport/SessionManager.h b/src/transport/SessionManager.h index 87b9174750bbfa..e383c39d27a29c 100644 --- a/src/transport/SessionManager.h +++ b/src/transport/SessionManager.h @@ -42,8 +42,8 @@ #include #include #include +#include #include -#include #include #include #include diff --git a/src/transport/SessionMessageDelegate.h b/src/transport/SessionMessageDelegate.h index e89ec2b9f4a5c2..7ad6b5024d40f6 100644 --- a/src/transport/SessionMessageDelegate.h +++ b/src/transport/SessionMessageDelegate.h @@ -16,7 +16,7 @@ #pragma once -#include +#include #include namespace chip {