You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/02 04:01:36 UTC

[incubator-linkis] branch dev-1.3.1 updated: feat: scala code format alarm clear in linkis-rpc (#3189)

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 9eba7ef34 feat: scala code format alarm clear in linkis-rpc (#3189)
9eba7ef34 is described below

commit 9eba7ef3405503e5aec3fcbc3091d4415e7bc284
Author: ruY <43...@users.noreply.github.com>
AuthorDate: Fri Sep 2 12:01:31 2022 +0800

    feat: scala code format alarm clear in linkis-rpc (#3189)
---
 .../org/apache/linkis/rpc/BaseRPCSender.scala      | 14 +++++++----
 .../org/apache/linkis/rpc/MessageReceiver.scala    |  3 +--
 .../org/apache/linkis/rpc/RPCReceiveRestful.scala  |  3 ++-
 .../org/apache/linkis/rpc/RPCSpringBeanCache.scala | 23 +++++++++++------
 .../linkis/rpc/interceptor/RPCServerLoader.scala   | 13 ++++++----
 .../common/BroadcastRPCInterceptor.scala           |  4 +--
 .../common/CacheableRPCInterceptor.scala           |  8 +++---
 .../SpringCloudFeignConfigurationCache.scala       |  6 +++--
 .../linkis/rpc/sender/SpringMVCRPCSender.scala     | 10 +++++---
 .../org/apache/linkis/rpc/sender/UnionSender.scala |  3 ++-
 .../sender/eureka/EurekaClientRefreshUtils.scala   | 29 ++++++++++++----------
 .../rpc/sender/eureka/EurekaRPCServerLoader.scala  |  8 +++++-
 .../rpc/transform/JavaCollectionSerializer.scala   |  2 +-
 .../org/apache/linkis/rpc/utils/RPCUtils.scala     | 10 +++++---
 14 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/BaseRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/BaseRPCSender.scala
index f4992c81f..149179f8b 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/BaseRPCSender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/BaseRPCSender.scala
@@ -127,12 +127,16 @@ private[rpc] class BaseRPCSender extends Sender with Logging {
 
   protected def getRPCSenderListenerBus = BaseRPCSender.rpcSenderListenerBus
 
-  override def equals(obj: scala.Any): Boolean = if (obj == null) false
-  else
-    obj match {
-      case sender: BaseRPCSender => name == sender.name
-      case _ => false
+  override def equals(obj: Any): Boolean = {
+    if (obj == null) {
+      false
+    } else {
+      obj match {
+        case sender: BaseRPCSender => name == sender.name
+        case _ => false
+      }
     }
+  }
 
   override def hashCode(): Int = if (name == null) 0 else name.hashCode
 
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/MessageReceiver.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/MessageReceiver.scala
index a06957052..dd3c71bdf 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/MessageReceiver.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/MessageReceiver.scala
@@ -35,11 +35,10 @@ class MessageReceiver extends Receiver {
 
   override def receiveAndReply(message: Any, sender: Sender): Any = {
     message match {
-      case requestProtocol: RequestProtocol => {
+      case requestProtocol: RequestProtocol =>
         val methodExecuteWrapper =
           receiverMethodSearcher.getMethodExecuteWrappers(requestProtocol)
         messageExecutor.execute(requestProtocol, methodExecuteWrapper, sender)
-      }
       case _ =>
     }
   }
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
index ab92151b3..8fac269ea 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCReceiveRestful.scala
@@ -171,8 +171,9 @@ private[rpc] class RPCReceiveRestful extends RPCReceiveRemote with Logging {
   @RequestMapping(path = Array("/rpc/replyInMills"), method = Array(RequestMethod.POST))
   override def receiveAndReplyInMills(@RequestBody message: Message): Message = catchIt {
     val duration = message.getData.get("duration")
-    if (duration == null || StringUtils.isEmpty(duration.toString))
+    if (duration == null || StringUtils.isEmpty(duration.toString)) {
       throw new DWCURIException(10002, "The timeout period is not set!(超时时间未设置!)")
+    }
     val timeout = Duration(duration.toString.toLong, TimeUnit.MILLISECONDS)
     receiveAndReply(message, _.receiveAndReply(_, timeout, _))
   }
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCSpringBeanCache.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCSpringBeanCache.scala
index 4c3228c3c..aa92605f9 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCSpringBeanCache.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/RPCSpringBeanCache.scala
@@ -24,7 +24,7 @@ import org.apache.linkis.rpc.interceptor.common.BroadcastSenderBuilder
 
 import java.util
 
-import scala.collection.JavaConversions.mapAsScalaMap
+import scala.collection.JavaConverters._
 
 private[rpc] object RPCSpringBeanCache extends Logging {
   import DataWorkCloudApplication.getApplicationContext
@@ -36,8 +36,9 @@ private[rpc] object RPCSpringBeanCache extends Logging {
   private var rpcReceiveRestful: RPCReceiveRestful = _
 
   def registerReceiver(receiverName: String, receiver: Receiver): Unit = {
-    if (beanNameToReceivers == null)
+    if (beanNameToReceivers == null) {
       beanNameToReceivers = getApplicationContext.getBeansOfType(classOf[Receiver])
+    }
     logger.info(s"register a new receiver with name $receiverName, receiver is " + receiver)
     beanNameToReceivers synchronized beanNameToReceivers.put(receiverName, receiver)
   }
@@ -64,44 +65,52 @@ private[rpc] object RPCSpringBeanCache extends Logging {
   }
 
   private[rpc] def getReceivers: util.Map[String, Receiver] = {
-    if (beanNameToReceivers == null)
+    if (beanNameToReceivers == null) {
       beanNameToReceivers = getApplicationContext.getBeansOfType(classOf[Receiver])
+    }
     beanNameToReceivers
   }
 
   private[rpc] def getRPCInterceptors: Array[RPCInterceptor] = {
-    if (rpcInterceptors == null)
+    if (rpcInterceptors == null) {
       rpcInterceptors = getApplicationContext
         .getBeansOfType(classOf[RPCInterceptor])
+        .asScala
         .map(_._2)
         .toArray
         .sortBy(_.order)
+    }
     rpcInterceptors
   }
 
   private[rpc] def getRPCLoadBalancers: Array[RPCLoadBalancer] = {
-    if (rpcLoadBalancers == null)
+    if (rpcLoadBalancers == null) {
       rpcLoadBalancers = getApplicationContext
         .getBeansOfType(classOf[RPCLoadBalancer])
+        .asScala
         .map(_._2)
         .toArray
         .sortBy(_.order)
+    }
     rpcLoadBalancers
   }
 
   private[rpc] def getRPCServerLoader: RPCServerLoader = {
-    if (rpcServerLoader == null)
+    if (rpcServerLoader == null) {
       rpcServerLoader = getApplicationContext.getBean(classOf[RPCServerLoader])
+    }
     rpcServerLoader
   }
 
   private[rpc] def getBroadcastSenderBuilders: Array[BroadcastSenderBuilder] = {
-    if (senderBuilders == null)
+    if (senderBuilders == null) {
       senderBuilders = getApplicationContext
         .getBeansOfType(classOf[BroadcastSenderBuilder])
+        .asScala
         .map(_._2)
         .toArray
         .sortBy(_.order)
+    }
     senderBuilders
   }
 
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/RPCServerLoader.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/RPCServerLoader.scala
index 12f5650e3..0c70393cb 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/RPCServerLoader.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/RPCServerLoader.scala
@@ -22,7 +22,7 @@ import org.apache.linkis.common.utils.{Logging, Utils}
 import org.apache.linkis.rpc.exception.NoInstanceExistsException
 import org.apache.linkis.rpc.sender.SpringCloudFeignConfigurationCache
 
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 import scala.concurrent.duration.Duration
 
 import com.netflix.loadbalancer.{DynamicServerListLoadBalancer, ILoadBalancer, Server}
@@ -65,16 +65,17 @@ abstract class AbstractRPCServerLoader extends RPCServerLoader with Logging {
       "The instance " +
         serviceInstance.getInstance + " of application " + serviceInstance.getApplicationName + " is not exists."
     )
-    if (!refreshed)
+    if (!refreshed) {
       Utils.tryThrow(
         Utils.waitUntil(
           () => {
             refresh
             val isRefreshed = refreshed
-            if (!isRefreshed)
+            if (!isRefreshed) {
               logger.info(
                 s"Need a $serviceInstance, but cannot find in DiscoveryClient refresh list."
               )
+            }
             isRefreshed
           },
           refreshMaxWaitTime,
@@ -85,6 +86,7 @@ abstract class AbstractRPCServerLoader extends RPCServerLoader with Logging {
         instanceNotExists.initCause(t)
         instanceNotExists
       }
+    }
   }
 
   override def getOrRefreshServiceInstance(serviceInstance: ServiceInstance): Unit = getOrRefresh(
@@ -96,10 +98,10 @@ abstract class AbstractRPCServerLoader extends RPCServerLoader with Logging {
   override def getServer(lb: ILoadBalancer, serviceInstance: ServiceInstance): Server = {
     getOrRefresh(
       refreshServerList(lb),
-      lb.getAllServers.exists(_.getHostPort == serviceInstance.getInstance),
+      lb.getAllServers.asScala.exists(_.getHostPort == serviceInstance.getInstance),
       serviceInstance
     )
-    lb.getAllServers.find(_.getHostPort == serviceInstance.getInstance).get
+    lb.getAllServers.asScala.find(_.getHostPort == serviceInstance.getInstance).get
 //    {
 //      var servers = lb.getAllServers
 //      val instanceNotExists = new NoInstanceExistsException(10051, "The instance " +
@@ -125,6 +127,7 @@ abstract class AbstractRPCServerLoader extends RPCServerLoader with Logging {
     SpringCloudFeignConfigurationCache.getDiscoveryClient
       .getInstances(applicationName)
       .iterator()
+      .asScala
       .map { s =>
         val serviceInstance = getDWCServiceInstance(s)
         serviceInstance.setApplicationName(
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala
index ab4107123..5f4fd4f3c 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/BroadcastRPCInterceptor.scala
@@ -42,11 +42,11 @@ class BroadcastRPCInterceptor extends RPCInterceptor with Logging {
   implicit val executor = BroadcastRPCInterceptor.broadcastThreadPool
 
   protected def getSenders(broadcast: BroadcastProtocol, applicationName: String): Array[Sender] =
-    if (broadcast.instances != null && broadcast.instances.nonEmpty)
+    if (broadcast.instances != null && broadcast.instances.nonEmpty) {
       broadcast.instances.map(instance =>
         Sender.getSender(ServiceInstance(applicationName, instance))
       )
-    else {
+    } else {
       var senders: Option[Array[Sender]] = None
       for (builder <- RPCSpringBeanCache.getBroadcastSenderBuilders if senders.isEmpty)
         senders = builder.build(broadcast, applicationName)
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala
index fc1c5e858..6afd8234d 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/interceptor/common/CacheableRPCInterceptor.scala
@@ -91,11 +91,9 @@ class CacheableRPCInterceptor extends RPCInterceptor with Logging {
         guavaCache.invalidate(cacheKey)
       }
       true
-    } {
-      case exception: Exception => {
-        logger.warn(s"Failed to clean RPC cache, cache key:${cacheKey}", exception)
-        false
-      }
+    } { case exception: Exception =>
+      logger.warn(s"Failed to clean RPC cache, cache key:${cacheKey}", exception)
+      false
     }
   }
 
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala
index 45e7d346a..06f13c70a 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringCloudFeignConfigurationCache.scala
@@ -84,10 +84,11 @@ private[linkis] object SpringCloudFeignConfigurationCache {
   private[rpc] def getContract = contract
 
   private[rpc] def getClient = {
-    if (client == null)
+    if (client == null) {
       DataWorkCloudApplication.getApplicationContext.getBean(
         classOf[SpringCloudFeignConfigurationCache]
       )
+    }
     client
   }
 
@@ -95,10 +96,11 @@ private[linkis] object SpringCloudFeignConfigurationCache {
   private[rpc] def getLoadBalancedRetryFactory = loadBalancedRetryFactory
 
   private[linkis] def getDiscoveryClient = {
-    if (discoveryClient == null)
+    if (discoveryClient == null) {
       DataWorkCloudApplication.getApplicationContext.getBean(
         classOf[SpringCloudFeignConfigurationCache]
       )
+    }
     discoveryClient
   }
 
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
index e60c93685..ab4f2d7fe 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/SpringMVCRPCSender.scala
@@ -143,19 +143,21 @@ private[rpc] class SpringMVCRPCSender private[rpc] (
   override def deliver(message: Any): Unit =
     getRPCSenderListenerBus.post(RPCMessageEvent(message, serviceInstance))
 
-  override def equals(obj: Any): Boolean = if (obj == null) false
-  else
+  override def equals(obj: Any): Boolean = if (obj == null) {
+    false
+  } else {
     obj match {
       case sender: SpringMVCRPCSender => sender.serviceInstance == serviceInstance
       case _ => false
     }
+  }
 
   override def hashCode(): Int = serviceInstance.hashCode()
 
   override val toString: String =
-    if (StringUtils.isBlank(serviceInstance.getInstance))
+    if (StringUtils.isBlank(serviceInstance.getInstance)) {
       s"RPCSender(${serviceInstance.getApplicationName})"
-    else s"RPCSender($getApplicationName, ${serviceInstance.getInstance})"
+    } else s"RPCSender($getApplicationName, ${serviceInstance.getInstance})"
 
 }
 
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/UnionSender.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/UnionSender.scala
index 4e2e44fcb..c843cc06e 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/UnionSender.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/UnionSender.scala
@@ -51,8 +51,9 @@ object UnionSender {
   def getUnionSender(receiver: Receiver, recycler: Receiver): Sender = {
     val key = receiver.hashCode() + "_" + recycler.hashCode()
     if (!receiverStringToSenders.containsKey(key)) receiverStringToSenders synchronized {
-      if (!receiverStringToSenders.containsKey(key))
+      if (!receiverStringToSenders.containsKey(key)) {
         receiverStringToSenders.put(key, new UnionSender(receiver, recycler))
+      }
     }
     receiverStringToSenders.get(key)
   }
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
index 3275647f0..7c535e96e 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaClientRefreshUtils.scala
@@ -38,20 +38,23 @@ class EurekaClientRefreshUtils {
   val serviceRefreshInterval =
     RPCConfiguration.BDP_RPC_EUREKA_SERVICE_REFRESH_INTERVAL.getValue.toLong
 
-  private[eureka] def refreshEurekaClient(): Unit = if (
-      System.currentTimeMillis - eurekaClientLastRefreshTime > serviceRefreshInterval
-  ) synchronized {
-    if (System.currentTimeMillis - eurekaClientLastRefreshTime < serviceRefreshInterval) return
-    eurekaClientLastRefreshTime = System.currentTimeMillis
-    eurekaClient match {
-      case disClient: NetflixDiscoveryClient =>
-        val refreshRegistry = classOf[NetflixDiscoveryClient].getDeclaredMethod("refreshRegistry")
-        refreshRegistry.setAccessible(true)
-        refreshRegistry.invoke(disClient)
-        Thread.sleep(100)
-      case _ =>
+  private[eureka] def refreshEurekaClient(): Unit =
+    if (System.currentTimeMillis - eurekaClientLastRefreshTime > serviceRefreshInterval) {
+      synchronized {
+        if (System.currentTimeMillis - eurekaClientLastRefreshTime < serviceRefreshInterval)
+          return
+        eurekaClientLastRefreshTime = System.currentTimeMillis
+        eurekaClient match {
+          case disClient: NetflixDiscoveryClient =>
+            val refreshRegistry =
+              classOf[NetflixDiscoveryClient].getDeclaredMethod("refreshRegistry")
+            refreshRegistry.setAccessible(true)
+            refreshRegistry.invoke(disClient)
+            Thread.sleep(100)
+          case _ =>
+        }
+      }
     }
-  }
 
   @PostConstruct
   def storeEurekaClientRefreshUtils(): Unit = {
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala
index 0702b5776..1eb326cb9 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/sender/eureka/EurekaRPCServerLoader.scala
@@ -24,6 +24,8 @@ import org.apache.linkis.rpc.interceptor.AbstractRPCServerLoader
 
 import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClient.EurekaServiceInstance
 
+import java.util.Locale
+
 import scala.concurrent.duration.Duration
 
 class EurekaRPCServerLoader extends AbstractRPCServerLoader {
@@ -43,7 +45,11 @@ class EurekaRPCServerLoader extends AbstractRPCServerLoader {
     }
 
   private[rpc] def getInstance(applicationName: String, instanceId: String): String =
-    if (instanceId.toLowerCase.indexOf(":" + applicationName.toLowerCase + ":") > 0) {
+    if (
+        instanceId
+          .toLowerCase(Locale.getDefault)
+          .indexOf(":" + applicationName.toLowerCase(Locale.getDefault) + ":") > 0
+    ) {
       val instanceInfos = instanceId.split(":")
       instanceInfos(0) + ":" + instanceInfos(2)
     } else instanceId
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/JavaCollectionSerializer.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/JavaCollectionSerializer.scala
index 4c488c2f8..5c9e16368 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/JavaCollectionSerializer.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/transform/JavaCollectionSerializer.scala
@@ -23,7 +23,7 @@ import org.json4s.{CustomSerializer, JArray, JObject}
 import org.json4s.jackson.JsonMethods.parse
 import org.json4s.jackson.Serialization.write
 
-//TODO is now only the simplest implementation, and there is a need to optimize it later.(TODO 现在只做最简单的实现,后续有需要再优化)
+// TODO is now only the simplest implementation, and there is a need to optimize it later.(TODO 现在只做最简单的实现,后续有需要再优化)
 
 object JavaCollectionSerializer
     extends CustomSerializer[java.util.List[_]](implicit formats =>
diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
index b6b33bbac..e7d48305a 100644
--- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
+++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/utils/RPCUtils.scala
@@ -27,8 +27,9 @@ import org.apache.commons.lang3.StringUtils
 
 import java.lang.reflect.UndeclaredThrowableException
 import java.net.ConnectException
+import java.util.Locale
 
-import scala.collection.JavaConversions._
+import scala.collection.JavaConverters._
 
 import com.netflix.client.ClientException
 import feign.RetryableException
@@ -66,8 +67,11 @@ object RPCUtils {
       parsedServiceId: String,
       tooManyDeal: List[String] => Option[String]
   ): Option[String] = {
-    val services = SpringCloudFeignConfigurationCache.getDiscoveryClient.getServices
-      .filter(_.toLowerCase.contains(parsedServiceId.toLowerCase))
+    val services = SpringCloudFeignConfigurationCache.getDiscoveryClient.getServices.asScala
+      .filter(
+        _.toLowerCase(Locale.getDefault)
+          .contains(parsedServiceId.toLowerCase(Locale.getDefault()))
+      )
       .toList
     if (services.length == 1) Some(services.head)
     else if (services.length > 1) tooManyDeal(services)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org