Skip to content

Commit

Permalink
Example refactor: Content filter (#4859)
Browse files Browse the repository at this point in the history
* Refs #20823: Copy ContentFilteredTopicExample files to content_filtering

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Change file names and CMakeList structure

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add CLI parser

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add application hpp and cpp

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Create publisher application

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Create subscriber application

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add test

Signed-off-by: elianalf <[email protected]>

* Refs #Refs 20823: Rename folder to content_filter

Signed-off-by: elianalf <[email protected]>

* Refs #20823 Add customizable lower bound and upper bound arguments to the example

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add changes to version.md

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Initialize interval in publisher

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Apply suggestion

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Apply suggestion: Update Readme.md

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add option none filter

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Set datareader and datawriter qos to meet the condition for writer side filtering

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Apply suggestions: Add filtering on the writer side

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Uncrustify

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Change guard name and custom filter classes name

Signed-off-by: elianalf <[email protected]>

* Refs #20823 Apply suggestions

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Update ReadMe

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add new arguments to set a custom filter expression and to allowing the writer side filtering

Signed-off-by: elianalf <[email protected]>

* Refs #20823: add transient and ralible as arguments

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Split and modify test

Signed-off-by: elianalf <[email protected]>

* Refs #20823: uncrustify

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Solve windows warning

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Remove argument --reliable --transient-local

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add the right includes

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Remove folders that were added during the rebase

Signed-off-by: elianalf <[email protected]>

* Refs #20823: Add license

Signed-off-by: elianalf <[email protected]>

---------

Signed-off-by: elianalf <[email protected]>
  • Loading branch information
elianalf authored Jun 17, 2024
1 parent b441560 commit 984405b
Show file tree
Hide file tree
Showing 92 changed files with 1,636 additions and 9,086 deletions.
2 changes: 2 additions & 0 deletions examples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
# limitations under the License.

set(fastdds_FOUND TRUE)

add_subdirectory(cpp/configuration)
add_subdirectory(cpp/content_filter)
add_subdirectory(cpp/custom_payload_pool)
add_subdirectory(cpp/dds)
add_subdirectory(cpp/hello_world)
Expand Down
58 changes: 58 additions & 0 deletions examples/cpp/content_filter/Application.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
// 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.
// 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.

/**
* @file Application.cpp
*
*/

#include "Application.hpp"

#include "CLIParser.hpp"
#include "SubscriberApp.hpp"
#include "PublisherApp.hpp"

using namespace eprosima::fastdds::dds;

namespace eprosima {
namespace fastdds {
namespace examples {
namespace content_filter {

//! Factory method to create a publisher or subscriber
std::shared_ptr<Application> Application::make_app(
const CLIParser::content_filter_config& config,
const std::string& topic_name)
{
std::shared_ptr<Application> entity;
switch (config.entity)
{
case CLIParser::EntityKind::PUBLISHER:
entity = std::make_shared<PublisherApp>(config.pub_config, topic_name);
break;
case CLIParser::EntityKind::SUBSCRIBER:
entity = std::make_shared<SubscriberApp>(config.sub_config, topic_name);
break;
case CLIParser::EntityKind::UNDEFINED:
default:
throw std::runtime_error("Entity initialization failed");
break;
}
return entity;
}

} // namespace content_filter
} // namespace examples
} // namespace fastdds
} // namespace eprosima
56 changes: 56 additions & 0 deletions examples/cpp/content_filter/Application.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
// 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.
// 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.

/**
* @file Application.hpp
*
*/

#ifndef _FASTDDS_CONTENT_FILTER_APPLICATION_HPP_
#define _FASTDDS_CONTENT_FILTER_APPLICATION_HPP_

#include <atomic>

#include "CLIParser.hpp"

namespace eprosima {
namespace fastdds {
namespace examples {
namespace content_filter {

class Application
{
public:

//! Virtual destructor
virtual ~Application() = default;

//! Run application
virtual void run() = 0;

//! Trigger the end of execution
virtual void stop() = 0;

//! Factory method to create applications based on configuration
static std::shared_ptr<Application> make_app(
const CLIParser::content_filter_config& config,
const std::string& topic_name);
};

} // namespace content_filter
} // namespace examples
} // namespace fastdds
} // namespace eprosima

#endif /* _FASTDDS_CONTEN_FILTER_APPLICATION_HPP_ */
Loading

0 comments on commit 984405b

Please sign in to comment.