From effcac42d164da75add60c9575c340acbb913fea Mon Sep 17 00:00:00 2001 From: Miguel Company Date: Thu, 18 Jul 2024 14:30:57 +0200 Subject: [PATCH] Remove `ReaderProxyData` from public APIs (#167) * Refs #21300. Refactor SubscriptionBuiltinTopicData. Signed-off-by: Miguel Company * Refs #21300. Additional fields on `SubscriptionBuiltinTopicData`. Signed-off-by: Miguel Company * Refs #21300. Move `ReaderProxyData.hpp` to src. Signed-off-by: Miguel Company * Refs #21300. Rename header to `ReaderDiscoveryStatus.hpp`. Signed-off-by: Miguel Company --------- Signed-off-by: Miguel Company --- fastdds_python/src/swig/fastdds.i | 1 + .../dds/builtin/topic/SubscriptionBuiltinTopicData.i | 1 + .../data/{ReaderProxyData.i => ContentFilterProperty.i} | 6 +++--- .../src/swig/fastdds/rtps/reader/ReaderDiscoveryInfo.i | 4 ++-- 4 files changed, 7 insertions(+), 5 deletions(-) rename fastdds_python/src/swig/fastdds/rtps/builtin/data/{ReaderProxyData.i => ContentFilterProperty.i} (75%) diff --git a/fastdds_python/src/swig/fastdds.i b/fastdds_python/src/swig/fastdds.i index 11a48f6a..f97b00c8 100644 --- a/fastdds_python/src/swig/fastdds.i +++ b/fastdds_python/src/swig/fastdds.i @@ -166,6 +166,7 @@ namespace xtypes { %include "fastdds/rtps/common/SequenceNumber.i" %include "fastdds/rtps/common/SampleIdentity.i" %include "fastdds/rtps/common/WriteParams.i" +%include "fastdds/rtps/builtin/data/ContentFilterProperty.i" %include "fastdds/dds/common/InstanceHandle.i" %include "fastdds/dds/core/ReturnCode.i" diff --git a/fastdds_python/src/swig/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.i b/fastdds_python/src/swig/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.i index 3edc2eb0..f81e1a14 100644 --- a/fastdds_python/src/swig/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.i +++ b/fastdds_python/src/swig/fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.i @@ -16,4 +16,5 @@ #include "fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp" %} +%include "fastdds/rtps/builtin/data/SubscriptionBuiltinTopicData.hpp" %include "fastdds/dds/builtin/topic/SubscriptionBuiltinTopicData.hpp" diff --git a/fastdds_python/src/swig/fastdds/rtps/builtin/data/ReaderProxyData.i b/fastdds_python/src/swig/fastdds/rtps/builtin/data/ContentFilterProperty.i similarity index 75% rename from fastdds_python/src/swig/fastdds/rtps/builtin/data/ReaderProxyData.i rename to fastdds_python/src/swig/fastdds/rtps/builtin/data/ContentFilterProperty.i index 6fa5dfac..aafc8574 100644 --- a/fastdds_python/src/swig/fastdds/rtps/builtin/data/ReaderProxyData.i +++ b/fastdds_python/src/swig/fastdds/rtps/builtin/data/ContentFilterProperty.i @@ -1,4 +1,4 @@ -// Copyright 2022 Proyectos y Sistemas de Mantenimiento SL (eProsima). +// Copyright 2024 Proyectos y Sistemas de Mantenimiento SL (eProsima). // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -13,7 +13,7 @@ // limitations under the License. %{ -#include "fastdds/rtps/builtin/data/ReaderProxyData.hpp" +#include "fastdds/rtps/builtin/data/ContentFilterProperty.hpp" %} -%include "fastdds/rtps/builtin/data/ReaderProxyData.hpp" +%include "fastdds/rtps/builtin/data/ContentFilterProperty.hpp" diff --git a/fastdds_python/src/swig/fastdds/rtps/reader/ReaderDiscoveryInfo.i b/fastdds_python/src/swig/fastdds/rtps/reader/ReaderDiscoveryInfo.i index 5f3abb16..af276969 100644 --- a/fastdds_python/src/swig/fastdds/rtps/reader/ReaderDiscoveryInfo.i +++ b/fastdds_python/src/swig/fastdds/rtps/reader/ReaderDiscoveryInfo.i @@ -13,7 +13,7 @@ // limitations under the License. %{ -#include "fastdds/rtps/reader/ReaderDiscoveryInfo.hpp" +#include "fastdds/rtps/reader/ReaderDiscoveryStatus.hpp" %} -%include "fastdds/rtps/reader/ReaderDiscoveryInfo.hpp" +%include "fastdds/rtps/reader/ReaderDiscoveryStatus.hpp"