micialware/mROA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove AsyncCommandExecution

Browse Source
This commit is contained in:
micialware
2025-07-29 17:03:27 +03:00
parent dea464d251
commit 3aa723c2ca
4 changed files with 13 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mROA/Abstract/IExecuteModule.cs
+1 -1
View File
@@ -4,7 +4,7 @@ namespace mROA.Abstract
{ {
public interface IExecuteModule public interface IExecuteModule
{ {
ICommandExecution Execute(ICallRequest command, IInstanceRepository instanceRepository, ICommandExecution? Execute(ICallRequest command, IInstanceRepository instanceRepository,
IRepresentationModule representationModule, IEndPointContext context); IRepresentationModule representationModule, IEndPointContext context);
} }
} }
mROA/Implementation/Backend/BasicExecutionModule.cs
+9 -14
View File
@@ -19,7 +19,7 @@ namespace mROA.Implementation.Backend
_serialization = serialization; _serialization = serialization;
} }
public ICommandExecution Execute(ICallRequest command, IInstanceRepository instanceRepository, public ICommandExecution? Execute(ICallRequest command, IInstanceRepository instanceRepository,
IRepresentationModule representationModule, IEndPointContext endPointContext) IRepresentationModule representationModule, IEndPointContext endPointContext)
{ {
// _logger.LogInformation("Executing {0}", command.Id); // _logger.LogInformation("Executing {0}", command.Id);
@@ -63,7 +63,7 @@ namespace mROA.Implementation.Backend
} }
} }
private ICommandExecution ExecuteRequest(ICallRequest command, IInstanceRepository instanceRepository, private ICommandExecution? ExecuteRequest(ICallRequest command, IInstanceRepository instanceRepository,
IRepresentationModule representationModule, IEndPointContext endPointContext, IMethodInvoker invoker, IRepresentationModule representationModule, IEndPointContext endPointContext, IMethodInvoker invoker,
object context, object?[]? castedParams, RequestContext execContext) object context, object?[]? castedParams, RequestContext execContext)
{ {
@@ -122,14 +122,14 @@ namespace mROA.Implementation.Backend
}; };
} }
private static ICommandExecution Execute(MethodInvoker invoker, object instance, object?[] parameter, private static ICommandExecution? Execute(MethodInvoker invoker, object instance, object?[] parameter,
ICallRequest command, RequestContext executionContext) ICallRequest command, RequestContext executionContext)
{ {
var finalResult = invoker.Invoke(instance, parameter, new object[] { executionContext }); var finalResult = invoker.Invoke(instance, parameter, new object[] { executionContext });
if (!invoker.IsTrusted) if (!invoker.IsTrusted)
{ {
return new AsyncCommandExecution(); return null;
} }
if (invoker.IsVoid) if (invoker.IsVoid)
@@ -147,7 +147,7 @@ namespace mROA.Implementation.Backend
}; };
} }
private ICommandExecution ExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters, private ICommandExecution? ExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters,
ICallRequest command, ICancellationRepository cancellationRepository, ICallRequest command, ICancellationRepository cancellationRepository,
IRepresentationModule representationModule, RequestContext executionContext, IEndPointContext context) IRepresentationModule representationModule, RequestContext executionContext, IEndPointContext context)
{ {
@@ -172,13 +172,11 @@ namespace mROA.Implementation.Backend
payload, context); payload, context);
}); });
return new AsyncCommandExecution
{ return null;
Id = command.Id
};
} }
private ICommandExecution TypedExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters, private ICommandExecution? TypedExecuteAsync(AsyncMethodInvoker invoker, object instance, object?[]? parameters,
ICallRequest command, ICancellationRepository cancellationRepository, ICallRequest command, ICancellationRepository cancellationRepository,
IRepresentationModule representationModule, RequestContext executionContext, IEndPointContext context) IRepresentationModule representationModule, RequestContext executionContext, IEndPointContext context)
{ {
@@ -201,10 +199,7 @@ namespace mROA.Implementation.Backend
payload, context); payload, context);
}); });
return new AsyncCommandExecution return null;
{
Id = command.Id
};
} }
} }
} }
mROA/Implementation/CommandExecution/AsyncCommandExecution.cs
-11
View File
@@ -1,11 +0,0 @@
using System;
using mROA.Abstract;
namespace mROA.Implementation.CommandExecution
{
public class AsyncCommandExecution : ICommandExecution
{
public RequestId Id { get; set; }
public EMessageType MessageType => EMessageType.Unknown;
}
}
mROA/Implementation/Frontend/RequestExtractor.cs
+3 -4
View File
@@ -76,14 +76,13 @@ namespace mROA.Implementation.Frontend
private void HandleCallRequest(DefaultCallRequest request) private void HandleCallRequest(DefaultCallRequest request)
{ {
var result = _executeModule.Execute(request, _context.RealRepository, _representationModule, _context); var result = _executeModule.Execute(request, _context.RealRepository, _representationModule, _context);
var resultType = result.MessageType; if (result is null)
if (resultType == EMessageType.Unknown)
{ {
return; return;
} }
var resultType = result.MessageType;
_representationModule.PostCallMessageAsync(request.Id, resultType, result, _context).ConfigureAwait(false); _representationModule.PostCallMessageAsync(request.Id, resultType, result, _context).ConfigureAwait(false);
} }