This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new 3b06767e3 feat:Scala code format alarm clear in linkis-module (#3176)
3b06767e3 is described below
commit 3b06767e3f37377c48324e2717dfb4065fe458fa
Author: ruY <[email protected]>
AuthorDate: Sat Sep 3 14:24:40 2022 +0800
feat:Scala code format alarm clear in linkis-module (#3176)
---
.../scala/org/apache/linkis/server/Message.scala | 3 ++-
.../linkis/server/conf/ServerConfiguration.scala | 4 ++--
.../scala/org/apache/linkis/server/package.scala | 6 +++---
.../linkis/server/security/ProxyUserSSOUtils.scala | 3 ++-
.../org/apache/linkis/server/security/SSOUtils.scala | 3 ++-
.../linkis/server/security/SecurityFilter.scala | 5 +++--
.../linkis/server/socket/ControllerServer.scala | 15 +++++++++------
.../apache/linkis/server/socket/ServerSocket.scala | 2 +-
.../server/socket/controller/ServerEvent.scala | 20 ++++++++++----------
.../socket/controller/ServerListenerEventBus.scala | 4 ++--
.../linkis/server/utils/LinkisMainHelper.scala | 5 +++--
scalastyle-config.xml | 3 ++-
12 files changed, 41 insertions(+), 32 deletions(-)
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
index 5bc19cd9e..d41bcd4b2 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/Message.scala
@@ -25,6 +25,7 @@ import
org.springframework.web.context.request.{RequestContextHolder, ServletReq
import javax.servlet.http.HttpServletRequest
import java.util
+import java.util.Locale
class Message(
private var method: String,
@@ -81,7 +82,7 @@ object Message {
Thread
.currentThread()
.getStackTrace
- .find(_.getClassName.toLowerCase.endsWith("restfulapi"))
+
.find(_.getClassName.toLowerCase(Locale.getDefault).endsWith("restfulapi"))
.foreach { stack =>
{
val httpRequest: HttpServletRequest = getCurrentHttpRequest
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
index 5e29fb688..5b0a5d637 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/conf/ServerConfiguration.scala
@@ -52,9 +52,9 @@ object ServerConfiguration extends Logging {
private val ticketHeader = CommonVars("wds.linkis.ticket.header",
"bfs_").getValue
- def getUsernameByTicket(ticketId: String): Option[String] = if
(StringUtils.isEmpty(ticketId))
+ def getUsernameByTicket(ticketId: String): Option[String] = if
(StringUtils.isEmpty(ticketId)) {
None
- else {
+ } else {
val userName = DESUtil.decrypt(ticketId, ServerConfiguration.cryptKey)
if (userName.startsWith(ticketHeader))
Some(userName.substring(ticketHeader.length))
else None
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
index a590ccb11..967b9ef8f 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/package.scala
@@ -66,7 +66,7 @@ package object server {
implicit def error(msg: String, t: Throwable): Message = Message.error(msg
-> t)
// def tryCatch[T](tryOp: => T)(catchOp: Throwable => T): T =
Utils.tryCatch(tryOp)(catchOp)
-// def tryCatch(tryOp: => Message)(catchOp: Throwable => Message): Message =
Utils.tryCatch(tryOp){
+// def tryCatch(tryOp: => Message)(catchOp: Throwable => Message): Message =
Utils.tryCatch(tryOp) {
// case nonLogin: NonLoginException => Message.noLogin(msg =
nonLogin.getMessage)
// case t => catchOp(t)
// }
@@ -103,9 +103,9 @@ package object server {
log.error(msg, t)
val errorMsg = ExceptionUtils.getRootCauseMessage(t)
val message =
- if (StringUtils.isNotEmpty(errorMsg) && "operation failed(操作失败)" !=
msg)
+ if (StringUtils.isNotEmpty(errorMsg) && "operation failed(操作失败)" !=
msg) {
error(msg + "！the reason(原因)：" + errorMsg)
- else if (StringUtils.isNotEmpty(errorMsg)) error(errorMsg)
+ } else if (StringUtils.isNotEmpty(errorMsg)) error(errorMsg)
else error(msg)
message.data(EXCEPTION_MSG,
ExceptionManager.unknownException(message.getMessage))
}
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/ProxyUserSSOUtils.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/ProxyUserSSOUtils.scala
index 183c1efc0..31d67f7c7 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/ProxyUserSSOUtils.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/ProxyUserSSOUtils.scala
@@ -75,11 +75,12 @@ object ProxyUserSSOUtils extends Logging {
def removeProxyUser(getCookies: => Array[Cookie]): Unit = {
val cookies = getCookies
- if (cookies != null)
+ if (cookies != null) {
cookies.find(_.getName == PROXY_USER_TICKET_ID_STRING).foreach { cookie
=>
cookie.setValue(null)
cookie.setMaxAge(0)
}
+ }
}
def removeLoginUserByAddCookie(addEmptyCookie: Cookie => Unit): Unit = {
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
index 05ac9dbff..4fa325514 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SSOUtils.scala
@@ -91,8 +91,9 @@ object SSOUtils extends Logging {
private[security] def getUserAndLoginTime(userTicketId: String):
Option[(String, Long)] = {
ServerConfiguration.getUsernameByTicket(userTicketId).map {
userAndLoginTime =>
{
- if (userAndLoginTime.indexOf(",") < 0)
+ if (userAndLoginTime.indexOf(",") < 0) {
throw new IllegalUserTicketException(s"Illegal user token
information(非法的用户token信息).")
+ }
val index = userAndLoginTime.lastIndexOf(",")
(userAndLoginTime.substring(0, index),
userAndLoginTime.substring(index + 1).toLong)
}
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
index 485cda39f..794579f41 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/security/SecurityFilter.scala
@@ -64,7 +64,7 @@ class SecurityFilter extends Filter {
return false
}
// Security certification support, solving verb tampering(安全认证支持，解决动词篡改)
- request.getMethod.toUpperCase match {
+ request.getMethod.toUpperCase(Locale.getDefault) match {
case "GET" | "POST" | "PUT" | "DELETE" | "HEAD" | "TRACE" | "CONNECT"
| "OPTIONS" =>
case _ =>
filterResponse(validateFailed("Do not use HTTP verbs to tamper
with!(不可使用HTTP动词篡改！)"))
@@ -121,8 +121,9 @@ class SecurityFilter extends Filter {
val request = servletRequest.asInstanceOf[HttpServletRequest]
implicit val response = servletResponse.asInstanceOf[HttpServletResponse]
if (doFilter(request)) filterChain.doFilter(servletRequest,
servletResponse)
- if (SecurityFilter.isRequestIgnoreTimeout(request))
+ if (SecurityFilter.isRequestIgnoreTimeout(request)) {
SecurityFilter.removeIgnoreTimeoutSignal(response)
+ }
}
protected def addAccessHeaders(response: HttpServletResponse) {
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
index 0b64cf4a9..33dcd9e17 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ControllerServer.scala
@@ -32,7 +32,7 @@ import org.apache.commons.lang3.time.DateFormatUtils
import java.util
import java.util.concurrent.atomic.AtomicInteger
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
import org.eclipse.jetty.websocket.servlet._
@@ -59,28 +59,30 @@ private[server] class
ControllerServer(serverListenerEventBus: ServerListenerEve
def sendMessage(id: Int, message: Message): Unit = {
val socket = socketList.get(id)
- if (socket == null)
+ if (socket == null) {
throw new BDPServerErrorException(
11004,
s"ServerSocket($id) does not exist!(ServerSocket($id)不存在！)"
)
+ }
socket.sendMessage(message)
}
def sendMessageToAll(message: Message): Unit =
- socketList.values().foreach(_.sendMessage(message))
+ socketList.values().asScala.foreach(_.sendMessage(message))
def sendMessageToUser(user: String, message: Message): Unit =
socketList
.values()
+ .asScala
.filter(s => s != null && s.user.contains(user))
.foreach(_.sendMessage(message))
override def onClose(socket: ServerSocket, code: Int, message: String): Unit
= {
val date = DateFormatUtils.format(socket.createTime,
DEFAULT_DATE_PATTERN.getValue)
- if (!socketList.containsKey(socket.id))
+ if (!socketList.containsKey(socket.id)) {
logger.warn(s"$socket created at $date has expired, ignore the close
function!")
- else {
+ } else {
logger.info(s"$socket closed at $date with code $code and message: " +
message)
socketList synchronized {
if (socketList.containsKey(socket.id)) socketList.remove(socket.id)
@@ -116,7 +118,7 @@ private[server] class
ControllerServer(serverListenerEventBus: ServerListenerEve
socketServerEvent.serverEvent.getWebsocketTag
) << socketServerEvent.serverEvent.getMethod
)
- } else
+ } else {
Utils.tryCatch(serverListenerEventBus.post(socketServerEvent)) {
case t: BDPServerErrorException =>
Message
@@ -126,6 +128,7 @@ private[server] class
ControllerServer(serverListenerEventBus: ServerListenerEve
socketServerEvent.serverEvent.getWebsocketTag
) << socketServerEvent.serverEvent.getMethod
}
+ }
}
}
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ServerSocket.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ServerSocket.scala
index a6bf3a469..5c7c3de26 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ServerSocket.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/ServerSocket.scala
@@ -35,7 +35,7 @@ case class ServerSocket(
private var session: Session = _
private[socket] var id: Int = _
val createTime = System.currentTimeMillis
- def user = SecurityFilter.getLoginUser(request)
+ def user: Option[String] = SecurityFilter.getLoginUser(request)
// Add a queue to do buffering, can not directly sendMessage back, will lead
to the connection can not stand
// 加一个队列做缓冲，不能直接sendMessage回去，会导致连接受不住
private val cacheMessages = new BlockingLoopArray[String](100)
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerEvent.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerEvent.scala
index b36e1b2ca..b668192eb 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerEvent.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerEvent.scala
@@ -29,16 +29,16 @@ class ServerEvent() extends Event {
private var data: util.Map[String, Object] = _
private var user: String = _
private var websocketTag: String = _
- def setId(id: Int) = this.id = id
- def getId = id
- def setUser(user: String) = this.user = user
- def setMethod(method: String) = this.method = method
- def getMethod = method
- def setData(data: util.Map[String, Object]) = this.data = data
- def getData = data
- def getUser = user
- def setWebsocketTag(websocketTag: String) = this.websocketTag = websocketTag
- def getWebsocketTag = websocketTag
+ def setId(id: Int): Unit = this.id = id
+ def getId: Int = id
+ def setUser(user: String): Unit = this.user = user
+ def setMethod(method: String): Unit = this.method = method
+ def getMethod: String = method
+ def setData(data: util.Map[String, Object]): Unit = this.data = data
+ def getData: util.Map[String, Object] = data
+ def getUser: String = user
+ def setWebsocketTag(websocketTag: String): Unit = this.websocketTag =
websocketTag
+ def getWebsocketTag: String = websocketTag
}
class SocketServerEvent(private[controller] val socket: ServerSocket, val
message: String)
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
index 00cacfbf0..7ed764174 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/socket/controller/ServerListenerEventBus.scala
@@ -41,9 +41,9 @@ class ServerListenerEventBus(
event: SocketServerEvent
): Unit = {
val serverEvent = event.serverEvent
- if (StringUtils.isEmpty(serverEvent.getMethod))
+ if (StringUtils.isEmpty(serverEvent.getMethod)) {
logger.info("ignore empty method with " + serverEvent.getData)
- else if (serverEvent.getMethod.startsWith(listener.serviceName)) {
+ } else if (serverEvent.getMethod.startsWith(listener.serviceName)) {
val response = listener.onEvent(serverEvent)
if (response != null) {
response.setMethod(serverEvent.getMethod)
diff --git
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/utils/LinkisMainHelper.scala
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/utils/LinkisMainHelper.scala
index 41aaaa41d..7614bbef2 100644
---
a/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/utils/LinkisMainHelper.scala
+++
b/linkis-commons/linkis-module/src/main/scala/org/apache/linkis/server/utils/LinkisMainHelper.scala
@@ -39,7 +39,7 @@ object LinkisMainHelper {
}
// TODO wait for linkis re-written
- @Deprecated
+ @deprecated
def addExtraPropertyFiles(filePaths: String*): Unit = {
sys.props.put("wds.linkis.server.confs", filePaths.mkString(","))
}
@@ -56,8 +56,9 @@ object LinkisMainHelper {
.toArray
if (Configuration.IS_PROMETHEUS_ENABLE.getValue) {
var prometheusEndpoint = Configuration.PROMETHEUS_ENDPOINT.getValue
- if (ServerConfiguration.IS_GATEWAY.getValue.equals("false"))
+ if (ServerConfiguration.IS_GATEWAY.getValue.equals("false")) {
prometheusEndpoint = servletPath + prometheusEndpoint
+ }
resArr = resArr :+ s"--prometheus.endpoint=$prometheusEndpoint"
}
return resArr
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 3d2bf1cb8..c13b1dc7b 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -188,6 +188,7 @@ This file is divided into 3 sections:
]]></customMessage>
</check>
+ <!--
<check customId="classforname" level="error"
class="org.scalastyle.file.RegexChecker" enabled="true">
<parameters><parameter name="regex">Class\.forName</parameter></parameters>
<customMessage><![CDATA[
@@ -198,7 +199,7 @@ This file is divided into 3 sections:
// scalastyle:on classforname
]]></customMessage>
</check>
-
+-->
<check customId="awaitresult" level="error"
class="org.scalastyle.file.RegexChecker" enabled="true">
<parameters><parameter name="regex">Await\.result</parameter></parameters>
<customMessage><![CDATA[
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
