Remove @feed operations from example (#256) (#260)

* Remove `@feed` operations from example (#256)

* Refs #23701. Remove feed operations from example.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

* Refs #23703. Apply suggestion.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
(cherry picked from commit e143c3b)

# Conflicts:
#	fastdds_python_examples/RPCExample/generated_code/calculator.i
#	fastdds_python_examples/RPCExample/generated_code/calculatorClient.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorPubSubTypes.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorServer.cxx
#	fastdds_python_examples/RPCExample/generated_code/calculatorServer.hpp
#	fastdds_python_examples/RPCExample/generated_code/calculatorServerImpl.hpp
#	fastdds_python_examples/RPCExample/generated_code/calculatorTypeObjectSupport.cxx

* Fix conflicts.

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>

---------

Signed-off-by: Miguel Company <miguelcompany@eprosima.com>
Co-authored-by: Miguel Company <miguelcompany@eprosima.com>

Author: mergify[bot]

fastdds_python_examples/RPCExample/CalculatorExample.py

@@ -50,38 +50,6 @@ def representation_limits(self, info):
     ret_val.max_value = 2147483647
     return ret_val
 
-  def fibonacci_seq(self, info, n_results, result_writer):
-    self.operation_call_print(info, "fibonacci_seq")
-    a = 1
-    b = 1
-    c = 0
-    
-    while n_results > 0:
-      n_results = n_results - 1
-      
-      result_writer.write(a)
-      c = a + b
-      a = b
-      b = c
-
-  def sum_all(self, info, value):
-    self.operation_call_print(info, "sum_all")
-    ret = 0
-    has_value, n = value.read()
-    while has_value:
-      ret = ret + n
-      has_value, n = value.read()
-    return ret
-
-  def accumulator(self, info, value, result_writer):
-    self.operation_call_print(info, "accumulator")
-    ret = 0
-    has_value, n = value.read()
-    while has_value:
-      ret = ret + n
-      result_writer.write(ret)
-      has_value, n = value.read()
-
 ### Server application ###
 
 def run_server(server):
@@ -134,9 +102,6 @@ def run(self):
     self.perform_addition()
     self.perform_subtraction()
     self.perform_representation_limits()
-    self.perform_fibonacci_seq()
-    self.perform_sum_all()
-    self.perform_accumulator()
 
   def perform_addition(self):
     try:
@@ -180,51 +145,6 @@ def perform_representation_limits(self):
       print("Exception: {}".format(type(e).__name__))
       print("Exception message: {}".format(e))
 
-  def perform_fibonacci_seq(self):
-    try:
-      print("Performing fibonacci_seq(10)")
-      result = self.client.fibonacci_seq(10)
-      has_value, n = result.read()
-      while has_value:
-        print("Result: {}".format(n))
-        has_value, n = result.read()
-    except Exception as e:
-      print("Exception: {}".format(type(e).__name__))
-      print("Exception message: {}".format(e))
-
-  def perform_sum_all(self):
-    try:
-      print("Performing sum_all([1, 2, 3, 4, 5])")
-      result, value = self.client.sum_all()
-      value.write(1)
-      value.write(2)
-      value.write(3)
-      value.write(4)
-      value.write(5)
-      value.finish()
-      print("Result: {}".format(result.get()))
-    except Exception as e:
-      print("Exception: {}".format(type(e).__name__))
-      print("Exception message: {}".format(e))
-
-  def perform_accumulator(self):
-    try:
-      print("Performing accumulator([1, 2, 3, 4, 5])")
-      result, value = self.client.accumulator()
-      value.write(1)
-      value.write(2)
-      value.write(3)
-      value.write(4)
-      value.write(5)
-      value.finish()
-      has_value, n = result.read()
-      while has_value:
-        print("Result: {}".format(n))
-        has_value, n = result.read()
-    except Exception as e:
-      print("Exception: {}".format(type(e).__name__))
-      print("Exception message: {}".format(e))
-
 def parse_options():
   """"
   Parse arguments.

fastdds_python_examples/RPCExample/calculator.idl

@@ -32,25 +32,10 @@ module calculator_base
         // Returns the result of value1 - value2
         long subtraction(in long value1, in long value2) raises(OverflowException);
     };
-
-    interface BasicCalculator : Adder, Subtractor
-    {
-        // Returns the minimum and maximum representable values
-        void representation_limits(out long min_value, out long max_value);
-    };
 };
 
-interface Calculator : calculator_base::BasicCalculator
+interface Calculator : calculator_base::Adder, calculator_base::Subtractor
 {
-    // Returns a feed of results with the n_results first elements of the Fibonacci sequence
-    // E.g. for an input of 5, returns a feed with {1, 1, 2, 3, 5}
-    @feed long fibonacci_seq(in unsigned long n_results) raises (calculator_base::OverflowException);
-
-    // Waits for an input feed to finish and returns the sum of all the received values
-    // E.g. for an input of {1, 2, 3, 4, 5} returns 15
-    long sum_all(@feed in long value) raises (calculator_base::OverflowException);
-
-    // Returns a feed of results with the sum of all received values
-    // E.g. for an input of {1, 2, 3, 4, 5}, returns a feed with {1, 3, 6, 10, 15}
-    @feed long accumulator(@feed in long value) raises (calculator_base::OverflowException);
+    // Returns the minimum and maximum representable values
+    void representation_limits(out long min_value, out long max_value);
 };

fastdds_python_examples/RPCExample/generated_code/CMakeLists.txt

@@ -1,18 +1,4 @@
 
-# Copyright 2025 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.
-
 cmake_minimum_required(VERSION 3.20)
 
 # SWIG: use standard target name.
@@ -41,19 +27,9 @@ find_package(fastdds 3 REQUIRED)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-if(NOT WIN32)
-    # Default values for shared library suffix in MacOS
-    if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-        set(CMAKE_SHARED_LIBRARY_SUFFIX ".so")
-    endif()
-endif()
-
 #Create library for C++ types
 add_library(${PROJECT_NAME} SHARED
         calculatorTypeObjectSupport.cxx
-        calculatorPubSubTypes.cxx
-        calculatorClient.cxx
-        calculatorServer.cxx
         )
 if(WIN32)
     target_compile_definitions(${PROJECT_NAME} PRIVATE EPROSIMA_USER_DLL_EXPORT)

fastdds_python_examples/RPCExample/generated_code/calculator.hpp

@@ -16,23 +16,14 @@
  * @file calculator.hpp
  * This header file contains the declaration of the described types in the IDL file.
  *
- * This file was generated by the tool fastddsgen (version: 4.1.0).
+ * This file was generated by the tool fastddsgen (version: 4.0.4).
  */
 
 #ifndef FAST_DDS_GENERATED__CALCULATOR_HPP
 #define FAST_DDS_GENERATED__CALCULATOR_HPP
 
 #include <cstdint>
-#include <memory>
-#include <string>
 #include <utility>
-#include <fastcdr/cdr/fixed_size_string.hpp>
-#include <fastcdr/xcdr/optional.hpp>
-#include <fastdds/dds/rpc/exceptions/RpcOperationError.hpp>
-#include <fastdds/dds/rpc/interfaces/RpcClientReader.hpp>
-#include <fastdds/dds/rpc/interfaces/RpcClientWriter.hpp>
-#include <fastdds/dds/rpc/interfaces/RpcFuture.hpp>
-
 
 #if defined(_WIN32)
 #if defined(EPROSIMA_USER_DLL_EXPORT)
@@ -60,161 +51,36 @@
 
 namespace calculator_base {
 
-/*!
- * @brief This class implements the user exception calculator_base::OverflowException
- * @ingroup calculator
- */
-class eProsima_user_DllExport OverflowException : public eprosima::fastdds::dds::rpc::RpcOperationError
-{
-public:
-
-    /**
-     * Default constructor.
-     */
-    OverflowException()
-        : OverflowException("OverflowException")
-    {
-    }
-
-    /**
-     * Constructor.
-     */
-    OverflowException(
-            const std::string& message)
-        : eprosima::fastdds::dds::rpc::RpcOperationError(message)
-    {
-    }
-
-    /**
-     * Constructor.
-     */
-    OverflowException(
-            const char* message)
-        : eprosima::fastdds::dds::rpc::RpcOperationError(message)
-    {
-    }
-
-    /**
-     * Copy constructor.
-     */
-    OverflowException(
-            const OverflowException& other) noexcept = default;
-
-    /**
-     * Copy assignment.
-     */
-    OverflowException& operator =(
-            const OverflowException& other) noexcept = default;
-
-    /**
-     * Destructor.
-     */
-    virtual ~OverflowException() noexcept = default;
-
-
-
-private:
-
-
-};
-
-
 /*!
  * @brief This class represents the interface Adder defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport Adder 
+class CALCULATOR_DllAPI Adder 
 {
 public:
-    virtual ~Adder() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<int32_t> addition(
-            /*in*/ int32_t value1,
-            /*in*/ int32_t value2) = 0;
 
 };
-
-
-
 /*!
  * @brief This class represents the interface Subtractor defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport Subtractor 
-{
-public:
-    virtual ~Subtractor() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<int32_t> subtraction(
-            /*in*/ int32_t value1,
-            /*in*/ int32_t value2) = 0;
-
-};
-
-
-
-namespace detail {
-
-struct BasicCalculator_representation_limits_Out;
-
-}  // namespace detail
-
-/*!
- * @brief This class represents the interface BasicCalculator defined by the user in the IDL file.
- * @ingroup calculator
- */
-class eProsima_user_DllExport BasicCalculator : public calculator_base::Adder, public calculator_base::Subtractor
+class CALCULATOR_DllAPI Subtractor 
 {
 public:
-    virtual ~BasicCalculator() = default;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<calculator_base::detail::BasicCalculator_representation_limits_Out> representation_limits(
-    ) = 0;
 
 };
 
-namespace detail {
-
-struct BasicCalculator_representation_limits_Out
-{
-    int32_t min_value;
-    int32_t max_value;
-};
-
-
-}  // namespace detail
-
-
 } // namespace calculator_base
-
 /*!
  * @brief This class represents the interface Calculator defined by the user in the IDL file.
  * @ingroup calculator
  */
-class eProsima_user_DllExport Calculator : public calculator_base::BasicCalculator
+class CALCULATOR_DllAPI Calculator : public calculator_base::Adder, public calculator_base::Subtractor
 {
 public:
-    virtual ~Calculator() = default;
-
-
-    virtual std::shared_ptr<eprosima::fastdds::dds::rpc::RpcClientReader<int32_t> > fibonacci_seq(
-            /*in*/ uint32_t n_results) = 0;
-
-
-    virtual eprosima::fastdds::dds::rpc::RpcFuture<int32_t> sum_all(
-            /*in*/ std::shared_ptr<eprosima::fastdds::dds::rpc::RpcClientWriter<int32_t>>& value) = 0;
-
-
-    virtual std::shared_ptr<eprosima::fastdds::dds::rpc::RpcClientReader<int32_t> > accumulator(
-            /*in*/ std::shared_ptr<eprosima::fastdds::dds::rpc::RpcClientWriter<int32_t>>& value) = 0;
 
 };
 
-
-
 #endif // _FAST_DDS_GENERATED_CALCULATOR_HPP_