Refactoring

Author: ezequieljuliano

README.md

@@ -203,7 +203,7 @@ function AspectContext: IAspectContext;
 begin
   if (AspectContextInstance = nil) then
   begin
-    AspectContextInstance := TAspectContextFactory.NewInstance;
+    AspectContextInstance := TAspectContextFactory.NewAspectContext;
     AspectContextInstance.RegisterAspect(TLoggingAspect.Create);
   end;
   Result := AspectContextInstance;

samples/logging/App.Context.pas

@@ -58,7 +58,7 @@ function AspectContext: IAspectContext;
 begin
   if (AspectContextInstance = nil) then
   begin
-    AspectContextInstance := TAspectContextFactory.NewInstance;
+    AspectContextInstance := TAspectContextFactory.NewAspectContext;
     AspectContextInstance.RegisterAspect(TLoggingAspect.Create);
   end;
   Result := AspectContextInstance;

samples/security/App.Context.pas

@@ -48,7 +48,7 @@ function AspectContext: IAspectContext;
 begin
   if (AspectContextInstance = nil) then
   begin
-    AspectContextInstance := TAspectContextFactory.NewInstance;
+    AspectContextInstance := TAspectContextFactory.NewAspectContext;
     AspectContextInstance.RegisterAspect(TRequiredRoleAspect.Create);
   end;
   Result := AspectContextInstance;

samples/transaction/App.Context.pas

@@ -44,7 +44,7 @@ function AspectContext: IAspectContext;
 begin
   if (AspectContextInstance = nil) then
   begin
-    AspectContextInstance := TAspectContextFactory.NewInstance;
+    AspectContextInstance := TAspectContextFactory.NewAspectContext;
     AspectContextInstance.RegisterAspect(TTransactionalAspect.Create);
   end;
   Result := AspectContextInstance;

src/Aspect.Context.pas

@@ -40,7 +40,7 @@ interface
 
   TAspectContextFactory = record
   public
-    class function NewInstance: IAspectContext; static;
+    class function NewAspectContext: IAspectContext; static;
   end;
 
 implementation
@@ -65,7 +65,7 @@ constructor TAspectContext.Create;
 begin
   inherited Create;
   fInterceptor := TAspectInterceptor.Create;
-  fWeaver := TAspectWeaverFactory.NewInstance(fInterceptor);
+  fWeaver := TAspectWeaverFactory.NewAspectWeaver(fInterceptor);
 end;
 
 destructor TAspectContext.Destroy;
@@ -87,7 +87,7 @@ function TAspectContext.Weaver: IAspectWeaver;
 
 { TAspectContextFactory }
 
-class function TAspectContextFactory.NewInstance: IAspectContext;
+class function TAspectContextFactory.NewAspectContext: IAspectContext;
 begin
   Result := TAspectContext.Create;
 end;

src/Aspect.Weaver.pas

@@ -41,7 +41,7 @@ interface
 
   TAspectWeaverFactory = record
   public
-    class function NewInstance(interceptor: TAspectInterceptor): IAspectWeaver; static;
+    class function NewAspectWeaver(interceptor: TAspectInterceptor): IAspectWeaver; static;
   end;
 
 implementation
@@ -104,7 +104,7 @@ procedure TAspectWeaver.Unproxify(instance: TObject);
 
 { TAspectWeaverFactory }
 
-class function TAspectWeaverFactory.NewInstance(interceptor: TAspectInterceptor): IAspectWeaver;
+class function TAspectWeaverFactory.NewAspectWeaver(interceptor: TAspectInterceptor): IAspectWeaver;
 begin
   Result := TAspectWeaver.Create(interceptor);
 end;

test/Aspect.Test.pas

@@ -134,7 +134,7 @@ procedure TTestAspect.SetUp;
   fAspectBeforeEvent := False;
   fAspectExceptionEvent := False;
 
-  fAspectContext := TAspectContextFactory.NewInstance;
+  fAspectContext := TAspectContextFactory.NewAspectContext;
   fAspectContext.RegisterAspect(TMockAspect.Create(Self));
   fMockObject := TMockObject.Create;
   fAspectContext.Weaver.Proxify(fMockObject);