This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-webui.git
The following commit(s) were added to refs/heads/main by this push:
new 6a374e77 [Bugfix] Unify user query list interface (#348)
6a374e77 is described below
commit 6a374e774022b0ac4ecf25536994bb85180bdde2
Author: XianmingZhou00 <[email protected]>
AuthorDate: Wed Jun 12 17:40:50 2024 +0800
[Bugfix] Unify user query list interface (#348)
---
.../org/apache/paimon/web/server/data/enums/UserType.java | 6 ++++--
.../java/org/apache/paimon/web/server/data/model/User.java | 3 ++-
.../java/org/apache/paimon/web/server/data/vo/UserVO.java | 3 ++-
.../paimon/web/server/service/impl/LdapServiceImpl.java | 2 +-
.../paimon/web/server/service/impl/UserServiceImpl.java | 2 +-
.../paimon/web/server/controller/UserControllerTest.java | 11 ++++++-----
6 files changed, 16 insertions(+), 11 deletions(-)
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/enums/UserType.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/enums/UserType.java
index 99bad93a..e8e5c6be 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/enums/UserType.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/enums/UserType.java
@@ -18,14 +18,16 @@
package org.apache.paimon.web.server.data.enums;
-/** user type. */
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
+/** User type. */
public enum UserType {
/** ldap user. */
LDAP(1, "LDAP"),
/** local user. */
LOCAL(0, "LOCAL");
- private final int code;
+ @EnumValue private final int code;
private final String type;
public int getCode() {
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
index 9f3444ae..5ee83b65 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/model/User.java
@@ -19,6 +19,7 @@
package org.apache.paimon.web.server.data.model;
import org.apache.paimon.web.server.constant.Constants;
+import org.apache.paimon.web.server.data.enums.UserType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -42,7 +43,7 @@ public class User extends BaseModel {
private String nickname;
/** login type (0:LOCAL,1:LDAP). */
- private Integer userType;
+ private UserType userType;
/** mobile phone. */
private String mobile;
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/vo/UserVO.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/vo/UserVO.java
index 3f59429f..65810405 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/vo/UserVO.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/data/vo/UserVO.java
@@ -18,6 +18,7 @@
package org.apache.paimon.web.server.data.vo;
+import org.apache.paimon.web.server.data.enums.UserType;
import org.apache.paimon.web.server.data.model.SysRole;
import lombok.AllArgsConstructor;
@@ -41,7 +42,7 @@ public class UserVO {
private String nickname;
- private String userType;
+ private UserType userType;
private String mobile;
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/LdapServiceImpl.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/LdapServiceImpl.java
index b1216c02..902f6177 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/LdapServiceImpl.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/LdapServiceImpl.java
@@ -120,7 +120,7 @@ public class LdapServiceImpl implements LdapService {
return StringUtils.EMPTY;
})
.orElse(StringUtils.EMPTY));
- user.setUserType(UserType.LDAP.getCode());
+ user.setUserType(UserType.LDAP);
user.setEnabled(true);
return user;
}
diff --git
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/UserServiceImpl.java
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/UserServiceImpl.java
index e505f7fb..9800bf12 100644
---
a/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/UserServiceImpl.java
+++
b/paimon-web-server/src/main/java/org/apache/paimon/web/server/service/impl/UserServiceImpl.java
@@ -299,7 +299,7 @@ public class UserServiceImpl extends
ServiceImpl<UserMapper, User> implements Us
StringUtils.isNotEmpty(userWithRolesDTO.getNickname())
? userWithRolesDTO.getNickname()
: "")
- .userType(userWithRolesDTO.getUserType() == 0 ? "LOCAL" :
"LDAP")
+ .userType(userWithRolesDTO.getUserType())
.mobile(
StringUtils.isNotEmpty(userWithRolesDTO.getMobile())
? userWithRolesDTO.getMobile()
diff --git
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
index 1cbf6d79..9accdb91 100644
---
a/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
+++
b/paimon-web-server/src/test/java/org/apache/paimon/web/server/controller/UserControllerTest.java
@@ -18,6 +18,7 @@
package org.apache.paimon.web.server.controller;
+import org.apache.paimon.web.server.data.enums.UserType;
import org.apache.paimon.web.server.data.model.User;
import org.apache.paimon.web.server.data.result.PageR;
import org.apache.paimon.web.server.data.result.R;
@@ -63,7 +64,7 @@ public class UserControllerTest extends ControllerTestBase {
user.setUsername(username);
user.setNickname(username);
user.setPassword("test");
- user.setUserType(0);
+ user.setUserType(UserType.LOCAL);
user.setEnabled(true);
user.setIsDelete(false);
@@ -95,7 +96,7 @@ public class UserControllerTest extends ControllerTestBase {
user.setId(userId);
user.setUsername(newUserName);
user.setNickname(newUserName);
- user.setUserType(0);
+ user.setUserType(UserType.LOCAL);
user.setEnabled(true);
user.setIsDelete(false);
@@ -132,7 +133,7 @@ public class UserControllerTest extends ControllerTestBase {
user.setId(userId);
user.setUsername(username);
user.setNickname(username);
- user.setUserType(0);
+ user.setUserType(UserType.LOCAL);
user.setEnabled(true);
user.setIsDelete(false);
user.setRoleIds(new Integer[] {2});
@@ -191,7 +192,7 @@ public class UserControllerTest extends ControllerTestBase {
assertEquals("admin", firstUser.getUsername());
assertEquals("Admin", firstUser.getNickname());
assertEquals("[email protected]", firstUser.getEmail());
- assertEquals("LOCAL", firstUser.getUserType());
+ assertEquals(UserType.LOCAL, firstUser.getUserType());
assertNotNull(firstUser.getCreateTime());
assertNotNull(firstUser.getUpdateTime());
assertTrue(firstUser.getEnabled());
@@ -200,7 +201,7 @@ public class UserControllerTest extends ControllerTestBase {
assertEquals("common", secondUser.getUsername());
assertEquals("common", secondUser.getNickname());
assertEquals("[email protected]", secondUser.getEmail());
- assertEquals("LOCAL", secondUser.getUserType());
+ assertEquals(UserType.LOCAL, secondUser.getUserType());
assertNotNull(secondUser.getCreateTime());
assertNotNull(secondUser.getUpdateTime());
assertTrue(secondUser.getEnabled());
