Merge pull request #210 from byBlurr/master

Namespaces refactor
dragonfruitnetwork · Jan 28, 2021 · 97a3fa4 · 97a3fa4
2 parents f0050b1 + e76e469
commit 97a3fa4
Show file tree

Hide file tree

Showing 106 changed files with 279 additions and 253 deletions.
diff --git a/DragonFruit.Six.API/DragonFruit.Six.API.csproj b/DragonFruit.Six.API/DragonFruit.Six.API.csproj
diff --git a/...ix.API.Tests/Data/AccountActivityTests.cs → ...ix.Api.Tests/Data/AccountActivityTests.cs b/...ix.API.Tests/Data/AccountActivityTests.cs → ...ix.Api.Tests/Data/AccountActivityTests.cs
@@ -3,11 +3,11 @@
 
 using System;
 using System.Globalization;
-using DragonFruit.Six.API.Data.Extensions;
-using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.Api.Extensions;
+using DragonFruit.Six.Api.Enums;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Data
+namespace DragonFruit.Six.Api.Tests.Data
 {
     [TestFixture]
     public class AccountActivityTests : Dragon6ApiTest

diff --git a/....Six.API.Tests/Data/AccountLookupTests.cs → ....Six.Api.Tests/Data/AccountLookupTests.cs b/....Six.API.Tests/Data/AccountLookupTests.cs → ....Six.Api.Tests/Data/AccountLookupTests.cs
@@ -2,11 +2,11 @@
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
 using System;
-using DragonFruit.Six.API.Data.Extensions;
-using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.Api.Extensions;
+using DragonFruit.Six.Api.Enums;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Data
+namespace DragonFruit.Six.Api.Tests.Data
 {
     [TestFixture]
     public class AccountLookupTests : Dragon6ApiTest

diff --git a/...t.Six.API.Tests/Data/GeneralStatsTests.cs → ...t.Six.Api.Tests/Data/GeneralStatsTests.cs b/...t.Six.API.Tests/Data/GeneralStatsTests.cs → ...t.Six.Api.Tests/Data/GeneralStatsTests.cs
@@ -1,12 +1,12 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Data.Extensions;
-using DragonFruit.Six.API.Enums;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Extensions;
+using DragonFruit.Six.Api.Enums;
+using DragonFruit.Six.Api.Utils;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Data
+namespace DragonFruit.Six.Api.Tests.Data
 {
     [TestFixture]
     public class GeneralStatsTests : Dragon6ApiTest

diff --git a/....Six.API.Tests/Data/SeasonalStatsTests.cs → ....Six.Api.Tests/Data/SeasonalStatsTests.cs b/....Six.API.Tests/Data/SeasonalStatsTests.cs → ....Six.Api.Tests/Data/SeasonalStatsTests.cs
@@ -1,11 +1,11 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Data.Extensions;
-using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.Api.Extensions;
+using DragonFruit.Six.Api.Enums;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Data
+namespace DragonFruit.Six.Api.Tests.Data
 {
     [TestFixture]
     public class SeasonalStatsTests : Dragon6ApiTest

diff --git a/DragonFruit.Six.API.Tests/Dragon6ApiTest.cs → DragonFruit.Six.Api.Tests/Dragon6ApiTest.cs b/DragonFruit.Six.API.Tests/Dragon6ApiTest.cs → DragonFruit.Six.Api.Tests/Dragon6ApiTest.cs
@@ -3,11 +3,11 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using DragonFruit.Six.API.Data;
-using DragonFruit.Six.API.Data.Extensions;
-using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Extensions;
+using DragonFruit.Six.Api.Enums;
 
-namespace DragonFruit.Six.API.Tests
+namespace DragonFruit.Six.Api.Tests
 {
     public abstract class Dragon6ApiTest
     {

diff --git a/...nFruit.Six.API.Tests/Dragon6TestClient.cs → ...nFruit.Six.Api.Tests/Dragon6TestClient.cs b/...nFruit.Six.API.Tests/Dragon6TestClient.cs → ...nFruit.Six.Api.Tests/Dragon6TestClient.cs
@@ -2,10 +2,10 @@
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
 using System;
-using DragonFruit.Six.API.Data.Tokens;
-using DragonFruit.Six.API.Developer;
+using DragonFruit.Six.Api.Tokens;
+using DragonFruit.Six.Api.Services.Developer;
 
-namespace DragonFruit.Six.API.Tests
+namespace DragonFruit.Six.Api.Tests
 {
     /// <summary>
     /// Dragon6 Client For API Testing. Should NOT be used outside of this repo.

diff --git a/...PI.Tests/DragonFruit.Six.API.Tests.csproj → ...pi.Tests/DragonFruit.Six.Api.Tests.csproj b/...PI.Tests/DragonFruit.Six.API.Tests.csproj → ...pi.Tests/DragonFruit.Six.Api.Tests.csproj
@@ -2,7 +2,6 @@
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -13,7 +12,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\DragonFruit.Six.API\DragonFruit.Six.API.csproj" />
+      <ProjectReference Include="..\DragonFruit.Six.Api\DragonFruit.Six.Api.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...nFruit.Six.API.Tests/Utils/IpInfoTests.cs → ...nFruit.Six.Api.Tests/Utils/IpInfoTests.cs b/...nFruit.Six.API.Tests/Utils/IpInfoTests.cs → ...nFruit.Six.Api.Tests/Utils/IpInfoTests.cs
@@ -1,10 +1,10 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Data.Extensions;
+using DragonFruit.Six.Api.Extensions;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Utils
+namespace DragonFruit.Six.Api.Tests.Utils
 {
     [TestFixture]
     public class IpInfoTests : Dragon6ApiTest

diff --git a/....Six.API.Tests/Utils/OperatorInfoTests.cs → ....Six.Api.Tests/Utils/OperatorInfoTests.cs b/....Six.API.Tests/Utils/OperatorInfoTests.cs → ....Six.Api.Tests/Utils/OperatorInfoTests.cs
@@ -1,10 +1,10 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Utils;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Utils
+namespace DragonFruit.Six.Api.Tests.Utils
 {
     [TestFixture]
     public class OperatorInfoTests : Dragon6ApiTest

diff --git a/...ix.API.Tests/Utils/PlatformParserTests.cs → ...ix.Api.Tests/Utils/PlatformParserTests.cs b/...ix.API.Tests/Utils/PlatformParserTests.cs → ...ix.Api.Tests/Utils/PlatformParserTests.cs
@@ -1,11 +1,11 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Enums;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Enums;
+using DragonFruit.Six.Api.Utils;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Utils
+namespace DragonFruit.Six.Api.Tests.Utils
 {
     [TestFixture]
     public class PlatformParserTests

diff --git a/...uit.Six.API.Tests/Utils/RatioUtilTests.cs → ...uit.Six.Api.Tests/Utils/RatioUtilTests.cs b/...uit.Six.API.Tests/Utils/RatioUtilTests.cs → ...uit.Six.Api.Tests/Utils/RatioUtilTests.cs
@@ -1,10 +1,10 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Utils;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Utils
+namespace DragonFruit.Six.Api.Tests.Utils
 {
     [TestFixture]
     public class RatioUtilTests

diff --git a/....Six.API.Tests/Utils/ServerStatusTests.cs → ....Six.Api.Tests/Utils/ServerStatusTests.cs b/....Six.API.Tests/Utils/ServerStatusTests.cs → ....Six.Api.Tests/Utils/ServerStatusTests.cs
@@ -1,10 +1,10 @@
 // Dragon6 API Copyright 2020 DragonFruit Network <inbox@dragonfruit.network>
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
-using DragonFruit.Six.API.Data.Extensions;
+using DragonFruit.Six.Api.Extensions;
 using NUnit.Framework;
 
-namespace DragonFruit.Six.API.Tests.Utils
+namespace DragonFruit.Six.Api.Tests.Utils
 {
     [TestFixture]
     public class ServerStatusTests : Dragon6ApiTest

diff --git a/DragonFruit.Six.API.sln → DragonFruit.Six.Api.sln b/DragonFruit.Six.API.sln → DragonFruit.Six.Api.sln
@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28606.126
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -9,9 +8,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragonFruit.Six.API", "DragonFruit.Six.API\DragonFruit.Six.API.csproj", "{7A576853-2EBA-48BB-AEDD-2E1819CAC342}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DragonFruit.Six.Api", "DragonFruit.Six.Api\DragonFruit.Six.Api.csproj", "{7A576853-2EBA-48BB-AEDD-2E1819CAC342}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DragonFruit.Six.API.Tests", "DragonFruit.Six.API.Tests\DragonFruit.Six.API.Tests.csproj", "{012E3B34-8063-4BF1-AF3D-BC1033C3FD93}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DragonFruit.Six.Api.Tests", "DragonFruit.Six.Api.Tests\DragonFruit.Six.Api.Tests.csproj", "{012E3B34-8063-4BF1-AF3D-BC1033C3FD93}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/DragonFruit.Six.API.sln.DotSettings → DragonFruit.Six.Api.sln.DotSettings b/DragonFruit.Six.API.sln.DotSettings → DragonFruit.Six.Api.sln.DotSettings
diff --git a/....Six.API/Data/Containers/ActivityDates.cs → ...Fruit.Six.Api/Containers/ActivityDates.cs b/....Six.API/Data/Containers/ActivityDates.cs → ...Fruit.Six.Api/Containers/ActivityDates.cs
@@ -4,7 +4,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace DragonFruit.Six.API.Data.Containers
+namespace DragonFruit.Six.Api.Containers
 {
     public class ActivityDates
     {

diff --git a/...API/Data/Containers/ModeStatsContainer.cs → ....Six.Api/Containers/ModeStatsContainer.cs b/...API/Data/Containers/ModeStatsContainer.cs → ....Six.Api/Containers/ModeStatsContainer.cs
@@ -2,11 +2,11 @@
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
 using System;
-using DragonFruit.Six.API.Data.Interfaces;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Interfaces;
+using DragonFruit.Six.Api.Utils;
 using Newtonsoft.Json;
 
-namespace DragonFruit.Six.API.Data.Containers
+namespace DragonFruit.Six.Api.Containers
 {
     public class BombModeStats : ModeStatsContainer
     {

diff --git a/....Six.API/Data/Containers/PlaylistStats.cs → ...Fruit.Six.Api/Containers/PlaylistStats.cs b/....Six.API/Data/Containers/PlaylistStats.cs → ...Fruit.Six.Api/Containers/PlaylistStats.cs
@@ -2,9 +2,10 @@
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
 using System;
+using DragonFruit.Six.Api.Entities;
 using Newtonsoft.Json;
 
-namespace DragonFruit.Six.API.Data.Containers
+namespace DragonFruit.Six.Api.Containers
 {
     public class PlaylistStats : StatsBase
     {

diff --git a/...Fruit.Six.API/Data/Containers/RankInfo.cs → DragonFruit.Six.Api/Containers/RankInfo.cs b/...Fruit.Six.API/Data/Containers/RankInfo.cs → DragonFruit.Six.Api/Containers/RankInfo.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace DragonFruit.Six.API.Data.Containers
+namespace DragonFruit.Six.Api.Containers
 {
     public class RankInfo
     {

diff --git a/...ix.API/Data/Containers/UserIdentifiers.cs → ...uit.Six.Api/Containers/UserIdentifiers.cs b/...ix.API/Data/Containers/UserIdentifiers.cs → ...uit.Six.Api/Containers/UserIdentifiers.cs
@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace DragonFruit.Six.API.Data.Containers
+namespace DragonFruit.Six.Api.Containers
 {
     public class UserIdentifiers
     {

diff --git a/...erializers/AccountActivityDeserializer.cs → ...erializers/AccountActivityDeserializer.cs b/...erializers/AccountActivityDeserializer.cs → ...erializers/AccountActivityDeserializer.cs
@@ -4,12 +4,13 @@
 using System;
 using System.Collections.Generic;
 using DragonFruit.Common.Data.Extensions;
-using DragonFruit.Six.API.Data.Containers;
-using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Containers;
+using DragonFruit.Six.Api.Strings;
+using DragonFruit.Six.Api.Utils;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class AccountActivityDeserializer
     {

diff --git a/.../Deserializers/AccountInfoDeserializer.cs → .../Deserializers/AccountInfoDeserializer.cs b/.../Deserializers/AccountInfoDeserializer.cs → .../Deserializers/AccountInfoDeserializer.cs
@@ -3,12 +3,13 @@
 
 using System.Collections.Generic;
 using DragonFruit.Common.Data.Extensions;
-using DragonFruit.Six.API.Data.Containers;
-using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Containers;
+using DragonFruit.Six.Api.Strings;
+using DragonFruit.Six.Api.Utils;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class AccountInfoDeserializer
     {

diff --git a/...Deserializers/GeneralStatsDeserializer.cs → ...Deserializers/GeneralStatsDeserializer.cs b/...Deserializers/GeneralStatsDeserializer.cs → ...Deserializers/GeneralStatsDeserializer.cs
@@ -2,12 +2,13 @@
 // Licensed under Apache-2. Please refer to the LICENSE file for more info
 
 using DragonFruit.Common.Data.Extensions;
-using DragonFruit.Six.API.Data.Containers;
-using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Containers;
+using DragonFruit.Six.Api.Strings;
+using DragonFruit.Six.Api.Utils;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class GeneralStatsDeserializer
     {

diff --git a/...eserializers/OperatorStatsDeserializer.cs → ...eserializers/OperatorStatsDeserializer.cs b/...eserializers/OperatorStatsDeserializer.cs → ...eserializers/OperatorStatsDeserializer.cs
@@ -4,11 +4,12 @@
 using System.Collections.Generic;
 using System.Linq;
 using DragonFruit.Common.Data.Extensions;
-using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Utils;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Strings;
+using DragonFruit.Six.Api.Utils;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class OperatorStatsDeserializer
     {

diff --git a/...rializers/PlayerLevelStatsDeserializer.cs → ...rializers/PlayerLevelStatsDeserializer.cs b/...rializers/PlayerLevelStatsDeserializer.cs → ...rializers/PlayerLevelStatsDeserializer.cs
@@ -3,8 +3,9 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json.Linq;
+using DragonFruit.Six.Api.Entities;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class PlayerLevelStatsDeserializer
     {

diff --git a/.../Deserializers/SeasonStatsDeserializer.cs → .../Deserializers/SeasonStatsDeserializer.cs b/.../Deserializers/SeasonStatsDeserializer.cs → .../Deserializers/SeasonStatsDeserializer.cs
@@ -3,11 +3,12 @@
 
 using System;
 using DragonFruit.Common.Data.Extensions;
-using DragonFruit.Six.API.Data.Strings;
-using DragonFruit.Six.API.Enums;
+using DragonFruit.Six.Api.Entities;
+using DragonFruit.Six.Api.Strings;
+using DragonFruit.Six.Api.Enums;
 using Newtonsoft.Json.Linq;
 
-namespace DragonFruit.Six.API.Data.Deserializers
+namespace DragonFruit.Six.Api.Deserializers
 {
     public static class SeasonStatsDeserializer
     {