changed syntax

Author: matteobruni

UnitOfWork.NET.EntityFramework.NUnit/Test.cs

@@ -49,17 +49,17 @@ public void TestEntityRepository()
                     Password = "test"
                 };
 
-                entity = uow.EntityRepository<User>().Insert(entity);
+                entity = uow.Repository<User>().Insert(entity);
                 uow.SaveChanges();
                 Assert.AreNotEqual(entity.Id, 0);
                 Console.WriteLine(entity.Id);
                 entity.Password = "test2";
-                uow.EntityRepository<User>().Update(entity, entity.Id);
+                uow.Repository<User>().Update(entity, entity.Id);
                 uow.SaveChanges();
-                Assert.AreEqual(entity.Password, uow.EntityRepository<User>().Entity(entity.Id).Password);
-                uow.EntityRepository<User>().Delete(entity.Id);
+                Assert.AreEqual(entity.Password, uow.Repository<User>().Entity(entity.Id).Password);
+                uow.Repository<User>().Delete(entity.Id);
                 uow.SaveChanges();
-                Assert.IsNull(uow.EntityRepository<User>().Entity(entity.Id));
+                Assert.IsNull(uow.Repository<User>().Entity(entity.Id));
             }
         }
 
@@ -70,7 +70,7 @@ public void TestDTORepository()
 
             using (var uow = new EntityUnitOfWork<TestDbContext>())
             {
-                var users = uow.EntityRepository<User, UserDTO>().List();
+                var users = uow.Repository<User, UserDTO>().List();
                 stopwatch.Stop();
                 Console.WriteLine(stopwatch.ElapsedMilliseconds);
 
@@ -83,20 +83,20 @@ public void TestDTORepository()
                     Password = "test"
                 };
 
-                dto = uow.EntityRepository<User, UserDTO>().Insert(dto);
+                dto = uow.Repository<User, UserDTO>().Insert(dto);
                 uow.SaveChanges();
                 var login = dto.Login;
-                dto = uow.EntityRepository<User, UserDTO>().DTO(d => d.Login == login);
+                dto = uow.Repository<User, UserDTO>().DTO(d => d.Login == login);
                 Assert.IsNotNull(dto);
                 Assert.AreNotEqual(dto.Id, 0);
                 Console.WriteLine(dto.Id);
                 dto.Password = "test2";
-                uow.EntityRepository<User, UserDTO>().Update(dto, dto.Id);
+                uow.Repository<User, UserDTO>().Update(dto, dto.Id);
                 uow.SaveChanges();
-                Assert.AreEqual(dto.Password, uow.EntityRepository<User, UserDTO>().DTO(dto.Id).Password);
-                uow.EntityRepository<User, UserDTO>().Delete(dto.Id);
+                Assert.AreEqual(dto.Password, uow.Repository<User, UserDTO>().DTO(dto.Id).Password);
+                uow.Repository<User, UserDTO>().Delete(dto.Id);
                 uow.SaveChanges();
-                Assert.IsNull(uow.EntityRepository<User, UserDTO>().DTO(dto.Id));
+                Assert.IsNull(uow.Repository<User, UserDTO>().DTO(dto.Id));
             }
         }
 
@@ -176,13 +176,9 @@ public void TestReflection()
             {
                 Console.WriteLine(uow.UserRolesRegistered);
 
-                Assert.IsNotNull(uow.Repository<User, UserDTO>(), "uow.Users != null by reflection base");
-                Assert.IsNotNull(uow.Repository<Role, RoleDTO>(), "uow.Roles != null by reflection base");
-                Assert.IsNotNull(uow.Repository<UserRole, UserRoleDTO>(), "uow.UserRoles != null by reflection base");
-
-                Assert.IsNotNull(uow.EntityRepository<User, UserDTO>(), "uow.Users != null by reflection");
-                Assert.IsNotNull(uow.EntityRepository<Role, RoleDTO>(), "uow.Roles != null by reflection");
-                Assert.IsNotNull(uow.EntityRepository<UserRole, UserRoleDTO>(), "uow.UserRoles != null by reflection");
+                Assert.IsNotNull(uow.Repository<User, UserDTO>(), "uow.Users != null by reflection");
+                Assert.IsNotNull(uow.Repository<Role, RoleDTO>(), "uow.Roles != null by reflection");
+                Assert.IsNotNull(uow.Repository<UserRole, UserRoleDTO>(), "uow.UserRoles != null by reflection");
 
                 Assert.IsNotNull(uow.Users, "uow.Users != null");
                 Assert.IsNotNull(uow.Roles, "uow.Roles != null");

UnitOfWork.NET.EntityFramework/Classes/EntityUnitOfWork.cs

@@ -130,18 +130,14 @@ public bool TransactionSaveChanges(Action<IEntityUnitOfWork> body)
 
         public DbSet<TEntity> Set<TEntity>() where TEntity : class => _dbContext.Set<TEntity>();
 
-        public IEntityRepository<TEntity> EntityRepository<TEntity>() where TEntity : class => base.Repository<TEntity>() as IEntityRepository<TEntity>;
-
-        public IEntityRepository<TEntity, TDTO> EntityRepository<TEntity, TDTO>() where TEntity : class where TDTO : class => base.Repository<TEntity, TDTO>() as IEntityRepository<TEntity, TDTO>;
-
-        public new IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class => EntityRepository<TEntity>();
-        public new IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class where TDTO : class => EntityRepository<TEntity, TDTO>();
+        public new IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class => base.Repository<TEntity>() as IEntityRepository<TEntity>;
+        public new IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class where TDTO : class => base.Repository<TEntity, TDTO>() as IEntityRepository<TEntity, TDTO>;
 
         private void CallOnSaveChanges<TEntity>(Dictionary<EntityState, IEnumerable<object>> entitiesObj) where TEntity : class
         {
             var entities = entitiesObj.ToDictionary(t => t.Key, t => t.Value.Cast<TEntity>());
 
-            EntityRepository<TEntity>().OnSaveChanges(entities);
+            Repository<TEntity>().OnSaveChanges(entities);
         }
 
         public async Task<int> SaveChangesAsync() => await new TaskFactory().StartNew(SaveChanges);

UnitOfWork.NET.EntityFramework/Interfaces/IEntityUnitOfWork.cs

@@ -44,11 +44,11 @@ public interface IEntityUnitOfWork : IUnitOfWork
         /// <summary>
         /// 
         /// </summary>
-        IEntityRepository<TEntity> EntityRepository<TEntity>() where TEntity : class;
+        IEntityRepository<TEntity> Repository<TEntity>() where TEntity : class;
 
         /// <summary>
         /// 
         /// </summary>
-        IEntityRepository<TEntity, TDTO> EntityRepository<TEntity, TDTO>() where TEntity : class where TDTO : class;
+        IEntityRepository<TEntity, TDTO> Repository<TEntity, TDTO>() where TEntity : class where TDTO : class;
     }
 }