Skip to content

ITwinObject swapping methods now async #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PTKu merged 1 commit into from
Mar 23, 2023
Merged

ITwinObject swapping methods now async #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ix.compiler/src/IX.Cs.Compiler/Helpers/CsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ public static string GetAttributeNameValue(this IDeclaration declaration, string
public static string CreateGenericSwapperMethodToPlainer(string methodName, string pocoTypeName, bool isExtended)
{
var qualifier = isExtended ? "override" : "virtual";
return $"public {qualifier} T {methodName}<T>(){{\n return (dynamic)this.{methodName}Async().Result;\n}}";
return $"public async {qualifier} Task<T> {methodName}<T>(){{\n return await (dynamic)this.{methodName}Async();\n}}";
}

public static string CreateGenericSwapperMethodFromPlainer(string methodName, string pocoTypeName, bool isExtended)
{
var qualifier = isExtended ? "override" : "virtual";
return $"public {qualifier} void {methodName}<T>(T plain){{\n this.{methodName}Async((dynamic)plain).Wait();\n}}";
return $"public async {qualifier} Task {methodName}<T>(T plain){{\n await this.{methodName}Async((dynamic)plain);\n}}";
}
}
32 changes: 16 additions & 16 deletions ...piler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/array_declaration.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ public array_declaration_class(Ix.Connector.ITwinObject parent, string readableT
PostConstruct(parent, readableTail, symbolTail);
}

public virtual T OnlineToPlain<T>()
public async virtual Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class> OnlineToPlainAsync()
Expand All @@ -51,9 +51,9 @@ public virtual T OnlineToPlain<T>()
return plain;
}

public virtual void PlainToOnline<T>(T plain)
public async virtual Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain)
Expand All @@ -65,9 +65,9 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.ArrayDec
return await this.WriteAsync();
}

public virtual T ShadowToPlain<T>()
public async virtual Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class> ShadowToPlainAsync()
Expand All @@ -85,9 +85,9 @@ public virtual T ShadowToPlain<T>()
return plain;
}

public virtual void PlainToShadow<T>(T plain)
public async virtual Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.ArrayDeclarationSimpleNamespace.array_declaration_class plain)
Expand Down Expand Up @@ -199,9 +199,9 @@ public some_complex_type(Ix.Connector.ITwinObject parent, string readableTail, s
PostConstruct(parent, readableTail, symbolTail);
}

public virtual T OnlineToPlain<T>()
public async virtual Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.some_complex_type> OnlineToPlainAsync()
Expand All @@ -216,19 +216,19 @@ public virtual T OnlineToPlain<T>()
return plain;
}

public virtual void PlainToOnline<T>(T plain)
public async virtual Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain)
{
return await this.WriteAsync();
}

public virtual T ShadowToPlain<T>()
public async virtual Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.ArrayDeclarationSimpleNamespace.some_complex_type> ShadowToPlainAsync()
Expand All @@ -242,9 +242,9 @@ public virtual T ShadowToPlain<T>()
return plain;
}

public virtual void PlainToShadow<T>(T plain)
public async virtual Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.ArrayDeclarationSimpleNamespace.some_complex_type plain)
Expand Down
16 changes: 8 additions & 8 deletions ...er/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_all_primitives.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ public class_all_primitives(Ix.Connector.ITwinObject parent, string readableTail
PostConstruct(parent, readableTail, symbolTail);
}

public virtual T OnlineToPlain<T>()
public async virtual Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.class_all_primitives> OnlineToPlainAsync()
Expand Down Expand Up @@ -147,9 +147,9 @@ public virtual T OnlineToPlain<T>()
return plain;
}

public virtual void PlainToOnline<T>(T plain)
public async virtual Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.class_all_primitives plain)
Expand Down Expand Up @@ -179,9 +179,9 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.class_al
return await this.WriteAsync();
}

public virtual T ShadowToPlain<T>()
public async virtual Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.class_all_primitives> ShadowToPlainAsync()
Expand Down Expand Up @@ -239,9 +239,9 @@ public virtual T ShadowToPlain<T>()
return plain;
}

public virtual void PlainToShadow<T>(T plain)
public async virtual Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.class_all_primitives plain)
Expand Down
32 changes: 16 additions & 16 deletions .../Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extended_by_known_type.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ public State1Transition(Ix.Connector.ITwinObject parent, string readableTail, st
PostConstruct(parent, readableTail, symbolTail);
}

public override T OnlineToPlain<T>()
public async override Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.Simatic.Ax.StateFramework.State1Transition> OnlineToPlainAsync()
Expand All @@ -35,9 +35,9 @@ public override T OnlineToPlain<T>()
return plain;
}

public override void PlainToOnline<T>(T plain)
public async override Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain)
Expand All @@ -46,9 +46,9 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Simatic.
return await this.WriteAsync();
}

public override T ShadowToPlain<T>()
public async override Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.Simatic.Ax.StateFramework.State1Transition> ShadowToPlainAsync()
Expand All @@ -64,9 +64,9 @@ public override T ShadowToPlain<T>()
return plain;
}

public override void PlainToShadow<T>(T plain)
public async override Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.State1Transition plain)
Expand Down Expand Up @@ -112,9 +112,9 @@ public AbstractState(Ix.Connector.ITwinObject parent, string readableTail, strin
PostConstruct(parent, readableTail, symbolTail);
}

public virtual T OnlineToPlain<T>()
public async virtual Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.Simatic.Ax.StateFramework.AbstractState> OnlineToPlainAsync()
Expand All @@ -133,9 +133,9 @@ public virtual T OnlineToPlain<T>()
return plain;
}

public virtual void PlainToOnline<T>(T plain)
public async virtual Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain)
Expand All @@ -145,9 +145,9 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Simatic.
return await this.WriteAsync();
}

public virtual T ShadowToPlain<T>()
public async virtual Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.Simatic.Ax.StateFramework.AbstractState> ShadowToPlainAsync()
Expand All @@ -165,9 +165,9 @@ public virtual T ShadowToPlain<T>()
return plain;
}

public virtual void PlainToShadow<T>(T plain)
public async virtual Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Simatic.Ax.StateFramework.AbstractState plain)
Expand Down
32 changes: 16 additions & 16 deletions ....compiler/tests/Ix.Compiler.CsTests/samples/units/expected/.g/Onliners/class_extends.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ public Extended(Ix.Connector.ITwinObject parent, string readableTail, string sym
PostConstruct(parent, readableTail, symbolTail);
}

public override T OnlineToPlain<T>()
public async override Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.Extended> OnlineToPlainAsync()
Expand All @@ -33,9 +33,9 @@ public override T OnlineToPlain<T>()
return plain;
}

public override void PlainToOnline<T>(T plain)
public async override Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Extended plain)
Expand All @@ -44,9 +44,9 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Extended
return await this.WriteAsync();
}

public override T ShadowToPlain<T>()
public async override Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.Extended> ShadowToPlainAsync()
Expand All @@ -62,9 +62,9 @@ public override T ShadowToPlain<T>()
return plain;
}

public override void PlainToShadow<T>(T plain)
public async override Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Extended plain)
Expand Down Expand Up @@ -101,9 +101,9 @@ public Extendee(Ix.Connector.ITwinObject parent, string readableTail, string sym
PostConstruct(parent, readableTail, symbolTail);
}

public virtual T OnlineToPlain<T>()
public async virtual Task<T> OnlineToPlain<T>()
{
return (dynamic)this.OnlineToPlainAsync().Result;
return await (dynamic)this.OnlineToPlainAsync();
}

public async Task<Pocos.Extendee> OnlineToPlainAsync()
Expand All @@ -118,19 +118,19 @@ public virtual T OnlineToPlain<T>()
return plain;
}

public virtual void PlainToOnline<T>(T plain)
public async virtual Task PlainToOnline<T>(T plain)
{
this.PlainToOnlineAsync((dynamic)plain).Wait();
await this.PlainToOnlineAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToOnlineAsync(Pocos.Extendee plain)
{
return await this.WriteAsync();
}

public virtual T ShadowToPlain<T>()
public async virtual Task<T> ShadowToPlain<T>()
{
return (dynamic)this.ShadowToPlainAsync().Result;
return await (dynamic)this.ShadowToPlainAsync();
}

public async Task<Pocos.Extendee> ShadowToPlainAsync()
Expand All @@ -144,9 +144,9 @@ public virtual T ShadowToPlain<T>()
return plain;
}

public virtual void PlainToShadow<T>(T plain)
public async virtual Task PlainToShadow<T>(T plain)
{
this.PlainToShadowAsync((dynamic)plain).Wait();
await this.PlainToShadowAsync((dynamic)plain);
}

public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Extendee plain)
Expand Down
Loading