Commit 3eb6aa6a authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Some namespace changes.

parent 7d913d06

Editor/Scripts/Windows/WorldStorageWindow.cs

+4 −4
Original line number Diff line number Diff line
@@ -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;

                });

Runtime/Scripts/OpenAPI/BaseClient.cs

+2 −2
Original line number Diff line number Diff line
@@ -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;

Runtime/Scripts/OpenAPI/Generated/WorldStorageOpenAPI.cs

+5 −5
Original line number Diff line number Diff line
@@ -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.

Runtime/Scripts/OpenAPI/ResponseObject.cs

+1 −1
Original line number Diff line number Diff line
@@ -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

    {

Runtime/Scripts/OpenAPI/UnityWebRequestHttpClient.cs

+1 −1
Original line number Diff line number Diff line
@@ -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

    {