diff --git a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java index ec38319f3..09c5b2f8f 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/group/AdminGroupAction.java @@ -216,7 +216,10 @@ public class AdminGroupAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: if (form instanceof CreateForm) { - return OptionalEntity.of(new Group()); + return OptionalEntity.of(new Group()).map(entity -> { + entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + return entity; + }); } break; case CrudMode.EDIT: @@ -233,7 +236,6 @@ public class AdminGroupAction extends FessAdminAction { protected OptionalEntity createGroup(final CreateForm form) { return getEntity(form).map(entity -> { copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8))); return entity; }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java index 9f02a4954..55a63d9e8 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/role/AdminRoleAction.java @@ -216,7 +216,10 @@ public class AdminRoleAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: if (form instanceof CreateForm) { - return OptionalEntity.of(new Role()); + return OptionalEntity.of(new Role()).map(entity -> { + entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + return entity; + }); } break; case CrudMode.EDIT: @@ -233,7 +236,6 @@ public class AdminRoleAction extends FessAdminAction { protected OptionalEntity createRole(final CreateForm form) { return getEntity(form).map(entity -> { copyBeanToBean(form, entity, op -> op.exclude(Constants.COMMON_CONVERSION_RULE)); - entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8))); return entity; }); } diff --git a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java index 0e4bdc162..45a93d883 100644 --- a/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java +++ b/src/main/java/org/codelibs/fess/app/web/admin/user/AdminUserAction.java @@ -252,7 +252,10 @@ public class AdminUserAction extends FessAdminAction { switch (form.crudMode) { case CrudMode.CREATE: if (form instanceof CreateForm) { - return OptionalEntity.of(new User()); + return OptionalEntity.of(new User()).map(entity -> { + entity.setId(Base64.getEncoder().encodeToString(form.name.getBytes(Constants.CHARSET_UTF_8))); + return entity; + }); } break; case CrudMode.EDIT: @@ -272,7 +275,6 @@ public class AdminUserAction extends FessAdminAction { sessionManager.getAttribute(TEMPORARY_PASSWORD, String.class).ifPresent(password -> { entity.setPassword(password); }); - entity.setId(Base64.getEncoder().encodeToString(entity.getName().getBytes(Constants.CHARSET_UTF_8))); return entity; }); }