Skip to content

[20739] Refactor IStatusQueryable and make monitor service interfaces private (backport #4651) - #4687

Merged
EduPonz merged 2 commits into
2.13.xfrom
mergify/bp/2.13.x/pr-4651
May 24, 2024
Merged

[20739] Refactor IStatusQueryable and make monitor service interfaces private (backport #4651)#4687
EduPonz merged 2 commits into
2.13.xfrom
mergify/bp/2.13.x/pr-4651

Conversation

@mergify

@mergify mergify Bot commented Apr 17, 2024

Copy link
Copy Markdown
Contributor

Description

This PR brings to master the work from #4640 commit a2f4664 and 7a0c328. It refactors the IStatusQueryable() interface and make monitor service interfaces private (except from IProxyQueryable.hpp as PDP.h is still public in master and implements it).

@Mergifyio backport 2.13.x

Contributor Checklist

  • Commit messages follow the project guidelines.
  • The code follows the style guidelines of this project.
  • N/A Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally
  • N/A Any new/modified methods have been properly documented using Doxygen.
  • Changes are ABI compatible.
  • Changes are API compatible.
  • N/A New feature has been added to the versions.md file (if applicable).
  • N/A New feature has been documented/Current behavior is correctly described in the documentation.
    Related documentation PR: [20739] Remove ddsentitystatus from docs Fast-DDS-docs#745
  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #4651 done by [Mergify](https://mergify.com).

…#4651)

* Refs #20739: Make monitor service interfaces private (except IProxyQueryable)

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Replace tabs with spaces in monitorservice_types.idl

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor include and src files

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Refactor tests

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Apply suggestion regarding asserts

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 2 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Linter

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs 20739: Rev 3 changes

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Remove status assert

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

* Refs #20739: Comment typo

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>

---------

Signed-off-by: Mario Dominguez <mariodominguez@eprosima.com>
(cherry picked from commit fb841b9)

# Conflicts:
#	include/fastdds/rtps/reader/RTPSReader.h
#	include/fastdds/rtps/writer/RTPSWriter.h
@mergify mergify Bot added the conflicts Backport PR wich git cherry pick failed label Apr 17, 2024
@mergify

mergify Bot commented Apr 17, 2024

Copy link
Copy Markdown
Contributor Author

Cherry-pick of fb841b9 has failed:

On branch mergify/bp/2.13.x/pr-4651
Your branch is up to date with 'origin/2.13.x'.

You are currently cherry-picking commit fb841b9a1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   include/fastdds/rtps/builtin/discovery/participant/PDP.h
	modified:   include/fastdds/statistics/monitorservice_types.idl
	new file:   include/fastdds/statistics/rtps/monitor_service/connections_fwd.hpp
	modified:   src/cpp/fastdds/publisher/PublisherImpl.cpp
	modified:   src/cpp/fastdds/publisher/PublisherImpl.hpp
	modified:   src/cpp/fastdds/subscriber/SubscriberImpl.cpp
	modified:   src/cpp/fastdds/subscriber/SubscriberImpl.hpp
	modified:   src/cpp/rtps/builtin/discovery/endpoint/EDP.cpp
	modified:   src/cpp/rtps/builtin/discovery/endpoint/EDPSimple.cpp
	modified:   src/cpp/rtps/builtin/discovery/participant/PDPListener.cpp
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h
	modified:   src/cpp/statistics/fastdds/domain/DomainParticipantImpl.cpp
	modified:   src/cpp/statistics/fastdds/domain/DomainParticipantImpl.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/Interfaces.hpp -> src/cpp/statistics/rtps/monitor-service/Interfaces.hpp
	modified:   src/cpp/statistics/rtps/monitor-service/MonitorService.cpp
	modified:   src/cpp/statistics/rtps/monitor-service/MonitorService.hpp
	modified:   src/cpp/statistics/rtps/monitor-service/MonitorServiceListener.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsObserver.hpp -> src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsObserver.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/interfaces/IConnectionsQueryable.hpp -> src/cpp/statistics/rtps/monitor-service/interfaces/IConnectionsQueryable.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/interfaces/IProxyObserver.hpp -> src/cpp/statistics/rtps/monitor-service/interfaces/IProxyObserver.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/interfaces/IStatusObserver.hpp -> src/cpp/statistics/rtps/monitor-service/interfaces/IStatusObserver.hpp
	renamed:    include/fastdds/statistics/rtps/monitor_service/interfaces/IStatusQueryable.hpp -> src/cpp/statistics/rtps/monitor-service/interfaces/IStatusQueryable.hpp
	modified:   test/mock/rtps/PDP/fastdds/rtps/builtin/discovery/participant/PDP.h
	modified:   test/mock/rtps/RTPSParticipant/fastdds/rtps/participant/RTPSParticipant.h
	modified:   test/unittest/statistics/dds/StatisticsDomainParticipantStatusQueryableTests.cpp
	modified:   test/unittest/statistics/rtps/MonitorServiceTests.cpp
	modified:   test/unittest/statistics/rtps/RTPSStatisticsTests.cpp
	modified:   test/unittest/statistics/rtps/mock/StatisticsBase/statistics/rtps/monitor-service/MonitorService.hpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   include/fastdds/rtps/reader/RTPSReader.h
	both modified:   include/fastdds/rtps/writer/RTPSWriter.h

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: JesusPoderoso <jesuspoderoso@eprosima.com>
@JesusPoderoso JesusPoderoso removed the conflicts Backport PR wich git cherry pick failed label May 20, 2024
@JesusPoderoso
JesusPoderoso self-requested a review May 20, 2024 06:38
@github-actions github-actions Bot added the ci-pending PR which CI is running label May 20, 2024
@JesusPoderoso

Copy link
Copy Markdown
Contributor

@richiprosima please test this

@JesusPoderoso JesusPoderoso left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI

@JesusPoderoso

JesusPoderoso commented May 23, 2024

Copy link
Copy Markdown
Contributor

CI issues are unrelated to the PR content
(Manual run with correct branches passed here)
Ready to merge!

@JesusPoderoso JesusPoderoso added ready-to-merge Ready to be merged. CI and changes have been reviewed and approved. and removed ci-pending PR which CI is running labels May 23, 2024
@EduPonz
EduPonz merged commit 4ca144e into 2.13.x May 24, 2024
@EduPonz
EduPonz deleted the mergify/bp/2.13.x/pr-4651 branch May 24, 2024 05:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ready-to-merge Ready to be merged. CI and changes have been reviewed and approved.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants