Fixing a bug in C++ socket server-client: message length was represented just in...

[iot2.git] / iotjava / iotrmi / C++ / basics / TestClass.hpp

diff --git a/iotjava/iotrmi/C++/basics/TestClass.hpp b/iotjava/iotrmi/C++/basics/TestClass.hpp
index a052c0d26654488f1bbac153a5bd0ea128f85a23..573ff64fc969e1ecee80d52213547421396d69df 100644 (file)
--- a/iotjava/iotrmi/C++/basics/TestClass.hpp
+++ b/iotjava/iotrmi/C++/basics/TestClass.hpp
@@ -52,6 +52,8 @@ class TestClass : public TestClassInterface {
                vector<Enum>            handleEnumList(vector<Enum> vecEn);
                Enum                            handleEnumComplex(Enum en, int i, char c);
                vector<Enum>            handleEnumComplex2(vector<Enum> en, int i, char c);
+               vector<Enum>            handleEnumTwo(vector<Enum> en1, vector<Enum> en2);
+               vector<Enum>            handleEnumThree(vector<Enum> en1, vector<Enum> en2, vector<Struct> str1, vector<Struct> str2);
 
                // Struct
                Struct                          handleStruct(Struct str);
@@ -59,9 +61,13 @@ class TestClass : public TestClassInterface {
                vector<Struct>          handleStructList(vector<Struct> vecStr);
                Struct                          handleStructComplex(int in, char c, Struct str);
                vector<Struct>          handleStructComplex2(int in, char c, vector<Struct> vecStr);
+               vector<Struct>          handleStructTwo(vector<Struct> str1, vector<Struct> str2);
+               vector<Struct>          handleStructThree(vector<Struct> str1, vector<Struct> str2, vector<Struct> str3);
 
                vector<Enum>            handleEnumStruct(vector<Enum> en, vector<Struct> str, char c);
                vector<Enum>            handleAll(vector<Enum> en, vector<Struct> str, char c, vector<CallBackInterfaceWithCallBack*> _cb);
+               vector<Enum>            handleAllTwo(vector<Enum> en1, vector<Enum> en2, vector<Struct> str1, vector<Struct> str2, char c, 
+                                                                       vector<CallBackInterfaceWithCallBack*> _cb1, vector<CallBackInterfaceWithCallBack*> _cb2);
 
                int                                     getA();
                void                            setA(int _int);
@@ -348,6 +354,32 @@ vector<Enum> TestClass::handleEnumComplex2(vector<Enum> vecEn, int in, char c) {
 }
 
 
+vector<Enum> TestClass::handleEnumTwo(vector<Enum> en1, vector<Enum> en2) {
+
+       for (Enum en : en1) {
+               cout << "Enum1: " << en << endl;
+       }
+       for (Enum en : en2) {
+               cout << "Enum2: " << en << endl;
+       }
+       
+       return en1;
+}
+
+
+vector<Enum> TestClass::handleEnumThree(vector<Enum> en1, vector<Enum> en2, vector<Struct> str1, vector<Struct> str2) {
+
+       for (Enum en : en1) {
+               cout << "Enum1: " << en << endl;
+       }
+       for (Enum en : en2) {
+               cout << "Enum2: " << en << endl;
+       }
+       
+       return en1;
+}
+
+
 
 // Struct
 Struct TestClass::handleStruct(Struct str) {
@@ -402,6 +434,32 @@ vector<Struct> TestClass::handleStructList(vector<Struct> vecStr) {
 }
 
 
+vector<Struct> TestClass::handleStructTwo(vector<Struct> str1, vector<Struct> str2) {
+
+       for (Struct str : str1) {
+
+               cout << "Name: " << str.name << endl;
+               cout << "Value: " << str.value << endl;
+               cout << "Year: " << str.year << endl;
+       }
+
+       return str2;
+}
+
+
+vector<Struct> TestClass::handleStructThree(vector<Struct> str1, vector<Struct> str2, vector<Struct> str3) {
+
+       for (Struct str : str1) {
+
+               cout << "Name: " << str.name << endl;
+               cout << "Value: " << str.value << endl;
+               cout << "Year: " << str.year << endl;
+       }
+
+       return str2;
+}
+
+
 Struct TestClass::handleStructComplex(int in, char c, Struct str) {
 
        cout << "Name: " << str.name << endl;
@@ -469,6 +527,26 @@ vector<Enum> TestClass::handleAll(vector<Enum> en, vector<Struct> str, char c, v
 }
 
 
+vector<Enum> TestClass::handleAllTwo(vector<Enum> en1, vector<Enum> en2, vector<Struct> str1, vector<Struct> str2, char c, 
+               vector<CallBackInterfaceWithCallBack*> _cb1, vector<CallBackInterfaceWithCallBack*> _cb2) {
+
+       for (CallBackInterfaceWithCallBack* cb : _cb1) {
+               cbvec.push_back(cb);
+               cout << "Registering callback object in array!" << endl;
+       }
+
+       for (Struct st : str1) {
+               cout << "Name: " << st.name << endl;
+               cout << "Value: " << st.value << endl;
+               cout << "Year: " << st.year << endl;
+       }
+
+       cout << "Char: " << c << endl;
+
+       return en1;
+}
+
+
 vector<Enum> TestClass::handleCallbackEnum(vector<Enum> en, char c, vector<CallBackInterfaceWithCallBack*> _cb) {
 
        for (CallBackInterfaceWithCallBack* cb : _cb) {