From d628d8ae5c3cfcd19ef9c83e67cd520afbfb9207 Mon Sep 17 00:00:00 2001 From: Detlef Runde Date: Wed, 18 May 2022 10:44:02 +0200 Subject: [PATCH] update to version 0.0.6 --- .gitmodules | 1 + arf005 | 2 +- readme.md | 2 +- .../ControllersImpl/DefaultApiImpl.cs | 4 +-- .../ControllersImpl/TrackablesApiImpl.cs | 2 +- .../ControllersImpl/WorldAnchorsApiImpl.cs | 2 +- .../ControllersImpl/WorldLinksApiImpl.cs | 36 +------------------ server/src/Org.OpenAPITools/Startup.cs | 8 ++--- 8 files changed, 12 insertions(+), 45 deletions(-) diff --git a/.gitmodules b/.gitmodules index 520b5d7..0b8e82d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "arf005"] path = arf005 url = git@forge.etsi.org:arf/arf005.git + branch = feature/elementNameAndNewObjectType \ No newline at end of file diff --git a/arf005 b/arf005 index c8802a3..8b13db3 160000 --- a/arf005 +++ b/arf005 @@ -1 +1 @@ -Subproject commit c8802a3a9846a3b82f9e88cf002d01c324c91b13 +Subproject commit 8b13db35ec8349a8bf513f9ad1d35d6a24699a00 diff --git a/readme.md b/readme.md index 579bfde..46a84cd 100644 --- a/readme.md +++ b/readme.md @@ -1,4 +1,4 @@ -# Description of version 0.0.5 +# Description of version 0.0.6 auto-generated ASP.NET server code diff --git a/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs b/server/src/Org.OpenAPITools/ControllersImpl/DefaultApiImpl.cs index d9e0699..5d7c9fa 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.5 + * The version of the OpenAPI document: 0.0.6 * * Generated by: https://openapi-generator.tech */ @@ -72,7 +72,7 @@ namespace Org.OpenAPITools.Controllers [SwaggerResponse(statusCode: 200, type: typeof(string), description: "Current version.")] public override IActionResult GetVersion() { - string version = "0.0.5"; + string version = "0.0.6"; 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 03d4989..b788c68 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.5 + * The version of the OpenAPI document: 0.0.6 * * 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 4b11b38..1fc7c34 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.5 + * The version of the OpenAPI document: 0.0.6 * * 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 ce6ef68..491bc46 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.5 + * The version of the OpenAPI document: 0.0.6 * * Generated by: https://openapi-generator.tech */ @@ -91,40 +91,6 @@ namespace Org.OpenAPITools.Controllers return (answer.IsAcknowledged && answer.DeletedCount > 0) ? new ObjectResult("ok") : StatusCode(404, "Not found, could not find UUID in database."); } - /// - /// Retrieve end objects connected to this world link by its UUID. - /// - /// UUID of the link from which you will retrieve the end objects. - /// Successful operation. - /// Invalid UUID supplied. - /// Not found, could not find UUID in database. - [HttpGet] - [Route("/worldLinks/attached/{worldLinkUUID}")] - [ValidateModelState] - [SwaggerOperation("GetAttachedObjectsFromUUID")] - [SwaggerResponse(statusCode: 200, type: typeof(AttachedObjects), description: "Successful operation.")] - public override IActionResult GetAttachedObjectsFromUUID([FromRoute(Name = "worldLinkUUID")][Required] Guid worldLinkUUID) - { - WorldLink myworldlink = _worldLinkService.Get(worldLinkUUID); - if (null == myworldlink) - { - return StatusCode(404, "not found, could not find UUID in database"); - } - AttachedObjects attachedobjects = new AttachedObjects(); - 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; - if (null != _worldLinkService.Get(attachedobjects.UUIDTo)) attachedobjects.TypeTo = ObjectType.WorldLinkEnum; - if (null != _worldLinkService.GetAnchor(attachedobjects.UUIDTo)) attachedobjects.TypeTo = ObjectType.WorldAnchorEnum; - if (null != _worldLinkService.GetTrackable(attachedobjects.UUIDTo)) attachedobjects.TypeTo = ObjectType.TrackableEnum; - - return new ObjectResult(attachedobjects); - } /// /// Find a link by its UUID. diff --git a/server/src/Org.OpenAPITools/Startup.cs b/server/src/Org.OpenAPITools/Startup.cs index 61c87dd..2ac047b 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.5 + * The version of the OpenAPI document: 0.0.6 * * Generated by: https://openapi-generator.tech */ @@ -88,7 +88,7 @@ namespace Org.OpenAPITools services .AddSwaggerGen(c => { - c.SwaggerDoc("0.0.5", new OpenApiInfo + c.SwaggerDoc("0.0.6", 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.5", + Version = "0.0.6", }); 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.5/openapi.json", "World Storage API"); + c.SwaggerEndpoint("/openapi/0.0.6/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