diff --git a/Editor/Scripts/Windows/WorldStorageWindow.cs b/Editor/Scripts/Windows/WorldStorageWindow.cs
index 14d08cda4830c6b9c930e3c6a7add0d1c8653646..d8d036ec13150a818fa3d01f95afccea2fedd182 100644
--- a/Editor/Scripts/Windows/WorldStorageWindow.cs
+++ b/Editor/Scripts/Windows/WorldStorageWindow.cs
@@ -87,7 +87,7 @@ namespace ETSI.ARF.WorldStorage.UI
public static void ShowWindow()
{
WorldStorageWindowSingleton = EditorWindow.GetWindow(typeof(WorldStorageWindow), false, WorldStorageWindow.winName) as WorldStorageWindow;
- OpenAPI.ResponseObject<string> ro = AdminRequest.PingAsync(WorldStorageWindowSingleton.worldStorageServer, (response) =>
+ ResponseObject<string> ro = AdminRequest.PingAsync(WorldStorageWindowSingleton.worldStorageServer, (response) =>
{
WorldStorageWindowSingleton.ping = response.result;
WorldStorageWindowSingleton.repaint = true;
@@ -173,7 +173,7 @@ namespace ETSI.ARF.WorldStorage.UI
ping = EditorGUILayout.TextField("Last Ping", ping);
if (GUILayout.Button("Ping"))
{
- OpenAPI.ResponseObject<string> ro = AdminRequest.PingAsync(worldStorageServer, (response) =>
+ ResponseObject<string> ro = AdminRequest.PingAsync(worldStorageServer, (response) =>
{
ping = response.result;
});
@@ -188,7 +188,7 @@ namespace ETSI.ARF.WorldStorage.UI
if (GUILayout.Button("Get World Storage Sate"))
{
- OpenAPI.ResponseObject<string> ro = AdminRequest.AdminAsync(worldStorageServer, (response) =>
+ ResponseObject<string> ro = AdminRequest.AdminAsync(worldStorageServer, (response) =>
{
state = response.result;
});
@@ -203,7 +203,7 @@ namespace ETSI.ARF.WorldStorage.UI
if (GUILayout.Button("Get World Storage API Version"))
{
- OpenAPI.ResponseObject<string> ro = AdminRequest.VersionAsync(worldStorageServer, (response) =>
+ ResponseObject<string> ro = AdminRequest.VersionAsync(worldStorageServer, (response) =>
{
vers = response.result;
});
diff --git a/Runtime/Scripts/OpenAPI/BaseClient.cs b/Runtime/Scripts/OpenAPI/BaseClient.cs
index 83fa8c3bfc606c775cfb77a48685d4928320ea3d..3bdc50bc76ec6ca0e77160020c7d1b558a5e58d1 100644
--- a/Runtime/Scripts/OpenAPI/BaseClient.cs
+++ b/Runtime/Scripts/OpenAPI/BaseClient.cs
@@ -13,7 +13,7 @@ namespace ETSI.ARF.OpenAPI
public string lastJsonText;
public long lastPayload;
- protected void _prepareRequest(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
+ protected void _prepareRequest(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
{
if (EnableClientLog)
{
@@ -22,7 +22,7 @@ namespace ETSI.ARF.OpenAPI
}
}
- protected void _processResponse(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpResponseMessage response)
+ protected void _processResponse(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpResponseMessage response)
{
lastJsonText = response.Content.ReadAsStringAsync().Result.ToString();
lastPayload = response.Content.Headers.ContentLength.Value;
diff --git a/Runtime/Scripts/OpenAPI/Generated/WorldStorageOpenAPI.cs b/Runtime/Scripts/OpenAPI/Generated/WorldStorageOpenAPI.cs
index a61b2ae2fe85ebdba436fac4c3dfb7cafaf0152a..ba07b09e8b7d04733a10489233037b985a42e9df 100644
--- a/Runtime/Scripts/OpenAPI/Generated/WorldStorageOpenAPI.cs
+++ b/Runtime/Scripts/OpenAPI/Generated/WorldStorageOpenAPI.cs
@@ -24,11 +24,11 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
[System.CodeDom.Compiler.GeneratedCode("NSwag", "14.0.7.0 (NJsonSchema v11.0.0.0 (Newtonsoft.Json v13.0.0.0))")]
public partial class WorldStorageClient
{
- private ETSI.ARF.OpenAPI.IHttpClient _httpClient;
+ private ETSI.ARF.OpenAPI.WorldStorage.IHttpClient _httpClient;
private static System.Lazy<Newtonsoft.Json.JsonSerializerSettings> _settings = new System.Lazy<Newtonsoft.Json.JsonSerializerSettings>(CreateSerializerSettings, true);
#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
- public WorldStorageClient(ETSI.ARF.OpenAPI.IHttpClient httpClient)
+ public WorldStorageClient(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient httpClient)
#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
{
_httpClient = httpClient;
@@ -45,9 +45,9 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
static partial void UpdateJsonSerializerSettings(Newtonsoft.Json.JsonSerializerSettings settings);
- partial void PrepareRequest(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url);
- partial void PrepareRequest(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder);
- partial void ProcessResponse(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpResponseMessage response);
+ partial void PrepareRequest(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url);
+ partial void PrepareRequest(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder);
+ partial void ProcessResponse(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpResponseMessage response);
/// <summary>
/// Test the server availability.
diff --git a/Runtime/Scripts/OpenAPI/ResponseObject.cs b/Runtime/Scripts/OpenAPI/ResponseObject.cs
index 2be59dc3ec783355c787f56f871d67f7f195544e..6a37f194b0475409347e1b207da05ab3b9cf432b 100644
--- a/Runtime/Scripts/OpenAPI/ResponseObject.cs
+++ b/Runtime/Scripts/OpenAPI/ResponseObject.cs
@@ -13,7 +13,7 @@ using System.Collections.Generic;
using System.Threading;
using UnityEngine;
-namespace ETSI.ARF.OpenAPI
+namespace ETSI.ARF.OpenAPI.WorldStorage
{
public class CancelToken
{
diff --git a/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs b/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
index c70ef4ccb306deaad882ba99514905f87cfce377..a119a0375914003c13a4416c08a6a837f45ab65e 100644
--- a/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
+++ b/Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs
@@ -34,7 +34,7 @@ using System.Threading.Tasks;
using UnityEngine;
using UnityEngine.Networking;
-namespace ETSI.ARF.OpenAPI
+namespace ETSI.ARF.OpenAPI.WorldStorage
{
public interface IHttpClient
{
diff --git a/Runtime/Scripts/OpenAPI/WorldStorageClient.cs b/Runtime/Scripts/OpenAPI/WorldStorageClient.cs
index 55a043e234518aa6cf49e10ba8f6f17b216f0c9d..d75cc6a0550c0181bccf932bbec7cf90155dd282 100644
--- a/Runtime/Scripts/OpenAPI/WorldStorageClient.cs
+++ b/Runtime/Scripts/OpenAPI/WorldStorageClient.cs
@@ -10,17 +10,17 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
/// </summary>
public partial class WorldStorageClient : BaseClient
{
- partial void PrepareRequest(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
+ partial void PrepareRequest(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
{
_prepareRequest(client, request, url);
}
- partial void PrepareRequest(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder)
+ partial void PrepareRequest(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder)
{
// do something...
}
- partial void ProcessResponse(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpResponseMessage response)
+ partial void ProcessResponse(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpResponseMessage response)
{
_processResponse(client, response);
}
diff --git a/Runtime/Scripts/REST/RelocalizationInformationRequest.cs b/Runtime/Scripts/REST/RelocalizationInformationRequest.cs
index 95470c6980acda76177fa875436d585aa4c186ff..5223399ae86e82e3be0aa011c423c7f079ac3f3e 100644
--- a/Runtime/Scripts/REST/RelocalizationInformationRequest.cs
+++ b/Runtime/Scripts/REST/RelocalizationInformationRequest.cs
@@ -81,7 +81,7 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
{
public partial class WorldStorageClient
{
- public ETSI.ARF.OpenAPI.IHttpClient GetHttpClient()
+ public ETSI.ARF.OpenAPI.WorldStorage.IHttpClient GetHttpClient()
{
return _httpClient;
}
@@ -92,15 +92,15 @@ namespace ETSI.ARF.OpenAPI.WorldStorage
}
- public void PrepareRequest_(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
+ public void PrepareRequest_(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, string url)
{
PrepareRequest(client, request, url);
}
- public void PrepareRequest_(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder)
+ public void PrepareRequest_(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpRequestMessage request, System.Text.StringBuilder urlBuilder)
{
PrepareRequest(client, request, urlBuilder);
}
- public void ProcessResponse_(ETSI.ARF.OpenAPI.IHttpClient client, System.Net.Http.HttpResponseMessage response)
+ public void ProcessResponse_(ETSI.ARF.OpenAPI.WorldStorage.IHttpClient client, System.Net.Http.HttpResponseMessage response)
{
ProcessResponse(client, response);
}