From 12be146f8a9958a82c24662216a473e6969e3169 Mon Sep 17 00:00:00 2001
From: jroyan <jerome.royan@b-com.com>
Date: Tue, 17 Sep 2024 23:37:46 +0200
Subject: [PATCH] update according to last OpenAPI
---
EtsiClientGen/patches/applyPatches.sh | 16 +++++-----
EtsiClientGen/patches/fixCTrackableAPI.patch | 21 +++++-------
.../patches/fixCWorldAnchorAPI.patch | 14 ++++----
EtsiClientGen/patches/fixCWorldLinkAPI.patch | 14 ++++----
.../patches/fixHeaderTrackable.patch | 18 +++--------
.../patches/fixHeaderWorldLink.patch | 18 ++++++++---
arf005 | 2 +-
package-lock.json | 32 +++++++++----------
8 files changed, 63 insertions(+), 72 deletions(-)
diff --git a/EtsiClientGen/patches/applyPatches.sh b/EtsiClientGen/patches/applyPatches.sh
index 5641ddd..1dfd8e6 100755
--- a/EtsiClientGen/patches/applyPatches.sh
+++ b/EtsiClientGen/patches/applyPatches.sh
@@ -1,16 +1,16 @@
#!/bin/bash
-patch -u ../model/encoding_information_structure.c -i fixCEncodingInformationStructure.patch
-patch -u ../model/error.c -i fixCError.patch
-patch -u ../model/trackable.c -i fixCTrackable.patch
+#patch -u ../model/encoding_information_structure.c -i fixCEncodingInformationStructure.patch
+#patch -u ../model/error.c -i fixCError.patch
+#patch -u ../model/trackable.c -i fixCTrackable.patch
patch -u ../api/TrackablesAPI.c -i fixCTrackableAPI.patch
-patch -u ../model/trackable_type.c -i fixCTrackableType.patch
+#patch -u ../model/trackable_type.c -i fixCTrackableType.patch
patch -u ../api/WorldAnchorsAPI.c -i fixCWorldAnchorAPI.patch
patch -u ../model/world_link.c -i fixCWorldLink.patch
-patch -u ../api/WorldLinksAPI.c -i fixCWorldLinkAPI.patch
-patch -u ../model/error.h -i fixHeaderError.patch
+patch -u ../api/WorldLinksAPI.c -i fixCWorldLinksAPI.patch
+#patch -u ../model/error.h -i fixHeaderError.patch
patch -u ../model/trackable.h -i fixHeaderTrackable.patch
-patch -u ../model/trackable_type.h -i fixHeaderTrackableType.patch
-patch -u ../model/unit_system.h -i fixHeaderUnitSystem.patch
+#patch -u ../model/trackable_type.h -i fixHeaderTrackableType.patch
+#patch -u ../model/unit_system.h -i fixHeaderUnitSystem.patch
patch -u ../model/world_link.h -i fixHeaderWorldLink.patch
diff --git a/EtsiClientGen/patches/fixCTrackableAPI.patch b/EtsiClientGen/patches/fixCTrackableAPI.patch
index e57127d..c7171a6 100644
--- a/EtsiClientGen/patches/fixCTrackableAPI.patch
+++ b/EtsiClientGen/patches/fixCTrackableAPI.patch
@@ -1,24 +1,19 @@
---- TrackablesAPI_origin.c 2024-05-17 23:00:40.039961617 +0200
-+++ TrackablesAPI.c 2024-05-17 23:18:05.808565009 +0200
-@@ -151,16 +151,7 @@
- sprintf(localVarToReplace_trackableUUID, "{%s}", "trackableUUID");
-
- localVarPath = strReplace(localVarPath, localVarToReplace_trackableUUID, trackableUUID);
-- if(trackableUUID == NULL) {
-- goto end;
-- }
+--- TrackablesAPI.c 2024-09-17 23:23:53.319036674 +0200
++++ TrackablesAPI_corrected.c 2024-09-17 23:23:33.078794600 +0200
+@@ -159,12 +159,6 @@
+ if(trackableUUID == NULL) {
+ goto end;
+ }
- char* localVarToReplace_trackableUUID = malloc(sizeOfPathParams_trackableUUID);
- sprintf(localVarToReplace_trackableUUID, "{%s}", "trackableUUID");
-
- localVarPath = strReplace(localVarPath, localVarToReplace_trackableUUID, trackableUUID);
-
-
--
-+
+
// header parameters
char *keyHeader_token = NULL;
- char * valueHeader_token = 0;
-@@ -255,15 +246,6 @@
+@@ -270,15 +264,6 @@
sprintf(localVarToReplace_trackableUUID, "{%s}", "trackableUUID");
localVarPath = strReplace(localVarPath, localVarToReplace_trackableUUID, trackableUUID);
diff --git a/EtsiClientGen/patches/fixCWorldAnchorAPI.patch b/EtsiClientGen/patches/fixCWorldAnchorAPI.patch
index 3fbebe6..14d436e 100644
--- a/EtsiClientGen/patches/fixCWorldAnchorAPI.patch
+++ b/EtsiClientGen/patches/fixCWorldAnchorAPI.patch
@@ -1,6 +1,6 @@
---- WorldAnchorsAPI_origin.c 2024-05-17 23:28:13.635759091 +0200
-+++ WorldAnchorsAPI.c 2024-05-17 23:28:43.856060784 +0200
-@@ -151,16 +151,7 @@
+--- WorldAnchorsAPI.c 2024-09-17 23:24:16.069306979 +0200
++++ WorldAnchorsAPI_corrected.c 2024-09-17 23:25:10.359950142 +0200
+@@ -156,15 +156,6 @@
sprintf(localVarToReplace_worldAnchorUUID, "{%s}", "worldAnchorUUID");
localVarPath = strReplace(localVarPath, localVarToReplace_worldAnchorUUID, worldAnchorUUID);
@@ -13,12 +13,10 @@
- localVarPath = strReplace(localVarPath, localVarToReplace_worldAnchorUUID, worldAnchorUUID);
-
-
--
-+
+
// header parameters
char *keyHeader_token = NULL;
- char * valueHeader_token = 0;
-@@ -255,16 +246,7 @@
+@@ -270,16 +261,7 @@
sprintf(localVarToReplace_worldAnchorUUID, "{%s}", "worldAnchorUUID");
localVarPath = strReplace(localVarPath, localVarToReplace_worldAnchorUUID, worldAnchorUUID);
@@ -32,7 +30,7 @@
-
-
-
-+
++
// header parameters
char *keyHeader_token = NULL;
char * valueHeader_token = 0;
diff --git a/EtsiClientGen/patches/fixCWorldLinkAPI.patch b/EtsiClientGen/patches/fixCWorldLinkAPI.patch
index f030069..39f5867 100644
--- a/EtsiClientGen/patches/fixCWorldLinkAPI.patch
+++ b/EtsiClientGen/patches/fixCWorldLinkAPI.patch
@@ -1,6 +1,6 @@
---- WorldLinksAPI_origin.c 2024-05-17 23:28:29.575918299 +0200
-+++ WorldLinksAPI.c 2024-05-17 23:28:56.976190462 +0200
-@@ -151,16 +151,7 @@
+--- WorldLinksAPI.c 2024-09-02 13:42:52.254209754 +0200
++++ WorldLinksAPI_corrected.c 2024-09-02 13:41:49.032856993 +0200
+@@ -156,15 +156,6 @@
sprintf(localVarToReplace_worldLinkUUID, "{%s}", "worldLinkUUID");
localVarPath = strReplace(localVarPath, localVarToReplace_worldLinkUUID, worldLinkUUID);
@@ -13,12 +13,10 @@
- localVarPath = strReplace(localVarPath, localVarToReplace_worldLinkUUID, worldLinkUUID);
-
-
--
-+
+
// header parameters
char *keyHeader_token = NULL;
- char * valueHeader_token = 0;
-@@ -255,16 +246,7 @@
+@@ -266,16 +257,7 @@
sprintf(localVarToReplace_worldLinkUUID, "{%s}", "worldLinkUUID");
localVarPath = strReplace(localVarPath, localVarToReplace_worldLinkUUID, worldLinkUUID);
@@ -32,7 +30,7 @@
-
-
-
-+
++
// header parameters
char *keyHeader_token = NULL;
char * valueHeader_token = 0;
diff --git a/EtsiClientGen/patches/fixHeaderTrackable.patch b/EtsiClientGen/patches/fixHeaderTrackable.patch
index 83a854a..ce41483 100644
--- a/EtsiClientGen/patches/fixHeaderTrackable.patch
+++ b/EtsiClientGen/patches/fixHeaderTrackable.patch
@@ -1,17 +1,9 @@
---- trackable_origin.h 2024-05-17 23:05:41.556322567 +0200
-+++ trackable.h 2024-05-17 23:06:00.866712577 +0200
-@@ -19,24 +19,6 @@
- #include "trackable_type.h"
- #include "unit_system.h"
+--- trackable.h 2024-09-17 17:56:08.141636062 +0200
++++ trackable_corrected.h 2024-09-17 23:18:59.492106342 +0200
+@@ -27,16 +27,6 @@
+
+ world_storage_api_trackable__e trackable_trackable_type_FromString(char* trackable_type);
--// Enum for trackable
--
--typedef enum { world_storage_api_trackable__NULL = 0, world_storage_api_trackable__FIDUCIAL_MARKER, world_storage_api_trackable__IMAGE_MARKER, world_storage_api_trackable__MESH, world_storage_api_trackable__MAP, world_storage_api_trackable__GEOPOSE, world_storage_api_trackable__OTHER } world_storage_api_trackable__e;
--
--char* trackable_trackable_type_ToString(world_storage_api_trackable__e trackable_type);
--
--world_storage_api_trackable__e trackable_trackable_type_FromString(char* trackable_type);
--
-// Enum for trackable
-
-typedef enum { world_storage_api_trackable__NULL = 0, world_storage_api_trackable__MM, world_storage_api_trackable__CM, world_storage_api_trackable__DM, world_storage_api_trackable__M, world_storage_api_trackable__DAM, world_storage_api_trackable__HM, world_storage_api_trackable__KM, world_storage_api_trackable__INCH, world_storage_api_trackable__FOOT, world_storage_api_trackable__YARD, world_storage_api_trackable__MILE } world_storage_api_trackable__e;
diff --git a/EtsiClientGen/patches/fixHeaderWorldLink.patch b/EtsiClientGen/patches/fixHeaderWorldLink.patch
index 0465f9c..15082da 100644
--- a/EtsiClientGen/patches/fixHeaderWorldLink.patch
+++ b/EtsiClientGen/patches/fixHeaderWorldLink.patch
@@ -1,9 +1,17 @@
---- world_link_origin.h 2024-05-17 23:08:53.449892849 +0200
-+++ world_link.h 2024-05-17 23:13:56.354907893 +0200
-@@ -26,24 +26,6 @@
-
- world_storage_api_world_link__e world_link_type_from_FromString(char* type_from);
+--- world_link.h 2024-09-17 23:26:00.190538680 +0200
++++ world_link_corrected.h 2024-09-17 23:28:19.122051317 +0200
+@@ -18,32 +18,6 @@
+ #include "type_world_storage.h"
+ #include "unit_system.h"
+-// Enum for world_link
+-
+-typedef enum { world_storage_api_world_link__NULL = 0, world_storage_api_world_link__TRACKABLE, world_storage_api_world_link__ANCHOR, world_storage_api_world_link__UNKNOWN } world_storage_api_world_link__e;
+-
+-char* world_link_type_from_ToString(world_storage_api_world_link__e type_from);
+-
+-world_storage_api_world_link__e world_link_type_from_FromString(char* type_from);
+-
-// Enum for world_link
-
-typedef enum { world_storage_api_world_link__NULL = 0, world_storage_api_world_link__TRACKABLE, world_storage_api_world_link__ANCHOR, world_storage_api_world_link__UNKNOWN } world_storage_api_world_link__e;
diff --git a/arf005 b/arf005
index af5fc23..5734880 160000
--- a/arf005
+++ b/arf005
@@ -1 +1 @@
-Subproject commit af5fc2355f7b03fbc76e9d9e04452044d4b5ca8d
+Subproject commit 5734880080c52572af65fe6d2703228ed6ee5653
diff --git a/package-lock.json b/package-lock.json
index 5f6e09f..ce80670 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,11 +1,11 @@
{
- "name": "worldstorageserver",
+ "name": "worldstoragecclient",
"version": "2.1.0",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
- "name": "worldstorageserver",
+ "name": "worldstoragecclient",
"version": "2.1.0",
"dependencies": {
"@openapitools/openapi-generator-cli": "^2.13.4"
@@ -123,16 +123,16 @@
}
},
"node_modules/@openapitools/openapi-generator-cli": {
- "version": "2.13.4",
- "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.13.4.tgz",
- "integrity": "sha512-4JKyrk55ohQK2FcuZbPdNvxdyXD14jjOIvE8hYjJ+E1cHbRbfXQXbYnjTODFE52Gx8eAxz8C9icuhDYDLn7nww==",
+ "version": "2.13.5",
+ "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.13.5.tgz",
+ "integrity": "sha512-9VgeKOTiiatKSwZDKKB3C86cW8tN9eDcFohotD4eisdK38UQswk/4Ysoq9KChRCbymjoMp6AIDHPtK1DQ2fTgw==",
"hasInstallScript": true,
"dependencies": {
"@nestjs/axios": "3.0.2",
"@nestjs/common": "10.3.0",
"@nestjs/core": "10.3.0",
"@nuxtjs/opencollective": "0.3.2",
- "axios": "1.6.8",
+ "axios": "1.7.4",
"chalk": "4.1.2",
"commander": "8.3.0",
"compare-versions": "4.1.4",
@@ -211,9 +211,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"node_modules/axios": {
- "version": "1.6.8",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
- "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+ "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"dependencies": {
"follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
@@ -1300,15 +1300,15 @@
}
},
"@openapitools/openapi-generator-cli": {
- "version": "2.13.4",
- "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.13.4.tgz",
- "integrity": "sha512-4JKyrk55ohQK2FcuZbPdNvxdyXD14jjOIvE8hYjJ+E1cHbRbfXQXbYnjTODFE52Gx8eAxz8C9icuhDYDLn7nww==",
+ "version": "2.13.5",
+ "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.13.5.tgz",
+ "integrity": "sha512-9VgeKOTiiatKSwZDKKB3C86cW8tN9eDcFohotD4eisdK38UQswk/4Ysoq9KChRCbymjoMp6AIDHPtK1DQ2fTgw==",
"requires": {
"@nestjs/axios": "3.0.2",
"@nestjs/common": "10.3.0",
"@nestjs/core": "10.3.0",
"@nuxtjs/opencollective": "0.3.2",
- "axios": "1.6.8",
+ "axios": "1.7.4",
"chalk": "4.1.2",
"commander": "8.3.0",
"compare-versions": "4.1.4",
@@ -1359,9 +1359,9 @@
"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
},
"axios": {
- "version": "1.6.8",
- "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz",
- "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+ "integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
"requires": {
"follow-redirects": "^1.15.6",
"form-data": "^4.0.0",
--
GitLab