From 458500e874b13093493165e6fbc736f46b2d7db5 Mon Sep 17 00:00:00 2001 From: Duarte Meneses Date: Mon, 16 Aug 2021 15:39:56 -0500 Subject: [PATCH] SONAR-15142 Use permission instead of role --- .../sonar/db/audit/model/ComponentNewValue.java | 2 +- .../sonar/db/audit/model/PermissionNewValue.java | 10 +++++----- .../audit/model/PermissionTemplateNewValue.java | 16 ++++++++-------- .../GroupPermissionDaoWithPersisterTest.java | 13 +++++++------ .../UserPermissionDaoWithPersisterTest.java | 16 ++++++++-------- ...mplateCharacteristicDaoWithPersisterTest.java | 4 ++-- .../PermissionTemplateDaoWithPersisterTest.java | 14 +++++++------- 7 files changed, 38 insertions(+), 37 deletions(-) diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/ComponentNewValue.java b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/ComponentNewValue.java index d45bd7f7d7f..51925c8c673 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/ComponentNewValue.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/ComponentNewValue.java @@ -53,7 +53,7 @@ public class ComponentNewValue extends NewValue { this.componentUuid = componentUuid; this.componentName = name; this.isPrivate = isPrivate; - this.qualifier = this.getQualifier(qualifier); + this.qualifier = getQualifier(qualifier); } public ComponentNewValue(String uuid, String name, String key, boolean enabled, String path, @Nullable String qualifier) { diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionNewValue.java b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionNewValue.java index 96a7bcb9ca3..8c1addd360a 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionNewValue.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionNewValue.java @@ -33,18 +33,18 @@ public abstract class PermissionNewValue extends NewValue { protected String componentName; @Nullable - protected String role; + protected String permission; @Nullable protected String qualifier; protected PermissionNewValue(@Nullable String permissionUuid, @Nullable String componentUuid, @Nullable String componentName, - @Nullable String role, @Nullable String qualifier) { + @Nullable String permission, @Nullable String qualifier) { this.permissionUuid = permissionUuid; this.componentUuid = componentUuid; this.componentName = componentName; this.qualifier = getQualifier(qualifier); - this.role = role; + this.permission = permission; } @CheckForNull @@ -58,8 +58,8 @@ public abstract class PermissionNewValue extends NewValue { } @CheckForNull - public String getRole() { - return this.role; + public String getPermission() { + return this.permission; } @CheckForNull diff --git a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionTemplateNewValue.java b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionTemplateNewValue.java index 26ff2491b9e..4a24fb46336 100644 --- a/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionTemplateNewValue.java +++ b/server/sonar-db-dao/src/main/java/org/sonar/db/audit/model/PermissionTemplateNewValue.java @@ -35,7 +35,7 @@ public class PermissionTemplateNewValue extends NewValue { private String description; @Nullable - private String role; + private String permission; @Nullable private String userUuid; @@ -64,21 +64,21 @@ public class PermissionTemplateNewValue extends NewValue { this.description = permissionTemplateDto.getDescription(); } - public PermissionTemplateNewValue(@Nullable String templateUuid, @Nullable String name, @Nullable String role, + public PermissionTemplateNewValue(@Nullable String templateUuid, @Nullable String name, @Nullable String permission, @Nullable String userUuid, @Nullable String userLogin, @Nullable String groupUuid, @Nullable String groupName) { this.templateUuid = templateUuid; this.name = name; - this.role = role; + this.permission = permission; this.userUuid = userUuid; this.userLogin = userLogin; this.groupUuid = groupUuid; this.groupName = groupName; } - public PermissionTemplateNewValue(String templateUuid, String role, String name, boolean withProjectCreator) { + public PermissionTemplateNewValue(String templateUuid, String permission, String name, boolean withProjectCreator) { this.templateUuid = templateUuid; this.name = name; - this.role = role; + this.permission = permission; this.withProjectCreator = withProjectCreator; } @@ -101,8 +101,8 @@ public class PermissionTemplateNewValue extends NewValue { } @CheckForNull - public String getRole() { - return this.role; + public String getPermission() { + return this.permission; } @CheckForNull @@ -137,7 +137,7 @@ public class PermissionTemplateNewValue extends NewValue { addField(sb, "\"name\": ", this.name, true); addField(sb, "\"keyPattern\": ", this.keyPattern, true); addField(sb, "\"description\": ", this.description, true); - addField(sb, "\"role\": ", this.role, true); + addField(sb, "\"permission\": ", this.permission, true); addField(sb, "\"userUuid\": ", this.userUuid, true); addField(sb, "\"userLogin\": ", this.userLogin, true); addField(sb, "\"groupUuid\": ", this.groupUuid, true); diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java index 4e37d71c52d..a50e9b10b16 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/GroupPermissionDaoWithPersisterTest.java @@ -67,14 +67,14 @@ public class GroupPermissionDaoWithPersisterTest { verify(auditPersister).addGroupPermission(eq(dbSession), newValueCaptor.capture()); GroupPermissionNewValue newValue = newValueCaptor.getValue(); assertNewValue(newValue, dto.getUuid(), group.getUuid(), group.getName(), null, dto.getRole(), null, null); - assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"role\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\" }"); + assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"permission\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\" }"); underTest.delete(dbSession, ADMIN, group.getUuid(), group.getName(), null, null); verify(auditPersister).deleteGroupPermission(eq(dbSession), newValueCaptor.capture()); newValue = newValueCaptor.getValue(); assertNewValue(newValue, null, group.getUuid(), group.getName(), null, ADMIN, null, null); - assertThat(newValue).hasToString("{\"role\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\" }"); + assertThat(newValue).hasToString("{\"permission\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\" }"); } @Test @@ -91,7 +91,7 @@ public class GroupPermissionDaoWithPersisterTest { verify(auditPersister).addGroupPermission(eq(dbSession), newValueCaptor.capture()); GroupPermissionNewValue newValue = newValueCaptor.getValue(); assertNewValue(newValue, dto.getUuid(), group.getUuid(), group.getName(), project.uuid(), dto.getRole(), project.name(), "project"); - assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"role\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\", \"componentUuid\": \"cuuid\", " + assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"permission\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\", \"componentUuid\": \"cuuid\", " + "\"componentName\": \"cname\", \"qualifier\": \"project\" }"); underTest.deleteByRootComponentUuid(dbSession, project); @@ -119,7 +119,8 @@ public class GroupPermissionDaoWithPersisterTest { verify(auditPersister).addGroupPermission(eq(dbSession), newValueCaptor.capture()); GroupPermissionNewValue newValue = newValueCaptor.getValue(); assertNewValue(newValue, dto.getUuid(), null, null, project.uuid(), dto.getRole(), project.name(), "project"); - assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"role\": \"admin\", \"componentUuid\": \"cuuid\", \"componentName\": \"cname\", \"qualifier\": \"project\" }"); + assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"permission\": \"admin\", \"componentUuid\": \"cuuid\", " + + "\"componentName\": \"cname\", \"qualifier\": \"project\" }"); underTest.deleteByRootComponentUuidForAnyOne(dbSession, project); @@ -146,7 +147,7 @@ public class GroupPermissionDaoWithPersisterTest { verify(auditPersister).addGroupPermission(eq(dbSession), newValueCaptor.capture()); GroupPermissionNewValue newValue = newValueCaptor.getValue(); assertNewValue(newValue, dto.getUuid(), group.getUuid(), group.getName(), project.uuid(), dto.getRole(), project.name(), "project"); - assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"role\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\", " + assertThat(newValue).hasToString("{\"permissionUuid\": \"1\", \"permission\": \"admin\", \"groupUuid\": \"guuid\", \"groupName\": \"gname\", " + "\"componentUuid\": \"cuuid\", \"componentName\": \"cname\", \"qualifier\": \"project\" }"); underTest.deleteByRootComponentUuidAndPermission(dbSession, dto.getRole(), project); @@ -154,7 +155,7 @@ public class GroupPermissionDaoWithPersisterTest { verify(auditPersister).deleteGroupPermission(eq(dbSession), newValueCaptor.capture()); newValue = newValueCaptor.getValue(); assertNewValue(newValue, null, null, null, project.uuid(), ADMIN, project.name(), "project"); - assertThat(newValue).hasToString("{\"role\": \"admin\", \"componentUuid\": \"cuuid\", \"componentName\": \"cname\", \"qualifier\": \"project\" }"); + assertThat(newValue).hasToString("{\"permission\": \"admin\", \"componentUuid\": \"cuuid\", \"componentName\": \"cname\", \"qualifier\": \"project\" }"); } @Test diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java index 5f85b9afd44..b423bf01e2b 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/UserPermissionDaoWithPersisterTest.java @@ -61,7 +61,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, - UserPermissionNewValue::getComponentUuid, UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getComponentUuid, UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(dto.getUuid(), user.getUuid(), user.getLogin(), null, dto.getPermission(), null, null); assertThat(newValue.toString()).doesNotContain("projectUuid"); @@ -71,7 +71,7 @@ public class UserPermissionDaoWithPersisterTest { newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName) .containsExactly(null, user.getUuid(), user.getLogin(), null, dto.getPermission(), null); assertThat(newValue.toString()).doesNotContain("permissionUuid"); } @@ -97,7 +97,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(dto.getUuid(), user.getUuid(), user.getLogin(), project.uuid(), dto.getPermission(), project.name(), "project"); assertThat(newValue.toString()).contains("componentUuid"); @@ -107,7 +107,7 @@ public class UserPermissionDaoWithPersisterTest { newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, - UserPermissionNewValue::getComponentUuid, UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName) + UserPermissionNewValue::getComponentUuid, UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName) .containsExactly(null, user.getUuid(), user.getLogin(), project.uuid(), dto.getPermission(), project.name()); assertThat(newValue.toString()) .doesNotContain("permissionUuid"); @@ -136,7 +136,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(dto.getUuid(), user.getUuid(), portfolio.uuid(), dto.getPermission(), portfolio.name(), "portfolio"); assertThat(newValue.toString()) .contains("componentUuid"); @@ -153,7 +153,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(dto.getUuid(), user.getUuid(), application.uuid(), dto.getPermission(), application.name(), "application"); assertThat(newValue.toString()) .contains("componentUuid"); @@ -171,7 +171,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(null, null, null, project.uuid(), SCAN_EXECUTION, project.name(), "project"); assertThat(newValue.toString()).doesNotContain("userUuid"); } @@ -198,7 +198,7 @@ public class UserPermissionDaoWithPersisterTest { UserPermissionNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(UserPermissionNewValue::getPermissionUuid, UserPermissionNewValue::getUserUuid, UserPermissionNewValue::getUserLogin, UserPermissionNewValue::getComponentUuid, - UserPermissionNewValue::getRole, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) + UserPermissionNewValue::getPermission, UserPermissionNewValue::getComponentName, UserPermissionNewValue::getQualifier) .containsExactly(null, user.getUuid(), user.getLogin(), null, null, null, null); assertThat(newValue.toString()).contains("userUuid"); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java index d6c646af846..7006ccb0647 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateCharacteristicDaoWithPersisterTest.java @@ -52,7 +52,7 @@ public class PermissionTemplateCharacteristicDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::isWithProjectCreator) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::isWithProjectCreator) .containsExactly(dto.getTemplateUuid(), "template", dto.getPermission(), dto.getWithProjectCreator()); assertThat(newValue.toString()).contains("withProjectCreator"); } @@ -68,7 +68,7 @@ public class PermissionTemplateCharacteristicDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::isWithProjectCreator) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::isWithProjectCreator) .containsExactly(updated.getTemplateUuid(), "template", updated.getPermission(), updated.getWithProjectCreator()); assertThat(newValue.toString()).contains("withProjectCreator"); } diff --git a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java index 4a2182eb9a1..9d6949f7635 100644 --- a/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java +++ b/server/sonar-db-dao/src/test/java/org/sonar/db/permission/template/PermissionTemplateDaoWithPersisterTest.java @@ -109,7 +109,7 @@ public class PermissionTemplateDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) .containsExactly(dto.getUuid(), dto.getName(), ADMIN, user.getUuid(), user.getLogin()); assertThat(newValue.toString()).doesNotContain("groupUuid"); @@ -119,7 +119,7 @@ public class PermissionTemplateDaoWithPersisterTest { newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) .containsExactly(dto.getUuid(), dto.getName(), ADMIN, user.getUuid(), user.getLogin()); assertThat(newValue.toString()).doesNotContain("groupUuid"); } @@ -143,7 +143,7 @@ public class PermissionTemplateDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getUserUuid, PermissionTemplateNewValue::getUserLogin) .containsExactly(null, null, null, user.getUuid(), user.getLogin()); assertThat(newValue.toString()).doesNotContain("groupUuid"); } @@ -165,7 +165,7 @@ public class PermissionTemplateDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) .containsExactly(dto.getUuid(), dto.getName(), ADMIN, group.getUuid(), group.getName()); assertThat(newValue.toString()).contains("groupUuid"); @@ -175,7 +175,7 @@ public class PermissionTemplateDaoWithPersisterTest { newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) .containsExactly(dto.getUuid(), dto.getName(), ADMIN, group.getUuid(), group.getName()); assertThat(newValue.toString()).contains("groupUuid"); } @@ -205,7 +205,7 @@ public class PermissionTemplateDaoWithPersisterTest { PermissionTemplateNewValue newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) .containsExactly(templateDto.getUuid(), templateDto.getName(), ADMIN, templateGroupDto.getGroupUuid(), templateGroupDto.getGroupName()); assertThat(newValue.toString()).doesNotContain("userUuid"); @@ -215,7 +215,7 @@ public class PermissionTemplateDaoWithPersisterTest { newValue = newValueCaptor.getValue(); assertThat(newValue) .extracting(PermissionTemplateNewValue::getTemplateUuid, PermissionTemplateNewValue::getName, - PermissionTemplateNewValue::getRole, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) + PermissionTemplateNewValue::getPermission, PermissionTemplateNewValue::getGroupUuid, PermissionTemplateNewValue::getGroupName) .containsExactly(null, null, null, templateGroupDto.getGroupUuid(), templateGroupDto.getGroupName()); assertThat(newValue.toString()).doesNotContain("userUuid"); } -- 2.39.5