From 68e181f09424faea7b2b6ff9a59736c4933cfa0b Mon Sep 17 00:00:00 2001 From: Cameron Cowen Date: Tue, 15 Jun 2021 18:37:35 +0100 Subject: [PATCH] Updated outfile data property to bytes to not hide inherited member --- .../Activities/OutFile/OutFile.cs | 6 +++--- .../OutFile/OutFileBuilderExtensions.cs | 20 +++++++++---------- .../Activities/OutFile/OutFileExtensions.cs | 12 +++++------ .../ReadLineToFileWorkflow.cs | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFile.cs b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFile.cs index 1194f53a7..e63694702 100644 --- a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFile.cs +++ b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFile.cs @@ -17,8 +17,8 @@ namespace Elsa.Activities.File Outcomes = new[] { OutcomeNames.Done })] public class OutFile : Activity { - [ActivityInput(Hint = "Data to write to file.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid })] - public byte[] Data { get; set; } + [ActivityInput(Hint = "Bytes to write to file.", SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid })] + public byte[] Bytes { get; set; } [ActivityInput(Hint = "Path to create file at.", UIHint = ActivityInputUIHints.SingleLine, SupportedSyntaxes = new[] { SyntaxNames.JavaScript, SyntaxNames.Liquid })] public string Path { get; set; } @@ -50,7 +50,7 @@ namespace Elsa.Activities.File using (var fs = new FileStream(Path, fileMode, fileAccess)) { - await fs.WriteAsync(Data); + await fs.WriteAsync(Bytes); await fs.FlushAsync(); } diff --git a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileBuilderExtensions.cs b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileBuilderExtensions.cs index 659d7da74..219a836ea 100644 --- a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileBuilderExtensions.cs +++ b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileBuilderExtensions.cs @@ -13,41 +13,41 @@ namespace Elsa.Activities.File { public static IActivityBuilder OutFile(this IBuilder builder, Action> setup, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.Then(setup, null, lineNumber, sourceFile); - public static IActivityBuilder OutFile(this IBuilder builder, Func data, Func path, Func mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + public static IActivityBuilder OutFile(this IBuilder builder, Func bytes, Func path, Func mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.OutFile(activity => activity - .Set(x => x.Data, data) + .Set(x => x.Bytes, bytes) .Set(x => x.Path, path) .Set(x => x.Mode, mode), lineNumber, sourceFile); - public static IActivityBuilder OutFile(this IBuilder builder, Func> data, Func> path, Func> mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + public static IActivityBuilder OutFile(this IBuilder builder, Func> bytes, Func> path, Func> mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.OutFile(activity => activity - .Set(x => x.Data, data) + .Set(x => x.Bytes, bytes) .Set(x => x.Path, path) .Set(x => x.Mode, mode), lineNumber, sourceFile); - public static IActivityBuilder OutFile(this IBuilder builder, Func data, Func path, Func mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + public static IActivityBuilder OutFile(this IBuilder builder, Func bytes, Func path, Func mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.OutFile(activity => activity - .Set(x => x.Data, data) + .Set(x => x.Bytes, bytes) .Set(x => x.Path, path) .Set(x => x.Mode, mode), lineNumber, sourceFile); - public static IActivityBuilder OutFile(this IBuilder builder, Func> data, Func> path, Func> mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + public static IActivityBuilder OutFile(this IBuilder builder, Func> bytes, Func> path, Func> mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.OutFile(activity => activity - .Set(x => x.Data, data) + .Set(x => x.Bytes, bytes) .Set(x => x.Path, path) .Set(x => x.Mode, mode), lineNumber, sourceFile); - public static IActivityBuilder OutFile(this IBuilder builder, byte[] data, string path, CopyMode mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => + public static IActivityBuilder OutFile(this IBuilder builder, byte[] bytes, string path, CopyMode mode, [CallerLineNumber] int lineNumber = default, [CallerFilePath] string? sourceFile = default) => builder.OutFile(activity => activity - .Set(x => x.Data, data) + .Set(x => x.Bytes, bytes) .Set(x => x.Path, path) .Set(x => x.Mode, mode), lineNumber, diff --git a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileExtensions.cs b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileExtensions.cs index 16823318a..9ea4f7c90 100644 --- a/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileExtensions.cs +++ b/src/activities/Elsa.Activities.File/Activities/OutFile/OutFileExtensions.cs @@ -10,12 +10,12 @@ namespace Elsa.Activities.File { public static class OutFileExtensions { - #region Data - public static ISetupActivity WithContent(this ISetupActivity setup, Func> data) => setup.Set(x => x.Data, data); - public static ISetupActivity WithContent(this ISetupActivity setup, Func data) => setup.Set(x => x.Data, data); - public static ISetupActivity WithContent(this ISetupActivity setup, Func> data) => setup.Set(x => x.Data, data); - public static ISetupActivity WithContent(this ISetupActivity setup, Func data) => setup.Set(x => x.Data, data); - public static ISetupActivity WithContent(this ISetupActivity setup, byte[] data) => setup.Set(x => x.Data, data); + #region Bytes + public static ISetupActivity WithBytes(this ISetupActivity setup, Func> bytes) => setup.Set(x => x.Bytes, bytes); + public static ISetupActivity WithBytes(this ISetupActivity setup, Func bytes) => setup.Set(x => x.Bytes, bytes); + public static ISetupActivity WithBytes(this ISetupActivity setup, Func> bytes) => setup.Set(x => x.Bytes, bytes); + public static ISetupActivity WithBytes(this ISetupActivity setup, Func bytes) => setup.Set(x => x.Bytes, bytes); + public static ISetupActivity WithBytes(this ISetupActivity setup, byte[] bytes) => setup.Set(x => x.Bytes, bytes); #endregion #region Path diff --git a/src/samples/console/Elsa.Samples.ReadLineToFile/ReadLineToFileWorkflow.cs b/src/samples/console/Elsa.Samples.ReadLineToFile/ReadLineToFileWorkflow.cs index d11a29a28..5f7b176d4 100644 --- a/src/samples/console/Elsa.Samples.ReadLineToFile/ReadLineToFileWorkflow.cs +++ b/src/samples/console/Elsa.Samples.ReadLineToFile/ReadLineToFileWorkflow.cs @@ -21,7 +21,7 @@ namespace Elsa.Samples.ReadLineToFile .WithName("TempFile") .OutFile(setup => { - setup.WithContent(context => System.Text.Encoding.UTF8.GetBytes(context.GetOutputFrom("ReadLine"))); + setup.WithBytes(context => System.Text.Encoding.UTF8.GetBytes(context.GetOutputFrom("ReadLine"))); setup.WithPath(context => context.GetOutputFrom("TempFile")); setup.WithMode(CopyMode.Overwrite); })