README.md

@@ -77,17 +77,17 @@ If you have at least Docker and the Java JDK installed in appropriate versions a
 
     # the following command should return a JSON array with just all customers:
     curl \
-        -H 'current-subject: superuser-alex@hostsharing.net' \
+        -H 'current-user: superuser-alex@hostsharing.net' \
         http://localhost:8080/api/test/customers
 
     # the following command should return a JSON array with just all packages visible for the admin of the customer yyy:
     curl \
-        -H 'current-subject: superuser-alex@hostsharing.net' -H 'assumed-roles: rbactest.customer#yyy:ADMIN' \
+        -H 'current-user: superuser-alex@hostsharing.net' -H 'assumed-roles: test_customer#yyy:ADMIN' \
         http://localhost:8080/api/test/packages
 
     # add a new customer
     curl \
-        -H 'current-subject: superuser-alex@hostsharing.net' -H "Content-Type: application/json" \
+        -H 'current-user: superuser-alex@hostsharing.net' -H "Content-Type: application/json" \
         -d '{ "prefix":"ttt", "reference":80001, "adminUserName":"admin@ttt.example.com" }' \
         -X POST http://localhost:8080/api/test/customers
 

bin/git-pull-and-if-origin-changed-run-tests

@@ -1,36 +0,0 @@
-#!/bin/bash
-
-# get the current branch name
-BRANCH=$(git rev-parse --abbrev-ref HEAD)
-
-while true; do
-
-  # get the latest commit hashes from origin and local
-  git fetch origin
-  LOCAL=$(git rev-parse HEAD)
-  REMOTE=$(git rev-parse origin/$BRANCH)
-
-  # check if the local branch differs from the remote branch
-  if [ "$LOCAL" != "$REMOTE" ]; then
-    echo "local $LOCAL differs from remote $REMOTE => pulling changes from origin"
-    git pull origin $BRANCH
-
-    # run the command
-    echo "Running ./gradlew test"
-    source .aliases # only variables, aliases are not expanded in scripts
-    ./gradlew test
-  fi
-
-  # wait 10s with a little animation
-  echo -e -n " waiting for changes (/) ..."
-  sleep 2
-  echo -e -n "\r\033[K waiting for changes (-) ..."
-  sleep 2
-  echo -e -n "\r\033[K waiting for changes (\) ..."
-  sleep 2
-  echo -e -n "\r\033[K waiting for changes (|) ..."
-  sleep 2
-  echo -e -n "\r\033[K waiting for changes ( ) ... "
-  sleep 2
-  echo -e -n "\r\033[K"
-done

doc/adr/2022-07-18.row-level-security-mechanism.md

@@ -14,9 +14,9 @@ The core problem here is, that in our RBAC system, determining the permissions o
 
 ### Technical Background
 
-The session variable `hsadminng.currentSubject` contains the accessing (domain-level) user, which is unrelated to the PostgreSQL user).
+The session variable `hsadminng.currentUser` contains the accessing (domain-level) user, which is unrelated to the PostgreSQL user).
 
-Given is a stored function `isPermissionGrantedToSubject` which detects if the accessing subject has a given permission (e.g. 'view').
+Given is a stored function `isPermissionGrantedToSubject` which detects if the accessing user has a given permission (e.g. 'view').
 
 Given is also a stored function `queryAllPermissionsOfSubjectId` which returns the flattened view to all permissions assigned to the given accessing user.
 
@@ -38,7 +38,7 @@ In this solution, the database ignores row level visibility and returns all rows
 
 Very flexible access, programmatic, rules could be implemented.
 
-The role-hierarchy and permissions for current subjects (e.g. logged-in users) could be cached in the backend.
+The role-hierarchy and permissions for currently logged-in users user could be cached in the backend.
 
 The access logic can be tested in pure Java unit tests.
 
@@ -74,11 +74,11 @@ For restricted DB-users, which are used by the backend, access to rows is filter
         FOR SELECT
         TO restricted
         USING (
-            rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('customer', id, 'view'), currentSubjectUuid())
+            isPermissionGrantedToSubject(findEffectivePermissionId('customer', id, 'view'), currentUserUuid())
         );
     
     SET SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
     SELECT * from customer; -- will only return visible rows
 
 #### Advantages
@@ -101,10 +101,10 @@ We are bound to PostgreSQL, including integration tests and testing the RBAC sys
     CREATE OR REPLACE RULE "_RETURN" AS
         ON SELECT TO cust_view
         DO INSTEAD
-            SELECT * FROM customer WHERE rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('customer', id, 'view'), currentSubjectUuid());
+            SELECT * FROM customer WHERE isPermissionGrantedToSubject(findEffectivePermissionId('customer', id, 'view'), currentUserUuid());
 
     SET SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
     SELECT * from customer; -- will only return visible rows
 
 #### Advantages
@@ -130,12 +130,12 @@ We do not access the tables directly from the backend, but via views which join
     CREATE OR REPLACE VIEW cust_view AS
         SELECT c.id, c.reference, c.prefix
           FROM customer AS c
-          JOIN queryAllPermissionsOfSubjectId(currentSubjectUuid()) AS p
+          JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
                ON p.tableName='customer' AND p.rowId=c.id AND p.op='view';
     GRANT ALL PRIVILEGES ON cust_view TO restricted;
     
     SET SESSION SESSION AUTHORIZATION restricted;
-    SET hsadminng.currentSubject TO 'alex@example.com';
+    SET hsadminng.currentUser TO 'alex@example.com';
     SELECT * from cust_view; -- will only return visible rows
 
 Alternatively the JOIN could also be applied in a "ON SELECT DO INSTEAD"-RULE, if there is any advantage for later features.

doc/rbac-performance-analysis.md

@@ -206,14 +206,14 @@ Limit  (cost=6549.08..6549.35 rows=54 width=16)
 
 ```SQL
 SELECT hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress,c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version 
-    FROM hs_office.relation_rv hore1_0
-    LEFT JOIN hs_office.person_rv a1_0 ON a1_0.uuid=hore1_0.anchoruuid 
-    LEFT JOIN hs_office.contact_rv c1_0 ON c1_0.uuid=hore1_0.contactuuid
-    LEFT JOIN hs_office.person_rv h1_0 ON h1_0.uuid=hore1_0.holderuuid
+    FROM hs_office_relation_rv hore1_0
+    LEFT JOIN hs_office_person_rv a1_0 ON a1_0.uuid=hore1_0.anchoruuid 
+    LEFT JOIN hs_office_contact_rv c1_0 ON c1_0.uuid=hore1_0.contactuuid
+    LEFT JOIN hs_office_person_rv h1_0 ON h1_0.uuid=hore1_0.holderuuid
     WHERE hore1_0.uuid=$1
 ```
 
-That query on the `hs_office.relation_rv`-table joins the three references anchor-person, holder-person and contact.
+That query on the `hs_office_relation_rv`-table joins the three references anchor-person, holder-person and contact.
 
 
 ### Total-Query-Time > Total-Import-Runtime
@@ -239,7 +239,7 @@ This did not improve the performance.
 We were suspicious about the sequential scan over all `rbacpermission` rows which was done by PostgreSQL to execute a HashJoin strategy. Turning off that strategy by
 
 ```SQL
-ALTER FUNCTION rbac.queryAccessibleObjectUuidsOfSubjectIds SET enable_hashjoin = off;
+ALTER FUNCTION queryAccessibleObjectUuidsOfSubjectIds SET enable_hashjoin = off;
 ```
 
 did not improve the performance though. The HashJoin was actually still applied, but no full table scan anymore:
@@ -270,16 +270,16 @@ At this point, the import took 21mins with these statistics:
 
 | query | calls | total_m | mean_ms |
 |-------|-------|---------|---------|
-| select hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress, c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 left join public.hs_office.person_rv a1_0 on a1_0.uuid=hore1_0.anchoruuid left join public.hs_office.contact_rv c1_0 on c1_0.uuid=hore1_0.contactuuid left join public.hs_office.person_rv h1_0 on h1_0.uuid=hore1_0.holderuuid where hore1_0.uuid=$1 | 517 | 11 | 1282 |
-| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1 | 973 | 4 | 254 |
-| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1 | 973 | 4 | 253 |
-| call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed) | 31316 | 0 | 1 |
+| select hore1_0.uuid,a1_0.uuid,a1_0.familyname,a1_0.givenname,a1_0.persontype,a1_0.salutation,a1_0.title,a1_0.tradename,a1_0.version,c1_0.uuid,c1_0.caption,c1_0.emailaddresses,c1_0.phonenumbers,c1_0.postaladdress, c1_0.version,h1_0.uuid,h1_0.familyname,h1_0.givenname,h1_0.persontype,h1_0.salutation,h1_0.title,h1_0.tradename,h1_0.version,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 left join public.hs_office_person_rv a1_0 on a1_0.uuid=hore1_0.anchoruuid left join public.hs_office_contact_rv c1_0 on c1_0.uuid=hore1_0.contactuuid left join public.hs_office_person_rv h1_0 on h1_0.uuid=hore1_0.holderuuid where hore1_0.uuid=$1 | 517 | 11 | 1282 |
+| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1 | 973 | 4 | 254 |
+| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1 | 973 | 4 | 253 |
+| call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed) | 31316 | 0 | 1 |
 | call buildRbacSystemForHsHostingAsset(NEW) | 2258 | 0 | 7 |
-| select * from rbac.isGranted(array[granteeId], grantedId) | 44613 | 0 | 0 |
+| select * from isGranted(array[granteeId], grantedId) | 44613 | 0 | 0 |
 | insert into public.hs_hosting_asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) | 2207 | 0 | 7 |
 | insert into hs_hosting_asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning * | 2207 | 0 | 7 |
-| insert into public.hs_office.relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7) | 1261 | 0 | 9 |
-| insert into hs_office.relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning * | 1261 | 0 | 9 |
+| insert into public.hs_office_relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7) | 1261 | 0 | 9 |
+| insert into hs_office_relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning * | 1261 | 0 | 9 |
 | call buildRbacSystemForHsOfficeRelation(NEW) | 1276 | 0 | 8 |
 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select ""grant"".descendantUuid, ""grant"".ascendantUuid from RbacGrants ""grant"" inner join grants recur on recur.ascendantUuid = ""grant"".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) | 47540 | 0 | 0 |
 | insert into RbacGrants (grantedByTriggerOf, ascendantuuid, descendantUuid, assumed) values (currentTriggerObjectUuid(), superRoleId, subRoleId, doAssume) on conflict do nothing" | 40472 | 0 | 0 |
@@ -294,17 +294,17 @@ We changed these mappings from `EAGER` (default) to `LAZY` to `@ManyToOne(fetch
 :::small
 | query                                                                                                                                                                                                                                                                                                                                                                                                 | calls | total (min) | mean (ms) |
 |-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------|-------------|----------|
-| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                          | 1015 | 4           | 238 |
-| select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                               | 517 | 4           | 439       |
-| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                                  | 497 | 2           | 213 |      
-| call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                                  | 31316 | 0           | 1   |      
-| select * from rbac.isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                                  | 44613 | 0           | 0     |    
+| select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                          | 1015 | 4           | 238 |
+| select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                               | 517 | 4           | 439       |
+| select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                                  | 497 | 2           | 213 |      
+| call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                                  | 31316 | 0           | 1   |      
+| select * from isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                                  | 44613 | 0           | 0     |    
 | call buildRbacSystemForHsHostingAsset(NEW)                                                                                                                                                                                                                                                                                                                                                            | 2258 | 0           | 7        | 
 | insert into public.hs_hosting_asset_rv (alarmcontactuuid,assignedtoassetuuid,bookingitemuuid,caption,config,identifier,parentassetuuid,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10)                                                                                                                                                                                                     | 2207 | 0           | 7         |
 | insert into hs_hosting_asset (alarmcontactuuid, version, bookingitemuuid, type, parentassetuuid, assignedtoassetuuid, config, uuid, identifier, caption) values (new.alarmcontactuuid, new. version, new. bookingitemuuid, new. type, new. parentassetuuid, new. assignedtoassetuuid, new. config, new. uuid, new. identifier, new. caption) returning *                                              | 2207 | 0           | 7 |        
 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select ""grant"".descendantUuid, ""grant"".ascendantUuid from RbacGrants ""grant"" inner join grants recur on recur.ascendantUuid = ""grant"".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) | 47538 | 0           | 0 |        
- insert into public.hs_office.relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7)                                                                                                                                                                                                                                                                     | 1261 | 0           | 8         |
-| insert into hs_office.relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning *                                                                                                                                                                                 | 1261 | 0           | 8         |
+ insert into public.hs_office_relation_rv (anchoruuid,contactuuid,holderuuid,mark,type,version,uuid) values ($1,$2,$3,$4,$5,$6,$7)                                                                                                                                                                                                                                                                     | 1261 | 0           | 8         |
+| insert into hs_office_relation (uuid, version, anchoruuid, holderuuid, contactuuid, type, mark) values (new.uuid, new. version, new. anchoruuid, new. holderuuid, new. contactuuid, new. type, new. mark) returning *                                                                                                                                                                                 | 1261 | 0           | 8         |
 | call buildRbacSystemForHsOfficeRelation(NEW)                                                                                                                                                                                                                                                                                                                                                          | 1276 | 0           | 7 |        
 | insert into public.hs_booking_item_rv (caption,parentitemuuid,projectuuid,resources,type,validity,version,uuid) values ($1,$2,$3,$4,$5,$6,$7,$8)                                                                                                                                                                                                                                                      | 926 | 0           | 7 |        
 | insert into hs_booking_item (resources, version, projectuuid, type, parentitemuuid, validity, uuid, caption) values (new.resources, new. version, new. projectuuid, new. type, new. parentitemuuid, new. validity, new. uuid, new. caption) returning *                                                                                                                                               | 926 | 0           | 7         |
@@ -331,13 +331,13 @@ Now, the longest running queries are these:
 | No.| calls   | total_m | mean_ms | query                                                                                                                                                                                                                                                                                                                                                                                          |
 |---:|---------|--------:|--------:|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 |  1 | 13.093  |       4 |      21 | insert into hs_hosting_asset( uuid, type, bookingitemuuid, parentassetuuid, assignedtoassetuuid, alarmcontactuuid, identifier, caption, config, version) values ( $1, $2, $3, $4, $5, $6, $7, $8, cast($9 as jsonb), $10)                                                                                                                                                                      |
-|  2 | 517     |       4 |     502 | select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office.relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                        |
+|  2 | 517     |       4 |     502 | select hore1_0.uuid,hore1_0.anchoruuid,hore1_0.contactuuid,hore1_0.holderuuid,hore1_0.mark,hore1_0.type,hore1_0.version from public.hs_office_relation_rv hore1_0 where hore1_0.uuid=$1                                                                                                                                                                                                        |
 |  3 | 13.144  |       4 |      21 | call buildRbacSystemForHsHostingAsset(NEW)                                                                                                                                                                                                                                                                                                                                                     |
-|  4 | 96.632  |       3 |       2 | call rbac.grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                           |
-|  5 | 120.815 |       3 |       2 | select * from rbac.isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                           |
+|  4 | 96.632  |       3 |       2 | call grantRoleToRole(roleUuid, superRoleUuid, superRoleDesc.assumed)                                                                                                                                                                                                                                                                                                                           |
+|  5 | 120.815 |       3 |       2 | select * from isGranted(array[granteeId], grantedId)                                                                                                                                                                                                                                                                                                                                           |
 |  6 | 123.740 |       3 |       2 | with recursive grants as ( select descendantUuid, ascendantUuid from RbacGrants where descendantUuid = grantedId union all select "grant".descendantUuid, "grant".ascendantUuid from RbacGrants "grant" inner join grants recur on recur.ascendantUuid = "grant".descendantUuid ) select exists ( select $3 from grants where ascendantUuid = any(granteeIds) ) or grantedId = any(granteeIds) |
-|  7 | 497     |       2 |     259 | select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office.contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                           |
-|  8 | 497     |       2 |     255 | select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office.person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                   |
+|  7 | 497     |       2 |     259 | select hoce1_0.uuid,hoce1_0.caption,hoce1_0.emailaddresses,hoce1_0.phonenumbers,hoce1_0.postaladdress,hoce1_0.version from public.hs_office_contact_rv hoce1_0 where hoce1_0.uuid=$1                                                                                                                                                                                                           |
+|  8 | 497     |       2 |     255 | select hope1_0.uuid,hope1_0.familyname,hope1_0.givenname,hope1_0.persontype,hope1_0.salutation,hope1_0.title,hope1_0.tradename,hope1_0.version from public.hs_office_person_rv hope1_0 where hope1_0.uuid=$1                                                                                                                                                                                   |
 |  9 | 13.144  |       1 |       8 | SELECT createRoleWithGrants( hsHostingAssetTENANT(NEW), permissions => array[$7], incomingSuperRoles => array[ hsHostingAssetAGENT(NEW), hsOfficeContactADMIN(newAlarmContact)], outgoingSubRoles => array[ hsBookingItemTENANT(newBookingItem), hsHostingAssetTENANT(newParentAsset)] ) |
 | 10 |  13.144 |       1 |       5 |  SELECT createRoleWithGrants( hsHostingAssetADMIN(NEW), permissions => array[$7], incomingSuperRoles => array[ hsBookingItemAGENT(newBookingItem), hsHostingAssetAGENT(newParentAsset), hsHostingAssetOWNER(NEW)] ) |
 
@@ -345,7 +345,7 @@ That the `INSERT into hs_hosting_asset` (No. 1) takes up the most time, seems to
 
 It seems that the trigger effects (eg. No. 3 and No. 4) are included in the measure for the causing INSERT, otherwise summing up the totals would exceed the actual total time of the whole import. And it was to be expected that building the RBAC rules for new business objects takes most of the time.
 
-In production, the `SELECT ... FROM hs_office.relation_rv` (No. 2) with about 0.5 seconds could still be a problem. But once we apply the improvements from the hosting asset area also to the office area, this should not be a problem for the import anymore.
+In production, the `SELECT ... FROM hs_office_relation_rv` (No. 2) with about 0.5 seconds could still be a problem. But once we apply the improvements from the hosting asset area also to the office area, this should not be a problem for the import anymore.
 
  
 ## Further Options To Explore
@@ -392,9 +392,9 @@ We found some solution approaches:
 
 3. Inverting the recursion of the CTE-query, combined with the type condition.
     
-    Instead of starting the recursion with `currentSubjectOrAssumedRolesUuids()`, 
+    Instead of starting the recursion with `currentsubjectsuuids()`, 
     we could start it with the target table name and row-type,
-    then recurse down to the `currentSubjectOrAssumedRolesUuids()`.
+    then recurse down to the `currentsubjectsuuids()`.
 
     In the end, we need the object UUIDs, though. 
     But if we start with the join of `rbacObject` with `rbacPermission`, 

doc/rbac.md

@@ -29,7 +29,7 @@ skinparam linetype ortho
 package RBAC {
 
     ' forward declarations    
-    entity RbacSubject
+    entity RbacUser
     
     together {
         
@@ -37,8 +37,8 @@ package RBAC {
         entity RbacPermission
  
         
-        RbacSubject -[hidden]> RbacRole
-        RbacRole -[hidden]> RbacSubject
+        RbacUser -[hidden]> RbacRole
+        RbacRole -[hidden]> RbacUser
     }
    
     together {
@@ -57,11 +57,11 @@ package RBAC {
     RbacGrant o-u-> RbacReference
     
     enum RbacReferenceType {
-        RbacSubject
+        RbacUser
         RbacRole
         RbacPermission
     }
-    RbacReferenceType ..> RbacSubject
+    RbacReferenceType ..> RbacUser
     RbacReferenceType ..> RbacRole
     RbacReferenceType ..> RbacPermission
     
@@ -71,12 +71,12 @@ package RBAC {
         type : RbacReferenceType
     }
     RbacReference o--> RbacReferenceType  
-    entity RbacSubject {
+    entity RbacUser {
         *uuid : uuid <<generated>>
         --
         name : varchar
     }
-    RbacSubject o-- RbacReference
+    RbacUser o-- RbacReference
     
     entity RbacRole {
         *uuid : uuid(RbacReference)
@@ -143,20 +143,20 @@ The primary key of the *RbacReference* and its referred object is always identic
 #### RbacReferenceType
 
 The enum *RbacReferenceType* describes the type of reference.
-It's only needed to make it easier to find the referred object in *RbacSubject*, *RbacRole* or *RbacPermission*.
+It's only needed to make it easier to find the referred object in *RbacUser*, *RbacRole* or *RbacPermission*.
 
-#### RbacSubject
+#### RbacUser
 
-An *RbacSubject* is a type of RBAC-subject which references a login account outside this system, identified by a name (usually an email-address).
+An *RbacUser* is a type of RBAC-subject which references a login account outside this system, identified by a name (usually an email-address).
 
-*RbacSubject*s can be assigned to multiple *RbacRole*s, through which they can get permissions to *RbacObject*s.
+*RbacUser*s can be assigned to multiple *RbacRole*s, through which they can get permissions to *RbacObject*s.
 
-The primary key of the *RbacSubject* is identical to its related *RbacReference*.
+The primary key of the *RbacUser* is identical to its related *RbacReference*.
 
 #### RbacRole
 
 An *RbacRole* represents a collection of directly or indirectly assigned *RbacPermission*s. 
-Each *RbacRole* can be assigned to *RbacSubject*s or to another *RbacRole*.
+Each *RbacRole* can be assigned to *RbacUser*s or to another *RbacRole*.
 
 Both kinds of assignments are represented via *RbacGrant*.
 
@@ -184,7 +184,7 @@ Only with this rule, the foreign key in *RbacPermission* can be defined as `NOT
 
 #### RbacGrant
 
-The *RbacGrant* entities represent the access-rights structure from *RbacSubject*s via hierarchical *RbacRoles* down to *RbacPermission*s.
+The *RbacGrant* entities represent the access-rights structure from *RbacUser*s via hierarchical *RbacRoles* down to *RbacPermission*s.
 
 The core SQL queries to determine access rights are all recursive queries on the *RbacGrant* table.
 
@@ -284,7 +284,7 @@ hide circle
 ' use right-angled line routing
 ' skinparam linetype ortho
 
-package RbacSubjects {
+package RbacUsers {
     object UserMike
     object UserSuse
     object UserPaul
@@ -296,7 +296,7 @@ package RbacRoles {
     object RoleCustXyz_Admin
     object RolePackXyz00_Owner
 }
-RbacSubjects -[hidden]> RbacRoles
+RbacUsers -[hidden]> RbacRoles
 
 package RbacPermissions {
     object PermCustXyz_SELECT
@@ -364,10 +364,10 @@ This way, each user can only select the data they have 'SELECT'-permission for,
 
 ### Current User
 
-The current use is taken from the session variable `hsadminng.currentSubject` which contains the name of the user as stored in the 
-*RbacSubject*s table. Example:
+The current use is taken from the session variable `hsadminng.currentUser` which contains the name of the user as stored in the 
+*RbacUser*s table. Example:
 
-    SET LOCAL hsadminng.currentSubject = 'mike@hostsharing.net';
+    SET LOCAL hsadminng.currentUser = 'mike@hostsharing.net';
 
 That user is also used for historicization and audit log, but which is a different topic.
 
@@ -388,7 +388,7 @@ A full example is shown here:
 
     BEGIN TRANSACTION;
         SET SESSION SESSION AUTHORIZATION restricted;
-        SET LOCAL hsadminng.currentSubject = 'mike@hostsharing.net';
+        SET LOCAL hsadminng.currentUser = 'mike@hostsharing.net';
         SET LOCAL hsadminng.assumedRoles = 'customer#aab:admin;customer#aac:admin';
         
         SELECT c.prefix, p.name as "package", ema.localPart || '@' || dom.name as "email-address"
@@ -605,8 +605,8 @@ Find the SQL script here: `28-hs-tests.sql`.
 We have tested two variants of the query for the restricted view,
 both utilizing a PostgreSQL function like this:
 
-    FUNCTION rbac.queryAccessibleObjectUuidsOfSubjectIds(
-            requiredOp rbac.RbacOp,
+    FUNCTION queryAccessibleObjectUuidsOfSubjectIds(
+            requiredOp RbacOp,
             forObjectTable varchar,
             subjectIds uuid[],
             maxObjects integer = 16000)
@@ -623,8 +623,8 @@ Let's have a look at the two view queries:
           FROM customer AS target
          WHERE target.uuid IN (
             SELECT uuid
-              FROM rbac.queryAccessibleObjectUuidsOfSubjectIds( 
-                'SELECT, 'customer', currentSubjectOrAssumedRolesUuids()));
+              FROM queryAccessibleObjectUuidsOfSubjectIds( 
+                'SELECT, 'customer', currentSubjectsUuids()));
 
 This view should be automatically updatable.
 Where, for updates, we actually have to check for 'UPDATE' instead of 'SELECT' operation, which makes it a bit more complicated.
@@ -641,8 +641,8 @@ Looks like the query optimizer needed some statistics to find the best path.
     CREATE OR REPLACE VIEW customer_rv AS
         SELECT DISTINCT target.*
           FROM customer AS target
-          JOIN rbac.queryAccessibleObjectUuidsOfSubjectIds( 
-                'SELECT, 'customer', currentSubjectOrAssumedRolesUuids()) AS allowedObjId
+          JOIN queryAccessibleObjectUuidsOfSubjectIds( 
+                'SELECT, 'customer', currentSubjectsUuids()) AS allowedObjId
             ON target.uuid = allowedObjId;
 
 This view cannot is not updatable automatically,
@@ -671,9 +671,9 @@ Access Control for business objects checked according to the assigned roles.
 But we decided not to create such roles and permissions for the RBAC-Objects itself.
 It would have overcomplicated the system and the necessary information can easily be added to the RBAC-Objects itself, mostly the `RbacGrant`s.
 
-### RbacSubject
+### RbacUser
 
-Users can self-register, thus to create a new RbacSubject entity, no login is required.
+Users can self-register, thus to create a new RbacUser entity, no login is required.
 But such a user has no access-rights except viewing itself.
 
 Users can view themselves.

sql/historization.sql

@@ -24,13 +24,13 @@ delete from hs_hosting_asset where uuid='5aea68d2-3b55-464f-8362-b05c76c5a681'::
 commit;
 
 -- single version at point in time
--- set hsadminng.tx_history_txid to (select max(txid) from base.tx_context where txtimestamp<='2024-08-27 12:13:13.450821');
+-- set hsadminng.tx_history_txid to (select max(txid) from tx_context where txtimestamp<='2024-08-27 12:13:13.450821');
 set hsadminng.tx_history_txid to '';
 set hsadminng.tx_history_timestamp to '2024-08-29 12:42';
 -- all versions
-select base.tx_history_txid(), txc.txtimestamp, txc.currentSubject, txc.currentTask, haex.*
+select tx_history_txid(), txc.txtimestamp, txc.currentUser, txc.currentTask, haex.*
     from hs_hosting_asset_ex haex
-             join base.tx_context txc on haex.txid=txc.txid
+             join tx_context txc on haex.txid=txc.txid
     where haex.identifier = 'test@thi.example.org';
 
 select uuid, version, type, identifier, caption from hs_hosting_asset_hv p where identifier = 'test@thi.example.org';

sql/rbac-tests.sql

@@ -3,28 +3,28 @@
 -- --------------------------------------------------------
 
 
-select rbac.isGranted(rbac.findRoleId('administrators'), rbac.findRoleId('rbactest.package#aaa00:OWNER'));
-select rbac.isGranted(rbac.findRoleId('rbactest.package#aaa00:OWNER'), rbac.findRoleId('administrators'));
--- call rbac.grantRoleToRole(findRoleId('rbactest.package#aaa00:OWNER'), findRoleId('administrators'));
--- call rbac.grantRoleToRole(findRoleId('administrators'), findRoleId('rbactest.package#aaa00:OWNER'));
+select isGranted(findRoleId('administrators'), findRoleId('test_package#aaa00:OWNER'));
+select isGranted(findRoleId('test_package#aaa00:OWNER'), findRoleId('administrators'));
+-- call grantRoleToRole(findRoleId('test_package#aaa00:OWNER'), findRoleId('administrators'));
+-- call grantRoleToRole(findRoleId('administrators'), findRoleId('test_package#aaa00:OWNER'));
 
 select count(*)
-FROM rbac.queryAllPermissionsOfSubjectIdForObjectUuids(rbac.findRbacSubject('superuser-fran@hostsharing.net'),
-                                                  ARRAY(select uuid from rbactest.customer where reference < 1100000));
+FROM queryAllPermissionsOfSubjectIdForObjectUuids(findRbacUser('superuser-fran@hostsharing.net'),
+                                                  ARRAY(select uuid from customer where reference < 1100000));
 select count(*)
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('superuser-fran@hostsharing.net'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('superuser-fran@hostsharing.net'));
 select *
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('alex@example.com'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('alex@example.com'));
 select *
-FROM rbac.queryAllPermissionsOfSubjectId(findRbacSubject('rosa@example.com'));
+FROM queryAllPermissionsOfSubjectId(findRbacUser('rosa@example.com'));
 
 select *
-FROM rbac.queryAllRbacSubjectsWithPermissionsFor(rbac.findEffectivePermissionId('customer',
-                                                          (SELECT uuid FROM rbac.RbacObject WHERE objectTable = 'customer' LIMIT 1),
+FROM queryAllRbacUsersWithPermissionsFor(findEffectivePermissionId('customer',
+                                                          (SELECT uuid FROM RbacObject WHERE objectTable = 'customer' LIMIT 1),
                                                           'add-package'));
 select *
-FROM rbac.queryAllRbacSubjectsWithPermissionsFor(rbac.findEffectivePermissionId('package',
-                                                          (SELECT uuid FROM rbac.RbacObject WHERE objectTable = 'package' LIMIT 1),
+FROM queryAllRbacUsersWithPermissionsFor(findEffectivePermissionId('package',
+                                                          (SELECT uuid FROM RbacObject WHERE objectTable = 'package' LIMIT 1),
                                                           'DELETE'));
 
 DO LANGUAGE plpgsql
@@ -33,13 +33,13 @@ $$
         userId uuid;
         result bool;
     BEGIN
-        userId = rbac.findRbacSubject('superuser-alex@hostsharing.net');
-        result = (SELECT * FROM rbac.isPermissionGrantedToSubject(rbac.findPermissionId('package', 94928, 'add-package'), userId));
+        userId = findRbacUser('superuser-alex@hostsharing.net');
+        result = (SELECT * FROM isPermissionGrantedToSubject(findPermissionId('package', 94928, 'add-package'), userId));
         IF (result) THEN
             RAISE EXCEPTION 'expected permission NOT to be granted, but it is';
         end if;
 
-        result = (SELECT * FROM rbac.isPermissionGrantedToSubject(rbac.findPermissionId('package', 94928, 'SELECT'), userId));
+        result = (SELECT * FROM isPermissionGrantedToSubject(findPermissionId('package', 94928, 'SELECT'), userId));
         IF (NOT result) THEN
             RAISE EXCEPTION 'expected permission to be granted, but it is NOT';
         end if;

sql/rbac-view-option-experiments.sql

@@ -20,43 +20,43 @@ CREATE POLICY customer_policy ON customer
     TO restricted
     USING (
         -- id=1000
-        rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('rbactest.customer', id, 'SELECT'), rbac.currentSubjectUuid())
+        isPermissionGrantedToSubject(findEffectivePermissionId('test_customer', id, 'SELECT'), currentUserUuid())
     );
 
 SET SESSION AUTHORIZATION restricted;
-SET hsadminng.currentSubject TO 'alex@example.com';
+SET hsadminng.currentUser TO 'alex@example.com';
 SELECT * from customer;
 
 -- access control via view-rule and isPermissionGrantedToSubject - way too slow (35 s 580 ms for 1 million rows)
 SET SESSION SESSION AUTHORIZATION DEFAULT;
 DROP VIEW cust_view;
 CREATE VIEW cust_view AS
-SELECT * FROM rbactest.customer;
+SELECT * FROM customer;
 CREATE OR REPLACE RULE "_RETURN" AS
     ON SELECT TO cust_view
     DO INSTEAD
-    SELECT * FROM rbactest.customer WHERE rbac.isPermissionGrantedToSubject(rbac.findEffectivePermissionId('rbactest.customer', id, 'SELECT'), rbac.currentSubjectUuid());
+    SELECT * FROM customer WHERE isPermissionGrantedToSubject(findEffectivePermissionId('test_customer', id, 'SELECT'), currentUserUuid());
 SELECT * from cust_view LIMIT 10;
 
-select rbac.queryAllPermissionsOfSubjectId(findRbacSubject('superuser-alex@hostsharing.net'));
+select queryAllPermissionsOfSubjectId(findRbacUser('superuser-alex@hostsharing.net'));
 
 -- access control via view-rule with join to recursive permissions - really fast (38ms for 1 million rows)
 SET SESSION SESSION AUTHORIZATION DEFAULT;
-ALTER TABLE rbactest.customer ENABLE ROW LEVEL SECURITY;
+ALTER TABLE customer ENABLE ROW LEVEL SECURITY;
 DROP VIEW IF EXISTS cust_view;
 CREATE OR REPLACE VIEW cust_view AS
 SELECT *
-FROM rbactest.customer;
+FROM customer;
 CREATE OR REPLACE RULE "_RETURN" AS
     ON SELECT TO cust_view
     DO INSTEAD
-    SELECT c.uuid, c.reference, c.prefix FROM rbactest.customer AS c
-      JOIN rbac.queryAllPermissionsOfSubjectId(rbac.currentSubjectUuid()) AS p
-           ON p.objectTable='rbactest.customer' AND p.objectUuid=c.uuid;
+    SELECT c.uuid, c.reference, c.prefix FROM customer AS c
+      JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
+           ON p.objectTable='test_customer' AND p.objectUuid=c.uuid;
 GRANT ALL PRIVILEGES ON cust_view TO restricted;
 
 SET SESSION SESSION AUTHORIZATION restricted;
-SET hsadminng.currentSubject TO 'alex@example.com';
+SET hsadminng.currentUser TO 'alex@example.com';
 SELECT * from cust_view;
 
 
@@ -67,23 +67,23 @@ DROP VIEW IF EXISTS cust_view;
 CREATE OR REPLACE VIEW cust_view AS
     SELECT c.uuid, c.reference, c.prefix
       FROM customer AS c
-      JOIN queryAllPermissionsOfSubjectId(rbac.currentSubjectUuid()) AS p
+      JOIN queryAllPermissionsOfSubjectId(currentUserUuid()) AS p
            ON p.objectUuid=c.uuid;
 GRANT ALL PRIVILEGES ON cust_view TO restricted;
 
 SET SESSION SESSION AUTHORIZATION restricted;
--- SET hsadminng.currentSubject TO 'alex@example.com';
-SET hsadminng.currentSubject TO 'superuser-alex@hostsharing.net';
--- SET hsadminng.currentSubject TO 'aaaaouq@example.com';
+-- SET hsadminng.currentUser TO 'alex@example.com';
+SET hsadminng.currentUser TO 'superuser-alex@hostsharing.net';
+-- SET hsadminng.currentUser TO 'aaaaouq@example.com';
 SELECT * from cust_view where reference=1144150;
 
-select rr.uuid, rr.type from rbac.RbacGrants g
-    join rbac.RbacReference RR on g.ascendantUuid = RR.uuid
+select rr.uuid, rr.type from RbacGrants g
+    join RbacReference RR on g.ascendantUuid = RR.uuid
     where g.descendantUuid in (
-        select uuid from rbac.queryAllPermissionsOfSubjectId(findRbacSubject('alex@example.com'))
-            where objectTable='rbactest.customer');
+        select uuid from queryAllPermissionsOfSubjectId(findRbacUser('alex@example.com'))
+            where objectTable='test_customer');
 
-call rbac.grantRoleToUser(rbac.findRoleId('rbactest.customer#aaa:ADMIN'), rbac.findRbacSubject('aaaaouq@example.com'));
+call grantRoleToUser(findRoleId('test_customer#aaa:ADMIN'), findRbacUser('aaaaouq@example.com'));
 
-select rbac.queryAllPermissionsOfSubjectId(findRbacSubject('aaaaouq@example.com'));
+select queryAllPermissionsOfSubjectId(findRbacUser('aaaaouq@example.com'));
 

sql/recursive-cte-experiments-for-accessible-uuids.sql

@@ -1,6 +1,6 @@
 -- just a permanent playground to explore optimization of the central recursive CTE query for RBAC
 
-select * from hs_statistics_v;
+select * from hs_statistics_view;
 
 -- ========================================================
 
@@ -17,7 +17,7 @@ with recursive
                         1 as level,
                         true
             from rbacgrants
-            where (rbacgrants.ascendantuuid = any (rbac.currentSubjectOrAssumedRolesUuids()))
+            where (rbacgrants.ascendantuuid = any (currentsubjectsuuids()))
               and rbacgrants.assumed
         union all
         select distinct g.descendantuuid,

src/main/java/net/hostsharing/hsadminng/context/Context.java

@@ -38,53 +38,53 @@ public class Context {
     private HttpServletRequest request;
 
     @Transactional(propagation = MANDATORY)
-    public void define(final String currentSubject) {
-        define(currentSubject, null);
+    public void define(final String currentUser) {
+        define(currentUser, null);
     }
 
     @Transactional(propagation = MANDATORY)
-    public void define(final String currentSubject, final String assumedRoles) {
-        define(toTask(request), toCurl(request), currentSubject, assumedRoles);
+    public void define(final String currentUser, final String assumedRoles) {
+        define(toTask(request), toCurl(request), currentUser, assumedRoles);
     }
 
     @Transactional(propagation = MANDATORY)
     public void define(
             final String currentTask,
             final String currentRequest,
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles) {
         final var query = em.createNativeQuery("""
-                call base.defineContext(
+                call defineContext(
                     cast(:currentTask as varchar(127)),
                     cast(:currentRequest as text),
-                    cast(:currentSubject as varchar(63)),
+                    cast(:currentUser as varchar(63)),
                     cast(:assumedRoles as varchar(1023)));
                 """);
         query.setParameter("currentTask", shortenToMaxLength(currentTask, 127));
         query.setParameter("currentRequest", currentRequest);
-        query.setParameter("currentSubject", currentSubject);
+        query.setParameter("currentUser", currentUser);
         query.setParameter("assumedRoles", assumedRoles != null ? assumedRoles : "");
         query.executeUpdate();
     }
 
-    public String fetchCurrentTask() {
+    public String getCurrentTask() {
         return (String) em.createNativeQuery("select current_setting('hsadminng.currentTask');").getSingleResult();
     }
 
-    public String fetchCurrentSubject() {
-        return String.valueOf(em.createNativeQuery("select base.currentSubject()").getSingleResult());
+    public String getCurrentUser() {
+        return String.valueOf(em.createNativeQuery("select currentUser()").getSingleResult());
     }
 
-    public UUID fetchCurrentSubjectUuid() {
-        return (UUID) em.createNativeQuery("select rbac.currentSubjectUuid()", UUID.class).getSingleResult();
+    public UUID getCurrentUserUUid() {
+        return (UUID) em.createNativeQuery("select currentUserUUid()", UUID.class).getSingleResult();
     }
 
-    public String[] fetchAssumedRoles() {
-        return (String[]) em.createNativeQuery("select base.assumedRoles() as roles", String[].class).getSingleResult();
+    public String[] getAssumedRoles() {
+        return (String[]) em.createNativeQuery("select assumedRoles() as roles", String[].class).getSingleResult();
     }
 
-    public UUID[] fetchCurrentSubjectOrAssumedRolesUuids() {
-        return (UUID[]) em.createNativeQuery("select rbac.currentSubjectOrAssumedRolesUuids() as uuids", UUID[].class).getSingleResult();
+    public UUID[] currentSubjectsUuids() {
+        return (UUID[]) em.createNativeQuery("select currentSubjectsUuids() as uuids", UUID[].class).getSingleResult();
     }
 
     public static String getCallerMethodNameFromStackFrame(final int skipFrames) {

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItem.java

@@ -14,7 +14,7 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
 import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemController.java

@@ -41,10 +41,10 @@ public class HsBookingItemController implements HsBookingItemsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsBookingItemResource>> listBookingItemsByProjectUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID projectUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = bookingItemRepo.findAllByProjectUuid(projectUuid);
 
@@ -55,11 +55,11 @@ public class HsBookingItemController implements HsBookingItemsApi {
     @Override
     @Transactional
     public ResponseEntity<HsBookingItemResource> addBookingItem(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsBookingItemInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsBookingItemRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
 
@@ -77,11 +77,11 @@ public class HsBookingItemController implements HsBookingItemsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsBookingItemResource> getBookingItemByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingItemUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bookingItemRepo.findByUuid(bookingItemUuid);
         result.ifPresent(entity -> em.detach(entity)); // prevent further LAZY-loading
@@ -94,10 +94,10 @@ public class HsBookingItemController implements HsBookingItemsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteBookingIemByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingItemUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bookingItemRepo.deleteByUuid(bookingItemUuid);
         return result == 0
@@ -108,12 +108,12 @@ public class HsBookingItemController implements HsBookingItemsApi {
     @Override
     @Transactional
     public ResponseEntity<HsBookingItemResource> patchBookingItem(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingItemUuid,
             final HsBookingItemPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = bookingItemRepo.findByUuid(bookingItemUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/booking/item/HsBookingItemRbacEntity.java

@@ -4,9 +4,9 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.hs.booking.project.HsBookingProjectRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.AttributeOverride;
 import jakarta.persistence.AttributeOverrides;
@@ -15,20 +15,19 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
 @Table(name = "hs_booking_item_rv")
@@ -46,10 +45,10 @@ public class HsBookingItemRbacEntity extends HsBookingItem {
                 .withIdentityView(SQL.projection("caption"))
                 .withRestrictedViewOrderBy(SQL.expression("validity"))
                 .withUpdatableColumns("version", "caption", "validity", "resources")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?
-                .toRole(GLOBAL, ADMIN).grantPermission(DELETE)
+                .toRole("global", ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?
+                .toRole("global", ADMIN).grantPermission(DELETE)
 
-                .importEntityAlias("project", HsBookingProjectRbacEntity.class, usingDefaultCase(),
+                .importEntityAlias("project", HsBookingProject.class, usingDefaultCase(),
                         dependsOnColumn("projectUuid"),
                         directlyFetchedByDependsOnColumn(),
                         NULLABLE)
@@ -75,7 +74,7 @@ public class HsBookingItemRbacEntity extends HsBookingItem {
                     with.permission(SELECT);
                 })
 
-                .limitDiagramTo("bookingItem", "project", "rbac.global");
+                .limitDiagramTo("bookingItem", "project", "global");
     }
 
     public static void main(String[] args) throws IOException {

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProject.java

@@ -5,9 +5,9 @@ import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.booking.debitor.HsBookingDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -17,16 +17,15 @@ import java.util.UUID;
 
 import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @MappedSuperclass
@@ -68,11 +67,11 @@ public abstract class HsBookingProject implements Stringifyable, BaseEntity<HsBo
     }
 
     public static RbacView rbac() {
-        return rbacViewFor("project", HsBookingProjectRbacEntity.class)
+        return rbacViewFor("project", HsBookingProject.class)
                 .withIdentityView(SQL.query("""
-                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || base.cleanIdentifier(bookingProject.caption) as idName
+                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || cleanIdentifier(bookingProject.caption) as idName
                             FROM hs_booking_project bookingProject
-                            JOIN hs_office.debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
+                            JOIN hs_office_debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
                         """))
                 .withRestrictedViewOrderBy(SQL.expression("caption"))
                 .withUpdatableColumns("version", "caption")
@@ -86,13 +85,13 @@ public abstract class HsBookingProject implements Stringifyable, BaseEntity<HsBo
                         dependsOnColumn("debitorUuid"),
                         fetchedBySql("""
                                 SELECT ${columns}
-                                    FROM hs_office.relation debitorRel
-                                    JOIN hs_office.debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
+                                    FROM hs_office_relation debitorRel
+                                    JOIN hs_office_debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
                                     WHERE debitor.uuid = ${REF}.debitorUuid
                                 """),
                         NOT_NULL)
                 .toRole("debitorRel", ADMIN).grantPermission(INSERT)
-                .toRole(GLOBAL, ADMIN).grantPermission(DELETE)
+                .toRole("global", ADMIN).grantPermission(DELETE)
 
                 .createRole(OWNER, (with) -> {
                     with.incomingSuperRole("debitorRel", AGENT).unassumed();
@@ -106,7 +105,7 @@ public abstract class HsBookingProject implements Stringifyable, BaseEntity<HsBo
                     with.permission(SELECT);
                 })
 
-                .limitDiagramTo("project", "debitorRel", "rbac.global");
+                .limitDiagramTo("project", "debitorRel", "global");
     }
 
     public static void main(String[] args) throws IOException {

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectController.java

@@ -36,10 +36,10 @@ public class HsBookingProjectController implements HsBookingProjectsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsBookingProjectResource>> listBookingProjectsByDebitorUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID debitorUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = bookingProjectRepo.findAllByDebitorUuid(debitorUuid);
 
@@ -50,11 +50,11 @@ public class HsBookingProjectController implements HsBookingProjectsApi {
     @Override
     @Transactional
     public ResponseEntity<HsBookingProjectResource> addBookingProject(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsBookingProjectInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsBookingProjectRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
 
@@ -72,11 +72,11 @@ public class HsBookingProjectController implements HsBookingProjectsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsBookingProjectResource> getBookingProjectByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingProjectUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bookingProjectRepo.findByUuid(bookingProjectUuid);
         return result
@@ -88,10 +88,10 @@ public class HsBookingProjectController implements HsBookingProjectsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteBookingIemByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingProjectUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bookingProjectRepo.deleteByUuid(bookingProjectUuid);
         return result == 0
@@ -102,12 +102,12 @@ public class HsBookingProjectController implements HsBookingProjectsApi {
     @Override
     @Transactional
     public ResponseEntity<HsBookingProjectResource> patchBookingProject(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bookingProjectUuid,
             final HsBookingProjectPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = bookingProjectRepo.findByUuid(bookingProjectUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/booking/project/HsBookingProjectRbacEntity.java

@@ -6,30 +6,29 @@ import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;
 
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
 @Table(name = "hs_booking_project_rv")
@@ -42,9 +41,9 @@ public class HsBookingProjectRbacEntity extends HsBookingProject {
     public static RbacView rbac() {
         return rbacViewFor("project", HsBookingProjectRbacEntity.class)
                 .withIdentityView(SQL.query("""
-                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || base.cleanIdentifier(bookingProject.caption) as idName
+                        SELECT bookingProject.uuid as uuid, debitorIV.idName || '-' || cleanIdentifier(bookingProject.caption) as idName
                             FROM hs_booking_project bookingProject
-                            JOIN hs_office.debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
+                            JOIN hs_office_debitor_iv debitorIV ON debitorIV.uuid = bookingProject.debitorUuid
                         """))
                 .withRestrictedViewOrderBy(SQL.expression("caption"))
                 .withUpdatableColumns("version", "caption")
@@ -58,13 +57,13 @@ public class HsBookingProjectRbacEntity extends HsBookingProject {
                         dependsOnColumn("debitorUuid"),
                         fetchedBySql("""
                                 SELECT ${columns}
-                                    FROM hs_office.relation debitorRel
-                                    JOIN hs_office.debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
+                                    FROM hs_office_relation debitorRel
+                                    JOIN hs_office_debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
                                     WHERE debitor.uuid = ${REF}.debitorUuid
                                 """),
                         NOT_NULL)
                 .toRole("debitorRel", ADMIN).grantPermission(INSERT)
-                .toRole(GLOBAL, ADMIN).grantPermission(DELETE)
+                .toRole("global", ADMIN).grantPermission(DELETE)
 
                 .createRole(OWNER, (with) -> {
                     with.incomingSuperRole("debitorRel", AGENT).unassumed();
@@ -78,7 +77,7 @@ public class HsBookingProjectRbacEntity extends HsBookingProject {
                     with.permission(SELECT);
                 })
 
-                .limitDiagramTo("project", "debitorRel", "rbac.global");
+                .limitDiagramTo("project", "debitorRel", "global");
     }
 
     public static void main(String[] args) throws IOException {

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAsset.java

@@ -14,7 +14,7 @@ import net.hostsharing.hsadminng.hs.booking.project.HsBookingProject;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.validation.PropertiesProvider;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetController.java

@@ -49,12 +49,12 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsHostingAssetResource>> listAssets(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID debitorUuid,
             final UUID parentAssetUuid,
             final HsHostingAssetTypeResource type) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = rbacAssetRepo.findAllByCriteria(debitorUuid, parentAssetUuid, HsHostingAssetType.of(type));
 
@@ -66,11 +66,11 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
     @Override
     @Transactional
     public ResponseEntity<HsHostingAssetResource> addAsset(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsHostingAssetInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entity = mapper.map(body, HsHostingAssetRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
 
@@ -94,11 +94,11 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsHostingAssetResource> getAssetByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID assetUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = rbacAssetRepo.findByUuid(assetUuid);
         return result
@@ -110,10 +110,10 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteAssetUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID assetUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = rbacAssetRepo.deleteByUuid(assetUuid);
         return result == 0
@@ -124,12 +124,12 @@ public class HsHostingAssetController implements HsHostingAssetsApi {
     @Override
     @Transactional
     public ResponseEntity<HsHostingAssetResource> patchAsset(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID assetUuid,
             final HsHostingAssetPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entity = rbacAssetRepo.findByUuid(assetUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/hosting/asset/HsHostingAssetRbacEntity.java

@@ -4,33 +4,33 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.experimental.SuperBuilder;
-import net.hostsharing.hsadminng.hs.booking.item.HsBookingItemRbacEntity;
+import net.hostsharing.hsadminng.hs.booking.item.HsBookingItem;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.CaseDef.inCaseOf;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.GUEST;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.REFERRER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef.inCaseOf;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.GUEST;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.REFERRER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
 @Table(name = "hs_hosting_asset_rv")
@@ -47,7 +47,7 @@ public class HsHostingAssetRbacEntity extends HsHostingAsset {
                 .withUpdatableColumns("version", "caption", "config", "assignedToAssetUuid", "alarmContactUuid")
                 .toRole(GLOBAL, ADMIN).grantPermission(INSERT) // TODO.impl: Why is this necessary to insert test data?
 
-                .importEntityAlias("bookingItem", HsBookingItemRbacEntity.class, usingDefaultCase(),
+                .importEntityAlias("bookingItem", HsBookingItem.class, usingDefaultCase(),
                         dependsOnColumn("bookingItemUuid"),
                         directlyFetchedByDependsOnColumn(),
                         NULLABLE)
@@ -106,7 +106,7 @@ public class HsHostingAssetRbacEntity extends HsHostingAsset {
                         "parentAsset",
                         "assignedToAsset",
                         "alarmContact",
-                        "rbac.global");
+                        "global");
     }
 
     public static void main(String[] args) throws IOException {

src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountController.java

@@ -32,10 +32,10 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeBankAccountResource>> listBankAccounts(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String holder) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = bankAccountRepo.findByOptionalHolderLike(holder);
 
@@ -46,11 +46,11 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeBankAccountResource> addBankAccount(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeBankAccountInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         IbanUtil.validate(body.getIban());
         BicUtil.validate(body.getBic());
@@ -72,11 +72,11 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeBankAccountResource> getBankAccountByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID bankAccountUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bankAccountRepo.findByUuid(bankAccountUuid);
         if (result.isEmpty()) {
@@ -88,10 +88,10 @@ public class HsOfficeBankAccountController implements HsOfficeBankAccountsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteBankAccountByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID BankAccountUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = bankAccountRepo.deleteByUuid(BankAccountUuid);
         if (result == 0) {

src/main/java/net/hostsharing/hsadminng/hs/office/bankaccount/HsOfficeBankAccountEntity.java

@@ -3,8 +3,8 @@ package net.hostsharing.hsadminng.hs.office.bankaccount;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -12,14 +12,14 @@ import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "bankaccount_rv")
+@Table(name = "hs_office_bankaccount_rv")
 @Getter
 @Setter
 @Builder
@@ -62,7 +62,7 @@ public class HsOfficeBankAccountEntity implements BaseEntity<HsOfficeBankAccount
                 .withIdentityView(SQL.projection("iban"))
                 .withUpdatableColumns("holder", "iban", "bic")
 
-                .toRole(GLOBAL, GUEST).grantPermission(INSERT)
+                .toRole("global", GUEST).grantPermission(INSERT)
 
                 .createRole(OWNER, (with) -> {
                     with.owningUser(CREATOR);

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContact.java

@@ -11,7 +11,7 @@ import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.mapper.PatchableMapWrapper;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactController.java

@@ -34,10 +34,10 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeContactResource>> listContacts(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String caption) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = contactRepo.findContactByOptionalCaptionLike(caption);
 
@@ -48,11 +48,11 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeContactResource> addContact(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeContactInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsOfficeContactRbacEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
 
@@ -70,11 +70,11 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeContactResource> getContactByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID contactUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = contactRepo.findByUuid(contactUuid);
         if (result.isEmpty()) {
@@ -86,10 +86,10 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteContactByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID contactUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = contactRepo.deleteByUuid(contactUuid);
         if (result == 0) {
@@ -102,12 +102,12 @@ public class HsOfficeContactController implements HsOfficeContactsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeContactResource> patchContact(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID contactUuid,
             final HsOfficeContactPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = contactRepo.findByUuid(contactUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRbacEntity.java

@@ -3,20 +3,20 @@ package net.hostsharing.hsadminng.hs.office.contact;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.*;
 import java.io.IOException;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
-@Table(schema = "hs_office", name = "contact_rv")
+@Table(name = "hs_office_contact_rv")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/net/hostsharing/hsadminng/hs/office/contact/HsOfficeContactRealEntity.java

@@ -10,7 +10,7 @@ import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 
 @Entity
-@Table(schema = "hs_office", name = "contact")
+@Table(name = "hs_office_contact")
 @Getter
 @Setter
 @NoArgsConstructor

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionController.java

@@ -37,12 +37,12 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeCoopAssetsTransactionResource>> listCoopAssets(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID membershipUuid,
             final @DateTimeFormat(iso = ISO.DATE) LocalDate fromValueDate,
             final @DateTimeFormat(iso = ISO.DATE) LocalDate toValueDate) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = coopAssetsTransactionRepo.findCoopAssetsTransactionByOptionalMembershipUuidAndDateRange(
                 membershipUuid,
@@ -56,11 +56,11 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
     @Override
     @Transactional
     public ResponseEntity<HsOfficeCoopAssetsTransactionResource> addCoopAssetsTransaction(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeCoopAssetsTransactionInsertResource requestBody) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
         validate(requestBody);
 
         final var entityToSave = mapper.map(requestBody, HsOfficeCoopAssetsTransactionEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
@@ -79,9 +79,9 @@ public class HsOfficeCoopAssetsTransactionController implements HsOfficeCoopAsse
     @Transactional(readOnly = true)
 
     public ResponseEntity<HsOfficeCoopAssetsTransactionResource> getCoopAssetTransactionByUuid(
-        final String currentSubject, final String assumedRoles, final UUID assetTransactionUuid) {
+        final String currentUser, final String assumedRoles, final UUID assetTransactionUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = coopAssetsTransactionRepo.findByUuid(assetTransactionUuid);
         if (result.isEmpty()) {

src/main/java/net/hostsharing/hsadminng/hs/office/coopassets/HsOfficeCoopAssetsTransactionEntity.java

@@ -8,8 +8,8 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
@@ -21,20 +21,20 @@ import java.time.LocalDate;
 import java.util.UUID;
 
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "coopassetstransaction_rv")
+@Table(name = "hs_office_coopassetstransaction_rv")
 @Getter
 @Setter
 @Builder

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionController.java

@@ -39,12 +39,12 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeCoopSharesTransactionResource>> listCoopShares(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID membershipUuid,
             final @DateTimeFormat(iso = ISO.DATE) LocalDate fromValueDate,
             final @DateTimeFormat(iso = ISO.DATE) LocalDate toValueDate) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = coopSharesTransactionRepo.findCoopSharesTransactionByOptionalMembershipUuidAndDateRange(
                 membershipUuid,
@@ -58,11 +58,11 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
     @Override
     @Transactional
     public ResponseEntity<HsOfficeCoopSharesTransactionResource> addCoopSharesTransaction(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeCoopSharesTransactionInsertResource requestBody) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
         validate(requestBody);
 
         final var entityToSave = mapper.map(requestBody, HsOfficeCoopSharesTransactionEntity.class, RESOURCE_TO_ENTITY_POSTMAPPER);
@@ -81,9 +81,9 @@ public class HsOfficeCoopSharesTransactionController implements HsOfficeCoopShar
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeCoopSharesTransactionResource> getCoopShareTransactionByUuid(
-        final String currentSubject, final String assumedRoles, final UUID shareTransactionUuid) {
+        final String currentUser, final String assumedRoles, final UUID shareTransactionUuid) {
 
-            context.define(currentSubject, assumedRoles);
+            context.define(currentUser, assumedRoles);
 
             final var result = coopSharesTransactionRepo.findByUuid(shareTransactionUuid);
             if (result.isEmpty()) {

src/main/java/net/hostsharing/hsadminng/hs/office/coopshares/HsOfficeCoopSharesTransactionEntity.java

@@ -7,9 +7,9 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.membership.HsOfficeMembershipEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -19,20 +19,20 @@ import java.time.LocalDate;
 import java.util.UUID;
 
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "coopsharestransaction_rv")
+@Table(name = "hs_office_coopsharestransaction_rv")
 @Getter
 @Setter
 @Builder

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorController.java

@@ -8,7 +8,7 @@ import net.hostsharing.hsadminng.hs.office.generated.api.v1.model.HsOfficeDebito
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealRepository;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import org.apache.commons.lang3.Validate;
 import org.hibernate.Hibernate;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,11 +48,11 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeDebitorResource>> listDebitors(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String name,
             final Integer debitorNumber) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = debitorNumber != null
                 ? debitorRepo.findDebitorByDebitorNumber(debitorNumber)
@@ -65,11 +65,11 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeDebitorResource> addDebitor(
-            String currentSubject,
+            String currentUser,
             String assumedRoles,
             HsOfficeDebitorInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         Validate.isTrue(body.getDebitorRel() == null || body.getDebitorRelUuid() == null,
                 "ERROR: [400] exactly one of debitorRel and debitorRelUuid must be supplied, but found both");
@@ -112,11 +112,11 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeDebitorResource> getDebitorByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID debitorUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = debitorRepo.findByUuid(debitorUuid);
         if (result.isEmpty()) {
@@ -128,10 +128,10 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteDebitorByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID debitorUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = debitorRepo.deleteByUuid(debitorUuid);
         if (result == 0) {
@@ -144,12 +144,12 @@ public class HsOfficeDebitorController implements HsOfficeDebitorsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeDebitorResource> patchDebitor(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID debitorUuid,
             final HsOfficeDebitorPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = debitorRepo.findByUuid(debitorUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/debitor/HsOfficeDebitorEntity.java

@@ -11,9 +11,9 @@ import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelation;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.GenericGenerator;
@@ -40,21 +40,20 @@ import static jakarta.persistence.CascadeType.PERSIST;
 import static jakarta.persistence.CascadeType.REFRESH;
 import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NULLABLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NULLABLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "debitor_rv")
+@Table(name = "hs_office_debitor_rv")
 @Getter
 @Setter
 @Builder(toBuilder = true)
@@ -87,10 +86,10 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
         value = """
             (
                 SELECT DISTINCT partner.uuid
-                FROM hs_office.partner_rv partner
-                JOIN hs_office.relation_rv dRel
+                FROM hs_office_partner_rv partner
+                JOIN hs_office_relation_rv dRel
                     ON dRel.uuid = debitorreluuid AND dRel.type = 'DEBITOR'
-                JOIN hs_office.relation_rv pRel
+                JOIN hs_office_relation_rv pRel
                     ON pRel.uuid = partner.partnerRelUuid AND pRel.type = 'PARTNER'
                 WHERE pRel.holderUuid = dRel.anchorUuid
             )
@@ -170,14 +169,14 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
                 .withIdentityView(SQL.query("""
                         SELECT debitor.uuid AS uuid,
                                     'D-' || (SELECT partner.partnerNumber
-                                            FROM hs_office.partner partner
-                                            JOIN hs_office.relation partnerRel
+                                            FROM hs_office_partner partner
+                                            JOIN hs_office_relation partnerRel
                                                 ON partnerRel.uuid = partner.partnerRelUUid AND partnerRel.type = 'PARTNER'
-                                            JOIN hs_office.relation debitorRel
+                                            JOIN hs_office_relation debitorRel
                                                 ON debitorRel.anchorUuid = partnerRel.holderUuid AND debitorRel.type = 'DEBITOR'
                                             WHERE debitorRel.uuid = debitor.debitorRelUuid)
                                          || debitorNumberSuffix as idName
-                        FROM hs_office.debitor AS debitor
+                        FROM hs_office_debitor AS debitor
                         """))
                 .withRestrictedViewOrderBy(SQL.projection("defaultPrefix"))
                 .withUpdatableColumns(
@@ -189,7 +188,7 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
                         "vatBusiness",
                         "vatReverseCharge",
                         "defaultPrefix")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)
 
                 .importRootEntityAliasProxy("debitorRel", HsOfficeRelationRbacEntity.class, usingCase(DEBITOR),
                         directlyFetchedByDependsOnColumn(),
@@ -209,8 +208,8 @@ public class HsOfficeDebitorEntity implements BaseEntity<HsOfficeDebitorEntity>,
                         dependsOnColumn("debitorRelUuid"),
                         fetchedBySql("""
                                 SELECT ${columns}
-                                    FROM hs_office.relation AS partnerRel
-                                    JOIN hs_office.relation AS debitorRel
+                                    FROM hs_office_relation AS partnerRel
+                                    JOIN hs_office_relation AS debitorRel
                                         ON debitorRel.type = 'DEBITOR' AND debitorRel.anchorUuid = partnerRel.holderUuid
                                     WHERE partnerRel.type = 'PARTNER'
                                         AND ${REF}.debitorRelUuid = debitorRel.uuid

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipController.java

@@ -32,11 +32,11 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeMembershipResource>> listMemberships(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             UUID partnerUuid,
             Integer memberNumber) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = ( memberNumber != null)
                     ? List.of(membershipRepo.findMembershipByMemberNumber(memberNumber))
@@ -50,11 +50,11 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeMembershipResource> addMembership(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeMembershipInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsOfficeMembershipEntity.class);
 
@@ -73,11 +73,11 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeMembershipResource> getMembershipByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID membershipUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = membershipRepo.findByUuid(membershipUuid);
         if (result.isEmpty()) {
@@ -90,10 +90,10 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteMembershipByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID membershipUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = membershipRepo.deleteByUuid(membershipUuid);
         if (result == 0) {
@@ -106,12 +106,12 @@ public class HsOfficeMembershipController implements HsOfficeMembershipsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeMembershipResource> patchMembership(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID membershipUuid,
             final HsOfficeMembershipPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = membershipRepo.findByUuid(membershipUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/membership/HsOfficeMembershipEntity.java

@@ -9,10 +9,10 @@ import lombok.NoArgsConstructor;
 import lombok.Setter;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.hs.office.partner.HsOfficePartnerEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;
@@ -38,25 +38,24 @@ import static io.hypersistence.utils.hibernate.type.range.Range.emptyRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.lowerInclusiveFromPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.toPostgresDateRange;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.upperInclusiveFromPostgresDateRange;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.fetchedBySql;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.fetchedBySql;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "membership_rv")
+@Table(name = "hs_office_membership_rv")
 @Getter
 @Setter
 @Builder
@@ -160,8 +159,8 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
                 .withIdentityView(SQL.query("""
                         SELECT m.uuid AS uuid,
                                 'M-' || p.partnerNumber || m.memberNumberSuffix as idName
-                        FROM hs_office.membership AS m
-                        JOIN hs_office.partner AS p ON p.uuid = m.partnerUuid
+                        FROM hs_office_membership AS m
+                        JOIN hs_office_partner AS p ON p.uuid = m.partnerUuid
                         """))
                 .withRestrictedViewOrderBy(SQL.projection("validity"))
                 .withUpdatableColumns("validity", "membershipFeeBillable", "status")
@@ -170,12 +169,12 @@ public class HsOfficeMembershipEntity implements BaseEntity<HsOfficeMembershipEn
                         dependsOnColumn("partnerUuid"),
                         fetchedBySql("""
                                 SELECT ${columns}
-                                    FROM hs_office.partner AS partner
-                                    JOIN hs_office.relation AS partnerRel ON partnerRel.uuid = partner.partnerRelUuid
+                                    FROM hs_office_partner AS partner
+                                    JOIN hs_office_relation AS partnerRel ON partnerRel.uuid = partner.partnerRelUuid
                                     WHERE partner.uuid = ${REF}.partnerUuid
                                 """),
                         NOT_NULL)
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)
 
                 .createRole(OWNER, (with) -> {
                     with.owningUser(CREATOR);

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerController.java

@@ -13,7 +13,7 @@ import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealRepository;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -50,10 +50,10 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficePartnerResource>> listPartners(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String name) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = partnerRepo.findPartnerByOptionalNameLike(name);
 
@@ -64,11 +64,11 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficePartnerResource> addPartner(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficePartnerInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = createPartnerEntity(body);
 
@@ -86,11 +86,11 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficePartnerResource> getPartnerByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID partnerUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = partnerRepo.findByUuid(partnerUuid);
         if (result.isEmpty()) {
@@ -102,10 +102,10 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deletePartnerByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID partnerUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var partnerToDelete = partnerRepo.findByUuid(partnerUuid);
         if (partnerToDelete.isEmpty()) {
@@ -122,12 +122,12 @@ public class HsOfficePartnerController implements HsOfficePartnersApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficePartnerResource> patchPartner(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID partnerUuid,
             final HsOfficePartnerPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = partnerRepo.findByUuid(partnerUuid).orElseThrow();
         final var previousPartnerRel = current.getPartnerRel();

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerDetailsEntity.java

@@ -2,9 +2,9 @@ package net.hostsharing.hsadminng.hs.office.partner;
 
 import lombok.*;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 
@@ -13,14 +13,13 @@ import java.io.IOException;
 import java.time.LocalDate;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "partner_details_rv")
+@Table(name = "hs_office_partner_details_rv")
 @Getter
 @Setter
 @Builder
@@ -71,9 +70,9 @@ public class HsOfficePartnerDetailsEntity implements BaseEntity<HsOfficePartnerD
         return rbacViewFor("partnerDetails", HsOfficePartnerDetailsEntity.class)
                 .withIdentityView(SQL.query("""
                         SELECT partnerDetails.uuid as uuid, partner_iv.idName as idName
-                            FROM hs_office.partner_details AS partnerDetails
-                            JOIN hs_office.partner partner ON partner.detailsUuid = partnerDetails.uuid
-                            JOIN hs_office.partner_iv partner_iv ON partner_iv.uuid = partner.uuid
+                            FROM hs_office_partner_details AS partnerDetails
+                            JOIN hs_office_partner partner ON partner.detailsUuid = partnerDetails.uuid
+                            JOIN hs_office_partner_iv partner_iv ON partner_iv.uuid = partner.uuid
                         """))
                 .withRestrictedViewOrderBy(SQL.expression("uuid"))
                 .withUpdatableColumns(
@@ -83,7 +82,7 @@ public class HsOfficePartnerDetailsEntity implements BaseEntity<HsOfficePartnerD
                         "birthName",
                         "birthday",
                         "dateOfDeath")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)
 
                 // The grants are defined in HsOfficePartnerEntity.rbac()
                 // because they have to be changed when its partnerRel changes,

src/main/java/net/hostsharing/hsadminng/hs/office/partner/HsOfficePartnerEntity.java

@@ -10,10 +10,10 @@ import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContact;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRealEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelation;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.NotFound;
@@ -24,19 +24,18 @@ import java.io.IOException;
 import java.util.UUID;
 
 import static jakarta.persistence.CascadeType.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static java.util.Optional.ofNullable;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "partner_rv")
+@Table(name = "hs_office_partner_rv")
 @Getter
 @Setter
 @Builder
@@ -104,7 +103,7 @@ public class HsOfficePartnerEntity implements Stringifyable, BaseEntity<HsOffice
         return rbacViewFor("partner", HsOfficePartnerEntity.class)
                 .withIdentityView(SQL.projection("'P-' || partnerNumber"))
                 .withUpdatableColumns("partnerRelUuid")
-                .toRole(GLOBAL, ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)
 
                 .importRootEntityAliasProxy("partnerRel", HsOfficeRelationRbacEntity.class,
                         usingDefaultCase(),

src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonController.java

@@ -31,10 +31,10 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficePersonResource>> listPersons(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String caption) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = personRepo.findPersonByOptionalNameLike(caption);
 
@@ -45,11 +45,11 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficePersonResource> addPerson(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficePersonInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsOfficePersonEntity.class);
 
@@ -67,11 +67,11 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficePersonResource> getPersonByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID personUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = personRepo.findByUuid(personUuid);
         if (result.isEmpty()) {
@@ -83,10 +83,10 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deletePersonByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID personUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = personRepo.deleteByUuid(personUuid);
         if (result == 0) {
@@ -99,12 +99,12 @@ public class HsOfficePersonController implements HsOfficePersonsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficePersonResource> patchPerson(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID personUuid,
             final HsOfficePersonPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = personRepo.findByUuid(personUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/person/HsOfficePersonEntity.java

@@ -3,9 +3,9 @@ package net.hostsharing.hsadminng.hs.office.person;
 import lombok.*;
 import lombok.experimental.FieldNameConstants;
 import net.hostsharing.hsadminng.errors.DisplayAs;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.apache.commons.lang3.StringUtils;
@@ -14,15 +14,15 @@ import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "person_rv")
+@Table(name = "hs_office_person_rv")
 @Getter
 @Setter
 @Builder
@@ -80,7 +80,7 @@ public class HsOfficePersonEntity implements BaseEntity<HsOfficePersonEntity>, S
         return rbacViewFor("person", HsOfficePersonEntity.class)
                 .withIdentityView(SQL.projection("concat(tradeName, familyName, givenName)"))
                 .withUpdatableColumns("personType", "title", "salutation", "tradeName", "givenName", "familyName")
-                .toRole(GLOBAL, GUEST).grantPermission(INSERT)
+                .toRole("global", GUEST).grantPermission(INSERT)
 
                 .createRole(OWNER, (with) -> {
                     with.permission(DELETE);

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelation.java

@@ -5,7 +5,7 @@ import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRealEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationController.java

@@ -45,11 +45,11 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeRelationResource>> listRelations(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID personUuid,
             final HsOfficeRelationTypeResource relationType) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = relationRbacRepo.findRelationRelatedToPersonUuidAndRelationType(personUuid,
                 mapper.map(relationType, HsOfficeRelationType.class));
@@ -62,11 +62,11 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeRelationResource> addRelation(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeRelationInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = new HsOfficeRelationRbacEntity();
         entityToSave.setType(HsOfficeRelationType.valueOf(body.getType()));
@@ -96,11 +96,11 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeRelationResource> getRelationByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID relationUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = relationRbacRepo.findByUuid(relationUuid);
         if (result.isEmpty()) {
@@ -112,10 +112,10 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteRelationByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID relationUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = relationRbacRepo.deleteByUuid(relationUuid);
         if (result == 0) {
@@ -128,12 +128,12 @@ public class HsOfficeRelationController implements HsOfficeRelationsApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeRelationResource> patchRelation(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID relationUuid,
             final HsOfficeRelationPatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = relationRbacRepo.findByUuid(relationUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacEntity.java

@@ -7,34 +7,34 @@ import lombok.experimental.SuperBuilder;
 import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.contact.HsOfficeContactRbacEntity;
 import net.hostsharing.hsadminng.hs.office.person.HsOfficePersonEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import java.io.IOException;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.CaseDef.inCaseOf;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.CaseDef.inOtherCases;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.DELETE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.SELECT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.UPDATE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.AGENT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.OWNER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.REFERRER;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.TENANT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef.inCaseOf;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef.inOtherCases;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.DELETE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.SELECT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.UPDATE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.AGENT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.OWNER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.REFERRER;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.TENANT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
-@Table(schema = "hs_office", name = "relation_rv")
+@Table(name = "hs_office_relation_rv")
 @NoArgsConstructor
 @Getter
 @Setter
@@ -45,12 +45,12 @@ public class HsOfficeRelationRbacEntity extends HsOfficeRelation {
     public static RbacView rbac() {
         return rbacViewFor("relation", HsOfficeRelationRbacEntity.class)
                 .withIdentityView(SQL.projection("""
-                             (select idName from hs_office.person_iv p where p.uuid = anchorUuid)
+                             (select idName from hs_office_person_iv p where p.uuid = anchorUuid)
                              || '-with-' || target.type || '-'
-                             || (select idName from hs_office.person_iv p where p.uuid = holderUuid)
+                             || (select idName from hs_office_person_iv p where p.uuid = holderUuid)
                         """))
                 .withRestrictedViewOrderBy(SQL.expression(
-                        "(select idName from hs_office.person_iv p where p.uuid = target.holderUuid)"))
+                        "(select idName from hs_office_person_iv p where p.uuid = target.holderUuid)"))
                 .withUpdatableColumns("contactUuid")
                 .importEntityAlias("anchorPerson", HsOfficePersonEntity.class, usingDefaultCase(),
                         dependsOnColumn("anchorUuid"),

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRbacRepository.java

@@ -17,13 +17,13 @@ public interface HsOfficeRelationRbacRepository extends Repository<HsOfficeRelat
     }
 
     @Query(value = """
-            SELECT p.* FROM hs_office.relation_rv AS p
+            SELECT p.* FROM hs_office_relation_rv AS p
                 WHERE p.anchorUuid = :personUuid OR p.holderUuid = :personUuid
                """, nativeQuery = true)
     List<HsOfficeRelationRbacEntity> findRelationRelatedToPersonUuid(@NotNull UUID personUuid);
 
     @Query(value = """
-            SELECT p.* FROM hs_office.relation_rv AS p
+            SELECT p.* FROM hs_office_relation_rv AS p
                 WHERE (:relationType IS NULL OR p.type = cast(:relationType AS HsOfficeRelationType))
                     AND ( p.anchorUuid = :personUuid OR p.holderUuid = :personUuid)
                """, nativeQuery = true)

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealEntity.java

@@ -11,7 +11,7 @@ import jakarta.persistence.Table;
 
 
 @Entity
-@Table(schema = "hs_office", name = "relation")
+@Table(name = "hs_office_relation")
 @NoArgsConstructor
 @Getter
 @Setter

src/main/java/net/hostsharing/hsadminng/hs/office/relation/HsOfficeRelationRealRepository.java

@@ -17,13 +17,13 @@ public interface HsOfficeRelationRealRepository extends Repository<HsOfficeRelat
     }
 
     @Query(value = """
-            SELECT p.* FROM hs_office.relation AS p
+            SELECT p.* FROM hs_office_relation AS p
                 WHERE p.anchorUuid = :personUuid OR p.holderUuid = :personUuid
                """, nativeQuery = true)
     List<HsOfficeRelationRealEntity> findRelationRelatedToPersonUuid(@NotNull UUID personUuid);
 
     @Query(value = """
-            SELECT p.* FROM hs_office.relation AS p
+            SELECT p.* FROM hs_office_relation AS p
                 WHERE (:relationType IS NULL OR p.type = cast(:relationType AS HsOfficeRelationType))
                     AND ( p.anchorUuid = :personUuid OR p.holderUuid = :personUuid)
                """, nativeQuery = true)

src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateController.java

@@ -39,10 +39,10 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<HsOfficeSepaMandateResource>> listSepaMandatesByIban(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final String iban) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entities = sepaMandateRepo.findSepaMandateByOptionalIban(iban);
 
@@ -54,11 +54,11 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeSepaMandateResource> addSepaMandate(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final HsOfficeSepaMandateInsertResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var entityToSave = mapper.map(body, HsOfficeSepaMandateEntity.class, SEPA_MANDATE_RESOURCE_TO_ENTITY_POSTMAPPER);
 
@@ -77,11 +77,11 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<HsOfficeSepaMandateResource> getSepaMandateByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID sepaMandateUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = sepaMandateRepo.findByUuid(sepaMandateUuid);
         if (result.isEmpty()) {
@@ -94,10 +94,10 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
     @Override
     @Transactional
     public ResponseEntity<Void> deleteSepaMandateByUuid(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID sepaMandateUuid) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = sepaMandateRepo.deleteByUuid(sepaMandateUuid);
         if (result == 0) {
@@ -110,12 +110,12 @@ public class HsOfficeSepaMandateController implements HsOfficeSepaMandatesApi {
     @Override
     @Transactional
     public ResponseEntity<HsOfficeSepaMandateResource> patchSepaMandate(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID sepaMandateUuid,
             final HsOfficeSepaMandatePatchResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = sepaMandateRepo.findByUuid(sepaMandateUuid).orElseThrow();
 

src/main/java/net/hostsharing/hsadminng/hs/office/sepamandate/HsOfficeSepaMandateEntity.java

@@ -7,8 +7,8 @@ import net.hostsharing.hsadminng.errors.DisplayAs;
 import net.hostsharing.hsadminng.hs.office.bankaccount.HsOfficeBankAccountEntity;
 import net.hostsharing.hsadminng.hs.office.debitor.HsOfficeDebitorEntity;
 import net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationRbacEntity;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
 import net.hostsharing.hsadminng.stringify.Stringify;
 import net.hostsharing.hsadminng.stringify.Stringifyable;
 import org.hibernate.annotations.Type;
@@ -20,20 +20,20 @@ import java.util.UUID;
 
 import static net.hostsharing.hsadminng.hs.office.relation.HsOfficeRelationType.DEBITOR;
 import static net.hostsharing.hsadminng.mapper.PostgresDateRange.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 import static net.hostsharing.hsadminng.stringify.Stringify.stringify;
 
 @Entity
-@Table(schema = "hs_office", name = "sepamandate_rv")
+@Table(name = "hs_office_sepamandate_rv")
 @Getter
 @Setter
 @Builder
@@ -104,8 +104,8 @@ public class HsOfficeSepaMandateEntity implements Stringifyable, BaseEntity<HsOf
         return rbacViewFor("sepaMandate", HsOfficeSepaMandateEntity.class)
                 .withIdentityView(query("""
                         select sm.uuid as uuid, ba.iban || '-' || sm.validity as idName
-                            from hs_office.sepamandate sm
-                            join hs_office.bankaccount ba on ba.uuid = sm.bankAccountUuid
+                            from hs_office_sepamandate sm
+                            join hs_office_bankaccount ba on ba.uuid = sm.bankAccountUuid
                         """))
                 .withRestrictedViewOrderBy(expression("validity"))
                 .withUpdatableColumns("reference", "agreement", "validity")
@@ -114,8 +114,8 @@ public class HsOfficeSepaMandateEntity implements Stringifyable, BaseEntity<HsOf
                         dependsOnColumn("debitorUuid"),
                         fetchedBySql("""
                                 SELECT ${columns}
-                                    FROM hs_office.relation debitorRel
-                                    JOIN hs_office.debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
+                                    FROM hs_office_relation debitorRel
+                                    JOIN hs_office_debitor debitor ON debitor.debitorRelUuid = debitorRel.uuid
                                     WHERE debitor.uuid = ${REF}.debitorUuid
                                 """),
                         NOT_NULL)

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/InsertTriggerGenerator.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import java.util.Optional;
 import java.util.Set;
@@ -6,12 +6,12 @@ import java.util.function.BinaryOperator;
 import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.joining;
-import static net.hostsharing.hsadminng.rbac.generator.PostgresTriggerReference.NEW;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition.GrantType.PERM_TO_ROLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.ADMIN;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.GUEST;
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.PostgresTriggerReference.NEW;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.PERM_TO_ROLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.ADMIN;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.GUEST;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.apache.commons.lang3.StringUtils.uncapitalize;
 
@@ -46,7 +46,7 @@ public class InsertTriggerGenerator {
     private void generateInsertPermissionGrants(final StringWriter plPgSql) {
         plPgSql.writeLn("""
             -- ============================================================================
-            --changeset InsertTriggerGenerator:${liquibaseTagPrefix}-rbac-GRANTING-INSERT-PERMISSION endDelimiter:--//
+            --changeset ${liquibaseTagPrefix}-rbac-GRANTING-INSERT-PERMISSION:1 endDelimiter:--//
             -- ----------------------------------------------------------------------------
             """,
                 with("liquibaseTagPrefix", liquibaseTagPrefix));
@@ -55,7 +55,7 @@ public class InsertTriggerGenerator {
             plPgSql.writeLn("""
                     -- granting INSERT permission to ${rawSubTable} ----------------------------
                     """,
-                with("rawSubTable", g.getSuperRoleDef().getEntityAlias().getRawTableNameWithSchema()));
+                with("rawSubTable", g.getSuperRoleDef().getEntityAlias().getRawTableName()));
 
             if (isGrantToADifferentTable(g)) {
                 plPgSql.writeLn(
@@ -67,13 +67,13 @@ public class InsertTriggerGenerator {
                         declare
                             row ${rawSuperTable};
                         begin
-                            call base.defineContext('create INSERT INTO ${rawSubTable} permissions for pre-exising ${rawSuperTable} rows');
+                            call defineContext('create INSERT INTO ${rawSubTable} permissions for pre-exising ${rawSuperTable} rows');
                                 
                             FOR row IN SELECT * FROM ${rawSuperTable}
                                 ${whenCondition}
                                 LOOP
-                                    call rbac.grantPermissionToRole(
-                                            rbac.createPermission(row.uuid, 'INSERT', '${rawSubTable}'),
+                                    call grantPermissionToRole(
+                                            createPermission(row.uuid, 'INSERT', '${rawSubTable}'),
                                             ${superRoleRef});
                                 END LOOP;
                         end;
@@ -84,40 +84,40 @@ public class InsertTriggerGenerator {
                             ? "WHERE type = '${value}'"
                             .replace("${value}", g.getSuperRoleDef().getEntityAlias().usingCase().value)
                             : "-- unconditional for all rows in that table"),
-                    with("rawSuperTable", g.getSuperRoleDef().getEntityAlias().getRawTableNameWithSchema()),
-                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableNameWithSchema()),
+                    with("rawSuperTable", g.getSuperRoleDef().getEntityAlias().getRawTableName()),
+                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableName()),
                     with("superRoleRef", toRoleDescriptor(g.getSuperRoleDef(), "row")));
             } else {
                 plPgSql.writeLn("""
                     -- Granting INSERT INTO hs_hosting_asset permissions to specified role of pre-existing hs_hosting_asset rows slipped,
                     -- because there cannot yet be any pre-existing rows in the same table yet.
                     """,
-                    with("rawSuperTable", g.getSuperRoleDef().getEntityAlias().getRawTableNameWithSchema()),
-                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableNameWithSchema()));
+                    with("rawSuperTable", g.getSuperRoleDef().getEntityAlias().getRawTableName()),
+                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableName()));
             }
 
             plPgSql.writeLn("""    
                 /**
                     Grants ${rawSubTable} INSERT permission to specified role of new ${rawSuperTable} rows.
                 */
-                create or replace function ${rawSubTableSchemaPrefix}new_${rawSubTableShortName}_grants_insert_to_${rawSuperTableShortName}_tf()
+                create or replace function new_${rawSubTable}_grants_insert_to_${rawSuperTable}_tf()
                     returns trigger
                     language plpgsql
                     strict as $$
                 begin
                     ${ifConditionThen}
-                        call rbac.grantPermissionToRole(
-                            rbac.createPermission(NEW.uuid, 'INSERT', '${rawSubTable}'),
+                        call grantPermissionToRole(
+                            createPermission(NEW.uuid, 'INSERT', '${rawSubTable}'),
                             ${superRoleRef});
                     ${ifConditionEnd}
                     return NEW;
                 end; $$;
                             
                 -- z_... is to put it at the end of after insert triggers, to make sure the roles exist
-                create trigger z_new_${rawSubTableName}_grants_after_insert_tg
-                    after insert on ${rawSuperTableWithSchema}
+                create trigger z_new_${rawSubTable}_grants_insert_to_${rawSuperTable}_tg
+                    after insert on ${rawSuperTable}
                     for each row
-                execute procedure ${rawSubTableSchemaPrefix}new_${rawSubTableShortName}_grants_insert_to_${rawSuperTableShortName}_tf();
+                execute procedure new_${rawSubTable}_grants_insert_to_${rawSuperTable}_tf();
                 """,
                     with("ifConditionThen", g.getSuperRoleDef().getEntityAlias().isCaseDependent()
                             // TODO.impl: .type needs to be dynamically generated
@@ -127,13 +127,8 @@ public class InsertTriggerGenerator {
                             ? "end if;"
                             : "-- end."),
                     with("superRoleRef", toRoleDescriptor(g.getSuperRoleDef(), NEW.name())),
-                    with("rawSuperTableWithSchema", g.getSuperRoleDef().getEntityAlias().getRawTableNameWithSchema()),
-                    with("rawSuperTableShortName", g.getSuperRoleDef().getEntityAlias().getRawTableShortName()),
                     with("rawSuperTable", g.getSuperRoleDef().getEntityAlias().getRawTableName()),
-                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableNameWithSchema()),
-                    with("rawSubTableSchemaPrefix", g.getPermDef().getEntityAlias().getRawTableSchemaPrefix()),
-                    with("rawSubTableName", g.getPermDef().getEntityAlias().getRawTableName()),
-                    with("rawSubTableShortName", g.getPermDef().getEntityAlias().getRawTableShortName()));
+                    with("rawSubTable", g.getPermDef().getEntityAlias().getRawTableName()));
 
         });
     }
@@ -141,7 +136,7 @@ public class InsertTriggerGenerator {
     private void generateInsertPermissionTriggerAlwaysDisallow(final StringWriter plPgSql) {
         plPgSql.writeLn("""
             -- ============================================================================
-            --changeset InsertTriggerGenerator:${liquibaseTagPrefix}-rbac-ALWAYS-DISALLOW-INSERT endDelimiter:--//
+            --changeset ${liquibaseTagPrefix}-rbac-ALWAYS-DISALLOW-INSERT:1 endDelimiter:--//
             -- ----------------------------------------------------------------------------
             """,
             with("liquibaseTagPrefix", liquibaseTagPrefix));
@@ -155,15 +150,14 @@ public class InsertTriggerGenerator {
                 returns trigger
                 language plpgsql as $$
             begin
-                raise exception '[403] insert into ${rawSubTableWithSchema} values(%) not allowed regardless of current subject, no insert permissions granted at all', NEW;
+                raise exception '[403] insert into ${rawSubTable} values(%) not allowed regardless of current subject, no insert permissions granted at all', NEW;
             end; $$;
                        
             create trigger ${rawSubTable}_insert_permission_check_tg
                 before insert on ${rawSubTable}
                 for each row
-                    execute procedure ${rawSubTableWithSchema}_insert_permission_missing_tf();
+                    execute procedure ${rawSubTable}_insert_permission_missing_tf();
             """,
-            with("rawSubTableWithSchema", rbacDef.getRootEntityAlias().getRawTableNameWithSchema()),
             with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableName()));
 
         plPgSql.writeLn("--//");
@@ -185,7 +179,7 @@ public class InsertTriggerGenerator {
     private void generateInsertPermissionsCheckHeader(final StringWriter plPgSql) {
         plPgSql.writeLn("""
             -- ============================================================================
-            --changeset InsertTriggerGenerator:${liquibaseTagPrefix}-rbac-CHECKING-INSERT-PERMISSION endDelimiter:--//
+            --changeset ${rawSubTable}-rbac-CHECKING-INSERT-PERMISSION:1 endDelimiter:--//
             -- ----------------------------------------------------------------------------
 
             /**
@@ -198,8 +192,7 @@ public class InsertTriggerGenerator {
                 superObjectUuid uuid;
             begin
             """,
-                with("liquibaseTagPrefix", liquibaseTagPrefix),
-                with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableNameWithSchema()));
+                with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableName()));
         plPgSql.chopEmptyLines();
     }
 
@@ -213,7 +206,7 @@ public class InsertTriggerGenerator {
         if (g.getSuperRoleDef().isGlobal(GUEST)) {
             plPgSql.writeLn(
                     """
-                    -- check INSERT permission for rbac.global anyone
+                    -- check INSERT INSERT permission for global anyone
                     if ${caseCondition}true then
                         return NEW;
                     end if;
@@ -222,8 +215,8 @@ public class InsertTriggerGenerator {
         } else if (g.getSuperRoleDef().isGlobal(ADMIN)) {
             plPgSql.writeLn(
                     """
-                    -- check INSERT permission if rbac.global ADMIN
-                    if ${caseCondition}rbac.isGlobalAdmin() then
+                    -- check INSERT INSERT if global ADMIN
+                    if ${caseCondition}isGlobalAdmin() then
                         return NEW;
                     end if;
                     """,
@@ -232,25 +225,25 @@ public class InsertTriggerGenerator {
                 plPgSql.writeLn(
                     """
                     -- check INSERT permission via direct foreign key: NEW.${refColumn}
-                    if ${caseCondition}rbac.hasInsertPermission(NEW.${refColumn}, '${rawSubTable}') then
+                    if ${caseCondition}hasInsertPermission(NEW.${refColumn}, '${rawSubTable}') then
                         return NEW;
                     end if;
                     """,
                     with("caseCondition", caseCondition),
                     with("refColumn", superRoleEntityAlias.dependsOnColumName()),
-                    with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableNameWithSchema()));
+                    with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableName()));
         } else {
             plPgSql.writeLn(
                 """
                 -- check INSERT permission via indirect foreign key: NEW.${refColumn}
                 superObjectUuid := (${fetchSql});
                 assert superObjectUuid is not null, 'object uuid fetched depending on ${rawSubTable}.${refColumn} must not be null, also check fetchSql in RBAC DSL';
-                if ${caseCondition}rbac.hasInsertPermission(superObjectUuid, '${rawSubTable}') then
+                if ${caseCondition}hasInsertPermission(superObjectUuid, '${rawSubTable}') then
                     return NEW;
                 end if;
                 """,
                 with("caseCondition", caseCondition),
-                with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableNameWithSchema()),
+                with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableName()),
                 with("refColumn", superRoleEntityAlias.dependsOnColumName()),
                 with("fetchSql", g.getSuperRoleDef().getEntityAlias().fetchSql().sql),
                 with("columns", g.getSuperRoleDef().getEntityAlias().aliasName() + ".uuid"),
@@ -261,17 +254,16 @@ public class InsertTriggerGenerator {
     private void generateInsertPermissionsChecksFooter(final StringWriter plPgSql) {
         plPgSql.writeLn();
         plPgSql.writeLn("""
-                raise exception '[403] insert into ${rawSubTableWithSchema} values(%) not allowed for current subjects % (%)',
-                        NEW, base.currentSubjects(), rbac.currentSubjectOrAssumedRolesUuids();
+                raise exception '[403] insert into ${rawSubTable} values(%) not allowed for current subjects % (%)',
+                        NEW, currentSubjects(), currentSubjectsUuids();
             end; $$;
             
             create trigger ${rawSubTable}_insert_permission_check_tg
-                before insert on ${rawSubTableWithSchema}
+                before insert on ${rawSubTable}
                 for each row
-                    execute procedure ${rawSubTableWithSchema}_insert_permission_check_tf();
+                    execute procedure ${rawSubTable}_insert_permission_check_tf();
             --//
             """,
-                with("rawSubTableWithSchema", rbacDef.getRootEntityAlias().getRawTableNameWithSchema()),
                 with("rawSubTable", rbacDef.getRootEntityAlias().getRawTableName()));
     }
 
@@ -280,7 +272,7 @@ public class InsertTriggerGenerator {
     }
 
     private boolean isGrantToADifferentTable(final RbacView.RbacGrantDefinition g) {
-        return !rbacDef.getRootEntityAlias().getRawTableNameWithSchema().equals(g.getSuperRoleDef().getEntityAlias().getRawTableNameWithSchema());
+        return !rbacDef.getRootEntityAlias().getRawTableName().equals(g.getSuperRoleDef().getEntityAlias().getRawTableName());
     }
 
     private Stream<RbacView.RbacGrantDefinition> getInsertGrants() {

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/PostgresTriggerReference.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 public enum PostgresTriggerReference {
     NEW, OLD

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacIdentityViewGenerator.java

@@ -1,6 +1,6 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 
 public class RbacIdentityViewGenerator {
     private final RbacView rbacDef;
@@ -12,13 +12,13 @@ public class RbacIdentityViewGenerator {
         this.rbacDef = rbacDef;
         this.liquibaseTagPrefix = liquibaseTagPrefix;
         this.simpleEntityVarName = rbacDef.getRootEntityAlias().simpleName();
-        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableNameWithSchema();
+        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableName();
     }
 
     void generateTo(final StringWriter plPgSql) {
         plPgSql.writeLn("""
                 -- ============================================================================
-                --changeset RbacIdentityViewGenerator:${liquibaseTagPrefix}-rbac-IDENTITY-VIEW endDelimiter:--//
+                --changeset ${liquibaseTagPrefix}-rbac-IDENTITY-VIEW:1 endDelimiter:--//
                 -- ----------------------------------------------------------------------------
                 """,
                 with("liquibaseTagPrefix", liquibaseTagPrefix));
@@ -26,13 +26,13 @@ public class RbacIdentityViewGenerator {
         plPgSql.writeLn(
             switch (rbacDef.getIdentityViewSqlQuery().part) {
             case SQL_PROJECTION -> """
-                    call rbac.generateRbacIdentityViewFromProjection('${rawTableName}', 
+                    call generateRbacIdentityViewFromProjection('${rawTableName}', 
                         $idName$
                     ${identityViewSqlPart}
                         $idName$);
                     """;
             case SQL_QUERY -> """
-                call rbac.generateRbacIdentityViewFromQuery('${rawTableName}', 
+                call generateRbacIdentityViewFromQuery('${rawTableName}', 
                     $idName$
                 ${identityViewSqlPart}
                     $idName$);

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacObjectGenerator.java

@@ -1,6 +1,6 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 
 public class RbacObjectGenerator {
 
@@ -9,15 +9,15 @@ public class RbacObjectGenerator {
 
     public RbacObjectGenerator(final RbacView rbacDef, final String liquibaseTagPrefix) {
         this.liquibaseTagPrefix = liquibaseTagPrefix;
-        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableNameWithSchema();
+        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableName();
     }
 
     void generateTo(final StringWriter plPgSql) {
         plPgSql.writeLn("""
                 -- ============================================================================
-                --changeset RbacObjectGenerator:${liquibaseTagPrefix}-rbac-OBJECT endDelimiter:--//
+                --changeset ${liquibaseTagPrefix}-rbac-OBJECT:1 endDelimiter:--//
                 -- ----------------------------------------------------------------------------
-                call rbac.generateRelatedRbacObject('${rawTableName}');
+                call generateRelatedRbacObject('${rawTableName}');
                 --//
                                 
                 """,

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRestrictedViewGenerator.java

@@ -1,9 +1,9 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 
 import static java.util.stream.Collectors.joining;
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.indented;
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.indented;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 
 public class RbacRestrictedViewGenerator {
     private final RbacView rbacDef;
@@ -13,15 +13,15 @@ public class RbacRestrictedViewGenerator {
     public RbacRestrictedViewGenerator(final RbacView rbacDef, final String liquibaseTagPrefix) {
         this.rbacDef = rbacDef;
         this.liquibaseTagPrefix = liquibaseTagPrefix;
-        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableNameWithSchema();
+        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableName();
     }
 
     void generateTo(final StringWriter plPgSql) {
         plPgSql.writeLn("""
                 -- ============================================================================
-                --changeset RbacRestrictedViewGenerator:${liquibaseTagPrefix}-rbac-RESTRICTED-VIEW endDelimiter:--//
+                --changeset ${liquibaseTagPrefix}-rbac-RESTRICTED-VIEW:1 endDelimiter:--//
                 -- ----------------------------------------------------------------------------
-                call rbac.generateRbacRestrictedView('${rawTableName}',
+                call generateRbacRestrictedView('${rawTableName}',
                     $orderBy$
                 ${orderBy}
                     $orderBy$,

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacRoleDescriptorsGenerator.java

@@ -1,6 +1,6 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 
 public class RbacRoleDescriptorsGenerator {
 
@@ -11,15 +11,15 @@ public class RbacRoleDescriptorsGenerator {
     public RbacRoleDescriptorsGenerator(final RbacView rbacDef, final String liquibaseTagPrefix) {
         this.liquibaseTagPrefix = liquibaseTagPrefix;
         this.simpleEntityVarName = rbacDef.getRootEntityAlias().simpleName();
-        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableNameWithSchema();
+        this.rawTableName = rbacDef.getRootEntityAlias().getRawTableName();
     }
 
     void generateTo(final StringWriter plPgSql) {
         plPgSql.writeLn("""
                 -- ============================================================================
-                --changeset RbacRoleDescriptorsGenerator:${liquibaseTagPrefix}-rbac-ROLE-DESCRIPTORS endDelimiter:--//
+                --changeset ${liquibaseTagPrefix}-rbac-ROLE-DESCRIPTORS:1 endDelimiter:--//
                 -- ----------------------------------------------------------------------------
-                call rbac.generateRbacRoleDescriptors('${simpleEntityVarName}', '${rawTableName}');
+                call generateRbacRoleDescriptors('${simpleEntityVarName}', '${rawTableName}');
                 --//
 
                 """,

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacView.java

@@ -1,8 +1,8 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
 import org.reflections.Reflections;
 import org.reflections.scanners.TypeAnnotationsScanner;
 
@@ -12,6 +12,7 @@ import jakarta.persistence.Version;
 import jakarta.validation.constraints.NotNull;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Consumer;
@@ -22,12 +23,12 @@ import static java.util.Arrays.asList;
 import static java.util.Arrays.stream;
 import static java.util.Collections.max;
 import static java.util.Optional.ofNullable;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition.GrantType.PERM_TO_ROLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition.GrantType.ROLE_TO_ROLE;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.Part.AUTO_FETCH;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.PERM_TO_ROLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.ROLE_TO_ROLE;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.Part.AUTO_FETCH;
 import static org.apache.commons.collections4.SetUtils.hashSet;
 import static org.apache.commons.lang3.StringUtils.uncapitalize;
 
@@ -35,12 +36,12 @@ import static org.apache.commons.lang3.StringUtils.uncapitalize;
 // TODO.refa: rename to RbacDSL
 public class RbacView {
 
-    public static final String GLOBAL = "rbac.global";
+    public static final String GLOBAL = "global";
     public static final String OUTPUT_BASEDIR = "src/main/resources/db/changelog";
 
     private final EntityAlias rootEntityAlias;
 
-    private final Set<RbacSubjectReference> userDefs = new LinkedHashSet<>();
+    private final Set<RbacUserReference> userDefs = new LinkedHashSet<>();
     private final Set<RbacRoleDefinition> roleDefs = new LinkedHashSet<>();
     private final Set<RbacPermissionDefinition> permDefs = new LinkedHashSet<>();
     private final Map<String, EntityAlias> entityAliases = new HashMap<>() {
@@ -89,15 +90,15 @@ public class RbacView {
      * @param <E>
      *     a JPA entity class extending RbacObject
      */
-    public static <E extends BaseEntity<?>> RbacView rbacViewFor(final String alias, final Class<E> entityClass) {
+    public static <E extends BaseEntity> RbacView rbacViewFor(final String alias, final Class<E> entityClass) {
         return new RbacView(alias, entityClass);
     }
 
-    RbacView(final String alias, final Class<? extends BaseEntity<?>> entityClass) {
+    RbacView(final String alias, final Class<? extends BaseEntity> entityClass) {
         rootEntityAlias = new EntityAlias(alias, entityClass);
         entityAliases.put(alias, rootEntityAlias);
-        new RbacSubjectReference(CREATOR);
-        entityAliases.put("rbac.global", new EntityAlias("rbac.global"));
+        new RbacUserReference(CREATOR);
+        entityAliases.put("global", new EntityAlias("global"));
     }
 
     /**
@@ -120,7 +121,7 @@ public class RbacView {
      * <p>An identity view is a view which maps an objectUuid to an idName.
      * The idName should be a human-readable representation of the row, but as short as possible.
      * The idName must only consist of letters (A-Z, a-z), digits (0-9), dash (-), dot (.) and unserscore '_'.
-     * It's used to create the object-specific-role-names like rbactest.customer#abc:ADMIN - here 'abc' is the idName.
+     * It's used to create the object-specific-role-names like test_customer#abc:ADMIN - here 'abc' is the idName.
      * The idName not necessarily unique in a table, but it should be avoided.
      * </p>
      *
@@ -286,9 +287,9 @@ public class RbacView {
      * @param <EC>
      *     a JPA entity class extending RbacObject
      */
-    public <EC extends BaseEntity<?>> RbacView importRootEntityAliasProxy(
+    public <EC extends BaseEntity> RbacView importRootEntityAliasProxy(
             final String aliasName,
-            final Class<? extends BaseEntity<?>> entityClass,
+            final Class<? extends BaseEntity> entityClass,
             final ColumnValue forCase,
             final SQL fetchSql,
             final Column dependsOnColum) {
@@ -312,7 +313,7 @@ public class RbacView {
      *     a JPA entity class extending RbacObject
      */
     public RbacView importSubEntityAlias(
-            final String aliasName, final Class<? extends BaseEntity<?>> entityClass,
+            final String aliasName, final Class<? extends BaseEntity> entityClass,
             final SQL fetchSql, final Column dependsOnColum) {
         importEntityAliasImpl(aliasName, entityClass, usingDefaultCase(), fetchSql, dependsOnColum, true, NOT_NULL);
         return this;
@@ -349,14 +350,14 @@ public class RbacView {
      *     a JPA entity class extending RbacObject
      */
     public RbacView importEntityAlias(
-            final String aliasName, final Class<? extends BaseEntity<?>> entityClass, final ColumnValue usingCase,
+            final String aliasName, final Class<? extends BaseEntity> entityClass, final ColumnValue usingCase,
             final Column dependsOnColum, final SQL fetchSql, final Nullable nullable) {
         importEntityAliasImpl(aliasName, entityClass, usingCase, fetchSql, dependsOnColum, false, nullable);
         return this;
     }
 
     private EntityAlias importEntityAliasImpl(
-            final String aliasName, final Class<? extends BaseEntity<?>> entityClass, final ColumnValue usingCase,
+            final String aliasName, final Class<? extends BaseEntity> entityClass, final ColumnValue usingCase,
             final SQL fetchSql, final Column dependsOnColum, boolean asSubEntity, final Nullable nullable) {
 
         final var entityAlias = ofNullable(entityAliases.get(aliasName))
@@ -466,7 +467,7 @@ public class RbacView {
         return new RbacExampleRole(entityAlias, role);
     }
 
-    private RbacGrantDefinition grantRoleToSubject(final RbacRoleDefinition roleDefinition, final RbacSubjectReference user) {
+    private RbacGrantDefinition grantRoleToUser(final RbacRoleDefinition roleDefinition, final RbacUserReference user) {
         return findOrCreateGrantDef(roleDefinition, user).toCreate();
     }
 
@@ -547,7 +548,7 @@ public class RbacView {
         }
 
         public RbacView grantPermission(final Permission perm) {
-            final var forTable = rootEntityAlias.getRawTableNameWithSchema();
+            final var forTable = rootEntityAlias.getRawTableName();
             findOrCreateGrantDef(findRbacPerm(rootEntityAlias, perm, forTable), superRoleDef).toCreate();
             return RbacView.this;
         }
@@ -563,7 +564,7 @@ public class RbacView {
     @EqualsAndHashCode
     public class RbacGrantDefinition {
 
-        private final RbacSubjectReference userDef;
+        private final RbacUserReference userDef;
         private final RbacRoleDefinition superRoleDef;
         private final RbacRoleDefinition subRoleDef;
         private final RbacPermissionDefinition permDef;
@@ -604,7 +605,7 @@ public class RbacView {
             register(this);
         }
 
-        public RbacGrantDefinition(final RbacRoleDefinition roleDef, final RbacSubjectReference userDef) {
+        public RbacGrantDefinition(final RbacRoleDefinition roleDef, final RbacUserReference userDef) {
             this.userDef = userDef;
             this.subRoleDef = roleDef;
             this.superRoleDef = null;
@@ -769,8 +770,8 @@ public class RbacView {
          * @return
          *  The grant definition for further chained calls.
          */
-        public RbacGrantDefinition owningUser(final RbacSubjectReference.UserRole userRole) {
-            return grantRoleToSubject(this, findUserRef(userRole));
+        public RbacGrantDefinition owningUser(final RbacUserReference.UserRole userRole) {
+            return grantRoleToUser(this, findUserRef(userRole));
         }
 
         /**
@@ -832,12 +833,12 @@ public class RbacView {
         }
     }
 
-    public RbacSubjectReference findUserRef(final RbacSubjectReference.UserRole userRole) {
+    public RbacUserReference findUserRef(final RbacUserReference.UserRole userRole) {
         return userDefs.stream().filter(u -> u.role == userRole).findFirst().orElseThrow();
     }
 
     @EqualsAndHashCode
-    public class RbacSubjectReference {
+    public class RbacUserReference {
 
         public enum UserRole {
             GLOBAL_ADMIN,
@@ -846,7 +847,7 @@ public class RbacView {
 
         final UserRole role;
 
-        public RbacSubjectReference(final UserRole creator) {
+        public RbacUserReference(final UserRole creator) {
             this.role = creator;
             userDefs.add(this);
         }
@@ -884,7 +885,7 @@ public class RbacView {
             .orElseGet(() -> new RbacPermissionDefinition(entityAlias, perm, tableName, true)); // TODO: true => toCreate
     }
 
-    private RbacGrantDefinition findOrCreateGrantDef(final RbacRoleDefinition roleDefinition, final RbacSubjectReference user) {
+    private RbacGrantDefinition findOrCreateGrantDef(final RbacRoleDefinition roleDefinition, final RbacUserReference user) {
         return grantDefs.stream()
                 .filter(g -> g.subRoleDef == roleDefinition && g.userDef == user)
                 .findFirst()
@@ -910,18 +911,18 @@ public class RbacView {
         return distinctGrantDef;
     }
 
-    record EntityAlias(String aliasName, Class<? extends BaseEntity<?>> entityClass, ColumnValue usingCase, SQL fetchSql, Column dependsOnColum, boolean isSubEntity, Nullable nullable) {
+    record EntityAlias(String aliasName, Class<? extends BaseEntity> entityClass, ColumnValue usingCase, SQL fetchSql, Column dependsOnColum, boolean isSubEntity, Nullable nullable) {
 
         public EntityAlias(final String aliasName) {
             this(aliasName, null, null, null, null, false, null);
         }
 
-        public EntityAlias(final String aliasName, final Class<? extends BaseEntity<?>> entityClass) {
+        public EntityAlias(final String aliasName, final Class<? extends BaseEntity> entityClass) {
             this(aliasName, entityClass, null, null, null, false, null);
         }
 
         boolean isGlobal() {
-            return aliasName().equals("rbac.global");
+            return aliasName().equals("global");
         }
 
         boolean isPlaceholder() {
@@ -936,7 +937,7 @@ public class RbacView {
             return switch (fetchSql.part) {
                 case SQL_QUERY -> fetchSql;
                 case AUTO_FETCH ->
-                        SQL.query("SELECT * FROM " + getRawTableNameWithSchema() + " WHERE uuid = ${ref}." + dependsOnColum.column);
+                        SQL.query("SELECT * FROM " + getRawTableName() + " WHERE uuid = ${ref}." + dependsOnColum.column);
                 default -> throw new IllegalStateException("unexpected SQL definition: " + fetchSql);
             };
         }
@@ -959,37 +960,11 @@ public class RbacView {
                     : uncapitalize(withoutEntitySuffix(entityClass.getSimpleName()));
         }
 
-        String getRawTableNameWithSchema() {
-            if ( aliasName.equals("rbac.global")) {
-                return "rbac.global"; // TODO: maybe we should introduce a GlobalEntity class?
-            }
-            return qualifiedRealTableName(entityClass);
-        }
-
-        String getRawTableSchemaPrefix() {
-            final var rawTableNameWithSchema = getRawTableNameWithSchema();
-            final var parts = rawTableNameWithSchema.split("\\.");
-            final var rawTableSchemaPrefix = parts.length > 1 ? parts[0] + "." : "";
-            return rawTableSchemaPrefix;
-        }
-
         String getRawTableName() {
-            final var rawTableNameWithSchema = getRawTableNameWithSchema();
-            final var parts = rawTableNameWithSchema.split("\\.");
-            final var rawTableName = parts.length > 1 ? parts[1] : rawTableNameWithSchema;
-            return rawTableName;
+            if ( aliasName.equals("global")) {
+                return "global"; // TODO: maybe we should introduce a GlobalEntity class?
             }
-
-        String getRawTableShortName() {
-            // TODO.impl: some combined function and trigger names are too long
-            // maybe we should shorten the table name e.g. hs_office.coopsharestransaction -> hsof.coopsharetx
-            // this is just a workaround:
-            return getRawTableName()
-                    .replace("hs_office.", "hsof.")
-                    .replace("hs_booking_", "hsbk_")
-                    .replace("hs_hosting_", "hsho_")
-                    .replace("coopsharestransaction", "coopsharetx")
-                    .replace("coopassetstransaction", "coopassettx");
+            return withoutRvSuffix(entityClass.getAnnotation(Table.class).name());
         }
 
         String dependsOnColumName() {
@@ -1009,12 +984,8 @@ public class RbacView {
         }
     }
 
-    public static String qualifiedRealTableName(final Class<? extends BaseEntity<?>> entityClass) {
-        final var tableAnnotation = entityClass.getAnnotation(Table.class);
-        final var schema = tableAnnotation.schema();
-        final var tableName = tableAnnotation.name();
-        final var realTableName = tableName.substring(0, tableName.length() - "_rv".length());
-        return (schema.isEmpty() ? "" : (schema + ".")) + realTableName;
+    public static String withoutRvSuffix(final String tableName) {
+        return tableName.substring(0, tableName.length() - "_rv".length());
     }
 
     public enum Role {
@@ -1195,7 +1166,7 @@ public class RbacView {
         }
 
         String map(final String originalAliasName) {
-            if (outerAliasNames.contains(originalAliasName) || originalAliasName.equals("rbac.global")) {
+            if (outerAliasNames.contains(originalAliasName) || originalAliasName.equals("global")) {
                 return originalAliasName;
             }
             if (originalAliasName.equals(importedRbacView.rootEntityAlias.aliasName)) {
@@ -1273,14 +1244,13 @@ public class RbacView {
 
     public static Set<Class<? extends BaseEntity>> findRbacEntityClasses(String packageName) {
         final var reflections = new Reflections(packageName, TypeAnnotationsScanner.class);
-        final Set<Class<? extends BaseEntity>> rbacEntityClasses = reflections.getTypesAnnotatedWith(Entity.class).stream()
-                .filter(BaseEntity.class::isAssignableFrom)
+        return reflections.getTypesAnnotatedWith(Entity.class).stream()
+                .filter(c -> stream(c.getInterfaces()).anyMatch(i -> i== BaseEntity.class))
                 .filter(c -> stream(c.getDeclaredMethods())
-                        .anyMatch(m -> m.getName().equals("rbac") && isStatic(m.getModifiers()))
+                        .anyMatch(m -> m.getName().equals("rbac") && Modifier.isStatic(m.getModifiers()))
                 )
                 .map(RbacView::castToSubclassOfBaseEntity)
                 .collect(Collectors.toSet());
-        return rbacEntityClasses;
     }
 
     @SuppressWarnings("unchecked")

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewMermaidFlowchartGenerator.java

@@ -1,7 +1,7 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import lombok.SneakyThrows;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.CaseDef;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef;
 import org.apache.commons.lang3.StringUtils;
 
 import java.nio.file.*;
@@ -12,7 +12,7 @@ import java.util.stream.Stream;
 
 import static java.util.Comparator.comparing;
 import static java.util.stream.Collectors.joining;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition.GrantType.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.*;
 
 public class RbacViewMermaidFlowchartGenerator {
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RbacViewPostgresGenerator.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import lombok.SneakyThrows;
 
@@ -6,8 +6,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
-import static net.hostsharing.hsadminng.rbac.generator.PostgresTriggerReference.NEW;
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.PostgresTriggerReference.NEW;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 
 public class RbacViewPostgresGenerator {
 
@@ -17,7 +17,7 @@ public class RbacViewPostgresGenerator {
 
     public RbacViewPostgresGenerator(final RbacView forRbacDef) {
         rbacDef = forRbacDef;
-        liqibaseTagPrefix = rbacDef.getRootEntityAlias().getRawTableNameWithSchema().replace("_", "-").replace(".", "-");
+        liqibaseTagPrefix = rbacDef.getRootEntityAlias().getRawTableName().replace("_", "-");
         plPgSql.writeLn("""
                 --liquibase formatted sql
                 -- This code generated was by ${generator}, do not amend manually.

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/RolesGrantsAndPermissionsGenerator.java

@@ -1,8 +1,8 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
-import net.hostsharing.hsadminng.rbac.generator.RbacView.CaseDef;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.RbacPermissionDefinition;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.CaseDef;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacPermissionDefinition;
 
 import java.util.HashSet;
 import java.util.List;
@@ -13,12 +13,12 @@ import java.util.stream.Stream;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toSet;
-import static net.hostsharing.hsadminng.rbac.generator.PostgresTriggerReference.NEW;
-import static net.hostsharing.hsadminng.rbac.generator.PostgresTriggerReference.OLD;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.INSERT;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacGrantDefinition.GrantType.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.StringWriter.with;
+import static net.hostsharing.hsadminng.rbac.rbacdef.PostgresTriggerReference.NEW;
+import static net.hostsharing.hsadminng.rbac.rbacdef.PostgresTriggerReference.OLD;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.INSERT;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacGrantDefinition.GrantType.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.StringWriter.with;
 import static org.apache.commons.lang3.StringUtils.capitalize;
 import static org.apache.commons.lang3.StringUtils.uncapitalize;
 
@@ -29,7 +29,7 @@ class RolesGrantsAndPermissionsGenerator {
     private final String liquibaseTagPrefix;
     private final String simpleEntityName;
     private final String simpleEntityVarName;
-    private final String qualifiedRawTableName;
+    private final String rawTableName;
 
     RolesGrantsAndPermissionsGenerator(final RbacView rbacDef, final String liquibaseTagPrefix) {
         this.rbacDef = rbacDef;
@@ -40,7 +40,7 @@ class RolesGrantsAndPermissionsGenerator {
 
         simpleEntityVarName = rbacDef.getRootEntityAlias().simpleName();
         simpleEntityName = capitalize(simpleEntityVarName);
-        qualifiedRawTableName = rbacDef.getRootEntityAlias().getRawTableNameWithSchema();
+        rawTableName = rbacDef.getRootEntityAlias().getRawTableName();
     }
 
     void generateTo(final StringWriter plPgSql) {
@@ -53,7 +53,7 @@ class RolesGrantsAndPermissionsGenerator {
     private void generateHeader(final StringWriter plPgSql, final String triggerType) {
         plPgSql.writeLn("""
                 -- ============================================================================
-                --changeset RolesGrantsAndPermissionsGenerator:${liquibaseTagPrefix}-rbac-${triggerType}-trigger endDelimiter:--//
+                --changeset ${liquibaseTagPrefix}-rbac-${triggerType}-trigger:1 endDelimiter:--//
                 -- ----------------------------------------------------------------------------
                 """,
                 with("liquibaseTagPrefix", liquibaseTagPrefix),
@@ -66,27 +66,28 @@ class RolesGrantsAndPermissionsGenerator {
                     Creates the roles, grants and permission for the AFTER INSERT TRIGGER.
                  */
 
-                create or replace procedure ${rawTableQualifiedName}_build_rbac_system(
-                    NEW ${rawTableQualifiedName}
+                create or replace procedure buildRbacSystemFor${simpleEntityName}(
+                    NEW ${rawTableName}
                 )
                     language plpgsql as $$
                 """
-                .replace("${rawTableQualifiedName}", qualifiedRawTableName));
+                .replace("${simpleEntityName}", simpleEntityName)
+                .replace("${rawTableName}", rawTableName));
 
         plPgSql.writeLn("declare");
         plPgSql.indented(() -> {
             referencedEntityAliases()
-                    .forEach((ea) -> plPgSql.writeLn(entityRefVar(NEW, ea) + " " + ea.getRawTableNameWithSchema() + ";"));
+                    .forEach((ea) -> plPgSql.writeLn(entityRefVar(NEW, ea) + " " + ea.getRawTableName() + ";"));
         });
 
         plPgSql.writeLn();
         plPgSql.writeLn("begin");
         plPgSql.indented(() -> {
-            plPgSql.writeLn("call rbac.enterTriggerForObjectUuid(NEW.uuid);");
+            plPgSql.writeLn("call enterTriggerForObjectUuid(NEW.uuid);");
             plPgSql.writeLn();
             generateCreateRolesAndGrantsAfterInsert(plPgSql);
             plPgSql.ensureSingleEmptyLine();
-            plPgSql.writeLn("call rbac.leaveTriggerForObjectUuid(NEW.uuid);");
+            plPgSql.writeLn("call leaveTriggerForObjectUuid(NEW.uuid);");
         });
         plPgSql.writeLn("end; $$;");
         plPgSql.writeLn();
@@ -105,21 +106,21 @@ class RolesGrantsAndPermissionsGenerator {
                         Called from the AFTER UPDATE TRIGGER to re-wire the grants.
                      */
     
-                    create or replace procedure ${rawTableQualifiedName}_update_rbac_system(
-                        OLD ${rawTableQualifiedName},
-                        NEW ${rawTableQualifiedName}
+                    create or replace procedure updateRbacRulesFor${simpleEntityName}(
+                        OLD ${rawTableName},
+                        NEW ${rawTableName}
                     )
                         language plpgsql as $$
                     begin
                     
                         if ${updateConditions} then
-                            delete from rbac.grants g where g.grantedbytriggerof = OLD.uuid;
-                            call ${rawTableQualifiedName}_build_rbac_system(NEW);
+                            delete from rbacgrants g where g.grantedbytriggerof = OLD.uuid;
+                            call buildRbacSystemFor${simpleEntityName}(NEW);
                         end if;
                     end; $$;
                     """,
                 with("simpleEntityName", simpleEntityName),
-                with("rawTableQualifiedName", qualifiedRawTableName),
+                with("rawTableName", rawTableName),
                 with("updateConditions", updateConditions));
     }
 
@@ -129,33 +130,34 @@ class RolesGrantsAndPermissionsGenerator {
                     Called from the AFTER UPDATE TRIGGER to re-wire the grants.
                  */
 
-                create or replace procedure ${rawTableQualifiedName}_update_rbac_system(
-                    OLD ${rawTableQualifiedName},
-                    NEW ${rawTableQualifiedName}
+                create or replace procedure updateRbacRulesFor${simpleEntityName}(
+                    OLD ${rawTableName},
+                    NEW ${rawTableName}
                 )
                     language plpgsql as $$
 
                 declare
-                """,
-                with("rawTableQualifiedName", qualifiedRawTableName));
+                """
+                .replace("${simpleEntityName}", simpleEntityName)
+                .replace("${rawTableName}", rawTableName));
 
         plPgSql.chopEmptyLines();
         plPgSql.indented(() -> {
             referencedEntityAliases()
                     .forEach((ea) -> {
-                        plPgSql.writeLn(entityRefVar(OLD, ea) + " " + ea.getRawTableNameWithSchema() + ";");
-                        plPgSql.writeLn(entityRefVar(NEW, ea) + " " + ea.getRawTableNameWithSchema() + ";");
+                        plPgSql.writeLn(entityRefVar(OLD, ea) + " " + ea.getRawTableName() + ";");
+                        plPgSql.writeLn(entityRefVar(NEW, ea) + " " + ea.getRawTableName() + ";");
                     });
         });
 
         plPgSql.writeLn();
         plPgSql.writeLn("begin");
         plPgSql.indented(() -> {
-            plPgSql.writeLn("call rbac.enterTriggerForObjectUuid(NEW.uuid);");
+            plPgSql.writeLn("call enterTriggerForObjectUuid(NEW.uuid);");
             plPgSql.writeLn();
             generateUpdateRolesAndGrantsAfterUpdate(plPgSql);
             plPgSql.ensureSingleEmptyLine();
-            plPgSql.writeLn("call rbac.leaveTriggerForObjectUuid(NEW.uuid);");
+            plPgSql.writeLn("call leaveTriggerForObjectUuid(NEW.uuid);");
         });
         plPgSql.writeLn("end; $$;");
         plPgSql.writeLn();
@@ -307,10 +309,10 @@ class RolesGrantsAndPermissionsGenerator {
     private String generateRevoke(RbacGrantDefinition grantDef) {
         return switch (grantDef.grantType()) {
             case ROLE_TO_USER -> throw new IllegalArgumentException("unexpected grant");
-            case ROLE_TO_ROLE -> "call rbac.revokeRoleFromRole(${subRoleRef}, ${superRoleRef});"
+            case ROLE_TO_ROLE -> "call revokeRoleFromRole(${subRoleRef}, ${superRoleRef});"
                     .replace("${subRoleRef}", roleRef(OLD, grantDef.getSubRoleDef()))
                     .replace("${superRoleRef}", roleRef(OLD, grantDef.getSuperRoleDef()));
-            case PERM_TO_ROLE -> "call rbac.revokePermissionFromRole(${permRef}, ${superRoleRef});"
+            case PERM_TO_ROLE -> "call revokePermissionFromRole(${permRef}, ${superRoleRef});"
                     .replace("${permRef}", getPerm(OLD, grantDef.getPermDef()))
                     .replace("${superRoleRef}", roleRef(OLD, grantDef.getSuperRoleDef()));
         };
@@ -319,13 +321,13 @@ class RolesGrantsAndPermissionsGenerator {
     private String generateGrant(RbacGrantDefinition grantDef) {
         final var grantSql = switch (grantDef.grantType()) {
             case ROLE_TO_USER -> throw new IllegalArgumentException("unexpected grant");
-            case ROLE_TO_ROLE -> "call rbac.grantRoleToRole(${subRoleRef}, ${superRoleRef}${assumed});"
-                    .replace("${assumed}", grantDef.isAssumed() ? "" : ", rbac.unassumed()")
+            case ROLE_TO_ROLE -> "call grantRoleToRole(${subRoleRef}, ${superRoleRef}${assumed});"
+                    .replace("${assumed}", grantDef.isAssumed() ? "" : ", unassumed()")
                     .replace("${subRoleRef}", roleRef(NEW, grantDef.getSubRoleDef()))
                     .replace("${superRoleRef}", roleRef(NEW, grantDef.getSuperRoleDef()));
             case PERM_TO_ROLE ->
                     grantDef.getPermDef().getPermission() == INSERT ? ""
-                    : "call rbac.grantPermissionToRole(${permRef}, ${superRoleRef});"
+                    : "call grantPermissionToRole(${permRef}, ${superRoleRef});"
                         .replace("${permRef}", createPerm(NEW, grantDef.getPermDef()))
                         .replace("${superRoleRef}", roleRef(NEW, grantDef.getSuperRoleDef()));
         };
@@ -333,15 +335,15 @@ class RolesGrantsAndPermissionsGenerator {
     }
 
     private String findPerm(final PostgresTriggerReference ref, final RbacPermissionDefinition permDef) {
-        return permRef("rbac.findPermissionId", ref, permDef);
+        return permRef("findPermissionId", ref, permDef);
     }
 
     private String getPerm(final PostgresTriggerReference ref, final RbacPermissionDefinition permDef) {
-        return permRef("rbac.getPermissionId", ref, permDef);
+        return permRef("getPermissionId", ref, permDef);
     }
 
     private String createPerm(final PostgresTriggerReference ref, final RbacPermissionDefinition permDef) {
-        return permRef("rbac.createPermission", ref, permDef);
+        return permRef("createPermission", ref, permDef);
     }
 
     private String permRef(final String functionName, final PostgresTriggerReference ref, final RbacPermissionDefinition permDef) {
@@ -362,7 +364,7 @@ class RolesGrantsAndPermissionsGenerator {
             System.out.println("null");
         }
         if (roleDef.getEntityAlias().isGlobal()) {
-            return "rbac.globalAdmin()";
+            return "globalAdmin()";
         }
         final String entityRefVar = entityRefVar(rootRefVar, roleDef.getEntityAlias());
         return roleDef.getEntityAlias().simpleName() + capitalize(roleDef.getRole().name())
@@ -387,7 +389,7 @@ class RolesGrantsAndPermissionsGenerator {
         }
 
         plPgSql.writeLn();
-        plPgSql.writeLn("perform rbac.defineRoleWithGrants(");
+        plPgSql.writeLn("perform createRoleWithGrants(");
         plPgSql.indented(() -> {
             plPgSql.writeLn("${simpleVarName)${roleSuffix}(NEW),"
                     .replace("${simpleVarName)", simpleEntityVarName)
@@ -413,7 +415,7 @@ class RolesGrantsAndPermissionsGenerator {
                     .map(this::toPlPgSqlReference)
                     .toList();
             plPgSql.indented(() ->
-                    plPgSql.writeLn("subjectUuids => array[" + joinArrayElements(arrayElements, 2) + "],\n"));
+                    plPgSql.writeLn("userUuids => array[" + joinArrayElements(arrayElements, 2) + "],\n"));
             rbacGrants.removeAll(grantsToUsers);
         }
     }
@@ -512,25 +514,25 @@ class RolesGrantsAndPermissionsGenerator {
 
         plPgSql.writeLn("""
                 /*
-                    AFTER INSERT TRIGGER to create the role+grant structure for a new ${rawTableQualifiedName} row.
+                    AFTER INSERT TRIGGER to create the role+grant structure for a new ${rawTableName} row.
                  */
                                 
-                create or replace function ${rawTableQualifiedName}_build_rbac_system_after_insert_tf()
+                create or replace function insertTriggerFor${simpleEntityName}_tf()
                     returns trigger
                     language plpgsql
                     strict as $$
                 begin
-                    call ${rawTableQualifiedName}_build_rbac_system(NEW);
+                    call buildRbacSystemFor${simpleEntityName}(NEW);
                     return NEW;
                 end; $$;
                                 
-                create trigger build_rbac_system_after_insert_tg
-                    after insert on ${rawTableQualifiedName}
+                create trigger insertTriggerFor${simpleEntityName}_tg
+                    after insert on ${rawTableName}
                     for each row
-                execute procedure ${rawTableQualifiedName}_build_rbac_system_after_insert_tf();
+                execute procedure insertTriggerFor${simpleEntityName}_tf();
                 """
-                .replace("${schemaPrefix}", schemaPrefix(qualifiedRawTableName))
-                .replace("${rawTableQualifiedName}", qualifiedRawTableName)
+                .replace("${simpleEntityName}", simpleEntityName)
+                .replace("${rawTableName}", rawTableName)
         );
 
         generateFooter(plPgSql);
@@ -547,43 +549,38 @@ class RolesGrantsAndPermissionsGenerator {
 
         plPgSql.writeLn("""
                 /*
-                    AFTER UPDATE TRIGGER to re-wire the grant structure for a new ${rawTableQualifiedName} row.
+                    AFTER INSERT TRIGGER to re-wire the grant structure for a new ${rawTableName} row.
                  */
                                 
-                create or replace function ${rawTableQualifiedName}_update_rbac_system_after_update_tf()
+                create or replace function updateTriggerFor${simpleEntityName}_tf()
                     returns trigger
                     language plpgsql
                     strict as $$
                 begin
-                    call ${rawTableQualifiedName}_update_rbac_system(OLD, NEW);
+                    call updateRbacRulesFor${simpleEntityName}(OLD, NEW);
                     return NEW;
                 end; $$;
                                 
-                create trigger update_rbac_system_after_update_tg
-                    after update on ${rawTableQualifiedName}
+                create trigger updateTriggerFor${simpleEntityName}_tg
+                    after update on ${rawTableName}
                     for each row
-                execute procedure ${rawTableQualifiedName}_update_rbac_system_after_update_tf();
+                execute procedure updateTriggerFor${simpleEntityName}_tf();
                 """
-                .replace("${rawTableQualifiedName}", qualifiedRawTableName)
+                .replace("${simpleEntityName}", simpleEntityName)
+                .replace("${rawTableName}", rawTableName)
         );
 
         generateFooter(plPgSql);
     }
 
-    private String schemaPrefix(final String qualifiedIdentifier) {
-        return qualifiedIdentifier.contains(".")
-                ? qualifiedIdentifier.split("\\.")[0] + "."
-                : "";
-    }
-
     private static void generateFooter(final StringWriter plPgSql) {
         plPgSql.writeLn("--//");
         plPgSql.writeLn();
     }
 
-    private String toPlPgSqlReference(final RbacView.RbacSubjectReference userRef) {
+    private String toPlPgSqlReference(final RbacView.RbacUserReference userRef) {
         return switch (userRef.role) {
-            case CREATOR -> "rbac.currentSubjectUuid()";
+            case CREATOR -> "currentUserUuid()";
             default -> throw new IllegalArgumentException("unknown user role: " + userRef);
         };
     }
@@ -592,9 +589,9 @@ class RolesGrantsAndPermissionsGenerator {
             final PostgresTriggerReference triggerRef,
             final RbacView.RbacRoleDefinition roleDef,
             final boolean assumed) {
-        final var assumedArg = assumed ? "" : ", rbac.unassumed()";
+        final var assumedArg = assumed ? "" : ", unassumed()";
         return toRoleRef(roleDef) +
-                (roleDef.getEntityAlias().isGlobal() ? ( assumed ? "()" : "(rbac.unassumed())")
+                (roleDef.getEntityAlias().isGlobal() ? ( assumed ? "()" : "(unassumed())")
                         : rbacDef.isRootEntityAlias(roleDef.getEntityAlias()) ? ("(" + triggerRef.name() + ")")
                         : "(" + toTriggerReference(triggerRef, roleDef.getEntityAlias()) + assumedArg + ")");
     }

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/StringWriter.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 import org.apache.commons.lang3.StringUtils;
 
@@ -19,11 +19,9 @@ public class StringWriter {
         writeLn();
     }
 
-    String writeLn(final String text, final VarDef... varDefs) {
-        final var insertText = indented(new VarReplacer(varDefs).apply(text));
-        string.append(insertText);
+    void writeLn(final String text, final VarDef... varDefs) {
+        string.append( indented( new VarReplacer(varDefs).apply(text) ));
         writeLn();
-        return insertText;
     }
 
     void writeLn() {

src/main/java/net/hostsharing/hsadminng/rbac/rbacdef/package-info.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.generator;
+package net.hostsharing.hsadminng.rbac.rbacdef;
 
 // TODO: The whole code in this package is more like a quick hack to solve an urgent problem.
 // It should be re-written in PostgreSQL pl/pgsql,

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import lombok.*;
 import org.springframework.data.annotation.Immutable;
@@ -12,7 +12,7 @@ import java.util.List;
 import java.util.UUID;
 
 @Entity
-@Table(schema = "rbac", name = "grants_ev")
+@Table(name = "rbacgrants_ev")
 @Getter
 @Setter
 @Builder

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RawRbacGrantRepository.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import org.springframework.data.repository.Repository;
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantController.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;
@@ -33,14 +33,14 @@ public class RbacGrantController implements RbacGrantsApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<RbacGrantResource> getGrantById(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID grantedRoleUuid,
-            final UUID granteeSubjectUuid) {
+            final UUID granteeUserUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
-        final var id = new RbacGrantId(granteeSubjectUuid, grantedRoleUuid);
+        final var id = new RbacGrantId(granteeUserUuid, grantedRoleUuid);
         final var result = rbacGrantRepository.findById(id);
         if (result == null) {
             return ResponseEntity.notFound().build();
@@ -50,23 +50,23 @@ public class RbacGrantController implements RbacGrantsApi {
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<List<RbacGrantResource>> listSubjectGrants(
-            final String currentSubject,
+    public ResponseEntity<List<RbacGrantResource>> listUserGrants(
+            final String currentUser,
             final String assumedRoles) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         return ResponseEntity.ok(mapper.mapList(rbacGrantRepository.findAll(), RbacGrantResource.class));
     }
 
     @Override
     @Transactional
-    public ResponseEntity<RbacGrantResource> grantRoleToSubject(
-            final String currentSubject,
+    public ResponseEntity<RbacGrantResource> grantRoleToUser(
+            final String currentUser,
             final String assumedRoles,
             final RbacGrantResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var granted = rbacGrantRepository.save(mapper.map(body, RbacGrantEntity.class));
         em.flush();
@@ -82,28 +82,28 @@ public class RbacGrantController implements RbacGrantsApi {
 
     @Override
     @Transactional
-    public ResponseEntity<Void> revokeRoleFromSubject(
-            final String currentSubject,
+    public ResponseEntity<Void> revokeRoleFromUser(
+            final String currentUser,
             final String assumedRoles,
             final UUID grantedRoleUuid,
-            final UUID granteeSubjectUuid) {
+            final UUID granteeUserUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
-        rbacGrantRepository.deleteByRbacGrantId(new RbacGrantId(granteeSubjectUuid, grantedRoleUuid));
+        rbacGrantRepository.deleteByRbacGrantId(new RbacGrantId(granteeUserUuid, grantedRoleUuid));
 
         return ResponseEntity.noContent().build();
     }
 
-// TODO.feat: implement an endpoint to create a Mermaid flowchart with all grants of a given user
+// TODO: implement an endpoint to create a Mermaid flowchart with all grants of a given user
 //    @GetMapping(
-//            path = "/api/rbac/subjects/{subjectUuid}/grants",
+//            path = "/api/rbac/users/{userUuid}/grants",
 //            produces = {"text/vnd.mermaid"})
 //    @Transactional(readOnly = true)
 //    public ResponseEntity<String> allGrantsOfUserAsMermaid(
-//            @RequestHeader(name = "current-subject") String currentSubject,
+//            @RequestHeader(name = "current-user") String currentUser,
 //            @RequestHeader(name = "assumed-roles", required = false) String assumedRoles) {
-//        final var graph = RbacGrantsDiagramService.allGrantsToUser(currentSubject);
+//        final var graph = RbacGrantsDiagramService.allGrantsToUser(currentUser);
 //        return ResponseEntity.ok(graph);
 //    }
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantEntity.java

@@ -1,14 +1,14 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import lombok.*;
-import net.hostsharing.hsadminng.rbac.role.RbacRoleType;
+import net.hostsharing.hsadminng.rbac.rbacrole.RbacRoleType;
 import org.springframework.data.annotation.Immutable;
 
 import jakarta.persistence.*;
 import java.util.UUID;
 
 @Entity
-@Table(schema = "rbac", name = "grants_rv")
+@Table(name = "rbacgrants_rv")
 @IdClass(RbacGrantId.class)
 @Getter
 @Setter
@@ -33,11 +33,11 @@ public class RbacGrantEntity {
     private UUID grantedRoleUuid;
 
     @Column(name = "username", updatable = false, insertable = false)
-    private String granteeSubjectName;
+    private String granteeUserName;
 
     @Id
-    @Column(name = "subjectuuid")
-    private UUID granteeSubjectUuid;
+    @Column(name = "useruuid")
+    private UUID granteeUserUuid;
 
     private boolean assumed;
 
@@ -55,12 +55,12 @@ public class RbacGrantEntity {
     private RbacRoleType grantedRoleType;
 
     RbacGrantId getRbacGrantId() {
-        return new RbacGrantId(granteeSubjectUuid, grantedRoleUuid);
+        return new RbacGrantId(granteeUserUuid, grantedRoleUuid);
     }
 
     public String toDisplay() {
         return "{ grant role:" + grantedRoleIdName +
-                " to user:" + granteeSubjectName +
+                " to user:" + granteeUserName +
                 " by role:" + grantedByRoleIdName +
                 (assumed ? " and assume" : "") +
                 " }";

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantId.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
@@ -14,6 +14,6 @@ import java.util.UUID;
 @AllArgsConstructor
 public class RbacGrantId implements Serializable {
 
-    private UUID granteeSubjectUuid;
+    private UUID granteeUserUuid;
     private UUID grantedRoleUuid;
 }

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantRepository.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
@@ -11,7 +11,7 @@ public interface RbacGrantRepository extends Repository<RbacGrantEntity, RbacGra
     @Query(value = """
              select g from RbacGrantEntity as g
                  where g.grantedRoleUuid=:#{#rbacGrantId.grantedRoleUuid}
-                   and g.granteeSubjectUuid=:#{#rbacGrantId.granteeSubjectUuid}
+                   and g.granteeUserUuid=:#{#rbacGrantId.granteeUserUuid}
             """)
     RbacGrantEntity findById(RbacGrantId rbacGrantId);
 
@@ -25,7 +25,7 @@ public interface RbacGrantRepository extends Repository<RbacGrantEntity, RbacGra
     @Query(value = """
              delete from RbacGrantEntity as g
                  where g.grantedRoleUuid=:#{#rbacGrantId.grantedRoleUuid}
-                   and g.granteeSubjectUuid=:#{#rbacGrantId.granteeSubjectUuid}
+                   and g.granteeUserUuid=:#{#rbacGrantId.granteeUserUuid}
             """)
     void deleteByRbacGrantId(RbacGrantId rbacGrantId);
 }

src/main/java/net/hostsharing/hsadminng/rbac/rbacgrant/RbacGrantsDiagramService.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.grant;
+package net.hostsharing.hsadminng.rbac.rbacgrant;
 
 import net.hostsharing.hsadminng.context.Context;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ import java.util.stream.Stream;
 
 import static java.util.stream.Collectors.groupingBy;
 import static java.util.stream.Collectors.joining;
-import static net.hostsharing.hsadminng.rbac.grant.RbacGrantsDiagramService.Include.*;
+import static net.hostsharing.hsadminng.rbac.rbacgrant.RbacGrantsDiagramService.Include.*;
 
 // TODO: cleanup - this code was 'hacked' to quickly fix a specific problem, needs refactoring
 @Service
@@ -64,9 +64,9 @@ public class RbacGrantsDiagramService {
 
     private Map<UUID, List<RawRbacGrantEntity>> descendantsByUuid = new HashMap<>();
 
-    public String allGrantsTocurrentSubject(final EnumSet<Include> includes) {
+    public String allGrantsToCurrentUser(final EnumSet<Include> includes) {
         final var graph = new LimitedHashSet<RawRbacGrantEntity>();
-        for ( UUID subjectUuid: context.fetchCurrentSubjectOrAssumedRolesUuids() ) {
+        for ( UUID subjectUuid: context.currentSubjectsUuids() ) {
             traverseGrantsTo(graph, subjectUuid, includes);
             }
         return toMermaidFlowchart(graph, includes);
@@ -78,11 +78,11 @@ public class RbacGrantsDiagramService {
             if (!includes.contains(PERMISSIONS) && g.getDescendantIdName().startsWith("perm:")) {
                 return;
             }
-            if ( !g.getDescendantIdName().startsWith("role:rbac.global")) {
-                if (!includes.contains(TEST_ENTITIES) && g.getDescendantIdName().contains(":rbactest.")) {
+            if ( !g.getDescendantIdName().startsWith("role:global")) {
+                if (!includes.contains(TEST_ENTITIES) && g.getDescendantIdName().contains(":test_")) {
                     return;
                 }
-                if (!includes.contains(NON_TEST_ENTITIES) && !g.getDescendantIdName().contains(":rbactest.")) {
+                if (!includes.contains(NON_TEST_ENTITIES) && !g.getDescendantIdName().contains(":test_")) {
                     return;
                 }
             }
@@ -94,7 +94,7 @@ public class RbacGrantsDiagramService {
     }
 
     public String allGrantsFrom(final UUID targetObject, final String op, final EnumSet<Include> includes) {
-        final var refUuid = (UUID) em.createNativeQuery("SELECT uuid FROM rbac.permission WHERE objectuuid=:targetObject AND op=:op")
+        final var refUuid = (UUID) em.createNativeQuery("SELECT uuid FROM rbacpermission WHERE objectuuid=:targetObject AND op=:op")
                 .setParameter("targetObject", targetObject)
                 .setParameter("op", op)
                 .getSingleResult();

src/main/java/net/hostsharing/hsadminng/rbac/rbacobject/BaseEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.object;
+package net.hostsharing.hsadminng.rbac.rbacobject;
 
 
 import org.hibernate.Hibernate;

src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleController.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.role;
+package net.hostsharing.hsadminng.rbac.rbacrole;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;
@@ -26,10 +26,10 @@ public class RbacRoleController implements RbacRolesApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<RbacRoleResource>> listRoles(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final List<RbacRoleEntity> result = rbacRoleRepository.findAll();
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.role;
+package net.hostsharing.hsadminng.rbac.rbacrole;
 
 import lombok.*;
 import org.hibernate.annotations.Formula;
@@ -8,7 +8,7 @@ import jakarta.persistence.*;
 import java.util.UUID;
 
 @Entity
-@Table(schema = "rbac", name = "role_rv")
+@Table(name = "rbacrole_rv")
 @Getter
 @Setter
 @ToString

src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleRepository.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.role;
+package net.hostsharing.hsadminng.rbac.rbacrole;
 
 import org.springframework.data.repository.Repository;
 

src/main/java/net/hostsharing/hsadminng/rbac/rbacrole/RbacRoleType.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.role;
+package net.hostsharing.hsadminng.rbac.rbacrole;
 
 public enum RbacRoleType {
     OWNER, ADMIN, AGENT, TENANT, GUEST, REFERRER

src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserController.java

@@ -1,10 +1,10 @@
-package net.hostsharing.hsadminng.rbac.subject;
+package net.hostsharing.hsadminng.rbac.rbacuser;
 
 import net.hostsharing.hsadminng.context.Context;
 import net.hostsharing.hsadminng.mapper.Mapper;
-import net.hostsharing.hsadminng.rbac.generated.api.v1.api.RbacSubjectsApi;
-import net.hostsharing.hsadminng.rbac.generated.api.v1.model.RbacSubjectPermissionResource;
-import net.hostsharing.hsadminng.rbac.generated.api.v1.model.RbacSubjectResource;
+import net.hostsharing.hsadminng.rbac.generated.api.v1.api.RbacUsersApi;
+import net.hostsharing.hsadminng.rbac.generated.api.v1.model.RbacUserPermissionResource;
+import net.hostsharing.hsadminng.rbac.generated.api.v1.model.RbacUserResource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.UUID;
 
 @RestController
-public class RbacSubjectController implements RbacSubjectsApi {
+public class RbacUserController implements RbacUsersApi {
 
     @Autowired
     private Context context;
@@ -24,81 +24,81 @@ public class RbacSubjectController implements RbacSubjectsApi {
     private Mapper mapper;
 
     @Autowired
-    private RbacSubjectRepository rbacSubjectRepository;
+    private RbacUserRepository rbacUserRepository;
 
     @Override
     @Transactional
-    public ResponseEntity<RbacSubjectResource> createSubject(
-            final RbacSubjectResource body
+    public ResponseEntity<RbacUserResource> createUser(
+            final RbacUserResource body
     ) {
         context.define(null);
 
         if (body.getUuid() == null) {
             body.setUuid(UUID.randomUUID());
         }
-        final var saved = mapper.map(body, RbacSubjectEntity.class);
-        rbacSubjectRepository.create(saved);
+        final var saved = mapper.map(body, RbacUserEntity.class);
+        rbacUserRepository.create(saved);
         final var uri =
                 MvcUriComponentsBuilder.fromController(getClass())
                         .path("/api/rbac.yaml/users/{id}")
                         .buildAndExpand(saved.getUuid())
                         .toUri();
-        return ResponseEntity.created(uri).body(mapper.map(saved, RbacSubjectResource.class));
+        return ResponseEntity.created(uri).body(mapper.map(saved, RbacUserResource.class));
     }
 
     @Override
     @Transactional
-    public ResponseEntity<Void> deleteSubjectByUuid(
-            final String currentSubject,
+    public ResponseEntity<Void> deleteUserByUuid(
+            final String currentUser,
             final String assumedRoles,
-            final UUID subjectUuid
+            final UUID userUuid
     ) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
-        rbacSubjectRepository.deleteByUuid(subjectUuid);
+        rbacUserRepository.deleteByUuid(userUuid);
 
         return ResponseEntity.noContent().build();
     }
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<RbacSubjectResource> getSubjectById(
-            final String currentSubject,
+    public ResponseEntity<RbacUserResource> getUserById(
+            final String currentUser,
             final String assumedRoles,
-            final UUID subjectUuid) {
+            final UUID userUuid) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
-        final var result = rbacSubjectRepository.findByUuid(subjectUuid);
+        final var result = rbacUserRepository.findByUuid(userUuid);
         if (result == null) {
             return ResponseEntity.notFound().build();
         }
-        return ResponseEntity.ok(mapper.map(result, RbacSubjectResource.class));
+        return ResponseEntity.ok(mapper.map(result, RbacUserResource.class));
     }
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<List<RbacSubjectResource>> listSubjects(
-            final String currentSubject,
+    public ResponseEntity<List<RbacUserResource>> listUsers(
+            final String currentUser,
             final String assumedRoles,
             final String userName
     ) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
-        return ResponseEntity.ok(mapper.mapList(rbacSubjectRepository.findByOptionalNameLike(userName), RbacSubjectResource.class));
+        return ResponseEntity.ok(mapper.mapList(rbacUserRepository.findByOptionalNameLike(userName), RbacUserResource.class));
     }
 
     @Override
     @Transactional(readOnly = true)
-    public ResponseEntity<List<RbacSubjectPermissionResource>> listSubjectPermissions(
-            final String currentSubject,
+    public ResponseEntity<List<RbacUserPermissionResource>> listUserPermissions(
+            final String currentUser,
             final String assumedRoles,
-            final UUID subjectUuid
+            final UUID userUuid
     ) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         return ResponseEntity.ok(mapper.mapList(
-                rbacSubjectRepository.findPermissionsOfUserByUuid(subjectUuid),
-                RbacSubjectPermissionResource.class));
+                rbacUserRepository.findPermissionsOfUserByUuid(userUuid),
+                RbacUserPermissionResource.class));
     }
 }

src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserEntity.java

@@ -1,4 +1,4 @@
-package net.hostsharing.hsadminng.rbac.subject;
+package net.hostsharing.hsadminng.rbac.rbacuser;
 
 import lombok.*;
 import org.springframework.data.annotation.Immutable;
@@ -13,14 +13,14 @@ import java.time.temporal.ChronoUnit;
 import java.util.UUID;
 
 @Entity
-@Table(schema = "rbac", name = "subject_rv")
+@Table(name = "rbacuser_rv")
 @Getter
 @Setter
 @ToString
 @Immutable
 @NoArgsConstructor
 @AllArgsConstructor
-public class RbacSubjectEntity {
+public class RbacUserEntity {
 
     private static final int MAX_VALIDITY_DAYS = 21;
     private static DateTimeFormatter DATE_FORMAT_WITH_FULLHOUR = DateTimeFormatter.ofPattern("MM-dd-yyyy HH");

src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserPermission.java

@@ -1,8 +1,8 @@
-package net.hostsharing.hsadminng.rbac.subject;
+package net.hostsharing.hsadminng.rbac.rbacuser;
 
 import java.util.UUID;
 
-public interface RbacSubjectPermission {
+public interface RbacUserPermission {
 
     UUID getRoleUuid();
     String getRoleName();

src/main/java/net/hostsharing/hsadminng/rbac/rbacuser/RbacUserRepository.java

@@ -0,0 +1,46 @@
+package net.hostsharing.hsadminng.rbac.rbacuser;
+
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface RbacUserRepository extends Repository<RbacUserEntity, UUID> {
+
+    @Query("""
+             select u from RbacUserEntity u
+                 where :userName is null or u.name like concat(cast(:userName as text), '%')
+                 order by u.name
+            """)
+    List<RbacUserEntity> findByOptionalNameLike(String userName);
+
+    // bypasses the restricted view, to be able to grant rights to arbitrary user
+    @Query(value = "select * from rbacuser where name=:userName", nativeQuery = true)
+    RbacUserEntity findByName(String userName);
+
+    RbacUserEntity findByUuid(UUID uuid);
+
+    @Query(value = "select * from grantedPermissions(:userUuid)", nativeQuery = true)
+    List<RbacUserPermission> findPermissionsOfUserByUuid(UUID userUuid);
+
+    /*
+        Can't use save/saveAndFlush from SpringData because the uuid is not generated on the entity level,
+        but explicitly, and then SpringData check's if it exists using an SQL SELECT.
+        And SQL SELECT needs a currentUser which we don't yet have in the case of self registration.
+     */
+    @Modifying
+    @Query(value = "insert into RBacUser_RV (uuid, name) values( :#{#newUser.uuid}, :#{#newUser.name})", nativeQuery = true)
+    void insert(final RbacUserEntity newUser);
+
+    default RbacUserEntity create(final RbacUserEntity rbacUserEntity) {
+        if (rbacUserEntity.getUuid() == null) {
+            rbacUserEntity.setUuid(UUID.randomUUID());
+        }
+        insert(rbacUserEntity);
+        return rbacUserEntity;
+    }
+
+    void deleteByUuid(UUID userUuid);
+}

src/main/java/net/hostsharing/hsadminng/rbac/subject/RbacSubjectRepository.java

@@ -1,46 +0,0 @@
-package net.hostsharing.hsadminng.rbac.subject;
-
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.Repository;
-
-import java.util.List;
-import java.util.UUID;
-
-public interface RbacSubjectRepository extends Repository<RbacSubjectEntity, UUID> {
-
-    @Query("""
-             select u from RbacSubjectEntity u
-                 where :userName is null or u.name like concat(cast(:userName as text), '%')
-                 order by u.name
-            """)
-    List<RbacSubjectEntity> findByOptionalNameLike(String userName);
-
-    // bypasses the restricted view, to be able to grant rights to arbitrary user
-    @Query(value = "select * from rbac.subject where name=:userName", nativeQuery = true)
-    RbacSubjectEntity findByName(String userName);
-
-    RbacSubjectEntity findByUuid(UUID uuid);
-
-    @Query(value = "select * from rbac.grantedPermissions(:subjectUuid)", nativeQuery = true)
-    List<RbacSubjectPermission> findPermissionsOfUserByUuid(UUID subjectUuid);
-
-    /*
-        Can't use save/saveAndFlush from SpringData because the uuid is not generated on the entity level,
-        but explicitly, and then SpringData check's if it exists using an SQL SELECT.
-        And SQL SELECT needs a currentSubject which we don't yet have in the case of self registration.
-     */
-    @Modifying
-    @Query(value = "insert into rbac.subject_rv (uuid, name) values( :#{#newUser.uuid}, :#{#newUser.name})", nativeQuery = true)
-    void insert(final RbacSubjectEntity newUser);
-
-    default RbacSubjectEntity create(final RbacSubjectEntity rbacSubjectEntity) {
-        if (rbacSubjectEntity.getUuid() == null) {
-            rbacSubjectEntity.setUuid(UUID.randomUUID());
-        }
-        insert(rbacSubjectEntity);
-        return rbacSubjectEntity;
-    }
-
-    void deleteByUuid(UUID subjectUuid);
-}

src/main/java/net/hostsharing/hsadminng/rbac/test/cust/TestCustomerController.java

@@ -32,11 +32,11 @@ public class TestCustomerController implements TestCustomersApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<TestCustomerResource>> listCustomers(
-            String currentSubject,
+            String currentUser,
             String assumedRoles,
             String prefix
     ) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = testCustomerRepository.findCustomerByOptionalPrefixLike(prefix);
 
@@ -46,11 +46,11 @@ public class TestCustomerController implements TestCustomersApi {
     @Override
     @Transactional
     public ResponseEntity<TestCustomerResource> addCustomer(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final TestCustomerResource customer) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var saved = testCustomerRepository.save(mapper.map(customer, TestCustomerEntity.class));
         final var uri =

src/main/java/net/hostsharing/hsadminng/rbac/test/cust/TestCustomerEntity.java

@@ -5,22 +5,22 @@ import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 
 import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.GLOBAL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.RbacSubjectReference.UserRole.CREATOR;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.GLOBAL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.RbacUserReference.UserRole.CREATOR;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
-@Table(schema = "rbactest", name = "customer_rv")
+@Table(name = "test_customer_rv")
 @Getter
 @Setter
 @NoArgsConstructor
@@ -46,7 +46,7 @@ public class TestCustomerEntity implements BaseEntity<TestCustomerEntity> {
                 .withIdentityView(SQL.projection("prefix"))
                 .withRestrictedViewOrderBy(SQL.expression("reference"))
                 .withUpdatableColumns("reference", "prefix", "adminUserName")
-                .toRole("rbac.global", ADMIN).grantPermission(INSERT)
+                .toRole("global", ADMIN).grantPermission(INSERT)
 
                 .createRole(OWNER, (with) -> {
                     with.owningUser(CREATOR).unassumed();
@@ -62,6 +62,6 @@ public class TestCustomerEntity implements BaseEntity<TestCustomerEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-rbactest/201-rbactest-customer/2013-rbactest-customer-rbac");
+        rbac().generateWithBaseFileName("2-test/201-test-customer/2013-test-customer-rbac");
     }
 }

src/main/java/net/hostsharing/hsadminng/rbac/test/dom/TestDomainEntity.java

@@ -4,25 +4,25 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.rbac.test.pac.TestPackageEntity;
 
 import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.directlyFetchedByDependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.directlyFetchedByDependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
-@Table(schema = "rbactest", name = "domain_rv")
+@Table(name = "test_domain_rv")
 @Getter
 @Setter
 @NoArgsConstructor
@@ -68,6 +68,6 @@ public class TestDomainEntity implements BaseEntity<TestDomainEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-rbactest/203-rbactest-domain/2033-rbactest-domain-rbac");
+        rbac().generateWithBaseFileName("2-test/203-test-domain/2033-test-domain-rbac");
     }
 }

src/main/java/net/hostsharing/hsadminng/rbac/test/pac/TestPackageController.java

@@ -29,11 +29,11 @@ public class TestPackageController implements TestPackagesApi {
     @Override
     @Transactional(readOnly = true)
     public ResponseEntity<List<TestPackageResource>> listPackages(
-            String currentSubject,
+            String currentUser,
             String assumedRoles,
             String name
     ) {
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var result = testPackageRepository.findAllByOptionalNameLike(name);
         return ResponseEntity.ok(mapper.mapList(result, TestPackageResource.class));
@@ -42,12 +42,12 @@ public class TestPackageController implements TestPackagesApi {
     @Override
     @Transactional
     public ResponseEntity<TestPackageResource> updatePackage(
-            final String currentSubject,
+            final String currentUser,
             final String assumedRoles,
             final UUID packageUuid,
             final TestPackageUpdateResource body) {
 
-        context.define(currentSubject, assumedRoles);
+        context.define(currentUser, assumedRoles);
 
         final var current = testPackageRepository.findByUuid(packageUuid);
         OptionalFromJson.of(body.getDescription()).ifPresent(current::setDescription);

src/main/java/net/hostsharing/hsadminng/rbac/test/pac/TestPackageEntity.java

@@ -4,25 +4,25 @@ import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
-import net.hostsharing.hsadminng.rbac.object.BaseEntity;
-import net.hostsharing.hsadminng.rbac.generator.RbacView;
-import net.hostsharing.hsadminng.rbac.generator.RbacView.SQL;
+import net.hostsharing.hsadminng.rbac.rbacobject.BaseEntity;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView;
+import net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL;
 import net.hostsharing.hsadminng.rbac.test.cust.TestCustomerEntity;
 
 import jakarta.persistence.*;
 import java.io.IOException;
 import java.util.UUID;
 
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Column.dependsOnColumn;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.ColumnValue.usingDefaultCase;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Nullable.NOT_NULL;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Permission.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.Role.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.SQL.*;
-import static net.hostsharing.hsadminng.rbac.generator.RbacView.rbacViewFor;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Column.dependsOnColumn;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.ColumnValue.usingDefaultCase;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Nullable.NOT_NULL;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Permission.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.Role.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.SQL.*;
+import static net.hostsharing.hsadminng.rbac.rbacdef.RbacView.rbacViewFor;
 
 @Entity
-@Table(schema = "rbactest", name = "package_rv")
+@Table(name = "test_package_rv")
 @Getter
 @Setter
 @NoArgsConstructor
@@ -69,6 +69,6 @@ public class TestPackageEntity implements BaseEntity<TestPackageEntity> {
     }
 
     public static void main(String[] args) throws IOException {
-        rbac().generateWithBaseFileName("2-rbactest/202-rbactest-package/2023-rbactest-package-rbac");
+        rbac().generateWithBaseFileName("2-test/202-test-package/2023-test-package-rbac");
     }
 }

src/main/resources/api-definition/auth.yaml

@@ -3,13 +3,13 @@ components:
 
     parameters:
 
-        currentSubject:
-            name: current-subject
+        currentUser:
+            name: current-user
             in: header
             required: true
             schema:
                 type: string
-            description: Identifying name of the current subject (e.g. user).
+            description: Identifying name of the currently logged in user.
 
         assumedRoles:
             name: assumed-roles
@@ -17,4 +17,4 @@ components:
             required: false
             schema:
                 type: string
-            description: Semicolon-separated list of roles to assume. The current subject needs to have the right to assume these roles.
+            description: Semicolon-separated list of roles to assume. The current user needs to have the right to assume these roles.

src/main/resources/api-definition/error-responses.yaml

@@ -8,13 +8,13 @@ components:
                     schema:
                         $ref: '#/components/schemas/Error'
         Unauthorized:
-            description: The current subject is unknown or not authorized.
+            description: The current user is unknown or not authorized.
             content:
                 application/json:
                     schema:
                         $ref: '#/components/schemas/Error'
         Forbidden:
-            description: The current subject or none of the assumed or roles is granted access to the resource.
+            description: The current user or none of the assumed or roles is granted access to the resource.
             content:
                 application/json:
                     schema:

src/main/resources/api-definition/hs-booking/auth.yaml

@@ -3,13 +3,13 @@ components:
 
     parameters:
 
-        currentSubject:
-            name: current-subject
+        currentUser:
+            name: current-user
             in: header
             required: true
             schema:
                 type: string
-            description: Identifying name of the currently logged in subject.
+            description: Identifying name of the currently logged in user.
 
         assumedRoles:
             name: assumed-roles
@@ -17,4 +17,4 @@ components:
             required: false
             schema:
                 type: string
-            description: Semicolon-separated list of roles to assume. The current subject needs to have the right to assume these roles.
+            description: Semicolon-separated list of roles to assume. The current user needs to have the right to assume these roles.

src/main/resources/api-definition/hs-booking/error-responses.yaml

@@ -8,13 +8,13 @@ components:
                     schema:
                         $ref: '#/components/schemas/Error'
         Unauthorized:
-            description: The current subject is unknown or not authorized.
+            description: The current user is unknown or not authorized.
             content:
                 application/json:
                     schema:
                         $ref: '#/components/schemas/Error'
         Forbidden:
-            description: The current subject or none of the assumed or roles is granted access to the resource.
+            description: The current user or none of the assumed or roles is granted access to the resource.
             content:
                 application/json:
                     schema:

src/main/resources/api-definition/hs-booking/hs-booking-items-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single booking item its uuid, if visible for the current subject.'
     operationId: getBookingItemByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bookingItemUuid
           in: path
@@ -32,7 +32,7 @@ patch:
     description: 'Updates a single booking item identified by its uuid, if permitted for the current subject.'
     operationId: patchBookingItem
     parameters:
-        -   $ref: 'auth.yaml#/components/parameters/currentSubject'
+        -   $ref: 'auth.yaml#/components/parameters/currentUser'
         -   $ref: 'auth.yaml#/components/parameters/assumedRoles'
         -   name: bookingItemUuid
             in: path
@@ -63,7 +63,7 @@ delete:
     description: 'Delete a single booking item identified by its uuid, if permitted for the current subject.'
     operationId: deleteBookingIemByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bookingItemUuid
           in: path

src/main/resources/api-definition/hs-booking/hs-booking-items.yaml

@@ -1,11 +1,11 @@
 get:
     summary: Returns a list of all booking items for a specified project.
-    description: Returns the list of all booking items for a specified project which are visible to the current subject or any of it's assumed roles.
+    description: Returns the list of all booking items for a specified project which are visible to the current user or any of it's assumed roles.
     tags:
         - hs-booking-items
     operationId: listBookingItemsByProjectUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: projectUuid
           in: query
@@ -34,7 +34,7 @@ post:
         - hs-booking-items
     operationId: addBookingItem
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     requestBody:
         description: A JSON object describing the new booking item.

src/main/resources/api-definition/hs-booking/hs-booking-projects-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single booking project its uuid, if visible for the current subject.'
     operationId: getBookingProjectByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bookingProjectUuid
           in: path
@@ -32,7 +32,7 @@ patch:
     description: 'Updates a single booking project identified by its uuid, if permitted for the current subject.'
     operationId: patchBookingProject
     parameters:
-        -   $ref: 'auth.yaml#/components/parameters/currentSubject'
+        -   $ref: 'auth.yaml#/components/parameters/currentUser'
         -   $ref: 'auth.yaml#/components/parameters/assumedRoles'
         -   name: bookingProjectUuid
             in: path
@@ -63,7 +63,7 @@ delete:
     description: 'Delete a single booking project identified by its uuid, if permitted for the current subject.'
     operationId: deleteBookingIemByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bookingProjectUuid
           in: path

src/main/resources/api-definition/hs-booking/hs-booking-projects.yaml

@@ -1,11 +1,11 @@
 get:
     summary: Returns a list of all booking projects for a specified debitor.
-    description: Returns the list of all booking projects for a specified debitor which are visible to the current subject or any of it's assumed roles.
+    description: Returns the list of all booking projects for a specified debitor which are visible to the current user or any of it's assumed roles.
     tags:
         - hs-booking-projects
     operationId: listBookingProjectsByDebitorUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: debitorUuid
           in: query
@@ -34,7 +34,7 @@ post:
         - hs-booking-projects
     operationId: addBookingProject
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     requestBody:
         description: A JSON object describing the new booking project.

src/main/resources/api-definition/hs-hosting/auth.yaml

@@ -3,13 +3,13 @@ components:
 
     parameters:
 
-        currentSubject:
-            name: current-subject
+        currentUser:
+            name: current-user
             in: header
             required: true
             schema:
                 type: string
-            description: Identifying name of the currently logged in subject.
+            description: Identifying name of the currently logged in user.
 
         assumedRoles:
             name: assumed-roles
@@ -17,4 +17,4 @@ components:
             required: false
             schema:
                 type: string
-            description: Semicolon-separated list of roles to assume. The current subject needs to have the right to assume these roles.
+            description: Semicolon-separated list of roles to assume. The current user needs to have the right to assume these roles.

src/main/resources/api-definition/hs-hosting/error-responses.yaml

@@ -8,13 +8,13 @@ components:
                     schema:
                         $ref: '#/components/schemas/Error'
         Unauthorized:
-            description: The current subject is unknown or not authorized.
+            description: The current user is unknown or not authorized.
             content:
                 application/json:
                     schema:
                         $ref: '#/components/schemas/Error'
         Forbidden:
-            description: The current subject or none of the assumed or roles is granted access to the resource.
+            description: The current user or none of the assumed or roles is granted access to the resource.
             content:
                 application/json:
                     schema:

src/main/resources/api-definition/hs-hosting/hs-hosting-assets-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single managed asset by its uuid, if visible for the current subject.'
     operationId: getAssetByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: assetUuid
           in: path
@@ -32,7 +32,7 @@ patch:
     description: 'Updates a single hosting asset identified by its uuid, if permitted for the current subject.'
     operationId: patchAsset
     parameters:
-        -   $ref: 'auth.yaml#/components/parameters/currentSubject'
+        -   $ref: 'auth.yaml#/components/parameters/currentUser'
         -   $ref: 'auth.yaml#/components/parameters/assumedRoles'
         -   name: assetUuid
             in: path
@@ -63,7 +63,7 @@ delete:
     description: 'Delete a single hosting asset identified by its uuid, if permitted for the current subject.'
     operationId: deleteAssetUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: assetUuid
           in: path

src/main/resources/api-definition/hs-hosting/hs-hosting-assets.yaml

@@ -1,11 +1,11 @@
 get:
     summary: Returns a filtered list of all hosting assets.
-    description: Returns the list of all hosting assets which match the given filters and are visible to the current subject or any of it's assumed roles.
+    description: Returns the list of all hosting assets which match the given filters and are visible to the current user or any of it's assumed roles.
     tags:
         - hs-hosting-assets
     operationId: listAssets
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: projectUuid
           in: query
@@ -47,7 +47,7 @@ post:
         - hs-hosting-assets
     operationId: addAsset
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     requestBody:
         description: A JSON object describing the new hosting asset.

src/main/resources/api-definition/hs-office/hs-office-bankaccounts-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single bank account by its uuid, if visible for the current subject.'
     operationId: getBankAccountByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bankAccountUUID
           in: path
@@ -31,7 +31,7 @@ delete:
     description: 'Delete a single bank account by its uuid, if permitted for the current subject.'
     operationId: deleteBankAccountByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: bankAccountUUID
           in: path

src/main/resources/api-definition/hs-office/hs-office-bankaccounts.yaml

@@ -1,11 +1,11 @@
 get:
     summary: Returns a list of (optionally filtered) bankaccounts.
-    description: Returns the list of (optionally filtered) bankaccounts which are visible to the current subject or any of it's assumed roles.
+    description: Returns the list of (optionally filtered) bankaccounts which are visible to the current user or any of it's assumed roles.
     tags:
         - hs-office-bank-accounts
     operationId: listBankAccounts
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: holder
           in: query
@@ -33,7 +33,7 @@ post:
         - hs-office-bank-accounts
     operationId: addBankAccount
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     requestBody:
         content:

src/main/resources/api-definition/hs-office/hs-office-contacts-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single business contact by its uuid, if visible for the current subject.'
     operationId: getContactByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: contactUUID
           in: path
@@ -32,7 +32,7 @@ patch:
     description: 'Updates a single contact by its uuid, if permitted for the current subject.'
     operationId: patchContact
     parameters:
-        -   $ref: 'auth.yaml#/components/parameters/currentSubject'
+        -   $ref: 'auth.yaml#/components/parameters/currentUser'
         -   $ref: 'auth.yaml#/components/parameters/assumedRoles'
         -   name: contactUUID
             in: path
@@ -63,7 +63,7 @@ delete:
     description: 'Delete a single business contact by its uuid, if permitted for the current subject.'
     operationId: deleteContactByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: contactUUID
           in: path

src/main/resources/api-definition/hs-office/hs-office-contacts.yaml

@@ -1,11 +1,11 @@
 get:
     summary: Returns a list of (optionally filtered) contacts.
-    description: Returns the list of (optionally filtered) contacts which are visible to the current subject or any of it's assumed roles.
+    description: Returns the list of (optionally filtered) contacts which are visible to the current user or any of it's assumed roles.
     tags:
         - hs-office-contacts
     operationId: listContacts
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: name
           in: query
@@ -33,7 +33,7 @@ post:
         - hs-office-contacts
     operationId: addContact
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     requestBody:
         content:

src/main/resources/api-definition/hs-office/hs-office-coopassets-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single asset transaction by its uuid, if visible for the current subject.'
     operationId: getCoopAssetTransactionByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: assetTransactionUUID
           in: path

src/main/resources/api-definition/hs-office/hs-office-coopassets.yaml

@@ -1,11 +1,11 @@
 get:
   summary: Returns a list of (optionally filtered) cooperative asset transactions.
-  description: Returns the list of (optionally filtered) cooperative asset transactions which are visible to the current subject or any of it's assumed roles.
+  description: Returns the list of (optionally filtered) cooperative asset transactions which are visible to the current user or any of it's assumed roles.
   tags:
     - hs-office-coopAssets
   operationId: listCoopAssets
   parameters:
-    - $ref: 'auth.yaml#/components/parameters/currentSubject'
+    - $ref: 'auth.yaml#/components/parameters/currentUser'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     - name: membershipUuid
       in: query
@@ -48,7 +48,7 @@ post:
     - hs-office-coopAssets
   operationId: addCoopAssetsTransaction
   parameters:
-    - $ref: 'auth.yaml#/components/parameters/currentSubject'
+    - $ref: 'auth.yaml#/components/parameters/currentUser'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
   requestBody:
     description: A JSON object describing the new cooperative assets transaction.

src/main/resources/api-definition/hs-office/hs-office-coopshares-with-uuid.yaml

@@ -4,7 +4,7 @@ get:
     description: 'Fetch a single share transaction by its uuid, if visible for the current subject.'
     operationId: getCoopShareTransactionByUuid
     parameters:
-        - $ref: 'auth.yaml#/components/parameters/currentSubject'
+        - $ref: 'auth.yaml#/components/parameters/currentUser'
         - $ref: 'auth.yaml#/components/parameters/assumedRoles'
         - name: shareTransactionUUID
           in: path

src/main/resources/api-definition/hs-office/hs-office-coopshares.yaml

@@ -1,11 +1,11 @@
 get:
   summary: Returns a list of (optionally filtered) cooperative share transactions.
-  description: Returns the list of (optionally filtered) cooperative share transactions which are visible to the current subject or any of it's assumed roles.
+  description: Returns the list of (optionally filtered) cooperative share transactions which are visible to the current user or any of it's assumed roles.
   tags:
     - hs-office-coopShares
   operationId: listCoopShares
   parameters:
-    - $ref: 'auth.yaml#/components/parameters/currentSubject'
+    - $ref: 'auth.yaml#/components/parameters/currentUser'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
     - name: membershipUuid
       in: query
@@ -48,7 +48,7 @@ post:
     - hs-office-coopShares
   operationId: addCoopSharesTransaction
   parameters:
-    - $ref: 'auth.yaml#/components/parameters/currentSubject'
+    - $ref: 'auth.yaml#/components/parameters/currentUser'
     - $ref: 'auth.yaml#/components/parameters/assumedRoles'
   requestBody:
     description: A JSON object describing the new cooperative shares transaction.