diff --git a/.gitmodules b/.gitmodules index 520b5d782325e8ad1c318bbf37557fbdaadd8bbf..0b8e82d4f78ab0550f7f50510c885183eefd7be4 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 c8802a3a9846a3b82f9e88cf002d01c324c91b13..8b13db35ec8349a8bf513f9ad1d35d6a24699a00 160000 --- a/arf005 +++ b/arf005 @@ -1 +1 @@ -Subproject commit c8802a3a9846a3b82f9e88cf002d01c324c91b13 +Subproject commit 8b13db35ec8349a8bf513f9ad1d35d6a24699a00 diff --git a/readme.md b/readme.md index 579bfde7c8573255938c479783e78420220b00fd..46a84cd0a667fddf627e04ee2ac9c9efbb7acaae 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 d9e0699699cb0c67a846813ac2d4eb958ef90a81..5d7c9faf64a7d2a3667956c532ad7429adf9682c 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 03d4989f13d72631e9ec58e76eedc18755f7b03b..b788c682790104b22ced37c00a5e1eb1fcac6a3c 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 4b11b38b900ecb6570055c9b340052b067f8576f..1fc7c348491249ef4575b80d9c5299a3e1993764 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 ce6ef68ea39e8b03738f0c1421f0ef384fb2aa67..491bc46a01b1241b5a93a998524a74e16066b5e4 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 61c87dd690d10071f12a1038b5e90749b904a706..2ac047bc329cacfff979e0ef9a4e7a186b61fe46 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");