refactor: uniformize Api namespaces

aneoconsulting · Aug 11, 2023 · fda408a · fda408a
1 parent fa68172
commit fda408a
Show file tree

Hide file tree

Showing 37 changed files with 50 additions and 90 deletions.
diff --git a/Common/src/ArmoniK.Core.Common.csproj b/Common/src/ArmoniK.Core.Common.csproj
@@ -26,7 +26,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Core" Version="3.11.0-edge.97.da9b639" />
+    <PackageReference Include="ArmoniK.Api.Core" Version="3.11.0-meuniformcsharpnamespaces.126.6bc6431" />
     <PackageReference Include="Calzolari.Grpc.AspNetCore.Validation" Version="6.3.0" />
     <PackageReference Include="Grpc.HealthCheck" Version="2.54.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />

diff --git a/Common/src/gRPC/EnumFieldExt.cs b/Common/src/gRPC/EnumFieldExt.cs
@@ -19,9 +19,7 @@
 using System.Linq.Expressions;
 
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.Partitions;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
 using ArmoniK.Api.gRPC.V1.Results;
 using ArmoniK.Api.gRPC.V1.Sessions;
 

diff --git a/Common/src/gRPC/ListPartitionsRequestExt.cs b/Common/src/gRPC/ListPartitionsRequestExt.cs
@@ -19,8 +19,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 
-using Armonik.Api.Grpc.V1.Partitions;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
 using ArmoniK.Core.Common.Storage;
 
 namespace ArmoniK.Core.Common.gRPC;

diff --git a/Common/src/gRPC/Services/GrpcApplicationsService.cs b/Common/src/gRPC/Services/GrpcApplicationsService.cs
@@ -22,9 +22,7 @@
 using System.Threading.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;
 using ArmoniK.Core.Common.Storage;

diff --git a/Common/src/gRPC/Services/GrpcPartitionsService.cs b/Common/src/gRPC/Services/GrpcPartitionsService.cs
@@ -19,9 +19,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-using Armonik.Api.Grpc.V1.Partitions;
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;
 using ArmoniK.Core.Common.Storage;

diff --git a/Common/src/gRPC/Services/GrpcResultsService.cs b/Common/src/gRPC/Services/GrpcResultsService.cs
@@ -23,9 +23,7 @@
 using ArmoniK.Api.Common.Utils;
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Results;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;
 using ArmoniK.Core.Common.Storage;

diff --git a/Common/src/gRPC/Services/GrpcSessionsService.cs b/Common/src/gRPC/Services/GrpcSessionsService.cs
@@ -20,9 +20,7 @@
 using System.Threading.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Sessions;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;
 using ArmoniK.Core.Common.Exceptions;

diff --git a/Common/src/gRPC/Services/GrpcTasksService.cs b/Common/src/gRPC/Services/GrpcTasksService.cs
@@ -20,8 +20,8 @@
 using System.Threading.Tasks;
 
 using ArmoniK.Api.gRPC.V1;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 
-using Armonik.Api.Grpc.V1.SortDirection;
 using Armonik.Api.gRPC.V1.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Tasks;

diff --git a/Common/src/gRPC/Services/GrpcVersionsService.cs b/Common/src/gRPC/Services/GrpcVersionsService.cs
@@ -17,8 +17,7 @@
 
 using System.Threading.Tasks;
 
-using Armonik.Api.Grpc.V1.Versions;
-
+using ArmoniK.Api.gRPC.V1.Versions;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;
 

diff --git a/Common/src/gRPC/Validators/ListPartitionsRequestValidator.cs b/Common/src/gRPC/Validators/ListPartitionsRequestValidator.cs
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-using Armonik.Api.Grpc.V1.Partitions;
+using ArmoniK.Api.gRPC.V1.Partitions;
 
 using FluentValidation;
 

diff --git a/Common/tests/Auth/AuthenticationIntegrationTest.cs b/Common/tests/Auth/AuthenticationIntegrationTest.cs
@@ -29,16 +29,12 @@
 using ArmoniK.Api.gRPC.V1.Applications;
 using ArmoniK.Api.gRPC.V1.Auth;
 using ArmoniK.Api.gRPC.V1.Events;
-
-using Armonik.Api.Grpc.V1.Partitions;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
 using ArmoniK.Api.gRPC.V1.Results;
 using ArmoniK.Api.gRPC.V1.Sessions;
 using ArmoniK.Api.gRPC.V1.Submitter;
 using ArmoniK.Api.gRPC.V1.Tasks;
-
-using Armonik.Api.Grpc.V1.Versions;
-
+using ArmoniK.Api.gRPC.V1.Versions;
 using ArmoniK.Core.Base;
 using ArmoniK.Core.Common.Auth.Authentication;
 using ArmoniK.Core.Common.Auth.Authorization;

diff --git a/Common/tests/ListApplicationsRequestExt/ToApplicationFieldTest.cs b/Common/tests/ListApplicationsRequestExt/ToApplicationFieldTest.cs
@@ -21,9 +21,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListApplicationsRequestExt/ToApplicationFilterTest.cs b/Common/tests/ListApplicationsRequestExt/ToApplicationFilterTest.cs
@@ -22,9 +22,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListPartitionsRequestExt/ListPartitionsHelper.cs b/Common/tests/ListPartitionsRequestExt/ListPartitionsHelper.cs
@@ -18,7 +18,8 @@
 using System.Collections.Generic;
 
 using Armonik.Api.gRPC.V1;
-using Armonik.Api.Grpc.V1.Partitions;
+
+using ArmoniK.Api.gRPC.V1.Partitions;
 
 namespace ArmoniK.Core.Common.Tests.ListPartitionsRequestExt;
 

diff --git a/Common/tests/ListPartitionsRequestExt/ToPartitionDataFieldTest.cs b/Common/tests/ListPartitionsRequestExt/ToPartitionDataFieldTest.cs
@@ -18,9 +18,9 @@
 using System.Collections.Generic;
 
 using Armonik.Api.gRPC.V1;
-using Armonik.Api.Grpc.V1.Partitions;
-using Armonik.Api.Grpc.V1.SortDirection;
 
+using ArmoniK.Api.gRPC.V1.Partitions;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListPartitionsRequestExt/ToTaskDataFilterTest.cs b/Common/tests/ListPartitionsRequestExt/ToTaskDataFilterTest.cs
@@ -19,9 +19,9 @@
 using System.Collections.Generic;
 
 using Armonik.Api.gRPC.V1;
-using Armonik.Api.Grpc.V1.Partitions;
-using Armonik.Api.Grpc.V1.SortDirection;
 
+using ArmoniK.Api.gRPC.V1.Partitions;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListResultsRequestExt/ToResultFieldTest.cs b/Common/tests/ListResultsRequestExt/ToResultFieldTest.cs
@@ -20,9 +20,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Results;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListResultsRequestExt/ToResultFilterTest.cs b/Common/tests/ListResultsRequestExt/ToResultFilterTest.cs
@@ -22,9 +22,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Results;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListSessionsRequestExt/ToSessionDataFieldTest.cs b/Common/tests/ListSessionsRequestExt/ToSessionDataFieldTest.cs
@@ -20,9 +20,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Sessions;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListSessionsRequestExt/ToSessionDataFilterTest.cs b/Common/tests/ListSessionsRequestExt/ToSessionDataFilterTest.cs
@@ -22,9 +22,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Sessions;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC;
 using ArmoniK.Core.Common.Storage;
 

diff --git a/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs b/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs
@@ -21,8 +21,8 @@
 using Armonik.Api.gRPC.V1;
 
 using ArmoniK.Api.gRPC.V1;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 
-using Armonik.Api.Grpc.V1.SortDirection;
 using Armonik.Api.gRPC.V1.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Tasks;

diff --git a/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs b/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs
@@ -21,8 +21,8 @@
 using Armonik.Api.gRPC.V1;
 
 using ArmoniK.Api.gRPC.V1;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 
-using Armonik.Api.Grpc.V1.SortDirection;
 using Armonik.Api.gRPC.V1.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Tasks;

diff --git a/Common/tests/TestBase/PartitionTableTestBase.cs b/Common/tests/TestBase/PartitionTableTestBase.cs
@@ -20,8 +20,8 @@
 using System.Threading.Tasks;
 
 using Armonik.Api.gRPC.V1;
-using Armonik.Api.Grpc.V1.Partitions;
 
+using ArmoniK.Api.gRPC.V1.Partitions;
 using ArmoniK.Core.Base.DataStructures;
 using ArmoniK.Core.Common.Exceptions;
 using ArmoniK.Core.Common.gRPC;

diff --git a/Common/tests/TestBase/SessionTableTestBase.cs b/Common/tests/TestBase/SessionTableTestBase.cs
@@ -23,9 +23,7 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Sessions;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Api.gRPC.V1.Submitter;
 using ArmoniK.Core.Base.DataStructures;
 using ArmoniK.Core.Common.Exceptions;

diff --git a/Common/tests/TestBase/TaskTableTestBase.cs b/Common/tests/TestBase/TaskTableTestBase.cs
@@ -29,9 +29,7 @@
 using Armonik.Api.gRPC.V1;
 
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Api.gRPC.V1.Submitter;
 
 using Armonik.Api.gRPC.V1.Tasks;

diff --git a/Common/tests/Validators/ListApplicationsRequestValidatorTest.cs b/Common/tests/Validators/ListApplicationsRequestValidatorTest.cs
@@ -18,9 +18,7 @@
 using System;
 
 using ArmoniK.Api.gRPC.V1.Applications;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC.Validators;
 
 using NUnit.Framework;

diff --git a/Common/tests/Validators/ListPartitionsRequestValidatorTest.cs b/Common/tests/Validators/ListPartitionsRequestValidatorTest.cs
@@ -17,9 +17,8 @@
 
 using System;
 
-using Armonik.Api.Grpc.V1.Partitions;
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC.Validators;
 
 using NUnit.Framework;

diff --git a/Common/tests/Validators/ListResultsRequestValidatorTest.cs b/Common/tests/Validators/ListResultsRequestValidatorTest.cs
@@ -18,9 +18,7 @@
 using System;
 
 using ArmoniK.Api.gRPC.V1.Results;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC.Validators;
 
 using NUnit.Framework;

diff --git a/Common/tests/Validators/ListSessionsRequestValidatorTest.cs b/Common/tests/Validators/ListSessionsRequestValidatorTest.cs
@@ -18,9 +18,7 @@
 using System;
 
 using ArmoniK.Api.gRPC.V1.Sessions;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Core.Common.gRPC.Validators;
 
 using NUnit.Framework;

diff --git a/Common/tests/Validators/ListTasksRequestValidatorTest.cs b/Common/tests/Validators/ListTasksRequestValidatorTest.cs
@@ -17,7 +17,8 @@
 
 using System;
 
-using Armonik.Api.Grpc.V1.SortDirection;
+using ArmoniK.Api.gRPC.V1.SortDirection;
+
 using Armonik.Api.gRPC.V1.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Tasks;

diff --git a/Tests/Bench/Client/src/Program.cs b/Tests/Bench/Client/src/Program.cs
@@ -29,13 +29,9 @@
 
 using ArmoniK.Api.gRPC.V1;
 using ArmoniK.Api.gRPC.V1.Events;
-
-using Armonik.Api.Grpc.V1.Partitions;
-
+using ArmoniK.Api.gRPC.V1.Partitions;
 using ArmoniK.Api.gRPC.V1.Results;
-
-using Armonik.Api.Grpc.V1.SortDirection;
-
+using ArmoniK.Api.gRPC.V1.SortDirection;
 using ArmoniK.Api.gRPC.V1.Submitter;
 using ArmoniK.Core.Common.Tests.Client;
 using ArmoniK.Samples.Bench.Client.Options;
@@ -52,9 +48,9 @@
 using Serilog;
 using Serilog.Formatting.Compact;
 
-using FilterField = Armonik.Api.Grpc.V1.Partitions.FilterField;
-using Filters = Armonik.Api.Grpc.V1.Partitions.Filters;
-using FiltersAnd = Armonik.Api.Grpc.V1.Partitions.FiltersAnd;
+using FilterField = ArmoniK.Api.gRPC.V1.Partitions.FilterField;
+using Filters = ArmoniK.Api.gRPC.V1.Partitions.Filters;
+using FiltersAnd = ArmoniK.Api.gRPC.V1.Partitions.FiltersAnd;
 using TaskStatus = ArmoniK.Api.gRPC.V1.TaskStatus;
 
 namespace ArmoniK.Samples.Bench.Client;

diff --git a/Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj b/Tests/Bench/Server/src/ArmoniK.Samples.Bench.Server.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Worker" Version="3.11.0-edge.97.da9b639" />
+    <PackageReference Include="ArmoniK.Api.Worker" Version="3.11.0-meuniformcsharpnamespaces.126.6bc6431" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
   </ItemGroup>
 

diff --git a/Tests/Common/Client/src/ArmoniK.Core.Common.Tests.Client.csproj b/Tests/Common/Client/src/ArmoniK.Core.Common.Tests.Client.csproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="ArmoniK.Api.Client" Version="3.11.0-edge.97.da9b639" />
+    <PackageReference Include="ArmoniK.Api.Client" Version="3.11.0-meuniformcsharpnamespaces.126.6bc6431" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />

diff --git a/Tests/Common/Client/src/GrpcChannelExt.cs b/Tests/Common/Client/src/GrpcChannelExt.cs
@@ -23,8 +23,8 @@
 using Armonik.Api.gRPC.V1;
 
 using ArmoniK.Api.gRPC.V1.Results;
+using ArmoniK.Api.gRPC.V1.SortDirection;
 
-using Armonik.Api.Grpc.V1.SortDirection;
 using Armonik.Api.gRPC.V1.Tasks;
 
 using ArmoniK.Api.gRPC.V1.Tasks;