You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/06/28 02:07:32 UTC
[inlong] branch master updated: [INLONG-4793][Manager] Change the userName to username (#4794)
This is an automated email from the ASF dual-hosted git repository.
healchow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 68bf31af3 [INLONG-4793][Manager] Change the userName to username (#4794)
68bf31af3 is described below
commit 68bf31af358630d7399a81ae6fff43a5aad5e17c
Author: ciscozhou <45...@users.noreply.github.com>
AuthorDate: Tue Jun 28 10:07:28 2022 +0800
[INLONG-4793][Manager] Change the userName to username (#4794)
---
.../client/api/inner/InnerInlongManagerClient.java | 2 +-
.../manager/common/auth/DefaultAuthentication.java | 10 ++++-----
.../common/pojo/consumption/ConsumptionQuery.java | 2 +-
.../manager/common/pojo/user/UserDetail.java | 10 ++++-----
.../common/pojo/user/UserDetailPageRequest.java | 2 +-
.../inlong/manager/common/util/LoginUserUtils.java | 2 +-
.../inlong/manager/dao/entity/UserRoleEntity.java | 2 +-
.../manager/dao/mapper/UserRoleEntityMapper.java | 2 +-
.../resources/mappers/ConsumptionEntityMapper.xml | 10 ++++-----
.../resources/mappers/UserRoleEntityMapper.xml | 20 +++++++++---------
.../inlong/manager/service/core/RoleService.java | 4 ++--
.../manager/service/core/impl/RoleServiceImpl.java | 4 ++--
.../manager/service/core/impl/UserServiceImpl.java | 6 +++---
.../core/operationlog/OperationLogRecorder.java | 2 +-
.../service/sort/util/ExtractNodeUtils.java | 4 ++--
.../manager/web/auth/WebAuthorizingRealm.java | 2 +-
.../web/config/ControllerExceptionHandler.java | 20 +++++++++---------
.../web/controller/ConsumptionController.java | 12 +++++------
.../manager/web/controller/DataNodeController.java | 6 +++---
.../web/controller/InlongClusterController.java | 12 +++++------
.../web/controller/InlongGroupController.java | 24 +++++++++++-----------
.../web/controller/InlongStreamController.java | 18 ++++++++--------
.../web/controller/StreamSinkController.java | 6 +++---
.../web/controller/StreamSourceController.java | 6 +++---
.../web/controller/StreamTransformController.java | 6 +++---
.../manager/web/controller/UserController.java | 4 ++--
.../web/controller/WorkflowApproverController.java | 6 +++---
.../manager/web/controller/WorkflowController.java | 22 ++++++++++----------
28 files changed, 113 insertions(+), 113 deletions(-)
diff --git a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
index 5ce2822ef..2b711e25b 100644
--- a/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
+++ b/inlong-manager/manager-client/src/main/java/org/apache/inlong/manager/client/api/inner/InnerInlongManagerClient.java
@@ -104,7 +104,7 @@ public class InnerInlongManagerClient {
OkHttpClient okHttpClient = new OkHttpClient.Builder()
.addInterceptor(
- new AuthInterceptor(defaultAuthentication.getUserName(), defaultAuthentication.getPassword()))
+ new AuthInterceptor(defaultAuthentication.getUsername(), defaultAuthentication.getPassword()))
.connectTimeout(configuration.getConnectTimeout(), configuration.getTimeUnit())
.readTimeout(configuration.getReadTimeout(), configuration.getTimeUnit())
.writeTimeout(configuration.getWriteTimeout(), configuration.getTimeUnit())
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/DefaultAuthentication.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/DefaultAuthentication.java
index 9661dcb03..3218040b3 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/DefaultAuthentication.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/auth/DefaultAuthentication.java
@@ -35,13 +35,13 @@ public class DefaultAuthentication implements Authentication {
public static final String PASSWORD = "password";
@Getter
- protected String userName;
+ protected String username;
@Getter
protected String password;
- public DefaultAuthentication(String userName, String password) {
- this.userName = userName;
+ public DefaultAuthentication(String username, String password) {
+ this.username = username;
this.password = password;
}
@@ -53,14 +53,14 @@ public class DefaultAuthentication implements Authentication {
@Override
public void configure(Map<String, String> properties) {
AssertUtils.notEmpty(properties, "Properties should not be empty when init DefaultAuthentication");
- this.userName = properties.get(USERNAME);
+ this.username = properties.get(USERNAME);
this.password = properties.get(PASSWORD);
}
@Override
public String toString() {
ObjectNode objectNode = OBJECT_MAPPER.createObjectNode();
- objectNode.put(USERNAME, this.getUserName());
+ objectNode.put(USERNAME, this.getUsername());
objectNode.put(PASSWORD, this.getPassword());
return objectNode.toString();
}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionQuery.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionQuery.java
index 8d53f65a6..039cbaa2b 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionQuery.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/consumption/ConsumptionQuery.java
@@ -64,7 +64,7 @@ public class ConsumptionQuery extends PageRequest {
private String modifier;
@ApiModelProperty(value = "Current login user")
- private String userName;
+ private String username;
@ApiModelProperty(value = "Weather current user have admin role", hidden = true)
private Boolean isAdminRole;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetail.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetail.java
index 4f2d94709..c022a567c 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetail.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetail.java
@@ -28,17 +28,17 @@ import java.util.Set;
public class UserDetail {
@ApiModelProperty(value = "username")
- private String userName;
+ private String username;
@ApiModelProperty(value = "user roles")
private Set<String> roles;
- public String getUserName() {
- return userName;
+ public String getUsername() {
+ return username;
}
- public UserDetail setUserName(String userName) {
- this.userName = userName;
+ public UserDetail setUsername(String username) {
+ this.username = username;
return this;
}
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailPageRequest.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailPageRequest.java
index bab42ab88..7de70018f 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailPageRequest.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/pojo/user/UserDetailPageRequest.java
@@ -28,7 +28,7 @@ import org.apache.inlong.manager.common.beans.PageRequest;
@EqualsAndHashCode(callSuper = false)
public class UserDetailPageRequest extends PageRequest {
- public String userName;
+ public String username;
public Integer type;
diff --git a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtils.java b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtils.java
index e0f598cb5..9b6621dfc 100644
--- a/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtils.java
+++ b/inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/util/LoginUserUtils.java
@@ -36,7 +36,7 @@ public class LoginUserUtils {
}
public static void setUserLoginInfo(UserDetail userDetail) {
- log.debug("user login: {}", userDetail.getUserName());
+ log.debug("user login: {}", userDetail.getUsername());
LOGIN_USER_DETAIL_TL.set(userDetail);
}
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/UserRoleEntity.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/UserRoleEntity.java
index a1d9d805c..04bcbca01 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/UserRoleEntity.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/entity/UserRoleEntity.java
@@ -29,7 +29,7 @@ public class UserRoleEntity implements Serializable {
private static final long serialVersionUID = 1L;
private Integer id;
- private String userName;
+ private String username;
private String roleCode;
private Date createTime;
private Date updateTime;
diff --git a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/UserRoleEntityMapper.java b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/UserRoleEntityMapper.java
index 45f953282..292afe791 100644
--- a/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/UserRoleEntityMapper.java
+++ b/inlong-manager/manager-dao/src/main/java/org/apache/inlong/manager/dao/mapper/UserRoleEntityMapper.java
@@ -38,5 +38,5 @@ public interface UserRoleEntityMapper {
int updateByPrimaryKey(UserRoleEntity record);
- List<UserRoleEntity> listByUserName(String userName);
+ List<UserRoleEntity> listByUsername(String username);
}
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
index 31e2cafe6..e04d710c0 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/ConsumptionEntityMapper.xml
@@ -268,8 +268,8 @@
</if>
<if test="isAdminRole == false">
and (
- FIND_IN_SET(#{userName,jdbcType=VARCHAR},c.in_charges)
- or c.creator = #{userName,jdbcType=VARCHAR}
+ FIND_IN_SET(#{username,jdbcType=VARCHAR},c.in_charges)
+ or c.creator = #{username,jdbcType=VARCHAR}
)
</if>
<if test="keyword != null and keyword !=''">
@@ -321,10 +321,10 @@
<if test="modifier != null and modifier != ''">
and modifier = #{modifier,jdbcType=VARCHAR}
</if>
- <if test="userName != null and userName !=''">
+ <if test="username != null and username !=''">
and (
- FIND_IN_SET(#{userName,jdbcType=VARCHAR},in_charges)
- or creator = #{userName,jdbcType=VARCHAR}
+ FIND_IN_SET(#{username,jdbcType=VARCHAR},in_charges)
+ or creator = #{username,jdbcType=VARCHAR}
)
</if>
<if test="keyword != null and keyword !=''">
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
index d57c7b01e..334a92a66 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/UserRoleEntityMapper.xml
@@ -22,7 +22,7 @@
<mapper namespace="org.apache.inlong.manager.dao.mapper.UserRoleEntityMapper">
<resultMap id="BaseResultMap" type="org.apache.inlong.manager.dao.entity.UserRoleEntity">
<id column="id" jdbcType="INTEGER" property="id"/>
- <result column="user_name" jdbcType="VARCHAR" property="userName"/>
+ <result column="user_name" jdbcType="VARCHAR" property="username"/>
<result column="role_code" jdbcType="VARCHAR" property="roleCode"/>
<result column="create_time" jdbcType="TIMESTAMP" property="createTime"/>
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime"/>
@@ -48,7 +48,7 @@
insert into user_role (id, user_name, role_code,
create_time, update_time, create_by,
update_by, disabled)
- values (#{id,jdbcType=INTEGER}, #{userName,jdbcType=VARCHAR}, #{roleCode,jdbcType=VARCHAR},
+ values (#{id,jdbcType=INTEGER}, #{username,jdbcType=VARCHAR}, #{roleCode,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{createBy,jdbcType=VARCHAR},
#{updateBy,jdbcType=VARCHAR}, #{disabled,jdbcType=INTEGER})
</insert>
@@ -59,7 +59,7 @@
<if test="id != null">
id,
</if>
- <if test="userName != null">
+ <if test="username != null">
user_name,
</if>
<if test="roleCode != null">
@@ -85,8 +85,8 @@
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
- <if test="userName != null">
- #{userName,jdbcType=VARCHAR},
+ <if test="username != null">
+ #{username,jdbcType=VARCHAR},
</if>
<if test="roleCode != null">
#{roleCode,jdbcType=VARCHAR},
@@ -112,8 +112,8 @@
parameterType="org.apache.inlong.manager.dao.entity.UserRoleEntity">
update user_role
<set>
- <if test="userName != null">
- user_name = #{userName,jdbcType=VARCHAR},
+ <if test="username != null">
+ user_name = #{username,jdbcType=VARCHAR},
</if>
<if test="roleCode != null">
role_code = #{roleCode,jdbcType=VARCHAR},
@@ -139,7 +139,7 @@
<update id="updateByPrimaryKey"
parameterType="org.apache.inlong.manager.dao.entity.UserRoleEntity">
update user_role
- set user_name = #{userName,jdbcType=VARCHAR},
+ set user_name = #{username,jdbcType=VARCHAR},
role_code = #{roleCode,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
@@ -149,10 +149,10 @@
where id = #{id,jdbcType=INTEGER}
</update>
- <select id="listByUserName" parameterType="java.lang.String" resultMap="BaseResultMap">
+ <select id="listByUsername" parameterType="java.lang.String" resultMap="BaseResultMap">
select
<include refid="Base_Column_List"/>
from user_role
- where user_name = #{userName,jdbcType=VARCHAR}
+ where user_name = #{username,jdbcType=VARCHAR}
</select>
</mapper>
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/RoleService.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/RoleService.java
index 92d7041a4..dce4f5363 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/RoleService.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/RoleService.java
@@ -27,8 +27,8 @@ public interface RoleService {
/**
* Get roles based on username
*
- * @param userName username
+ * @param username username
* @return Role list
*/
- List<String> listByUser(String userName);
+ List<String> listByUser(String username);
}
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/RoleServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/RoleServiceImpl.java
index a6b8db777..617807a09 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/RoleServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/RoleServiceImpl.java
@@ -37,8 +37,8 @@ public class RoleServiceImpl implements RoleService {
private UserRoleEntityMapper userRoleEntityMapper;
@Override
- public List<String> listByUser(String userName) {
- return userRoleEntityMapper.listByUserName(userName)
+ public List<String> listByUser(String username) {
+ return userRoleEntityMapper.listByUsername(username)
.stream()
.map(UserRoleEntity::getRoleCode)
.collect(Collectors.toList());
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
index e1e6c2e1b..727b0617e 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/impl/UserServiceImpl.java
@@ -88,7 +88,7 @@ public class UserServiceImpl implements UserService {
entity.setAccountType(userInfo.getType());
entity.setPassword(SmallTools.passwordMd5(userInfo.getPassword()));
entity.setDueDate(getOverDueDate(userInfo.getValidDays()));
- entity.setCreateBy(LoginUserUtils.getLoginUserDetail().getUserName());
+ entity.setCreateBy(LoginUserUtils.getLoginUserDetail().getUsername());
entity.setName(username);
entity.setCreateTime(new Date());
Preconditions.checkTrue(userMapper.insert(entity) > 0, "Create user failed");
@@ -155,8 +155,8 @@ public class UserServiceImpl implements UserService {
PageHelper.startPage(request.getPageNum(), request.getPageSize());
UserEntityExample example = new UserEntityExample();
Criteria criteria = example.createCriteria();
- if (request.getUserName() != null) {
- criteria.andNameLike(request.getUserName() + "%");
+ if (request.getUsername() != null) {
+ criteria.andNameLike(request.getUsername() + "%");
}
Page<UserEntity> entityPage = (Page<UserEntity>) userMapper.selectByExample(example);
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLogRecorder.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLogRecorder.java
index 82a20ef72..7faa8c011 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLogRecorder.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/core/operationlog/OperationLogRecorder.java
@@ -57,7 +57,7 @@ public class OperationLogRecorder {
UserDetail userDetail = Optional.ofNullable(LoginUserUtils.getLoginUserDetail())
.orElseGet(UserDetail::new);
- String operator = userDetail.getUserName();
+ String operator = userDetail.getUsername();
operator = StringUtils.isBlank(operator) ? ANONYMOUS_USER : operator;
String requestUrl = request.getRequestURI();
diff --git a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/ExtractNodeUtils.java b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/ExtractNodeUtils.java
index f23c31f2d..08988fa3d 100644
--- a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/ExtractNodeUtils.java
+++ b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/sort/util/ExtractNodeUtils.java
@@ -111,7 +111,7 @@ public class ExtractNodeUtils {
final String database = binlogSource.getDatabaseWhiteList();
final String primaryKey = binlogSource.getPrimaryKey();
final String hostName = binlogSource.getHostname();
- final String userName = binlogSource.getUser();
+ final String username = binlogSource.getUser();
final String password = binlogSource.getPassword();
final Integer port = binlogSource.getPort();
Integer serverId = null;
@@ -147,7 +147,7 @@ public class ExtractNodeUtils {
primaryKey,
tableNames,
hostName,
- userName,
+ username,
password,
database,
port,
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
index 37f09b480..89d8b7377 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/WebAuthorizingRealm.java
@@ -58,7 +58,7 @@ public class WebAuthorizingRealm extends AuthorizingRealm {
Preconditions.checkNotNull(userEntity, "User doesn't exist");
Preconditions.checkTrue(userEntity.getDueDate().after(new Date()), "user has expired");
UserDetail userDetail = new UserDetail();
- userDetail.setUserName(username);
+ userDetail.setUsername(username);
userDetail.setRoles(Sets.newHashSet(userEntity.getAccountType() == 0
? UserTypeEnum.ADMIN.name() : UserTypeEnum.OPERATOR.name()));
return new SimpleAuthenticationInfo(userDetail, userEntity.getPassword(), getName());
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
index c79659457..1bbee2007 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/config/ControllerExceptionHandler.java
@@ -51,7 +51,7 @@ public class ControllerExceptionHandler {
public Response<String> handleConstraintViolationException(HttpServletRequest request,
ConstraintViolationException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
Set<ConstraintViolation<?>> violations = e.getConstraintViolations();
@@ -67,7 +67,7 @@ public class ControllerExceptionHandler {
public Response<String> handleMethodArgumentNotValidException(HttpServletRequest request,
MethodArgumentNotValidException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
StringBuilder builder = new StringBuilder();
@@ -87,7 +87,7 @@ public class ControllerExceptionHandler {
@ExceptionHandler(value = IllegalArgumentException.class)
public Response<String> handleIllegalArgumentException(HttpServletRequest request, IllegalArgumentException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail(e.getMessage());
}
@@ -95,7 +95,7 @@ public class ControllerExceptionHandler {
@ExceptionHandler(value = BindException.class)
public Response<String> handleBindExceptionHandler(HttpServletRequest request, BindException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
StringBuilder builder = new StringBuilder();
@@ -110,7 +110,7 @@ public class ControllerExceptionHandler {
public Response<String> handleHttpMessageConversionExceptionHandler(HttpServletRequest request,
HttpMessageConversionException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail("http message convert exception! pls check params");
}
@@ -118,7 +118,7 @@ public class ControllerExceptionHandler {
@ExceptionHandler(value = WorkflowException.class)
public Response<String> handleWorkflowException(HttpServletRequest request, WorkflowException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail(e.getMessage());
}
@@ -126,7 +126,7 @@ public class ControllerExceptionHandler {
@ExceptionHandler(value = BusinessException.class)
public Response<String> handleBusinessExceptionHandler(HttpServletRequest request, BusinessException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail(e.getMessage());
}
@@ -140,16 +140,16 @@ public class ControllerExceptionHandler {
@ExceptionHandler(value = UnauthorizedException.class)
public Response<String> handleUnauthorizedException(HttpServletRequest request, AuthorizationException e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail(String.format("Current user [%s] has no permission to access URL",
- (userDetail != null ? userDetail.getUserName() : "")));
+ (userDetail != null ? userDetail.getUsername() : "")));
}
@ExceptionHandler(Exception.class)
public Response<String> handle(HttpServletRequest request, Exception e) {
UserDetail userDetail = LoginUserUtils.getLoginUserDetail();
- String username = userDetail != null ? userDetail.getUserName() : "";
+ String username = userDetail != null ? userDetail.getUsername() : "";
log.error(String.format(ERROR_MSG, request.getRequestURI(), username), e);
return Response.fail("There was an error in the service..."
+ "Please try again later! "
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
index b32965173..8501bb4f8 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/ConsumptionController.java
@@ -58,14 +58,14 @@ public class ConsumptionController {
@GetMapping("/summary")
@ApiOperation(value = "Get data consumption summary")
public Response<ConsumptionSummary> getSummary(ConsumptionQuery query) {
- query.setUserName(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setUsername(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(consumptionService.getSummary(query));
}
@GetMapping("/list")
@ApiOperation(value = "List data consumptions")
public Response<PageInfo<ConsumptionListVo>> list(ConsumptionQuery query) {
- query.setUserName(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setUsername(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(consumptionService.list(query));
}
@@ -81,7 +81,7 @@ public class ConsumptionController {
@ApiOperation(value = "Delete data consumption")
@ApiImplicitParam(name = "id", value = "Consumption ID", dataTypeClass = Integer.class, required = true)
public Response<Object> delete(@PathVariable(name = "id") Integer id) {
- this.consumptionService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName());
+ this.consumptionService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success();
}
@@ -89,7 +89,7 @@ public class ConsumptionController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Save data consumption", notes = "Full coverage")
public Response<Integer> save(@Validated @RequestBody ConsumptionInfo consumptionInfo) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(consumptionService.save(consumptionInfo, currentUser));
}
@@ -99,7 +99,7 @@ public class ConsumptionController {
public Response<String> update(@PathVariable(name = "id") Integer id,
@Validated @RequestBody ConsumptionInfo consumptionInfo) {
consumptionInfo.setId(id);
- consumptionService.update(consumptionInfo, LoginUserUtils.getLoginUserDetail().getUserName());
+ consumptionService.update(consumptionInfo, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success();
}
@@ -108,7 +108,7 @@ public class ConsumptionController {
@ApiOperation(value = "Start approval process")
@ApiImplicitParam(name = "id", value = "Consumption ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> startProcess(@PathVariable(name = "id") Integer id) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(processOperation.startProcess(id, username));
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
index 17064b6d8..7f6e89b34 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/DataNodeController.java
@@ -57,7 +57,7 @@ public class DataNodeController {
@OperationLog(operation = OperationType.CREATE)
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Integer> save(@RequestBody DataNodeRequest request) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(dataNodeService.save(request, currentUser));
}
@@ -78,7 +78,7 @@ public class DataNodeController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update data node")
public Response<Boolean> update(@RequestBody DataNodeRequest request) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(dataNodeService.update(request, username));
}
@@ -88,7 +88,7 @@ public class DataNodeController {
@ApiImplicitParam(name = "id", value = "Data node ID", dataTypeClass = Integer.class, required = true)
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Boolean> delete(@PathVariable Integer id) {
- return Response.success(dataNodeService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(dataNodeService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/testConnection", method = RequestMethod.POST)
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
index 63cb0ead4..23a908e6b 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongClusterController.java
@@ -59,7 +59,7 @@ public class InlongClusterController {
@OperationLog(operation = OperationType.CREATE)
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Integer> save(@RequestBody InlongClusterRequest request) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.save(request, currentUser));
}
@@ -80,7 +80,7 @@ public class InlongClusterController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update cluster")
public Response<Boolean> update(@RequestBody InlongClusterRequest request) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.update(request, username));
}
@@ -90,14 +90,14 @@ public class InlongClusterController {
@ApiImplicitParam(name = "id", value = "Cluster ID", dataTypeClass = Integer.class, required = true)
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Boolean> delete(@PathVariable Integer id) {
- return Response.success(clusterService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(clusterService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@PostMapping(value = "/node/save")
@ApiOperation(value = "Save cluster node")
@OperationLog(operation = OperationType.CREATE)
public Response<Integer> saveNode(@RequestBody ClusterNodeRequest request) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.saveNode(request, currentUser));
}
@@ -118,7 +118,7 @@ public class InlongClusterController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update cluster node")
public Response<Boolean> updateNode(@RequestBody ClusterNodeRequest request) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(clusterService.updateNode(request, username));
}
@@ -127,7 +127,7 @@ public class InlongClusterController {
@OperationLog(operation = OperationType.DELETE)
@ApiImplicitParam(name = "id", value = "Cluster node id", dataTypeClass = Integer.class, required = true)
public Response<Boolean> deleteNode(@PathVariable Integer id) {
- return Response.success(clusterService.deleteNode(id, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(clusterService.deleteNode(id, LoginUserUtils.getLoginUserDetail().getUsername()));
}
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
index 918917f13..e7eacd030 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongGroupController.java
@@ -63,7 +63,7 @@ public class InlongGroupController {
@ApiOperation(value = "Save inlong group info")
public Response<String> save(@RequestBody InlongGroupRequest groupRequest) {
groupRequest.checkParams();
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupService.save(groupRequest, operator));
}
@@ -77,7 +77,7 @@ public class InlongGroupController {
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ApiOperation(value = "Get inlong group list by paginating")
public Response<PageInfo<InlongGroupListResponse>> listByCondition(@RequestBody InlongGroupPageRequest request) {
- request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUserName());
+ request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserTypeEnum.ADMIN.name()));
return Response.success(groupService.listByPage(request));
}
@@ -87,7 +87,7 @@ public class InlongGroupController {
@ApiOperation(value = "Update inlong group info")
public Response<String> update(@RequestBody InlongGroupRequest groupRequest) {
groupRequest.checkParams();
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupService.update(groupRequest, operator));
}
@@ -101,7 +101,7 @@ public class InlongGroupController {
@RequestMapping(value = "/countByStatus", method = RequestMethod.GET)
@ApiOperation(value = "Count inlong group status for current user")
public Response<InlongGroupCountResponse> countGroupByUser() {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupService.countGroupByUser(operator));
}
@@ -109,7 +109,7 @@ public class InlongGroupController {
@ApiOperation(value = "Start inlong approval process")
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class)
public Response<WorkflowResult> startProcess(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.startProcess(groupId, operator));
}
@@ -117,7 +117,7 @@ public class InlongGroupController {
@ApiOperation(value = "Suspend inlong group process")
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class)
public Response<WorkflowResult> suspendProcess(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.suspendProcess(groupId, operator));
}
@@ -125,7 +125,7 @@ public class InlongGroupController {
@ApiOperation(value = "Restart inlong group process")
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class)
public Response<WorkflowResult> restartProcess(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.restartProcess(groupId, operator));
}
@@ -134,7 +134,7 @@ public class InlongGroupController {
@OperationLog(operation = OperationType.DELETE)
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class, required = true)
public Response<Boolean> delete(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.deleteProcess(groupId, operator));
}
@@ -142,7 +142,7 @@ public class InlongGroupController {
@ApiOperation(value = "Suspend inlong group process")
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class)
public Response<String> suspendProcessAsync(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.suspendProcessAsync(groupId, operator));
}
@@ -150,7 +150,7 @@ public class InlongGroupController {
@ApiOperation(value = "Restart inlong group process")
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class)
public Response<String> restartProcessAsync(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.restartProcessAsync(groupId, operator));
}
@@ -159,7 +159,7 @@ public class InlongGroupController {
@OperationLog(operation = OperationType.DELETE)
@ApiImplicitParam(name = "groupId", value = "Inlong group id", dataTypeClass = String.class, required = true)
public Response<String> deleteAsync(@PathVariable String groupId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.deleteProcessAsync(groupId, operator));
}
@@ -172,7 +172,7 @@ public class InlongGroupController {
@PostMapping(value = "/reset")
@ApiOperation(value = "Reset group status when group is in CONFIG_ING|SUSPENDING|RESTARTING|DELETING")
public Response<Boolean> reset(@RequestBody @Validated InlongGroupResetRequest request) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(groupProcessOperation.resetGroupStatus(request, operator));
}
}
\ No newline at end of file
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
index 3ba86cd4e..895a1fd63 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/InlongStreamController.java
@@ -62,7 +62,7 @@ public class InlongStreamController {
@OperationLog(operation = OperationType.CREATE)
@ApiOperation(value = "Save inlong stream info")
public Response<Integer> save(@RequestBody InlongStreamRequest request) {
- int result = streamService.save(request, LoginUserUtils.getLoginUserDetail().getUserName());
+ int result = streamService.save(request, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(result);
}
@@ -89,7 +89,7 @@ public class InlongStreamController {
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ApiOperation(value = "Get inlong stream by paginating")
public Response<PageInfo<InlongStreamListResponse>> listByCondition(@RequestBody InlongStreamPageRequest request) {
- request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUserName());
+ request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserRoleCode.ADMIN));
return Response.success(streamService.listByCondition(request));
}
@@ -97,7 +97,7 @@ public class InlongStreamController {
@RequestMapping(value = "/listAll", method = RequestMethod.POST)
@ApiOperation(value = "Get inlong stream info by paginating")
public Response<PageInfo<InlongStreamInfo>> listAllWithGroupId(@RequestBody InlongStreamPageRequest request) {
- request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUserName());
+ request.setCurrentUser(LoginUserUtils.getLoginUserDetail().getUsername());
request.setIsAdminRole(LoginUserUtils.getLoginUserDetail().getRoles().contains(UserRoleCode.ADMIN));
return Response.success(streamService.listAllWithGroupId(request));
}
@@ -106,7 +106,7 @@ public class InlongStreamController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update inlong stream info")
public Response<Boolean> update(@RequestBody InlongStreamRequest request) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamService.update(request, username));
}
@@ -118,7 +118,7 @@ public class InlongStreamController {
})
public Response<Boolean> startProcess(@PathVariable String groupId, @PathVariable String streamId,
@RequestParam boolean sync) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamProcessOperation.startProcess(groupId, streamId, operator, sync));
}
@@ -130,7 +130,7 @@ public class InlongStreamController {
})
public Response<Boolean> suspendProcess(@PathVariable String groupId, @PathVariable String streamId,
@RequestParam boolean sync) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamProcessOperation.suspendProcess(groupId, streamId, operator, sync));
}
@@ -142,7 +142,7 @@ public class InlongStreamController {
})
public Response<Boolean> restartProcess(@PathVariable String groupId, @PathVariable String streamId,
@RequestParam boolean sync) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamProcessOperation.restartProcess(groupId, streamId, operator, sync));
}
@@ -154,7 +154,7 @@ public class InlongStreamController {
})
public Response<Boolean> deleteProcess(@PathVariable String groupId, @PathVariable String streamId,
@RequestParam boolean sync) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamProcessOperation.deleteProcess(groupId, streamId, operator, sync));
}
@@ -167,7 +167,7 @@ public class InlongStreamController {
@ApiImplicitParam(name = "streamId", dataTypeClass = String.class, required = true)
})
public Response<Boolean> delete(@RequestParam String groupId, @RequestParam String streamId) {
- String username = LoginUserUtils.getLoginUserDetail().getUserName();
+ String username = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(streamService.delete(groupId, streamId, username));
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java
index fae2b28a2..def3d5481 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSinkController.java
@@ -53,7 +53,7 @@ public class StreamSinkController {
@OperationLog(operation = OperationType.CREATE)
@ApiOperation(value = "Save sink information")
public Response<Integer> save(@Validated @RequestBody SinkRequest request) {
- return Response.success(sinkService.save(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(sinkService.save(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -73,7 +73,7 @@ public class StreamSinkController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Modify data sink information")
public Response<Boolean> update(@Validated @RequestBody SinkRequest request) {
- return Response.success(sinkService.update(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(sinkService.update(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
@@ -81,7 +81,7 @@ public class StreamSinkController {
@ApiOperation(value = "Delete data sink information")
@ApiImplicitParam(name = "id", dataTypeClass = Integer.class, required = true)
public Response<Boolean> delete(@PathVariable Integer id) {
- boolean result = sinkService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName());
+ boolean result = sinkService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(result);
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSourceController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSourceController.java
index 4b2742836..86832c392 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSourceController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamSourceController.java
@@ -53,7 +53,7 @@ public class StreamSourceController {
@OperationLog(operation = OperationType.CREATE)
@ApiOperation(value = "Save stream source")
public Response<Integer> save(@Validated @RequestBody SourceRequest request) {
- return Response.success(sourceService.save(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(sourceService.save(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/get/{id}", method = RequestMethod.GET)
@@ -73,7 +73,7 @@ public class StreamSourceController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Modify stream source")
public Response<Boolean> update(@Validated @RequestBody SourceRequest request) {
- return Response.success(sourceService.update(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ return Response.success(sourceService.update(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/delete/{id}", method = RequestMethod.DELETE)
@@ -81,7 +81,7 @@ public class StreamSourceController {
@ApiOperation(value = "Delete stream source")
@ApiImplicitParam(name = "id", dataTypeClass = Integer.class, required = true)
public Response<Boolean> delete(@PathVariable Integer id) {
- boolean result = sourceService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName());
+ boolean result = sourceService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(result);
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamTransformController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamTransformController.java
index c0e201960..3d8292f20 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamTransformController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/StreamTransformController.java
@@ -54,7 +54,7 @@ public class StreamTransformController {
@ApiOperation(value = "Save stream transform")
public Response<Integer> save(@Validated @RequestBody TransformRequest request) {
return Response.success(
- streamTransformService.save(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ streamTransformService.save(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/list", method = RequestMethod.GET)
@@ -69,7 +69,7 @@ public class StreamTransformController {
@ApiOperation(value = "Modify stream source")
public Response<Boolean> update(@Validated @RequestBody TransformRequest request) {
return Response.success(
- streamTransformService.update(request, LoginUserUtils.getLoginUserDetail().getUserName()));
+ streamTransformService.update(request, LoginUserUtils.getLoginUserDetail().getUsername()));
}
@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
@@ -79,6 +79,6 @@ public class StreamTransformController {
@RequestParam("inlongStreamId") String streamId, @RequestParam("transformName") String transformName) {
return Response.success(
streamTransformService.delete(groupId, streamId, transformName,
- LoginUserUtils.getLoginUserDetail().getUserName()));
+ LoginUserUtils.getLoginUserDetail().getUsername()));
}
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
index 27e8bec93..5fab745af 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/UserController.java
@@ -75,7 +75,7 @@ public class UserController {
@PostMapping("/update")
@ApiOperation(value = "Update user info")
public Response<Integer> update(@Validated @RequestBody UserInfo userInfo) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(userService.update(userInfo, currentUser));
}
@@ -95,7 +95,7 @@ public class UserController {
@ApiOperation(value = "Delete user by id")
@RequiresRoles(value = UserRoleCode.ADMIN)
public Response<Boolean> delete(@RequestParam("id") Integer id) {
- String currentUser = LoginUserUtils.getLoginUserDetail().getUserName();
+ String currentUser = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(userService.delete(id, currentUser));
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
index 895a15d1f..0475e4092 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowApproverController.java
@@ -59,7 +59,7 @@ public class WorkflowApproverController {
@OperationLog(operation = OperationType.CREATE)
@ApiOperation(value = "Add approver configuration")
public Response<Object> add(@RequestBody WorkflowApprover config) {
- this.workflowApproverService.add(config, LoginUserUtils.getLoginUserDetail().getUserName());
+ this.workflowApproverService.add(config, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success();
}
@@ -67,7 +67,7 @@ public class WorkflowApproverController {
@OperationLog(operation = OperationType.UPDATE)
@ApiOperation(value = "Update approver configuration")
public Response<Object> update(@RequestBody WorkflowApprover config) {
- this.workflowApproverService.update(config, LoginUserUtils.getLoginUserDetail().getUserName());
+ this.workflowApproverService.update(config, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success();
}
@@ -76,7 +76,7 @@ public class WorkflowApproverController {
@ApiOperation(value = "Delete approver configuration")
@ApiParam(value = "Configuration item ID", required = true)
public Response<Object> delete(@PathVariable Integer id) {
- this.workflowApproverService.delete(id, LoginUserUtils.getLoginUserDetail().getUserName());
+ this.workflowApproverService.delete(id, LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success();
}
}
diff --git a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
index b49422a6c..6e1fd2796 100644
--- a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
+++ b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/controller/WorkflowController.java
@@ -67,7 +67,7 @@ public class WorkflowController {
@OperationLog(operation = OperationType.CREATE)
@ApiOperation(value = "Initiation process")
public Response<WorkflowResult> start(@RequestBody WorkflowOperation operation) {
- String applicant = LoginUserUtils.getLoginUserDetail().getUserName();
+ String applicant = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.start(operation.getName(), applicant, operation.getForm()));
}
@@ -76,7 +76,7 @@ public class WorkflowController {
@ApiOperation(value = "Cancellation process")
@ApiImplicitParam(name = "id", value = "WorkflowProcess ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> cancel(@PathVariable Integer id, @RequestBody WorkflowOperation operation) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.cancel(id, operator, operation.getRemark()));
}
@@ -85,7 +85,7 @@ public class WorkflowController {
@ApiOperation(value = "Approval and consent")
@ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> approve(@PathVariable Integer id, @RequestBody WorkflowTaskRequest operation) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.approve(id, operation.getRemark(), operation.getForm(), operator));
}
@@ -94,7 +94,7 @@ public class WorkflowController {
@ApiOperation(value = "Approval rejected")
@ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> reject(@PathVariable Integer id, @RequestBody WorkflowTaskRequest operation) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.reject(id, operation.getRemark(), operator));
}
@@ -103,7 +103,7 @@ public class WorkflowController {
@ApiOperation(value = "Turn to do", notes = "Change approver")
@ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> transfer(@PathVariable Integer id, @RequestBody WorkflowTaskRequest operation) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.transfer(id, operation.getRemark(),
operation.getTransferTo(), operator));
}
@@ -113,7 +113,7 @@ public class WorkflowController {
@ApiOperation(value = "Finish task by id")
@ApiImplicitParam(name = "id", value = "WorkflowTask ID", dataTypeClass = Integer.class, required = true)
public Response<WorkflowResult> complete(@PathVariable Integer id, @RequestBody WorkflowTaskRequest request) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.complete(id, request.getRemark(), operator));
}
@@ -125,35 +125,35 @@ public class WorkflowController {
})
public Response<ProcessDetailResponse> detail(@PathVariable(name = "id") Integer id,
@RequestParam(required = false) Integer taskId) {
- String operator = LoginUserUtils.getLoginUserDetail().getUserName();
+ String operator = LoginUserUtils.getLoginUserDetail().getUsername();
return Response.success(workflowService.detail(id, taskId, operator));
}
@GetMapping("/listProcess")
@ApiOperation(value = "List my processes")
public Response<PageInfo<ProcessResponse>> listProcess(ProcessQuery query) {
- query.setApplicant(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setApplicant(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.listProcess(query));
}
@GetMapping("/listTask")
@ApiOperation(value = "List my tasks")
public Response<PageInfo<TaskResponse>> listTask(TaskQuery query) {
- query.setApprover(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setApprover(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.listTask(query));
}
@GetMapping("/processSummary")
@ApiOperation(value = "Get process statistics")
public Response<ProcessCountResponse> processSummary(ProcessCountQuery query) {
- query.setApplicant(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setApplicant(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.countProcess(query));
}
@GetMapping("/taskSummary")
@ApiOperation(value = "Get task statistics")
public Response<TaskCountResponse> taskSummary(TaskCountQuery query) {
- query.setApprover(LoginUserUtils.getLoginUserDetail().getUserName());
+ query.setApprover(LoginUserUtils.getLoginUserDetail().getUsername());
return Response.success(workflowService.countTask(query));
}