diff --git a/src/main/java/org/codelibs/fess/app/service/UserService.java b/src/main/java/org/codelibs/fess/app/service/UserService.java index bbcdae77b7957237474852c650a076fd79fbe799..cc344785b09f2d851e0e91130e9a131f27ea8848 100644 --- a/src/main/java/org/codelibs/fess/app/service/UserService.java +++ b/src/main/java/org/codelibs/fess/app/service/UserService.java @@ -57,7 +57,7 @@ public class UserService implements Serializable { return userList; } - + public OptionalEntity<User> getUser(final String id) { return userBhv.selectByPK(id); } 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 8cd23a0310d416d0647dfc3e3d180689e772c224..2114b28a66f7d06a781cb69b653db89efc9666be 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 @@ -384,7 +384,8 @@ public class AdminUserAction extends FessAdminAction { }, toEditHtml()); } } - protected void verifyPassword(final CreateForm form) { + + protected void verifyPassword(final CreateForm form) { if (form.crudMode == CrudMode.CREATE && StringUtil.isBlank(form.password)) { throwValidationError(messages -> { messages.addErrorsBlankPassword(GLOBAL); diff --git a/src/main/java/org/codelibs/fess/es/exentity/Group.java b/src/main/java/org/codelibs/fess/es/exentity/Group.java index 0a9d152eed238bc158606200a478141fbb10653f..c6904ba3b499e739141920601f824b3af91c0562 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/Group.java +++ b/src/main/java/org/codelibs/fess/es/exentity/Group.java @@ -8,4 +8,12 @@ import org.codelibs.fess.es.bsentity.BsGroup; public class Group extends BsGroup { private static final long serialVersionUID = 1L; + + public Long getVersionNo() { + return asDocMeta().version(); + } + + public void setVersionNo(final Long version) { + asDocMeta().version(version); + } } diff --git a/src/main/java/org/codelibs/fess/es/exentity/Role.java b/src/main/java/org/codelibs/fess/es/exentity/Role.java index bd5ecd039fb4ce4429fc2951ea075b5e4734ebf0..421df5c5f551107a3b9cac010839934554dfa9d2 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/Role.java +++ b/src/main/java/org/codelibs/fess/es/exentity/Role.java @@ -8,4 +8,12 @@ import org.codelibs.fess.es.bsentity.BsRole; public class Role extends BsRole { private static final long serialVersionUID = 1L; + + public Long getVersionNo() { + return asDocMeta().version(); + } + + public void setVersionNo(final Long version) { + asDocMeta().version(version); + } } diff --git a/src/main/java/org/codelibs/fess/es/exentity/User.java b/src/main/java/org/codelibs/fess/es/exentity/User.java index 1af71760b43b4b6408aef12f6d657ce2f2321273..9ab00f7f20e42eb3122f13c3f9bcd2067a6009e3 100644 --- a/src/main/java/org/codelibs/fess/es/exentity/User.java +++ b/src/main/java/org/codelibs/fess/es/exentity/User.java @@ -13,6 +13,14 @@ public class User extends BsUser { private static final long serialVersionUID = 1L; + public Long getVersionNo() { + return asDocMeta().version(); + } + + public void setVersionNo(final Long version) { + asDocMeta().version(version); + } + public String[] getRoleNames() { return Stream.of(getRoles()).map(role -> new String(Base64.getDecoder().decode(role), Constants.CHARSET_UTF_8)) .toArray(n -> new String[n]);