Skip to content
Snippets Groups Projects
Commit 8bf07172 authored by Jerome Royan's avatar Jerome Royan
Browse files

update according to last OpenAPI modifications

parent 8bd6dc37
No related branches found
No related tags found
3 merge requests!6Correction of many fixes,!5force the use of version 6.6.0 of openapi-generator-cli due to a bug since...,!4fix: uniqueItem for array reactivated: Work around found to use std::vector...
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
patch -u ../api/DefaultApi.h -i fixHeaderModelIssue.patch patch -u ../api/DefaultApi.h -i fixHeaderModelIssue.patch
patch -u ../api/DefaultApi.cpp -i fixCppModelIssue.patch patch -u ../api/DefaultApi.cpp -i fixCppModelIssue.patch
patch -u ../api/RelocalizationInformationApi.cpp -i fixCppRelocalizationInformation.patch patch -u ../api/RelocalizationInformationApi.cpp -i fixCppRelocalizationInformation.patch
patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch #patch -u ../api/WorldAnchorsApi.cpp -i fixCppWorldAnchors.patch
patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch #patch -u ../model/WorldAnchor.cpp -i fixCppWorldAnchorModel.patch
patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch #patch -u ../api/WorldLinksApi.cpp -i fixCppWorldLinks.patch
patch -u ../model/WorldLink.cpp -i fixCppWorldLinksModel.patch #patch -u ../model/WorldLink.cpp -i fixCppWorldLinksModel.patch
--- RelocalizationInformationApi.cpp 2024-08-30 10:10:07.846664769 +0200 --- RelocalizationInformationApi.cpp 2024-09-17 15:53:04.949160050 +0200
+++ RelocalizationInformationApi_corrected.cpp 2024-08-30 10:05:55.896662600 +0200 +++ RelocalizationInformationApi_corrected.cpp 2024-09-17 15:44:29.639017895 +0200
@@ -161,12 +161,12 @@ @@ -161,12 +161,12 @@
std::vector<GetRelocalizationInformation_uuids_parameter_inner> uuids; std::vector<UuidAndMode> uuids;
std::vector<std::string> uuids_temp; std::vector<std::string> uuids_temp;
boost::split(uuids_temp, uuids_raw, boost::is_any_of(",")); boost::split(uuids_temp, uuids_raw, boost::is_any_of(","));
- std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ GetRelocalizationInformation_uuids_parameter_inner ret; ret.fromString(i); return ret;}); - std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromString(i); return ret;});
+ std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ GetRelocalizationInformation_uuids_parameter_inner ret; ret.setUuid(i); return ret;}); + std::transform(uuids_temp.begin(), uuids_temp.end(), std::back_inserter(uuids), [](const auto& i){ UuidAndMode ret; ret.fromJsonString(i); return ret;});
std::string capabilities_raw = request->get_query_parameter("capabilities"); std::string capabilities_raw = request->get_query_parameter("capabilities");
std::vector<Capability> capabilities; std::vector<Capability> capabilities;
std::vector<std::string> capabilities_temp; std::vector<std::string> capabilities_temp;
......
arf005 @ 57348800
Subproject commit 8be02781f334915d2fa0efabc0f924d97f10922c Subproject commit 5734880080c52572af65fe6d2703228ed6ee5653
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
"description": "ISG ARF World Storage Cpp Server", "description": "ISG ARF World Storage Cpp Server",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"generate": "cd EtsiServerGen && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/7.5.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapi.yaml --skip-validate-spec --type-mappings=set=std::vector -g cpp-restbed-server -o . && cd patches && ./applyPatches.sh", "generate": "cd EtsiServerGen && java -jar /usr/local/lib/node_modules/@openapitools/openapi-generator-cli/versions/7.5.0.jar generate -i ../arf005/API/worldstorage/worldstorageopenapi.yaml --type-mappings=set=std::vector -g cpp-restbed-server -o . && cd patches && ./applyPatches.sh",
"build": "cd EtsiServerGen && conan install . --build=missing && cd build && cmake .. --preset conan-release && cd Release && cmake --build . && sudo make install" "build": "cd EtsiServerGen && conan install . --build=missing && cd build && cmake .. --preset conan-release && cd Release && cmake --build . && sudo make install"
}, },
"devDependencies": { "devDependencies": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment