From ea388f998ce1f3ec3923a614d0bc2b98dd696c16 Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Wed, 20 Apr 2022 10:50:01 +0000 Subject: [PATCH 1/5] Changed MachineInterface and UserInterface to Field from Method --- machinesystem.capnp | 2 +- usersystem.capnp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/machinesystem.capnp b/machinesystem.capnp index 473fa53..9809d35 100644 --- a/machinesystem.capnp +++ b/machinesystem.capnp @@ -11,7 +11,7 @@ using Machine = import "machine.capnp".Machine; interface MachineSystem { - info @0 () -> ( info : Info ); + info @0 : Info ; interface Info $CSharp.name("InfoInterface") { getMachineList @0 () -> ( machine_list :List(Machine) ); diff --git a/usersystem.capnp b/usersystem.capnp index 955514b..8b8b18e 100644 --- a/usersystem.capnp +++ b/usersystem.capnp @@ -11,16 +11,16 @@ using User = import "user.capnp".User; interface UserSystem { - info @0 () -> ( info : Info ); + info @0 : Info; interface Info $CSharp.name("InfoInterface") { getUserSelf @0 ( ) -> ( user :User, dummy :UInt8 = 0 ); } - manage @1 () -> ( manage : Manage ); + manage @1 : Manage; interface Manage $CSharp.name("ManageInterface") { getUserList @0 () -> ( user_list :List(User) ); addUser @1 (username :Text, password: Text) -> ( user :User ); removeUser @2 (user :User, dummy :UInt8 = 0); } -} \ No newline at end of file +} From 2977a0f5d9d50613a305f98ebddd74a2984cabb1 Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Thu, 21 Apr 2022 20:08:55 +0200 Subject: [PATCH 2/5] fix --- machinesystem.capnp | 4 ++-- usersystem.capnp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/machinesystem.capnp b/machinesystem.capnp index 9809d35..0ea8cf8 100644 --- a/machinesystem.capnp +++ b/machinesystem.capnp @@ -9,9 +9,9 @@ $CSharp.namespace("FabAccessAPI.Schema"); using General = import "general.capnp"; using Machine = import "machine.capnp".Machine; -interface MachineSystem +struct MachineSystem { - info @0 : Info ; + info @0 :Info; interface Info $CSharp.name("InfoInterface") { getMachineList @0 () -> ( machine_list :List(Machine) ); diff --git a/usersystem.capnp b/usersystem.capnp index 8b8b18e..dfcbd9e 100644 --- a/usersystem.capnp +++ b/usersystem.capnp @@ -9,14 +9,14 @@ $CSharp.namespace("FabAccessAPI.Schema"); using General = import "general.capnp"; using User = import "user.capnp".User; -interface UserSystem +struct UserSystem { - info @0 : Info; + info @0 :Info; interface Info $CSharp.name("InfoInterface") { getUserSelf @0 ( ) -> ( user :User, dummy :UInt8 = 0 ); } - manage @1 : Manage; + manage @1 :Manage; interface Manage $CSharp.name("ManageInterface") { getUserList @0 () -> ( user_list :List(User) ); From d006351b6f97e725660afe72ab44e0b2d81fa3a3 Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Thu, 21 Apr 2022 20:17:03 +0200 Subject: [PATCH 3/5] fix2 --- permissionsystem.capnp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/permissionsystem.capnp b/permissionsystem.capnp index fbca4be..6ef60ff 100644 --- a/permissionsystem.capnp +++ b/permissionsystem.capnp @@ -8,14 +8,14 @@ $CSharp.namespace("FabAccessAPI.Schema"); using Role = import "role.capnp".Role; -interface PermissionSystem +struct PermissionSystem { - info @0 () -> ( info : Info ); + info @0 :Info; interface Info $CSharp.name("InfoInterface") { getRoleList @0 () -> ( role_list :List(Role) ); } - manage @1 () -> ( manage : Manage ); + manage @1 :Manage; interface Manage $CSharp.name("ManageInterface") { } From f8b317bb1514741eb3f388d591b52c5f00376616 Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Thu, 21 Apr 2022 20:19:59 +0200 Subject: [PATCH 4/5] fix3 --- usersystem.capnp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usersystem.capnp b/usersystem.capnp index dfcbd9e..9eecebf 100644 --- a/usersystem.capnp +++ b/usersystem.capnp @@ -13,7 +13,7 @@ struct UserSystem { info @0 :Info; interface Info $CSharp.name("InfoInterface") { - getUserSelf @0 ( ) -> ( user :User, dummy :UInt8 = 0 ); + getUserSelf @0 ( ) -> User; } manage @1 :Manage; From 2406e77fb9fd2ce3d6e183742521a5d9c9cf77af Mon Sep 17 00:00:00 2001 From: Nadja Reitzenstein Date: Thu, 21 Apr 2022 20:21:10 +0200 Subject: [PATCH 5/5] fix4 --- usersystem.capnp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usersystem.capnp b/usersystem.capnp index 9eecebf..50cda33 100644 --- a/usersystem.capnp +++ b/usersystem.capnp @@ -20,7 +20,7 @@ struct UserSystem interface Manage $CSharp.name("ManageInterface") { getUserList @0 () -> ( user_list :List(User) ); - addUser @1 (username :Text, password: Text) -> ( user :User ); - removeUser @2 (user :User, dummy :UInt8 = 0); + addUser @1 (username :Text, password: Text) -> User; + removeUser @2 User; } }