refactor: Change default namespace and remove obsolete types

BREAKING CHANGE: Change default namespace and remove obsolete types
casbin-net · Aug 19, 2023 · d460562 · d460562
1 parent f209dd2
commit d460562
Show file tree

Hide file tree

Showing 24 changed files with 36 additions and 277 deletions.
diff --git a/Casbin.Adapter.EFCore/Entities/CasbinRule.cs b/Casbin.Adapter.EFCore/Entities/CasbinRule.cs
diff --git a/Casbin.Adapter.EFCore/Extensions/CasbinRuleExtenstion.cs b/Casbin.Adapter.EFCore/Extensions/CasbinRuleExtenstion.cs
diff --git a/Casbin.Adapter.EFCore/ICasbinRule.cs b/Casbin.Adapter.EFCore/ICasbinRule.cs
diff --git a/Casbin.Adapter.EFCore.UnitTest/AutoTest.cs → ...rsist.Adapter.EFCore.UnitTest/AutoTest.cs b/Casbin.Adapter.EFCore.UnitTest/AutoTest.cs → ...rsist.Adapter.EFCore.UnitTest/AutoTest.cs
@@ -1,14 +1,13 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Casbin.Adapter.EFCore.Entities;
-using Casbin.Adapter.EFCore.UnitTest.Extensions;
-using Casbin.Adapter.EFCore.UnitTest.Fixtures;
+using Casbin.Persist.Adapter.EFCore.UnitTest.Extensions;
 using Microsoft.EntityFrameworkCore;
-using Casbin.Persist;
+using Casbin.Persist.Adapter.EFCore.Entities;
+using Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures;
 using Xunit;
 
-namespace Casbin.Adapter.EFCore.UnitTest
+namespace Casbin.Persist.Adapter.EFCore.UnitTest
 {
     public class AdapterTest : TestUtil, IClassFixture<ModelProvideFixture>, IClassFixture<DbContextProviderFixture>
     {

diff --git a/...est/Casbin.Adapter.EFCore.UnitTest.csproj → ...in.Persist.Adapter.EFCore.UnitTest.csproj b/...est/Casbin.Adapter.EFCore.UnitTest.csproj → ...in.Persist.Adapter.EFCore.UnitTest.csproj
@@ -40,7 +40,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Casbin.Adapter.EFCore\Casbin.Adapter.EFCore.csproj" />
+    <ProjectReference Include="..\Casbin.Persist.Adapter.EFCore\Casbin.Persist.Adapter.EFCore.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...FCore.UnitTest/DependencyInjectionTest.cs → ...FCore.UnitTest/DependencyInjectionTest.cs b/...FCore.UnitTest/DependencyInjectionTest.cs → ...FCore.UnitTest/DependencyInjectionTest.cs
@@ -1,9 +1,8 @@
-using Casbin.Adapter.EFCore.UnitTest.Fixtures;
-using Microsoft.Extensions.DependencyInjection;
-using Casbin.Persist;
+using Microsoft.Extensions.DependencyInjection;
+using Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures;
 using Xunit;
 
-namespace Casbin.Adapter.EFCore.UnitTest
+namespace Casbin.Persist.Adapter.EFCore.UnitTest
 {
     public class DependencyInjectionTest : IClassFixture<TestHostFixture>
     {

diff --git a/...st/Extensions/CasbinDbContextExtension.cs → ...st/Extensions/CasbinDbContextExtension.cs b/...st/Extensions/CasbinDbContextExtension.cs → ...st/Extensions/CasbinDbContextExtension.cs
@@ -1,7 +1,6 @@
 using System;
-using System.IO;
 
-namespace Casbin.Adapter.EFCore.UnitTest.Extensions
+namespace Casbin.Persist.Adapter.EFCore.UnitTest.Extensions
 {
     public static class CasbinDbContextExtension
     {

diff --git a/...Test/Fixtures/DbContextProviderFixture.cs → ...Test/Fixtures/DbContextProviderFixture.cs b/...Test/Fixtures/DbContextProviderFixture.cs → ...Test/Fixtures/DbContextProviderFixture.cs
@@ -1,8 +1,7 @@
 using System;
-using Casbin.Adapter.EFCore.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace Casbin.Adapter.EFCore.UnitTest.Fixtures
+namespace Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures
 {
     public class DbContextProviderFixture
     {

diff --git a/....UnitTest/Fixtures/ModelProvideFixture.cs → ....UnitTest/Fixtures/ModelProvideFixture.cs b/....UnitTest/Fixtures/ModelProvideFixture.cs → ....UnitTest/Fixtures/ModelProvideFixture.cs
@@ -1,7 +1,7 @@
 // using System.IO;
 using Casbin.Model;
 
-namespace Casbin.Adapter.EFCore.UnitTest.Fixtures
+namespace Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures
 {
     public class ModelProvideFixture
     {

diff --git a/...Core.UnitTest/Fixtures/TestHostFixture.cs → ...Core.UnitTest/Fixtures/TestHostFixture.cs b/...Core.UnitTest/Fixtures/TestHostFixture.cs → ...Core.UnitTest/Fixtures/TestHostFixture.cs
@@ -1,10 +1,9 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Casbin.Persist;
 using System;
 
-namespace Casbin.Adapter.EFCore.UnitTest.Fixtures
+namespace Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures
 {
     public class TestHostFixture
     {

diff --git a/...pter.EFCore.UnitTest/SpecialPolicyTest.cs → ...pter.EFCore.UnitTest/SpecialPolicyTest.cs b/...pter.EFCore.UnitTest/SpecialPolicyTest.cs → ...pter.EFCore.UnitTest/SpecialPolicyTest.cs
@@ -1,10 +1,9 @@
-using Casbin.Adapter.EFCore.UnitTest.Extensions;
-using Casbin.Adapter.EFCore.UnitTest.Fixtures;
-using Casbin;
+using Casbin.Persist.Adapter.EFCore.UnitTest.Extensions;
 using Casbin.Model;
+using Casbin.Persist.Adapter.EFCore.UnitTest.Fixtures;
 using Xunit;
 
-namespace Casbin.Adapter.EFCore.UnitTest
+namespace Casbin.Persist.Adapter.EFCore.UnitTest
 {
     public class SpecialPolicyTest :  IClassFixture<ModelProvideFixture>, IClassFixture<DbContextProviderFixture>
     {

diff --git a/Casbin.Adapter.EFCore.UnitTest/TestUtil.cs → ...rsist.Adapter.EFCore.UnitTest/TestUtil.cs b/Casbin.Adapter.EFCore.UnitTest/TestUtil.cs → ...rsist.Adapter.EFCore.UnitTest/TestUtil.cs
@@ -1,11 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Casbin;
-using Casbin.Util;
 using Xunit;
 
-namespace Casbin.Adapter.EFCore.UnitTest
+namespace Casbin.Persist.Adapter.EFCore.UnitTest
 {
     public class TestUtil
     {

diff --git a/....EFCore.UnitTest/examples/rbac_model.conf → ....EFCore.UnitTest/examples/rbac_model.conf b/....EFCore.UnitTest/examples/rbac_model.conf → ....EFCore.UnitTest/examples/rbac_model.conf
diff --git a/....EFCore.UnitTest/examples/rbac_policy.csv → ....EFCore.UnitTest/examples/rbac_policy.csv b/....EFCore.UnitTest/examples/rbac_policy.csv → ....EFCore.UnitTest/examples/rbac_policy.csv
diff --git a/...apter.EFCore/Casbin.Adapter.EFCore.csproj → ...Core/Casbin.Persist.Adapter.EFCore.csproj b/...apter.EFCore/Casbin.Adapter.EFCore.csproj → ...Core/Casbin.Persist.Adapter.EFCore.csproj
@@ -2,7 +2,6 @@
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
-    <AssemblyName>Casbin.Adapter.EFCore</AssemblyName>
     <LangVersion>9.0</LangVersion>
   </PropertyGroup>
 

diff --git a/Casbin.Adapter.EFCore/CasbinDbContext.cs → ...Persist.Adapter.EFCore/CasbinDbContext.cs b/Casbin.Adapter.EFCore/CasbinDbContext.cs → ...Persist.Adapter.EFCore/CasbinDbContext.cs
@@ -1,8 +1,8 @@
-using Casbin.Adapter.EFCore.Entities;
-using Microsoft.EntityFrameworkCore;
 using System;
+using Casbin.Persist.Adapter.EFCore.Entities;
+using Microsoft.EntityFrameworkCore;
 
-namespace Casbin.Adapter.EFCore
+namespace Casbin.Persist.Adapter.EFCore
 {
     public partial class CasbinDbContext<TKey> : DbContext where TKey : IEquatable<TKey>
     {

diff --git a/...ltPersistPolicyEntityTypeConfiguration.cs → ...ltPersistPolicyEntityTypeConfiguration.cs b/...ltPersistPolicyEntityTypeConfiguration.cs → ...ltPersistPolicyEntityTypeConfiguration.cs
@@ -1,9 +1,9 @@
-using Casbin.Adapter.EFCore.Entities;
+using System;
+using Casbin.Persist.Adapter.EFCore.Entities;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
-using System;
 
-namespace Casbin.Adapter.EFCore
+namespace Casbin.Persist.Adapter.EFCore
 {
     public class DefaultPersistPolicyEntityTypeConfiguration<TKey> : IEntityTypeConfiguration<EFCorePersistPolicy<TKey>> 
         where TKey : IEquatable<TKey>

diff --git a/....Adapter.EFCore/EFCoreAdapter.Internal.cs → ....Adapter.EFCore/EFCoreAdapter.Internal.cs b/....Adapter.EFCore/EFCoreAdapter.Internal.cs → ....Adapter.EFCore/EFCoreAdapter.Internal.cs
@@ -1,17 +1,15 @@
-using Casbin.Persist;
-using Casbin.Model;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System;
-using Microsoft.EntityFrameworkCore;
 using System.Threading.Tasks;
-using Casbin.Adapter.EFCore.Extensions;
-using Casbin.Adapter.EFCore.Entities;
+using Casbin.Model;
+using Microsoft.EntityFrameworkCore;
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable MemberCanBeProtected.Global
 // ReSharper disable MemberCanBePrivate.Global
 
-namespace Casbin.Adapter.EFCore
+namespace Casbin.Persist.Adapter.EFCore
 {
     public partial class EFCoreAdapter<TKey, TPersistPolicy, TDbContext> : IAdapter, IFilteredAdapter 
         where TDbContext : DbContext