Skip to content
Snippets Groups Projects
Commit ca42e4d9 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Current version for HHI server.

parent 8ee3fc87
No related branches found
No related tags found
1 merge request!11Fixed issue missing some modules by using new generator version (7.6.0) in the...
Showing
with 51 additions and 19 deletions
/*
* 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);
}
......
//
// 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
//
/*
......
......@@ -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
//
/*
......
//
// 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
//
/*
......
......@@ -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(
......
......@@ -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(
......
......@@ -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;
......
//
// 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
......
{
"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": {
......
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