From 1c02fdbbbf173f92aede2f35b4a94cb097108545 Mon Sep 17 00:00:00 2001
From: Detlef Runde <detlef.runde@hhi.fraunhofer.de>
Date: Tue, 3 May 2022 09:04:46 +0200
Subject: [PATCH] Update to version 0.0.5
---
.../ControllersImpl/DefaultApiImpl.cs | 29 +++++++++++++++----
.../ControllersImpl/TrackablesApiImpl.cs | 2 +-
.../ControllersImpl/WorldAnchorsApiImpl.cs | 2 +-
.../ControllersImpl/WorldLinksApiImpl.cs | 4 ++-
server/src/Org.OpenAPITools/Startup.cs | 8 ++---
5 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs b/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs
index 6476543..d9e0699 100644
--- a/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs
+++ b/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs
@@ -3,7 +3,7 @@
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 0.0.4
+ * The version of the OpenAPI document: 0.0.5
*
* Generated by: https://openapi-generator.tech
*/
@@ -29,6 +29,23 @@ namespace Org.OpenAPITools.Controllers
[ApiController]
public class DefaultApiControllerImpl : DefaultApiController
{
+
+ /// <summary>
+ /// Get the version of the server.
+ /// </summary>
+ /// <response code="200">OK, world storage server ready.</response>
+ [HttpGet]
+ [Route("/admin")]
+ [ValidateModelState]
+ [SwaggerOperation("GetAdmin")]
+ [SwaggerResponse(statusCode: 200, type: typeof(string), description: "OK, world storage server ready.")]
+ public override IActionResult GetAdmin()
+ {
+ string version = "OK world storage server ready";
+ return new ObjectResult(version);
+ //return StatusCode(200, new ObjectResult(version));
+ }
+
/// <summary>
/// Test the server availability
/// </summary>
@@ -45,17 +62,17 @@ namespace Org.OpenAPITools.Controllers
}
/// <summary>
- /// Get the version of the API.
+ /// Get the version of the ARF API.
/// </summary>
- /// <response code="200">OK, world storage ready.</response>
+ /// <response code="200">Current version.</response>
[HttpGet]
- [Route("/admin")]
+ [Route("/version")]
[ValidateModelState]
[SwaggerOperation("GetVersion")]
- [SwaggerResponse(statusCode: 200, type: typeof(string), description: "OK, world storage ready.")]
+ [SwaggerResponse(statusCode: 200, type: typeof(string), description: "Current version.")]
public override IActionResult GetVersion()
{
- string version = "OK world storage 0.0.4 ready";
+ string version = "0.0.5";
return new ObjectResult(version);
//return StatusCode(200, new ObjectResult(version));
}
diff --git a/server/src/Org.OpenAPITools/ControllersImpl/TrackablesApiImpl.cs b/server/src/Org.OpenAPITools/ControllersImpl/TrackablesApiImpl.cs
index d4be291..03d4989 100644
--- a/server/src/Org.OpenAPITools/ControllersImpl/TrackablesApiImpl.cs
+++ b/server/src/Org.OpenAPITools/ControllersImpl/TrackablesApiImpl.cs
@@ -3,7 +3,7 @@
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 0.0.4
+ * The version of the OpenAPI document: 0.0.5
*
* Generated by: https://openapi-generator.tech
*/
diff --git a/server/src/Org.OpenAPITools/ControllersImpl/WorldAnchorsApiImpl.cs b/server/src/Org.OpenAPITools/ControllersImpl/WorldAnchorsApiImpl.cs
index e557fce..4b11b38 100644
--- a/server/src/Org.OpenAPITools/ControllersImpl/WorldAnchorsApiImpl.cs
+++ b/server/src/Org.OpenAPITools/ControllersImpl/WorldAnchorsApiImpl.cs
@@ -3,7 +3,7 @@
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 0.0.4
+ * The version of the OpenAPI document: 0.0.5
*
* Generated by: https://openapi-generator.tech
*/
diff --git a/server/src/Org.OpenAPITools/ControllersImpl/WorldLinksApiImpl.cs b/server/src/Org.OpenAPITools/ControllersImpl/WorldLinksApiImpl.cs
index 10731c6..ce6ef68 100644
--- a/server/src/Org.OpenAPITools/ControllersImpl/WorldLinksApiImpl.cs
+++ b/server/src/Org.OpenAPITools/ControllersImpl/WorldLinksApiImpl.cs
@@ -3,7 +3,7 @@
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 0.0.4
+ * The version of the OpenAPI document: 0.0.5
*
* Generated by: https://openapi-generator.tech
*/
@@ -114,6 +114,8 @@ namespace Org.OpenAPITools.Controllers
attachedobjects.UUID = myworldlink.UUID;
attachedobjects.UUIDFrom = myworldlink.UUIDFrom;
attachedobjects.UUIDTo = myworldlink.UUIDTo;
+ attachedobjects.TypeFrom = ObjectType.NotIdentifiedEnum;
+ attachedobjects.TypeTo = ObjectType.NotIdentifiedEnum;
if (null != _worldLinkService.Get(attachedobjects.UUIDFrom)) attachedobjects.TypeFrom = ObjectType.WorldLinkEnum;
if (null != _worldLinkService.GetAnchor(attachedobjects.UUIDFrom)) attachedobjects.TypeFrom = ObjectType.WorldAnchorEnum;
if (null != _worldLinkService.GetTrackable(attachedobjects.UUIDFrom)) attachedobjects.TypeFrom = ObjectType.TrackableEnum;
diff --git a/server/src/Org.OpenAPITools/Startup.cs b/server/src/Org.OpenAPITools/Startup.cs
index 1e524f5..61c87dd 100644
--- a/server/src/Org.OpenAPITools/Startup.cs
+++ b/server/src/Org.OpenAPITools/Startup.cs
@@ -3,7 +3,7 @@
*
* API ensuring interoperability between an authoring tool and a World Storage service
*
- * The version of the OpenAPI document: 0.0.4
+ * The version of the OpenAPI document: 0.0.5
*
* Generated by: https://openapi-generator.tech
*/
@@ -88,7 +88,7 @@ namespace Org.OpenAPITools
services
.AddSwaggerGen(c =>
{
- c.SwaggerDoc("0.0.4", new OpenApiInfo
+ c.SwaggerDoc("0.0.5", new OpenApiInfo
{
Title = "World Storage API",
Description = "World Storage API (ASP.NET Core 3.1)",
@@ -104,7 +104,7 @@ namespace Org.OpenAPITools
Name = "NoLicense",
Url = new Uri("https://opensource.org/licenses/BSD-3-Clause")
},
- Version = "0.0.4",
+ Version = "0.0.5",
});
c.CustomSchemaIds(type => type.FriendlyId(true));
c.IncludeXmlComments($"{AppContext.BaseDirectory}{Path.DirectorySeparatorChar}{Assembly.GetEntryAssembly().GetName().Name}.xml");
@@ -145,7 +145,7 @@ namespace Org.OpenAPITools
// set route prefix to openapi, e.g. http://localhost:8080/openapi/index.html
c.RoutePrefix = "openapi";
//TODO: Either use the SwaggerGen generated OpenAPI contract (generated from C# classes)
- c.SwaggerEndpoint("/openapi/0.0.4/openapi.json", "World Storage API");
+ c.SwaggerEndpoint("/openapi/0.0.5/openapi.json", "World Storage API");
//TODO: Or alternatively use the original OpenAPI contract that's included in the static files
// c.SwaggerEndpoint("/openapi-original.json", "World Storage API Original");
--
GitLab