Skip to content

[IDEA] Change remote execution handling in AxoDataExchange to use a single instance of AxoRemoteTask #149

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 5 commits into from
Aug 1, 2023
Merged

[IDEA] Change remote execution handling in AxoDataExchange to use a single instance of AxoRemoteTask #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d99f6aa
Create draft PR for #148
Brano5 Jul 28, 2023
0e2786a
Changed CRUD Tasks to using only one instance of Task in AxoDataExcha…
Brano5 Jul 31, 2023
3c9a35c
Merge branch 'dev' into 148-_IDEA_Change_remote_execution_handling_in…
PTKu Aug 1, 2023
19146e6
updates AX# tools to 0.14.0-alpha.115
PTKu Aug 1, 2023
6530d63
adds AxoCore services to integration project
PTKu Aug 1, 2023
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
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"AXSharp.ixc": {
"version": "0.14.0-alpha.112",
"version": "0.14.0-alpha.115",
"commands": [
"ixc"
]
Expand All @@ -15,13 +15,13 @@
]
},
"AXSharp.ixd": {
"version": "0.14.0-alpha.112",
"version": "0.14.0-alpha.115",
"commands": [
"ixd"
]
},
"AXSharp.ixr": {
"version": "0.14.0-alpha.112",
"version": "0.14.0-alpha.115",
"commands": [
"ixr"
]
Expand Down
2 changes: 1 addition & 1 deletion src/data/ctrl/src/AxoDataCrudTask.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ NAMESPACE AXOpen.Data
END_CLASS

TYPE
eCrudOperation : (Create, Read, Update, Delete);
eCrudOperation : (Create, Read, Update, Delete, CreateOrUpdate, EntityExist);
END_TYPE

END_NAMESPACE
23 changes: 0 additions & 23 deletions src/data/ctrl/src/AxoDataEntityExistTask.st
View file
Open in desktop

This file was deleted.

58 changes: 14 additions & 44 deletions src/data/ctrl/src/AxoDataExchange.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,35 +8,8 @@ NAMESPACE AXOpen.Data
{#ix-generic:<TOnline, TPlain>}
CLASS AxoDataExchange EXTENDS AxoDataExchangeBase IMPLEMENTS IAxoDataExchange
VAR PUBLIC
{#ix-set:AttributeName = "<#Create#>"}
CreateTask : AxoDataExchangeTask;
{#ix-set:AttributeName = "<#Read#>"}
ReadTask : AxoDataExchangeTask;
{#ix-set:AttributeName = "<#Update#>"}
UpdateTask : AxoDataExchangeTask;
{#ix-set:AttributeName = "<#Delete#>"}
DeleteTask : AxoDataExchangeTask;
{#ix-set:AttributeName = "<#EntityExist#>"}
EntityExistTask : AxoDataEntityExistTask;
{#ix-set:AttributeName = "<#CreateOrUpdate#>"}
CreateOrUpdateTask : AxoDataExchangeTask;
Operation : AxoDataCrudTask;
END_VAR

METHOD PRIVATE Run
CreateTask.Initialize(THIS);
ReadTask.Initialize(THIS);
UpdateTask.Initialize(THIS);
DeleteTask.Initialize(THIS);
EntityExistTask.Initialize(THIS);
CreateOrUpdateTask.Initialize(THIS);

CreateTask.Execute();
ReadTask.Execute();
UpdateTask.Execute();
DeleteTask.Execute();
EntityExistTask.Execute();
CreateOrUpdateTask.Execute();
END_METHOD

///<summary>
/// Runs intialization and cyclical handling of this AxoDataExchange.
Expand All @@ -47,7 +20,8 @@ NAMESPACE AXOpen.Data
parent : IAxoObject;
END_VAR
THIS.Initialize(parent);
THIS.Run();
Operation.Initialize(THIS);
Operation.Execute();
END_METHOD

///<summary>
Expand All @@ -59,7 +33,8 @@ NAMESPACE AXOpen.Data
context : IAxoContext;
END_VAR
THIS.Initialize(context);
THIS.Run();
Operation.Initialize(THIS);
Operation.Execute();
END_METHOD

///<summary>
Expand All @@ -70,7 +45,7 @@ NAMESPACE AXOpen.Data
VAR_INPUT
identifier : STRING[254];
END_VAR
Create := CreateTask.Invoke(identifier);
Create := Operation.Invoke(identifier, eCrudOperation#Create);
END_METHOD

///<summary>
Expand All @@ -81,7 +56,7 @@ NAMESPACE AXOpen.Data
VAR_INPUT
identifier : STRING[254];
END_VAR
Read := ReadTask.Invoke(identifier);
Read := Operation.Invoke(identifier, eCrudOperation#Read);
END_METHOD

///<summary>
Expand All @@ -92,7 +67,7 @@ NAMESPACE AXOpen.Data
VAR_INPUT
identifier : STRING[254];
END_VAR
Update := UpdateTask.Invoke(identifier);
Update := Operation.Invoke(identifier, eCrudOperation#Update);
END_METHOD

///<summary>
Expand All @@ -103,19 +78,19 @@ NAMESPACE AXOpen.Data
VAR_INPUT
identifier : STRING[254];
END_VAR
Delete := DeleteTask.Invoke(identifier);
Delete := Operation.Invoke(identifier, eCrudOperation#Delete);
END_METHOD

///<summary>
/// Check if data entry exists with given ID in remote repository.
/// </summary>
/// <param name="identifier">Data identifier.</param>
METHOD PUBLIC EntityExist : IAxoDataEntityExistTask
METHOD PUBLIC EntityExist : IAxoEntityExistTaskState
VAR_INPUT
identifier : STRING[254];
END_VAR
EntityExistTask.Invoke(identifier);
EntityExist := EntityExistTask;
Operation.Invoke(identifier, eCrudOperation#EntityExist);
EntityExist := Operation;
END_METHOD

///<summary>
Expand All @@ -126,19 +101,14 @@ NAMESPACE AXOpen.Data
VAR_INPUT
identifier : STRING[254];
END_VAR
CreateOrUpdate := CreateOrUpdateTask.Invoke(identifier);
CreateOrUpdate := Operation.Invoke(identifier, eCrudOperation#CreateOrUpdate);
END_METHOD

///<summary>
/// Restores all tasks associated with this object.
///</summary>
METHOD PUBLIC Restore
CreateTask.Restore();
ReadTask.Restore();
UpdateTask.Restore();
DeleteTask.Restore();
EntityExistTask.Restore();
CreateOrUpdateTask.Restore();
Operation.Restore();
END_METHOD
END_CLASS
END_NAMESPACE
12 changes: 12 additions & 0 deletions src/data/ctrl/src/AxoDataExchangeTask.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,11 @@ NAMESPACE AXOpen.Data
/// </summary>
CLASS AxoDataExchangeTask
EXTENDS AXOpen.Core.AxoRemoteTask
IMPLEMENTS IAxoEntityExistTaskState

VAR PUBLIC
DataEntityIdentifier : STRING[254];
_exist : BOOL;
END_VAR

METHOD PUBLIC Invoke : IAxoTaskState
Expand All @@ -18,6 +21,15 @@ NAMESPACE AXOpen.Data
DataEntityIdentifier := identifier;
Invoke := SUPER.Invoke();
END_METHOD

METHOD PUBLIC Exist : BOOL
Exist := _exist;
END_METHOD

END_CLASS

INTERFACE PUBLIC IAxoEntityExistTaskState EXTENDS IAxoTaskState
METHOD Exist : BOOL END_METHOD
END_INTERFACE

END_NAMESPACE
24 changes: 4 additions & 20 deletions src/data/ctrl/src/AxoDataFragmentExchange.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ NAMESPACE AXOpen.Data
CLASS PUBLIC AxoDataFragmentExchange EXTENDS AxoDataExchangeBase IMPLEMENTS IAxoDataExchange
VAR PUBLIC
Operation : AxoDataCrudTask;
EntityExistTask : AxoDataEntityExistTask;
CreateOrUpdateTask : AxoDataExchangeTask;
END_VAR

///<summary>
Expand Down Expand Up @@ -62,12 +60,12 @@ NAMESPACE AXOpen.Data
/// Check if data entry exists in each associated remote repository with given ID.
/// </summary>
/// <param name="identifier">Data identifier.</param>
METHOD PUBLIC EntityExist : IAxoDataEntityExistTask
METHOD PUBLIC EntityExist : IAxoEntityExistTaskState
VAR_INPUT
Identifier : STRING[254];
END_VAR
EntityExistTask.Invoke(Identifier);
EntityExist := EntityExistTask;
Operation.Invoke(Identifier, eCrudOperation#EntityExist);
EntityExist := Operation;
END_METHOD

///<summary>
Expand All @@ -78,13 +76,11 @@ NAMESPACE AXOpen.Data
VAR_INPUT
Identifier : STRING[254];
END_VAR
CreateOrUpdate := CreateOrUpdateTask.Invoke(Identifier);
CreateOrUpdate := Operation.Invoke(Identifier, eCrudOperation#CreateOrUpdate);
END_METHOD

METHOD PUBLIC Restore
Operation.Restore();
EntityExistTask.Restore();
CreateOrUpdateTask.Restore();
END_METHOD

///<summary>
Expand All @@ -98,12 +94,6 @@ NAMESPACE AXOpen.Data
THIS.Initialize(context);
Operation.Initialize(THIS);
Operation.Execute();

EntityExistTask.Initialize(THIS);
EntityExistTask.Execute();

CreateOrUpdateTask.Initialize(THIS);
CreateOrUpdateTask.Execute();
END_METHOD

///<summary>
Expand All @@ -117,12 +107,6 @@ NAMESPACE AXOpen.Data
THIS.Initialize(parent);
Operation.Initialize(THIS);
Operation.Execute();

EntityExistTask.Initialize(THIS);
EntityExistTask.Execute();

CreateOrUpdateTask.Initialize(THIS);
CreateOrUpdateTask.Execute();
END_METHOD

END_CLASS
Expand Down
2 changes: 1 addition & 1 deletion src/data/ctrl/src/IAxoDataExchange.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ NAMESPACE AXOpen.Data
END_VAR
END_METHOD

METHOD EntityExist : IAxoDataEntityExistTask
METHOD EntityExist : IAxoEntityExistTaskState
VAR_INPUT
Identifier : STRING[254];
END_VAR
Expand Down
12 changes: 6 additions & 6 deletions src/data/ctrl/test/AxoDataExchangeTests.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ NAMESPACE AXOpen.Data
expected := 'CreateRecordIdentifier';
_dataExchange.Create(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.CreateTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD


Expand All @@ -72,7 +72,7 @@ NAMESPACE AXOpen.Data
expected := 'ReadRecordIdentifier';
_dataExchange.Read(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.ReadTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD

{Test}
Expand All @@ -85,7 +85,7 @@ NAMESPACE AXOpen.Data
expected := 'UpdateRecordIdentifier';
_dataExchange.Update(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.UpdateTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD

{Test}
Expand All @@ -98,7 +98,7 @@ NAMESPACE AXOpen.Data
expected := 'DeleteRecordIdentifier';
_dataExchange.Delete(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.DeleteTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD

{Test}
Expand All @@ -111,7 +111,7 @@ NAMESPACE AXOpen.Data
expected := 'EntityExistRecordIdentifier';
_dataExchange.EntityExist(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.EntityExistTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD

{Test}
Expand All @@ -124,7 +124,7 @@ NAMESPACE AXOpen.Data
expected := 'CreateOrUpdateRecordIdentifier';
_dataExchange.CreateOrUpdate(expected);
_context.Close();
AxUnit.Assert.Equal(_dataExchange.CreateOrUpdateTask.DataEntityIdentifier, expected);
AxUnit.Assert.Equal(_dataExchange.Operation.DataEntityIdentifier, expected);
END_METHOD
END_CLASS
END_NAMESPACE
Expand Down
Loading