diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/DefaultImpl.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/DefaultImpl.cs
index ea5c39ba95d6d969b9f6cb1643364bed6df7d7be..af22e0201db072c2515a0608b8afc721b3337360 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/DefaultImpl.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/DefaultImpl.cs
@@ -1,9 +1,9 @@
/*
- * SmartSite Core System API
+ * ETSI ARF Core System API
*
- * API ensuring interoperability between the various services, tools and apps in SmartSite
+ * API ensuring interoperability between the various services, tools and apps in ARF
*
- * The version of the OpenAPI document: 1.0.2
+ * The version of the OpenAPI document: 2.0.1
*
* Generated by: https://openapi-generator.tech
*/
@@ -39,13 +39,13 @@ namespace ETSI.ARF.OpenAPI.WorldStorage.Controllers
public override IActionResult GetAdmin()
{
- string answer = "ETSI ARF Server Running.";
+ string answer = "ETSI ARF World Storage Server is running.";
return new ObjectResult(answer);
}
public override IActionResult GetVersion()
{
- string answer = "ETSI ARF RESTful API 1.1.0";
+ string answer = "ETSI ARF RESTful API v" + Startup.apiVersion;//"2.0.1";
return new ObjectResult(answer);
}
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/TrackablesImpl.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/TrackablesImpl.cs
index 5845b1007de4267f86043862fe47cb1b59a963fd..f6c4bdce3a49c4e5aaa0375582fd51d7f37f0f7a 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/TrackablesImpl.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/TrackablesImpl.cs
@@ -1,7 +1,7 @@
//
// ARF - Augmented Reality Framework (ETSI ISG ARF)
//
-// Copyright 2022 ETSI
+// Copyright 2024 ETSI
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-// Last change: June 2022
+// Last change: June 2024
//
/*
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldAnchorsImpl.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldAnchorsImpl.cs
index 8d5e48bc1d4b4c1de5cb1c04f80f34d6dcc39ce6..0d6663375c20628577dd23c0df7f95c8d525586f 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldAnchorsImpl.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldAnchorsImpl.cs
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-// Last change: June 2022
+// Last change: June 2024
//
/*
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldLinksImpl.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldLinksImpl.cs
index cd5da8ac57a90b905ce163c9ef5423f5920f9db4..27ce36e891b86c3a6dff3ea9f757fa3941ebc2b9 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldLinksImpl.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ControllersImpl/WorldLinksImpl.cs
@@ -1,7 +1,7 @@
//
// ARF - Augmented Reality Framework (ETSI ISG ARF)
//
-// Copyright 2022 ETSI
+// Copyright 2024 ETSI
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
//
-// Last change: June 2022
+// Last change: June 2024
//
/*
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/TrackableExt.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/TrackableExt.cs
index db4d674300258f0510450525b767d85cafba99a4..059404bd0109baf0d59a878218467fb311c647b7 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/TrackableExt.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/TrackableExt.cs
@@ -40,6 +40,9 @@ namespace ETSI.ARF.OpenAPI.WorldStorage.Models
//[BsonIgnore] - don't ignore, so mongo replace can use it!
public ObjectId _mongoID { get => _id; set => _id = value; }
+ /// <summary>
+ /// Check for capabilities
+ /// </summary>
public bool Match(List<Capability> capabilities)
{
if (capabilities.Count == 0)
@@ -60,6 +63,9 @@ namespace ETSI.ARF.OpenAPI.WorldStorage.Models
return false;
}
+ /// <summary>
+ /// Give the matrix from the array of the object
+ /// </summary>
public Matrix4x4 Matrix()
{
return new Matrix4x4(
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/WorldLinksExt.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/WorldLinksExt.cs
index 3191d4a2f6130d08b76832ecaadc94e20ca559e3..f7d1ce7f9b94393308e0f7c1300147b2e3008c5e 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/WorldLinksExt.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/ModelsExt/WorldLinksExt.cs
@@ -46,6 +46,9 @@ namespace ETSI.ARF.OpenAPI.WorldStorage.Models
//[BsonIgnore] - don't ignore, so mongo replace can use it!
public ObjectId _mongoID { get => _id; set => _id = value; }
+ /// <summary>
+ /// Give the matrix from the array of the object
+ /// </summary>
public Matrix4x4 Matrix()
{
return new Matrix4x4(
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/Services/BaseService.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/Services/BaseService.cs
index 90e909ed8457dbb58ecf172d8fb421e2bc531a97..6b499f14835a1474b67fe506df2aa73e837081b8 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/Services/BaseService.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/ETSI-ARF/Services/BaseService.cs
@@ -36,7 +36,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage.Services
{
string msg = "World Storage API: Service for '" + settings.CollectionNameTrackables + "' can only be instantiated one time!";
Console.WriteLine(msg);
- return;
+ //return;
//throw new Exception(msg);
}
else _singleton = this;
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/Startup.cs b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/Startup.cs
index 701c68495ee2ff253082dfcf4313efafd35e126f..b2d59f7aa163a8dc47a08351cc99c1ac74395d8c 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/Startup.cs
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/Startup.cs
@@ -1,9 +1,29 @@
+//
+// ARF - Augmented Reality Framework (ETSI ISG ARF)
+//
+// Copyright 2024 ETSI
+//
+// 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.
+//
+// Last change: June 2024
+//
+
/*
- * World Storage API
+*World Storage API
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 1.0.0
+ * The version of the OpenAPI document: 2.0.1
*
* Generated by: https://openapi-generator.tech
*/
@@ -17,9 +37,12 @@ using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Options;
using Microsoft.OpenApi.Models;
+
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
+
using ETSI.ARF.OpenAPI.WorldStorage.Authentication;
using ETSI.ARF.OpenAPI.WorldStorage.Filters;
using ETSI.ARF.OpenAPI.WorldStorage.OpenApi;
@@ -27,10 +50,10 @@ using ETSI.ARF.OpenAPI.WorldStorage.Formatters;
using ETSI.ARF.OpenAPI.WorldStorage.Services;
using ETSI.ARF.OpenAPI.WorldStorage.Models;
using ETSI.ARF.OpenAPI.WorldStorage.Binders;
+
using MongoDB.Bson.Serialization.Serializers;
using MongoDB.Bson.Serialization;
using MongoDB.Bson;
-using Microsoft.Extensions.Options;
namespace ETSI.ARF.OpenAPI.WorldStorage
{
@@ -45,7 +68,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
/// <summary>
/// The API version. (how to read it from the yaml?)
/// </summary>
- static public string apiVersion = "1.1.0";
+ static public string apiVersion = "2.0.1";
/// <summary>
/// Demo access key
diff --git a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/appsettings.json b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/appsettings.json
index f7404687ec93f6d3dc634d7051b291f4b9e30458..f2c1c69170344c6eb056decb3e52e44808e147dc 100644
--- a/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/appsettings.json
+++ b/server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/appsettings.json
@@ -1,13 +1,13 @@
{
"DatabaseSettings": {
- "Description" : "Version for Visual Studio",
+ "Description": "Version for Visual Studio",
"LocalDataPath": ".\\wwwroot\\dataspace\\data",
"MongoSrv": "192-168-020-029.fe.hhi.de",
"MongoPort": "27037",
"DatabaseName": "WorldStorageAPI",
- "CollectionNameWorldLinks": "WorldLinks",
- "CollectionNameTrackables": "Trackables",
- "CollectionNameWorldAnchors": "WorldAnchors"
+ "CollectionNameWorldLinks": "WorldLinks-DEV",
+ "CollectionNameTrackables": "Trackables-DEV",
+ "CollectionNameWorldAnchors": "WorldAnchors-DEV"
},
"Logging": {
"LogLevel": {