Merge branch 'CustomAspect'

src/NexusAop/CustomAspect/CustomAspectAttribute.cs → samples/NexusAop.Console/CustomAspect/CustomAspectAttribute.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 
-namespace NexusAop.CustomAspect
+namespace NexusAop.Console.CustomAspect
 {
-    public class CustomAspectAttribute : Attribute
+    public class CustomAspectAttribute : NexusAopAttribute
     {
         public Dictionary<string, object> Properties { get; }
 
@@ -22,5 +23,21 @@ public CustomAspectAttribute(params object[] propertyValues)
                 Properties[propertyName] = propertyValues[i + 1];
             }
         }
+
+        public override async Task ExecuteAsync(NexusAopContext context)
+        {
+            // User-defined logic before the target method
+            //System.Console.WriteLine("Before invoking the target method.");
+
+            // Proceed with the execution of the target method
+
+            var result=await context.NextAsync();
+
+            var setResult= await context.SetResultAsync();
+
+            // User-defined logic after the target method
+            //System.Console.WriteLine("After invoking the target method.");
+           // return Task.CompletedTask;
+        }
     }
 }

samples/NexusAop.Console/Program.cs

@@ -1,16 +1,10 @@
 // See https://aka.ms/new-console-template for more information
 
 using System;
-using System.Diagnostics;
-using System.Reflection;
-using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using NexusAop.Cache;
-using NexusAop.Console.Repository;
 using NexusAop.Console.Service;
-using NexusAop.CustomAspect;
 using NexusAop.Extensions;
 
 namespace NexusAop.Console
@@ -21,10 +15,8 @@ public static async Task Main(
             string[] arg)
         {
             var serviceCollection = new ServiceCollection();
-            serviceCollection.AddNexusAop();
-            //serviceCollection.AddSingletonWithAop<ITestService, TestService>();
             serviceCollection.AddSingletonWithCustomAop<ITestService, TestService>();
-            serviceCollection.AddSingleton<IFooRepository, FooRepository>();
+
             serviceCollection.AddLogging(configure =>
             {
                 configure.AddConsole();
@@ -33,34 +25,16 @@ public static async Task Main(
             var provider = serviceCollection.BuildServiceProvider();
 
             var svc = provider.GetRequiredService<ITestService>();
-            svc.MyMethod();
 
-            //for (var i = 0; i < 3; i++)
-            //{
-            //    var isGoodNumber = i % 2 == 0;
-            //    var stopWatch = Stopwatch.StartNew();
-            //    var result = await svc.GetFooAsync(isGoodNumber, CancellationToken.None);
-            //    stopWatch.Stop();
-            //    System.Console.WriteLine($"[Loop {i}] Method result is {result} with parameter {isGoodNumber} & total execution is {stopWatch.ElapsedMilliseconds} ms");
-            //    await Task.Delay(TimeSpan.FromSeconds(2));
-            //}
 
+            svc.MyStringMethod();
 
-            //TestService myClass = new TestService(new FooRepository());
-            //Type type = myClass.GetType();
-            //var methodInfo = type.GetMethod("MyMethod");
+            svc.MyVoidMethod();
 
-            //var customAspectAttributes = methodInfo.GetCustomAttributes(typeof(CustomAspectAttribute), true);
+            await svc.MyMethodTask();
 
-            //if (customAspectAttributes.Length > 0)
-            //{
-            //    CustomAspectAttribute aspect = (CustomAspectAttribute)customAspectAttributes[0];
+            await svc.MyMethodTaskReturnString();
 
-            //    foreach (var property in aspect.Properties)
-            //    {
-            //        System.Console.WriteLine($"{property.Key}: {property.Value}");
-            //    }
-            //}
 
         }
     }

samples/NexusAop.Console/Service/ITestService.cs

@@ -1,25 +1,21 @@
-using System.Threading;
 using System.Threading.Tasks;
-using NexusAop.Cache;
-using NexusAop.Console.Models;
-using NexusAop.CustomAspect;
+using NexusAop.Console.CustomAspect;
 
 namespace NexusAop.Console.Service
 {
     public interface ITestService
-    {
-        void SayHello(string name);
-
-        [CacheMethod(10)]
-        int GetBalance(
-            int id);
-
-        [CacheMethod(20)]
-        Task<FooEntity> GetFooAsync(
-            bool isGoodNumber,
-            CancellationToken cancellationToken = default);
+    {       
+        [CustomAspect]
+        void MyVoidMethod();
+
+        [CustomAspect]
+        string MyStringMethod();
+
+        [CustomAspect]
+        Task MyMethodTask();
+
+        [CustomAspect]
+        Task<string> MyMethodTaskReturnString();
 
-        [CustomAspect("Property1", "Value1", "Property2", 42, "Property3", true)]
-        void MyMethod();
     }
 }

samples/NexusAop.Console/Service/TestService.cs

@@ -1,59 +1,28 @@
-using System;
-using System.Threading;
 using System.Threading.Tasks;
-using NexusAop.Console.Models;
-using NexusAop.Console.Repository;
-using NexusAop.CustomAspect;
 
 namespace NexusAop.Console.Service
 {
     public class TestService : ITestService
-    {
-        private readonly IFooRepository _fooRepository;
-
-        public TestService(
-            IFooRepository fooRepository)
+    {  
+        public string MyStringMethod()
         {
-            _fooRepository = fooRepository;
+            //System.Console.WriteLine("My string method.");
+            return "My string method.";
         }
-
-        public void SayHello(
-            string name)
+        public void MyVoidMethod()
         {
-            if (string.IsNullOrEmpty(name))
-            {
-                throw new ArgumentNullException();
-            }
-
-            System.Console.WriteLine($"Hi {name}");
-
+            //System.Console.WriteLine("My void method.");
         }
-
-        public int GetBalance(
-            int id)
+        public async Task MyMethodTask()
         {
-            System.Console.WriteLine($"Checking id for {id}!");
-            var balance = new Random().Next(11111);
-            Task.Delay(balance).GetAwaiter().GetResult();
-            return balance;
+            //System.Console.WriteLine("MyMethod returns task.");
+            await Task.CompletedTask;
         }
 
-        public async Task<FooEntity> GetFooAsync(
-            bool isGoodNumber,
-            CancellationToken cancellationToken = default)
-        {
-            var number = new Random().Next(9000);
-            await Task.Delay(number, cancellationToken);
-            var foo = await _fooRepository.GetByIdAsync(2, cancellationToken);
-            return new FooEntity()
-            {
-                Id = number,
-                Text = DateTime.Now.ToLongDateString()
-            };
-        }
-        public void MyMethod()
+        public async Task<string> MyMethodTaskReturnString()
         {
-            System.Console.WriteLine("MyMethod has custom aspect properties.");
+            //System.Console.WriteLine("MyMethod returns Task<string>.");
+            return "thats ok";            
         }
     }
 }