From b238892d395eeeca821aae12dc37777e0f5b56be Mon Sep 17 00:00:00 2001 From: peacewong Date: Sat, 20 Jul 2024 21:43:29 +0800 Subject: [PATCH 01/10] =?UTF-8?q?Once=20Client=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8D=95=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../computation/client/LinkisJobClient.scala | 30 ++++++++++- .../client/once/simple/SimpleOnceJob.scala | 6 +++ .../once/simple/SimpleOnceJobBuilder.scala | 53 +++++++++++++++++-- 3 files changed, 82 insertions(+), 7 deletions(-) diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobClient.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobClient.scala index d44c479abb..80e8e7ad42 100644 --- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobClient.scala +++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/LinkisJobClient.scala @@ -17,11 +17,37 @@ package org.apache.linkis.computation.client -import org.apache.linkis.computation.client.interactive.InteractiveJob -import org.apache.linkis.computation.client.once.OnceJob +import org.apache.linkis.bml.client.BmlClientFactory +import org.apache.linkis.computation.client.interactive.{InteractiveJob, InteractiveJobBuilder} +import org.apache.linkis.computation.client.once.{LinkisManagerClient, OnceJob} +import org.apache.linkis.computation.client.once.simple.{SimpleOnceJob, SimpleOnceJobBuilder} +import org.apache.linkis.httpclient.dws.config.DWSClientConfig +import org.apache.linkis.ujes.client.UJESClientImpl import java.io.Closeable +class LinkisJobClient(clientConfig: DWSClientConfig) extends Closeable { + + private val ujseClient = new UJESClientImpl(clientConfig) + + private lazy val linkisManagerCLient = LinkisManagerClient(ujseClient) + + override def close(): Unit = { + if (null != linkisManagerCLient) { + linkisManagerCLient.close() + } + } + + def onceJobBuilder(): SimpleOnceJobBuilder = + SimpleOnceJob.builder(SimpleOnceJobBuilder.getBmlClient(clientConfig), linkisManagerCLient) + + def interactiveJobBuilder(): InteractiveJobBuilder = { + val builder = InteractiveJob.builder() + builder.setUJESClient(ujseClient) + } + +} + /** * This class is only used to provide a unified entry for user to build a LinkisJob conveniently and * simply. Please keep this class lightweight enough, do not set too many field to confuse user. diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala index e672e7bfe1..13d96c238a 100644 --- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala +++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJob.scala @@ -17,6 +17,7 @@ package org.apache.linkis.computation.client.once.simple +import org.apache.linkis.bml.client.BmlClient import org.apache.linkis.common.ServiceInstance import org.apache.linkis.common.utils.Utils import org.apache.linkis.computation.client.LinkisJobMetrics @@ -157,6 +158,11 @@ object SimpleOnceJob { def builder(): SimpleOnceJobBuilder = new SimpleOnceJobBuilder + def builder( + bmlClient: BmlClient, + linkisManagerClient: LinkisManagerClient + ): SimpleOnceJobBuilder = new SimpleOnceJobBuilder(bmlClient, linkisManagerClient) + /** * Build a submitted SimpleOnceJob by id and user. * @param id diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala index dc4451ff0f..a1f4c9f553 100644 --- a/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala +++ b/linkis-computation-governance/linkis-client/linkis-computation-client/src/main/scala/org/apache/linkis/computation/client/once/simple/SimpleOnceJobBuilder.scala @@ -20,6 +20,7 @@ package org.apache.linkis.computation.client.once.simple import org.apache.linkis.bml.client.{BmlClient, BmlClientFactory} import org.apache.linkis.common.utils.Utils import org.apache.linkis.computation.client.LinkisJobBuilder +import org.apache.linkis.computation.client.LinkisJobBuilder.clientConfig import org.apache.linkis.computation.client.once.LinkisManagerClient import org.apache.linkis.computation.client.once.action.CreateEngineConnAction import org.apache.linkis.computation.client.once.simple.SimpleOnceJobBuilder._ @@ -28,6 +29,8 @@ import org.apache.linkis.governance.common.entity.job.OnceExecutorContent import org.apache.linkis.governance.common.utils.OnceExecutorContentUtils import org.apache.linkis.governance.common.utils.OnceExecutorContentUtils.BmlResource import org.apache.linkis.httpclient.dws.DWSHttpClient +import org.apache.linkis.httpclient.dws.authentication.TokenAuthenticationStrategy +import org.apache.linkis.httpclient.dws.config.{DWSClientConfig, DWSClientConfigBuilder} import org.apache.linkis.manager.label.constant.LabelKeyConstant import org.apache.linkis.protocol.utils.TaskUtils import org.apache.linkis.ujes.client.exception.UJESJobException @@ -38,12 +41,19 @@ import java.util import scala.collection.convert.WrapAsJava._ import scala.collection.convert.WrapAsScala._ -class SimpleOnceJobBuilder private[simple] () extends LinkisJobBuilder[SubmittableSimpleOnceJob] { +class SimpleOnceJobBuilder private[simple] ( + private val bmlClient: BmlClient, + private val linkisManagerClient: LinkisManagerClient +) extends LinkisJobBuilder[SubmittableSimpleOnceJob] { private var createService: String = _ private var maxSubmitTime: Long = _ private var description: String = _ + def this() = { + this(null, null) + } + def setCreateService(createService: String): this.type = { this.createService = createService this @@ -69,10 +79,26 @@ class SimpleOnceJobBuilder private[simple] () extends LinkisJobBuilder[Submittab val contentMap = OnceExecutorContentUtils.contentToMap(onceExecutorContent) val bytes = DWSHttpClient.jacksonJson.writeValueAsBytes(contentMap) val response = - getBmlClient.uploadResource(executeUser, getFilePath, new ByteArrayInputStream(bytes)) + getThisBMLClient.uploadResource(executeUser, getFilePath, new ByteArrayInputStream(bytes)) OnceExecutorContentUtils.resourceToValue(BmlResource(response.resourceId, response.version)) } + protected def getThisBMLClient(): BmlClient = { + if (null == this.bmlClient) { + getBmlClient(LinkisJobBuilder.getDefaultClientConfig) + } else { + this.bmlClient + } + } + + protected def getThisLinkisManagerClient(): LinkisManagerClient = { + if (null == this.linkisManagerClient) { + getLinkisManagerClient + } else { + this.linkisManagerClient + } + } + override def build(): SubmittableSimpleOnceJob = { ensureNotNull(labels, "labels") ensureNotNull(jobContent, "jobContent") @@ -99,7 +125,7 @@ class SimpleOnceJobBuilder private[simple] () extends LinkisJobBuilder[Submittab .setMaxSubmitTime(maxSubmitTime) .setDescription(description) .build() - new SubmittableSimpleOnceJob(getLinkisManagerClient, createEngineConnAction) + new SubmittableSimpleOnceJob(getThisLinkisManagerClient, createEngineConnAction) } implicit def toMap(map: util.Map[String, Any]): util.Map[String, String] = map.map { @@ -128,10 +154,27 @@ object SimpleOnceJobBuilder { private var bmlClient: BmlClient = _ private var linkisManagerClient: LinkisManagerClient = _ - def getBmlClient: BmlClient = { + def getBmlClient(clientConfig: DWSClientConfig): BmlClient = { if (bmlClient == null) synchronized { if (bmlClient == null) { - bmlClient = BmlClientFactory.createBmlClient(LinkisJobBuilder.getDefaultClientConfig) + val newClientConfig = DWSClientConfigBuilder + .newBuilder() + .addServerUrl(clientConfig.getServerUrl) + .connectionTimeout(clientConfig.getConnectTimeout) + .discoveryEnabled(clientConfig.isDiscoveryEnabled) + .loadbalancerEnabled(clientConfig.isLoadbalancerEnabled) + .maxConnectionSize(clientConfig.getMaxConnection) + .retryEnabled(clientConfig.isRetryEnabled) + .setRetryHandler(clientConfig.getRetryHandler) + .readTimeout( + clientConfig.getReadTimeout + ) // We think 90s is enough, if SocketTimeoutException is throw, just set a new clientConfig to modify it. + .setAuthenticationStrategy(new TokenAuthenticationStrategy()) + .setAuthTokenKey(TokenAuthenticationStrategy.TOKEN_KEY) + .setAuthTokenValue("LINKIS-AUTH-eTaYLbQpmIulPyrXcMl") + .setDWSVersion(clientConfig.getDWSVersion) + .build() + bmlClient = BmlClientFactory.createBmlClient(newClientConfig) Utils.addShutdownHook(() => bmlClient.close()) } } From 5074deea9c3475fc8672511628b9b49be57608e3 Mon Sep 17 00:00:00 2001 From: peacewong Date: Sat, 20 Jul 2024 22:20:53 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E7=BC=93=E5=AD=98t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apache/linkis/rpc/sender/SpringMVCRPCSender.scala | 4 +++- .../async/AsyncConcurrentComputationExecutor.scala | 3 --- .../executor/execute/ComputationExecutor.scala | 2 +- .../executor/execute/EngineExecutionContext.scala | 10 ++++++++-- .../engineconn/acessible/executor/log/LogHelper.scala | 4 ++++ .../jdbc/executor/JDBCEngineConnExecutor.scala | 1 - .../executor/OpenLooKengEngineConnExecutor.java | 2 -- .../engineplugin/python/executor/PythonSession.scala | 4 +--- .../spark/executor/SparkPythonExecutor.scala | 4 +--- 9 files changed, 18 insertions(+), 16 deletions(-) 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 24d17a015b..9bb2fdea96 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 @@ -20,11 +20,13 @@ package org.apache.linkis.rpc.sender import org.apache.linkis.common.ServiceInstance import org.apache.linkis.common.utils.Logging import org.apache.linkis.rpc.{BaseRPCSender, RPCMessageEvent, RPCSpringBeanCache} +import org.apache.linkis.rpc.conf.RPCConfiguration import org.apache.linkis.rpc.interceptor.{RPCInterceptor, ServiceInstanceRPCInterceptorChain} import org.apache.linkis.server.conf.ServerConfiguration + import org.apache.commons.lang3.StringUtils + import feign._ -import org.apache.linkis.rpc.conf.RPCConfiguration private[rpc] class SpringMVCRPCSender private[rpc] ( private[rpc] val serviceInstance: ServiceInstance diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala index c78ec28294..9af394da80 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/async/AsyncConcurrentComputationExecutor.scala @@ -105,9 +105,6 @@ abstract class AsyncConcurrentComputationExecutor(override val outputPrintLimit: }) } { e => logger.info("failed to do with hook", e) - engineExecutionContext.appendStdout( - LogUtils.generateWarn(s"failed execute hook: ${ExceptionUtils.getStackTrace(e)}") - ) } if (hookedCode.length > 100) { logger.info(s"hooked after code: ${hookedCode.substring(0, 100)} ....") diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala index a1ad029ade..b156ea9aa0 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/ComputationExecutor.scala @@ -418,7 +418,7 @@ abstract class ComputationExecutor(val outputPrintLimit: Int = 1000) EngineConnObject.getEngineCreationContext.getOptions.asScala.foreach({ case (key, value) => // skip log jobId because it corresponding jobid when the ec created if (!ComputationExecutorConf.PRINT_TASK_PARAMS_SKIP_KEYS.getValue.contains(key)) { - sb.append(s"${key}=${value.toString}\n") + sb.append(s"${key}=${value}\n") } }) diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala index 87504ada94..4a13da3c25 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala @@ -21,12 +21,14 @@ import org.apache.linkis.common.io.{FsPath, MetaData, Record} import org.apache.linkis.common.io.resultset.{ResultSet, ResultSetWriter} import org.apache.linkis.common.utils.{Logging, Utils} import org.apache.linkis.cs.client.utils.ContextServiceUtils +import org.apache.linkis.engineconn.acessible.executor.conf.AccessibleExecutorConfiguration import org.apache.linkis.engineconn.acessible.executor.listener.event.{ TaskLogUpdateEvent, TaskProgressUpdateEvent, TaskResultCreateEvent, TaskResultSizeCreatedEvent } +import org.apache.linkis.engineconn.acessible.executor.log.LogHelper import org.apache.linkis.engineconn.computation.executor.conf.ComputationExecutorConf import org.apache.linkis.engineconn.computation.executor.cs.CSTableResultSetWriter import org.apache.linkis.engineconn.executor.ExecutorExecutionContext @@ -196,8 +198,12 @@ class EngineExecutionContext(executor: ComputationExecutor, executorUser: String taskLog = s"${log.substring(0, limitLength)}..." logger.info("The log is too long and will be intercepted,log limit length : {}", limitLength) } - val listenerBus = getEngineSyncListenerBus - getJobId.foreach(jId => listenerBus.postToAll(TaskLogUpdateEvent(jId, taskLog))) + if (!AccessibleExecutorConfiguration.ENGINECONN_SUPPORT_PARALLELISM.getValue) { + LogHelper.cacheLog(taskLog) + } else { + val listenerBus = getEngineSyncListenerBus + getJobId.foreach(jId => listenerBus.postToAll(TaskLogUpdateEvent(jId, taskLog))) + } } override def close(): Unit = { diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala index 7602a3b288..a7169697ae 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/log/LogHelper.scala @@ -44,6 +44,10 @@ object LogHelper extends Logging { def setLogListener(logListener: LogListener): Unit = this.logListener = logListener + def cacheLog(log: String): Unit = { + logCache.cacheLog(log) + } + def pushAllRemainLogs(): Unit = { // logger.info(s"start to push all remain logs") Thread.sleep(30) diff --git a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala index ec9fe7f174..34d03a2b3a 100644 --- a/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala +++ b/linkis-engineconn-plugins/jdbc/src/main/scala/org/apache/linkis/manager/engineplugin/jdbc/executor/JDBCEngineConnExecutor.scala @@ -272,7 +272,6 @@ class JDBCEngineConnExecutor(override val outputPrintLimit: Int, val id: Int) ): ExecuteResponse = { if (isDDLCommand(statement.getUpdateCount, resultSet.getMetaData.getColumnCount)) { logger.info(s"current result is a ResultSet Object , but there are no more results!") - engineExecutorContext.appendStdout("Query executed successfully.") SuccessExecuteResponse() } else { val md = resultSet.getMetaData diff --git a/linkis-engineconn-plugins/openlookeng/src/main/java/org/apache/linkis/engineplugin/openlookeng/executor/OpenLooKengEngineConnExecutor.java b/linkis-engineconn-plugins/openlookeng/src/main/java/org/apache/linkis/engineplugin/openlookeng/executor/OpenLooKengEngineConnExecutor.java index 2c21687760..9ce2703451 100644 --- a/linkis-engineconn-plugins/openlookeng/src/main/java/org/apache/linkis/engineplugin/openlookeng/executor/OpenLooKengEngineConnExecutor.java +++ b/linkis-engineconn-plugins/openlookeng/src/main/java/org/apache/linkis/engineplugin/openlookeng/executor/OpenLooKengEngineConnExecutor.java @@ -20,7 +20,6 @@ import org.apache.linkis.common.io.MetaData; import org.apache.linkis.common.io.Record; import org.apache.linkis.common.io.resultset.ResultSetWriter; -import org.apache.linkis.common.log.LogUtils; import org.apache.linkis.engineconn.common.conf.EngineConnConf; import org.apache.linkis.engineconn.common.conf.EngineConnConstant; import org.apache.linkis.engineconn.computation.executor.entity.EngineConnTask; @@ -358,7 +357,6 @@ private ErrorExecuteResponse verifyServerError( if (cause == null) { errorString = ExceptionUtils.getStackTrace(cause); } - engineExecutorContext.appendStdout(LogUtils.generateERROR(errorString)); return new ErrorExecuteResponse(ExceptionUtils.getMessage(cause), cause); } } else if (statement.isClientAborted()) { diff --git a/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala b/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala index 87aec337cc..9ef07b3eae 100644 --- a/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala +++ b/linkis-engineconn-plugins/python/src/main/scala/org/apache/linkis/manager/engineplugin/python/executor/PythonSession.scala @@ -255,9 +255,7 @@ class PythonSession extends Logging { def printLog(log: Any): Unit = { if (engineExecutionContext != null) { - engineExecutionContext.appendStdout("+++++++++++++++") - engineExecutionContext.appendStdout(log.toString) - engineExecutionContext.appendStdout("+++++++++++++++") + engineExecutionContext.appendStdout(s"+++++++++++++++\n${log.toString}\n+++++++++++++++") } else { logger.warn("engine context is null can not send log") } diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala index 63018ad9d1..f79b263da6 100644 --- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala +++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkPythonExecutor.scala @@ -436,9 +436,7 @@ class SparkPythonExecutor(val sparkEngineSession: SparkEngineSession, val id: In def printLog(log: Any): Unit = { logger.info(log.toString) if (engineExecutionContext != null) { - engineExecutionContext.appendStdout("+++++++++++++++") - engineExecutionContext.appendStdout(log.toString) - engineExecutionContext.appendStdout("+++++++++++++++") + engineExecutionContext.appendStdout(s"+++++++++++++++\n${log.toString}\n+++++++++++++++") } else { logger.warn("engine context is null can not send log") } From 4a01cfa4aee07d89cf19f19750e91653f6d82afb Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 24 Jul 2024 22:33:43 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../linkis/engineconn/acessible/executor/log/SendAppender.java | 2 +- .../execute/DefaultCodeExecTaskExecutorManager.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/SendAppender.java b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/SendAppender.java index b29c94fa02..05976bb2c7 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/SendAppender.java +++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/java/org/apache/linkis/engineconn/acessible/executor/log/SendAppender.java @@ -101,7 +101,7 @@ public void append(LogEvent event) { } } if (!flag) { - logStr = matchLog(logStr); + // logStr = matchLog(logStr); logCache.cacheLog(logStr); } } else { diff --git a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala index db47ed30f5..36e0ef32b0 100644 --- a/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala +++ b/linkis-orchestrator/linkis-computation-orchestrator/src/main/scala/org/apache/linkis/orchestrator/computation/execute/DefaultCodeExecTaskExecutorManager.scala @@ -129,7 +129,7 @@ class DefaultCodeExecTaskExecutorManager extends CodeExecTaskExecutorManager wit TaskLogEvent( execTask, LogUtils.generateInfo( - "Background is starting a new engine for you(您的任务正在请求引擎中，请耐心等待)" + s",\nexecId ${execTask + "Background is starting a new engine for you(您的任务正在请求引擎中，请耐心等待)" + s", execId ${execTask .getIDInfo()} mark id is ${mark.getMarkId()}" ) ) From 9ed846a797f4438630cfc0099d7eefeca7fdb414 Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 24 Jul 2024 22:34:08 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E5=86=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/utils/CodeAndRunTypeUtils.scala | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala index 3870fe6e58..b5e38e034e 100644 --- a/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala +++ b/linkis-commons/linkis-common/src/main/scala/org/apache/linkis/common/utils/CodeAndRunTypeUtils.scala @@ -21,6 +21,10 @@ import org.apache.linkis.common.conf.CommonVars import org.apache.commons.lang3.StringUtils +import java.util.Locale + +import scala.collection.mutable + object CodeAndRunTypeUtils { private val CONF_LOCK = new Object() @@ -101,14 +105,23 @@ object CodeAndRunTypeUtils { def getLanguageTypeAndCodeTypeRelationMap: Map[String, String] = { val codeTypeAndRunTypeRelationMap = getCodeTypeAndLanguageTypeRelationMap if (codeTypeAndRunTypeRelationMap.isEmpty) Map() - else codeTypeAndRunTypeRelationMap.flatMap(x => x._2.map(y => (y, x._1))) + else { +// codeTypeAndRunTypeRelationMap.flatMap(x => x._2.map(y => (y, x._1))) + val map = mutable.Map[String, String]() + codeTypeAndRunTypeRelationMap.foreach(kv => { + kv._2.foreach(v => map.put(v, kv._1)) + }) + map.toMap + } } def getLanguageTypeByCodeType(codeType: String, defaultLanguageType: String = ""): String = { if (StringUtils.isBlank(codeType)) { return "" } - getLanguageTypeAndCodeTypeRelationMap.getOrElse(codeType, defaultLanguageType) + val lowerCaseCodeType = codeType.toLowerCase(Locale.getDefault) + getLanguageTypeAndCodeTypeRelationMap.getOrElse(lowerCaseCodeType, defaultLanguageType) + } /** From c0979ddc8b8a8c93904f7581dc0bc7edc0cca2a0 Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 24 Jul 2024 22:35:18 +0800 Subject: [PATCH 05/10] =?UTF-8?q?EC=E7=BB=93=E6=9E=9C=E9=9B=86=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/conf/GovernaceCommonConf.scala | 9 ++ .../common/utils/GovernanceUtils.scala | 25 ++++- .../common/conf/EngineConnConstant.scala | 2 +- .../executor/ExecutorExecutionContext.scala | 12 +-- .../conf/EntranceSpringConfiguration.java | 18 +--- .../linkis/entrance/parser/ParserUtils.java | 24 +---- .../entrance/conf/EntranceConfiguration.scala | 14 --- .../execute/EntranceExecutorManager.scala | 11 --- .../execute/ExecuteRequestInterceptor.scala | 39 -------- .../impl/EntranceExecutorManagerImpl.scala | 8 -- .../impl/StorePathEntranceInterceptor.scala | 96 ------------------- .../entrance/utils/CommonLogPathUtils.scala | 32 ++----- 12 files changed, 51 insertions(+), 239 deletions(-) delete mode 100644 linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala index 0d9b62ff48..b0c9dda666 100644 --- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala +++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/conf/GovernaceCommonConf.scala @@ -86,4 +86,13 @@ object GovernanceCommonConf { val EC_APP_MANAGE_MODE = CommonVars("linkis.ec.app.manage.mode", "attach") + /** + * DEFAULT_LOGPATH_PREFIX is the prefix that represents the default log storage path + * DEFAULT_LOGPATH_PREFIX 是表示默认的日志存储路径的前缀 和 结果集的前缀 + */ + val DEFAULT_LOGPATH_PREFIX = CommonVars[String]( + "wds.linkis.entrance.config.log.path", + CommonVars[String]("wds.linkis.filesystem.hdfs.root.path").getValue + ).getValue + } diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceUtils.scala b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceUtils.scala index ddcb17a3b2..56cb019a6e 100644 --- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceUtils.scala +++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/utils/GovernanceUtils.scala @@ -24,8 +24,9 @@ import org.apache.linkis.governance.common.conf.GovernanceCommonConf import org.apache.commons.lang3.StringUtils import java.io.File +import java.text.SimpleDateFormat import java.util -import java.util.{ArrayList, List} +import java.util.{ArrayList, Date, List} object GovernanceUtils extends Logging { @@ -121,4 +122,26 @@ object GovernanceUtils extends Logging { } } + /** + * get result path parentPath: resPrefix + dateStr + result + creator subPath: parentPath + + * executeUser + taskid + filename + * + * @param creator + * @return + */ + def getResultParentPath(creator: String): String = { + val resPrefix = GovernanceCommonConf.DEFAULT_LOGPATH_PREFIX + val resStb = new StringBuilder() + if (resStb.endsWith("/")) { + resStb.append(resPrefix) + } else { + resStb.append(resPrefix).append("/") + } + val dateFormat = new SimpleDateFormat("yyyy-MM-dd") + val date = new Date(System.currentTimeMillis) + val dateString = dateFormat.format(date) + resStb.append("result").append("/").append(dateString).append("/").append(creator) + resStb.toString() + } + } diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConstant.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConstant.scala index cdc14592d8..fec2756f9f 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConstant.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-common/src/main/scala/org/apache/linkis/engineconn/common/conf/EngineConnConstant.scala @@ -27,5 +27,5 @@ object EngineConnConstant { var hiveLogReg = "The url to track the job: http://.*?/proxy/(application_[0-9]+_[0-9]+)/" - val YARN_LOG_URL = "INFO yarn application url:" + val YARN_LOG_URL = "Yarn application url:" } diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala index a7675287e0..cfda27816e 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala +++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/executor-core/src/main/scala/org/apache/linkis/engineconn/executor/ExecutorExecutionContext.scala @@ -20,11 +20,10 @@ package org.apache.linkis.engineconn.executor import org.apache.linkis.common.io.{FsPath, MetaData, Record} import org.apache.linkis.common.io.resultset.{ResultSet, ResultSetWriter} import org.apache.linkis.common.utils.Utils -import org.apache.linkis.governance.common.conf.GovernanceCommonConf +import org.apache.linkis.governance.common.utils.GovernanceUtils import org.apache.linkis.manager.label.entity.Label import org.apache.commons.lang3.StringUtils -import org.apache.commons.lang3.time.DateFormatUtils import java.util.concurrent.atomic.AtomicInteger @@ -60,9 +59,8 @@ trait ExecutorExecutionContext { def setLabels(labels: Array[Label[_]]): Unit = this.labels = labels protected def getDefaultStorePath: String = { - val path = GovernanceCommonConf.RESULT_SET_STORE_PATH.getValue - val pathPrefix = (if (path.endsWith("/")) path else path + "/") + Utils.getJvmUser + "/" + - DateFormatUtils.format(System.currentTimeMillis(), "yyyyMMdd") + "/" + val path = GovernanceUtils.getResultParentPath("default") + val pathPrefix = (if (path.endsWith("/")) path else path + "/") + Utils.getJvmUser + "/" getJobId.map(pathPrefix + _ + "/" + System.nanoTime).getOrElse(pathPrefix + System.nanoTime) } @@ -81,11 +79,11 @@ trait ExecutorExecutionContext { protected def getDefaultResultSetByType: String def createDefaultResultSetWriter(): ResultSetWriter[_ <: MetaData, _ <: Record] = { - createResultSetWriter(getResultSetByType(getDefaultResultSetByType)) // todo check + createResultSetWriter(getResultSetByType(getDefaultResultSetByType)) } def createDefaultResultSetWriter(alias: String): ResultSetWriter[_ <: MetaData, _ <: Record] = - createResultSetWriter(getResultSetByType(getDefaultResultSetByType), alias) // todo check + createResultSetWriter(getResultSetByType(getDefaultResultSetByType), alias) def createResultSetWriter(resultSetType: String): ResultSetWriter[_ <: MetaData, _ <: Record] = createResultSetWriter(getResultSetByType(resultSetType), null) diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/conf/EntranceSpringConfiguration.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/conf/EntranceSpringConfiguration.java index 86b1a91f7a..ff4f28f407 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/conf/EntranceSpringConfiguration.java +++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/conf/EntranceSpringConfiguration.java @@ -28,19 +28,9 @@ import org.apache.linkis.entrance.interceptor.EntranceInterceptor; import org.apache.linkis.entrance.interceptor.OnceJobInterceptor; import org.apache.linkis.entrance.interceptor.impl.*; -import org.apache.linkis.entrance.log.CacheLogManager; -import org.apache.linkis.entrance.log.ErrorCodeListener; -import org.apache.linkis.entrance.log.ErrorCodeManager; -import org.apache.linkis.entrance.log.FlexibleErrorCodeManager$; -import org.apache.linkis.entrance.log.LogManager; -import org.apache.linkis.entrance.log.PersistenceErrorCodeListener; +import org.apache.linkis.entrance.log.*; import org.apache.linkis.entrance.parser.CommonEntranceParser; -import org.apache.linkis.entrance.persistence.EntranceResultSetEngine; -import org.apache.linkis.entrance.persistence.PersistenceEngine; -import org.apache.linkis.entrance.persistence.PersistenceManager; -import org.apache.linkis.entrance.persistence.QueryPersistenceEngine; -import org.apache.linkis.entrance.persistence.QueryPersistenceManager; -import org.apache.linkis.entrance.persistence.ResultSetEngine; +import org.apache.linkis.entrance.persistence.*; import org.apache.linkis.entrance.scheduler.EntranceGroupFactory; import org.apache.linkis.entrance.scheduler.EntranceParallelConsumerManager; import org.apache.linkis.entrance.scheduler.EntranceSchedulerContext; @@ -137,8 +127,6 @@ public EntranceInterceptor[] entranceInterceptors() { new OnceJobInterceptor(), new CSEntranceInterceptor(), new ShellDangerousGrammerInterceptor(), - // new PythonCodeCheckInterceptor(), - // new DBInfoCompleteInterceptor(), new CompatibleInterceptor(), new SparkCodeCheckInterceptor(), new SQLCodeCheckInterceptor(), @@ -146,11 +134,9 @@ public EntranceInterceptor[] entranceInterceptors() { new ParserVarLabelInterceptor(), new VarSubstitutionInterceptor(), new LogPathCreateInterceptor(), - new StorePathEntranceInterceptor(), new ScalaCodeInterceptor(), new SQLLimitEntranceInterceptor(), new CommentInterceptor(), - // new SetTenantLabelInterceptor(), new UserCreatorIPCheckInterceptor() }; } diff --git a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java index 86af74d5c8..9c1ef63aa0 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java +++ b/linkis-computation-governance/linkis-entrance/src/main/java/org/apache/linkis/entrance/parser/ParserUtils.java @@ -18,8 +18,8 @@ package org.apache.linkis.entrance.parser; import org.apache.linkis.common.io.FsPath; -import org.apache.linkis.entrance.conf.EntranceConfiguration$; import org.apache.linkis.entrance.utils.CommonLogPathUtils; +import org.apache.linkis.governance.common.conf.GovernanceCommonConf; import org.apache.linkis.governance.common.entity.job.JobRequest; import org.apache.linkis.manager.label.utils.LabelUtil; import org.apache.linkis.storage.utils.StorageUtils; @@ -28,32 +28,16 @@ import java.text.SimpleDateFormat; import java.util.Date; -import java.util.HashMap; import java.util.Map; public final class ParserUtils { - private static final Map types = new HashMap<>(); - - static { - types.put("py", "python"); - types.put("python", "python"); - types.put("sql", "sql"); - types.put("pyspark", "python"); - types.put("scala", "scala"); - types.put("rspark", "r"); - types.put("r", "r"); - types.put("java", "java"); - types.put("hql", "hql"); - types.put("sparksql", "sql"); - } - public static void generateLogPath(JobRequest jobRequest, Map params) { String logPath = null; String logPathPrefix = null; String logMid = "log"; if (StringUtils.isEmpty(logPathPrefix)) { - logPathPrefix = EntranceConfiguration$.MODULE$.DEFAULT_LOGPATH_PREFIX().getValue(); + logPathPrefix = GovernanceCommonConf.DEFAULT_LOGPATH_PREFIX(); } /*Determine whether logPathPrefix is terminated with /, if it is, delete */ /*判断是否logPathPrefix是否是以 / 结尾， 如果是，就删除*/ @@ -87,8 +71,4 @@ public static void generateLogPath(JobRequest jobRequest, Map pa } jobRequest.setLogPath(logPath); } - - public static String getCorrespondingType(String runType) { - return types.get(runType.toLowerCase()); - } } diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala index 369523265c..a23bac28a5 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/conf/EntranceConfiguration.scala @@ -30,20 +30,9 @@ object EntranceConfiguration { val JOB_MAX_PERSIST_WAIT_TIME = CommonVars("wds.linkis.entrance.job.persist.wait.max", new TimeType("5m")) - val MULTI_ENTRANCE_CONDITION = CommonVars("wds.linkis.entrance.multi.entrance.flag", true) - val JOBHISTORY_SPRING_APPLICATION_NAME = CommonVars("wds.linkis.jobhistory.application.name", "linkis-ps-jobhistory") - /** - * DEFAULT_LOGPATH_PREFIX is the prefix that represents the default log storage path - * DEFAULT_LOGPATH_PREFIX 是表示默认的日志存储路径的前缀 - */ - val DEFAULT_LOGPATH_PREFIX = CommonVars[String]( - "wds.linkis.entrance.config.log.path", - CommonVars[String]("wds.linkis.filesystem.hdfs.root.path").getValue - ) - /** * Default_Cache_Max is used to specify the size of the LoopArray of the CacheLogWriter * Default_Cache_Max 是用来指定CacheLogWriter的LoopArray的大小 @@ -248,7 +237,4 @@ object EntranceConfiguration { val ENABLE_HDFS_JVM_USER = CommonVars[Boolean]("linkis.entrance.enable.hdfs.jvm.user", true).getValue - val ENABLE_HDFS_RES_DIR_PRIVATE = - CommonVars[Boolean]("linkis.entrance.enable.hdfs.res.dir.private", false).getValue - } diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceExecutorManager.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceExecutorManager.scala index 3733e8ee83..1560ffb947 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceExecutorManager.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/EntranceExecutorManager.scala @@ -18,7 +18,6 @@ package org.apache.linkis.entrance.execute import org.apache.linkis.common.exception.WarnException -import org.apache.linkis.common.log.LogUtils import org.apache.linkis.common.utils.{Logging, Utils} import org.apache.linkis.entrance.errorcode.EntranceErrorCodeSummary._ import org.apache.linkis.entrance.exception.EntranceErrorException @@ -37,8 +36,6 @@ abstract class EntranceExecutorManager(groupFactory: GroupFactory) private val idGenerator = new AtomicLong(0) - def getOrCreateInterceptors(): Array[ExecuteRequestInterceptor] - override def delete(executor: Executor): Unit = { if (null != executor) { executor.close() @@ -91,15 +88,7 @@ abstract class EntranceExecutorManager(groupFactory: GroupFactory) case jobReq: JobRequest => val entranceEntranceExecutor = new DefaultEntranceExecutor(jobReq.getId) - // getEngineConn Executor - job.getLogListener.foreach( - _.onLogUpdate( - job, - LogUtils.generateInfo("Your job is being scheduled by orchestrator.") - ) - ) jobReq.setUpdatedTime(new Date(System.currentTimeMillis())) - entranceEntranceExecutor case _ => throw new EntranceErrorException( diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/ExecuteRequestInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/ExecuteRequestInterceptor.scala index 8230557298..7946da40d1 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/ExecuteRequestInterceptor.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/ExecuteRequestInterceptor.scala @@ -65,42 +65,3 @@ object JobExecuteRequestInterceptor extends ExecuteRequestInterceptor { } } - -object ReconnectExecuteRequestInterceptor extends ExecuteRequestInterceptor { - val PROPERTY_EXEC_ID = "execId" - - override def apply(requestTask: RequestTask, executeRequest: ExecuteRequest): RequestTask = - executeRequest match { - case reconnect: ReconnectExecuteRequest => - requestTask.data(PROPERTY_EXEC_ID, reconnect.execId) - requestTask - case _ => requestTask - } - -} - -object StorePathExecuteRequestInterceptor extends ExecuteRequestInterceptor { - - override def apply(requestTask: RequestTask, executeRequest: ExecuteRequest): RequestTask = - executeRequest match { - case storePath: StorePathExecuteRequest => - requestTask.data(RequestTask.RESULT_SET_STORE_PATH, storePath.storePath) - requestTask - case _ => requestTask - } - -} - -object RuntimePropertiesExecuteRequestInterceptor extends ExecuteRequestInterceptor { - - override def apply(requestTask: RequestTask, executeRequest: ExecuteRequest): RequestTask = - executeRequest match { - case runtime: RuntimePropertiesExecuteRequest => - runtime.properties.asScala.foreach { case (k, v) => - requestTask.data(k, v) - } - requestTask - case _ => requestTask - } - -} diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala index 3efcf41c89..89fcaa7b22 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/impl/EntranceExecutorManagerImpl.scala @@ -25,13 +25,5 @@ import org.apache.linkis.scheduler.queue.GroupFactory class EntranceExecutorManagerImpl(groupFactory: GroupFactory, engineConnManager: EngineConnManager) extends EntranceExecutorManager(groupFactory) { - override def getOrCreateInterceptors(): Array[ExecuteRequestInterceptor] = Array( - JobExecuteRequestInterceptor, - LabelExecuteRequestInterceptor, - ReconnectExecuteRequestInterceptor, - StorePathExecuteRequestInterceptor, - RuntimePropertiesExecuteRequestInterceptor - ) - override def setExecutorListener(engineListener: ExecutorListener): Unit = {} } diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala deleted file mode 100644 index 50b23df263..0000000000 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/interceptor/impl/StorePathEntranceInterceptor.scala +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.entrance.interceptor.impl - -import org.apache.linkis.common.utils.Logging -import org.apache.linkis.entrance.conf.EntranceConfiguration -import org.apache.linkis.entrance.exception.{EntranceErrorCode, EntranceErrorException} -import org.apache.linkis.entrance.interceptor.EntranceInterceptor -import org.apache.linkis.governance.common.conf.GovernanceCommonConf -import org.apache.linkis.governance.common.entity.job.JobRequest -import org.apache.linkis.manager.label.utils.LabelUtil -import org.apache.linkis.protocol.utils.TaskUtils -import org.apache.linkis.server.BDPJettyServerHelper - -import org.apache.commons.lang3.time.DateFormatUtils - -import java.util - -import scala.collection.JavaConverters.{asScalaBufferConverter, mapAsScalaMapConverter} - -class StorePathEntranceInterceptor extends EntranceInterceptor with Logging { - - /** - * The apply function is to supplement the information of the incoming parameter task, making the - * content of this task more complete. Additional information includes: database information - * supplement, custom variable substitution, code check, limit limit, etc. - * apply函数是对传入参数task进行信息的补充，使得这个task的内容更加完整。 补充的信息包括: 数据库信息补充、自定义变量替换、代码检查、limit限制等 - * - * @param jobReq - * @return - */ - override def apply(jobReq: JobRequest, logAppender: java.lang.StringBuilder): JobRequest = { - val paramsMap = if (null != jobReq.getParams) { - jobReq.getParams - } else { - new util.HashMap[String, AnyRef]() - } - var runtimeMap = TaskUtils.getRuntimeMap(paramsMap) - if (null == runtimeMap || runtimeMap.isEmpty) { - runtimeMap = new util.HashMap[String, AnyRef]() - } - if (runtimeMap.containsKey(GovernanceCommonConf.RESULT_SET_STORE_PATH.key)) { - return jobReq - } - if (EntranceConfiguration.ENABLE_HDFS_RES_DIR_PRIVATE) { - val parentPath = generateUserPrivateResDir(jobReq) - runtimeMap.put(GovernanceCommonConf.RESULT_SET_STORE_PATH.key, parentPath) - TaskUtils.addRuntimeMap(paramsMap, runtimeMap) - val params = new util.HashMap[String, AnyRef]() - paramsMap.asScala.foreach(kv => params.put(kv._1, kv._2)) - jobReq.setResultLocation(parentPath) - jobReq.setParams(params) - jobReq - } else { - jobReq - } - - } - - private def generateUserPrivateResDir(jobReq: JobRequest): String = { - var parentPath: String = GovernanceCommonConf.RESULT_SET_STORE_PATH.getValue - if (!parentPath.endsWith("/")) parentPath += "/" - parentPath += jobReq.getExecuteUser - if (!parentPath.endsWith("/")) parentPath += "/linkis/" - else parentPath += "linkis/" - val userCreator = LabelUtil.getUserCreator(jobReq.getLabels) - if (null == userCreator) { - val labelJson = - BDPJettyServerHelper.gson.toJson(jobReq.getLabels.asScala.filter(_ != null).map(_.toString)) - throw new EntranceErrorException( - EntranceErrorCode.LABEL_PARAMS_INVALID.getErrCode, - s"UserCreator cannot be empty in labels : ${labelJson} of job with id : ${jobReq.getId}" - ) - } - // multi linkis cluster should not use same root folder , in which case result file may be overwrite - parentPath += DateFormatUtils.format(System.currentTimeMillis, "yyyy-MM-dd/HHmmss") + "/" + - userCreator._2 + "/" + jobReq.getId - parentPath - } - -} diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/CommonLogPathUtils.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/CommonLogPathUtils.scala index 746774633e..ffd4ee26f2 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/CommonLogPathUtils.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/utils/CommonLogPathUtils.scala @@ -21,14 +21,12 @@ import org.apache.linkis.common.io.FsPath import org.apache.linkis.common.utils.Utils import org.apache.linkis.entrance.conf.EntranceConfiguration import org.apache.linkis.governance.common.entity.job.JobRequest +import org.apache.linkis.governance.common.utils.GovernanceUtils import org.apache.linkis.manager.label.utils.LabelUtil import org.apache.linkis.storage.FSFactory import org.apache.linkis.storage.fs.FileSystem import org.apache.linkis.storage.utils.{FileSystemUtils, StorageConfiguration, StorageUtils} -import java.text.SimpleDateFormat -import java.util.Date - object CommonLogPathUtils { def buildCommonPath(commonPath: String): Unit = { @@ -58,34 +56,20 @@ object CommonLogPathUtils { } } - private val resPrefix = EntranceConfiguration.DEFAULT_LOGPATH_PREFIX.getValue - - /** - * get result path parentPath: resPrefix + dateStr + result + creator subPath: parentPath + - * executeUser + taskid + filename - * @param jobRequest - * @return - */ def getResultParentPath(jobRequest: JobRequest): String = { - val resStb = new StringBuilder() - if (resStb.endsWith("/")) { - resStb.append(resPrefix) - } else { - resStb.append(resPrefix).append("/") - } - val dateFormat = new SimpleDateFormat("yyyy-MM-dd") - val date = new Date(System.currentTimeMillis) - val dateString = dateFormat.format(date) val userCreator = LabelUtil.getUserCreatorLabel(jobRequest.getLabels) val creator = - if (null == userCreator) EntranceConfiguration.DEFAULT_CREATE_SERVICE + if (null == userCreator) EntranceConfiguration.DEFAULT_CREATE_SERVICE.getValue else userCreator.getCreator - resStb.append("result").append("/").append(dateString).append("/").append(creator) - resStb.toString() + GovernanceUtils.getResultParentPath(creator) } def getResultPath(jobRequest: JobRequest): String = { - val parentPath = getResultParentPath(jobRequest) + val userCreator = LabelUtil.getUserCreatorLabel(jobRequest.getLabels) + val creator = + if (null == userCreator) EntranceConfiguration.DEFAULT_CREATE_SERVICE.getValue + else userCreator.getCreator + val parentPath = GovernanceUtils.getResultParentPath(creator) parentPath + "/" + jobRequest.getExecuteUser + "/" + jobRequest.getId } From 65dd507a7c2065dfa775f5aa7290f3bb878740fd Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 24 Jul 2024 22:36:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../execute/DefaultEntranceExecutor.scala | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala index 4d3980fb41..ec7d44dd6f 100644 --- a/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala +++ b/linkis-computation-governance/linkis-entrance/src/main/scala/org/apache/linkis/entrance/execute/DefaultEntranceExecutor.scala @@ -130,35 +130,10 @@ class DefaultEntranceExecutor(id: Long) null != arrayResultSetPathResp.getResultSets && arrayResultSetPathResp.getResultSets.length > 0 ) { val resultsetSize = arrayResultSetPathResp.getResultSets.length - entranceExecuteRequest.getJob.setResultSize(resultsetSize) entranceExecuteRequest.getJob .asInstanceOf[EntranceJob] .addAndGetResultSize(resultsetSize) } - val firstResultSet = arrayResultSetPathResp.getResultSets.headOption.orNull - if (null != firstResultSet) { - // assert that all result set files have same parent path, so we get the first - Utils.tryCatch { - entranceExecuteRequest.getJob - .asInstanceOf[EntranceJob] - .getEntranceContext - .getOrCreatePersistenceManager() - .onResultSetCreated( - entranceExecuteRequest.getJob, - AliasOutputExecuteResponse(firstResultSet.alias, firstResultSet.result) - ) - } { case e: Exception => - val msg = s"Persist resultSet error. ${e.getMessage}" - logger.error(msg) - val errorExecuteResponse = new DefaultFailedTaskResponse( - msg, - EntranceErrorCode.RESULT_NOT_PERSISTED_ERROR.getErrCode, - e - ) - dealResponse(errorExecuteResponse, entranceExecuteRequest, orchestration) - return - } - } case _ => logger.info( s"JobRequest : ${entranceExecuteRequest.jobId()} succeed to execute task,no result." From a7179284c8978fbc54e1054c65031ed349a1bb8c Mon Sep 17 00:00:00 2001 From: peacewong Date: Wed, 24 Jul 2024 22:36:52 +0800 Subject: [PATCH 07/10] =?UTF-8?q?Bug=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala index 17f39f0585..14d35b344b 100644 --- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala +++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala @@ -121,9 +121,6 @@ object RPCConfiguration { val BDP_RPC_CACHE_CONF_EXPIRE_TIME: CommonVars[Long] = CommonVars("wds.linkis.rpc.cache.expire.time", 120000L) - val ENABLE_SPRING_PARAMS: Boolean = - CommonVars("wds.linkis.rpc.spring.params.enable", false).getValue - val RPC_READ_TIME_OUT: Int = CommonVars[Int]("spring.ribbon.ReadTimeout", 100000).getValue From 73bc2a333a349fe80595ea2360dbab43bad97ca9 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 25 Jul 2024 18:01:20 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=85=B3=E8=AE=BF=E9=97=AE=E7=9A=84Retry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkis-commons/linkis-module/pom.xml | 7 +++++ .../linkis/DataWorkCloudApplication.java | 2 ++ .../impl/DefaultResourceLabelService.scala | 1 - .../rm/service/ResourceLockService.scala | 8 +++-- .../impl/LabelResourceServiceImpl.scala | 10 +++++-- .../linkis/manager/dao/LockManagerMapper.java | 7 +++++ .../impl/DefaultLabelManagerPersistence.java | 8 +++++ .../impl/DefaultLockManagerPersistence.java | 30 ++++++++++--------- .../impl/DefaultResourceLabelPersistence.java | 8 +++++ .../DefaultResourceManagerPersistence.java | 7 +++++ .../manager/util/PersistenceManagerConf.java | 5 ---- .../jobhistory/dao/JobHistoryMapper.java | 12 ++++++++ 12 files changed, 81 insertions(+), 24 deletions(-) diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml index 80bbf94c35..638dc42550 100644 --- a/linkis-commons/linkis-module/pom.xml +++ b/linkis-commons/linkis-module/pom.xml @@ -338,6 +338,13 @@ org.springframework.cloud spring-cloud-openfeign-core + + + org.springframework.retry + spring-retry + 2.0.5 + + diff --git a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java index 5610ded412..0e40836e83 100644 --- a/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java +++ b/linkis-commons/linkis-module/src/main/java/org/apache/linkis/DataWorkCloudApplication.java @@ -50,6 +50,7 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; +import org.springframework.retry.annotation.EnableRetry; import org.springframework.web.filter.CharacterEncodingFilter; import javax.servlet.DispatcherType; @@ -68,6 +69,7 @@ @EnableDiscoveryClient @RefreshScope @EnableFeignClients +@EnableRetry public class DataWorkCloudApplication extends SpringBootServletInitializer { private static final Log logger = LogFactory.getLog(DataWorkCloudApplication.class); diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/label/service/impl/DefaultResourceLabelService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/label/service/impl/DefaultResourceLabelService.scala index 4f8ef7abc4..d4c5894c46 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/label/service/impl/DefaultResourceLabelService.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/label/service/impl/DefaultResourceLabelService.scala @@ -104,7 +104,6 @@ class DefaultResourceLabelService extends ResourceLabelService with Logging { if (persistenceResource.isEmpty) { null } else { - // TODO: 判断取哪个resource ResourceUtils.fromPersistenceResource(persistenceResource.get(0)) } } diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/ResourceLockService.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/ResourceLockService.scala index 18d328fcbd..c90ced3abf 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/ResourceLockService.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/ResourceLockService.scala @@ -53,7 +53,7 @@ class ResourceLockService extends Logging { } isLocked } { case t: Throwable => - logger.error(s"failed to lock label [${persistenceLock.getLockObject}]", t) + logger.error(s"Failed to lock label [${persistenceLock.getLockObject}]", t) false } } @@ -63,10 +63,14 @@ class ResourceLockService extends Logging { lockManagerPersistence.unlock(persistenceLock) logger.info("unlocked " + persistenceLock.getLockObject) } { case t: Throwable => - logger.error(s"failed to unlock label [${persistenceLock.getLockObject}]", t) + logger.error(s"Failed to unlock label [${persistenceLock.getLockObject}]", t) } } + /** + * Clean up the created time before end Date 清理所创建时间在end Date之前的 + * @param timeout + */ def clearTimeoutLock(timeout: Long): Unit = { val endDate = new Date(System.currentTimeMillis() - timeout) val locks = lockManagerPersistence.getTimeOutLocks(endDate) diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala index 3ffcd35e92..87a64b9900 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala @@ -29,6 +29,8 @@ import org.apache.linkis.manager.rm.domain.RMLabelContainer import org.apache.linkis.manager.rm.service.LabelResourceService import org.springframework.beans.factory.annotation.Autowired +import org.springframework.jdbc.CannotGetJdbcConnectionException +import org.springframework.retry.annotation.{Backoff, Retryable} import org.springframework.stereotype.Component import java.util @@ -49,10 +51,14 @@ class LabelResourceServiceImpl extends LabelResourceService with Logging { private val labelFactory = LabelBuilderFactoryContext.getLabelBuilderFactory - override def getLabelResource(label: Label[_]): NodeResource = { + override def getLabelResource(label: Label[_]): NodeResource = resourceLabelService.getResourceByLabel(label) - } + @Retryable( + value = Array(Array(classOf[CannotGetJdbcConnectionException])), + maxAttempts = 5, + backoff = new Backoff(delay = 10000) + ) override def setLabelResource( label: Label[_], nodeResource: NodeResource, diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java index 40b2c04ed0..5549820ef9 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/LockManagerMapper.java @@ -21,6 +21,9 @@ import org.apache.ibatis.annotations.*; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; import org.springframework.transaction.annotation.Transactional; import java.util.Date; @@ -29,6 +32,10 @@ @Mapper public interface LockManagerMapper { + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 6, + backoff = @Backoff(delay = 10000)) @Transactional(rollbackFor = Exception.class) int lock(PersistenceLock persistenceLock); diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java index 37f0236fee..5e515f589b 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java @@ -34,6 +34,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; + import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.stream.Collectors; @@ -134,6 +138,10 @@ private void replaceIntoLabelKeyValues(Map labelValueKeyAndConte } } + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 5, + backoff = @Backoff(delay = 10000)) @Override public PersistenceLabel getLabel(int id) { PersistenceLabel persistenceLabel = labelManagerMapper.getLabel(id); diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLockManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLockManagerPersistence.java index 927e2841be..b37ac74c43 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLockManagerPersistence.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLockManagerPersistence.java @@ -24,6 +24,10 @@ import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; + import java.util.Date; import java.util.List; @@ -66,27 +70,21 @@ private boolean tryQueueLock(PersistenceLock persistenceLock, Long timeOut) { String syncLocker = persistenceLock.getLockObject().intern(); synchronized (syncLocker) { // insert lock The order is determined by the id auto-incrementing number - do { - lockManagerMapper.lock(persistenceLock); - } while (persistenceLock.getId() < 0); + lockManagerMapper.lock(persistenceLock); } - boolean isLocked = isAcquireLock(persistenceLock); + boolean isLocked = false; while (!isLocked && System.currentTimeMillis() - startTime < timeOut) { try { - if (PersistenceManagerConf.Distributed_lock_request_sync_enabled) { - synchronized (syncLocker) { + synchronized (syncLocker) { + isLocked = isAcquireLock(persistenceLock); + if (isLocked) { + syncLocker.notifyAll(); + } else { syncLocker.wait(PersistenceManagerConf.Distributed_lock_request_interval); - isLocked = isAcquireLock(persistenceLock); - if (isLocked) { - syncLocker.notifyAll(); - } } - } else { - Thread.sleep(PersistenceManagerConf.Distributed_lock_request_interval); - isLocked = isAcquireLock(persistenceLock); } } catch (Exception e) { - logger.info("lock waiting failed", e); + logger.info("lock waiting failed, can be retry", e); } } if (!isLocked) { @@ -107,6 +105,10 @@ private boolean isAcquireLock(PersistenceLock persistenceLock) { } } + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 5, + backoff = @Backoff(delay = 10000)) @Override public void unlock(PersistenceLock persistenceLock) { if (persistenceLock.getId() > 0) { diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java index 8fa1794064..9ae8a64854 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceLabelPersistence.java @@ -31,6 +31,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; + import java.util.Collections; import java.util.List; import java.util.Map; @@ -120,6 +124,10 @@ public void setResourceToLabel(PersistenceLabel label, PersistenceResource persi } } + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 5, + backoff = @Backoff(delay = 10000)) @Override public List getResourceByLabel(PersistenceLabel label) { // label id 不为空，则直接通过label_id 查询，否则通过 value_key and value_content 查询 diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceManagerPersistence.java index a6f9d7c8de..a517ef0ccf 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceManagerPersistence.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultResourceManagerPersistence.java @@ -29,6 +29,10 @@ import org.apache.commons.collections.CollectionUtils; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; + import java.util.ArrayList; import java.util.List; @@ -158,6 +162,9 @@ public void nodeResourceUpdate( resourceManagerMapper.nodeResourceUpdateByResourceId(resourceId, persistenceResource); } + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + backoff = @Backoff(delay = 10000)) @Override public PersistenceResource getNodeResourceByTicketId(String ticketId) { PersistenceResource persistenceResource = diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/util/PersistenceManagerConf.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/util/PersistenceManagerConf.java index 8e96b5dafa..a41e287241 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/util/PersistenceManagerConf.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/util/PersistenceManagerConf.java @@ -23,9 +23,4 @@ public class PersistenceManagerConf { public static final Integer Distributed_lock_request_interval = CommonVars$.MODULE$.apply("linkis.master.distributed.lock.request.interval", 500).getValue(); - - public static final Boolean Distributed_lock_request_sync_enabled = - CommonVars$.MODULE$ - .apply("linkis.master.distributed.lock.request.sync.enabled", true) - .getValue(); } diff --git a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java index da1263574d..a6c58f5c27 100644 --- a/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java +++ b/linkis-public-enhancements/linkis-jobhistory/src/main/java/org/apache/linkis/jobhistory/dao/JobHistoryMapper.java @@ -21,6 +21,10 @@ import org.apache.ibatis.annotations.Param; +import org.springframework.jdbc.CannotGetJdbcConnectionException; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; + import java.util.Date; import java.util.List; @@ -28,8 +32,16 @@ public interface JobHistoryMapper { List selectJobHistory(JobHistory jobReq); + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 5, + backoff = @Backoff(delay = 10000)) void insertJobHistory(JobHistory jobReq); + @Retryable( + value = {CannotGetJdbcConnectionException.class}, + maxAttempts = 5, + backoff = @Backoff(delay = 10000)) void updateJobHistory(JobHistory jobReq); List searchWithIdOrderAsc( From c7b39b04d37f06ce63f9d54721dcc8e652bccad1 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 25 Jul 2024 18:10:33 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/persistence/impl/DefaultNodeManagerPersistence.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java index b97d2aa3ad..6468658bbf 100644 --- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java +++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java @@ -119,7 +119,7 @@ public void updateEngineNode(ServiceInstance serviceInstance, Node node) LinkisRetryException linkisRetryException = new LinkisRetryException( NODE_INFO_DUPLICATE.getErrorCode(), NODE_INFO_DUPLICATE.getErrorMessage()); - linkisRetryException.initCause(linkisRetryException); + linkisRetryException.initCause(e); throw linkisRetryException; } catch (Exception e) { NodeInstanceNotFoundException nodeInstanceNotFoundException = From 54b37cef1dad7c916eb21b50ab1c313268134ca0 Mon Sep 17 00:00:00 2001 From: peacewong Date: Thu, 1 Aug 2024 17:11:46 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=B0=83=E6=95=B4pes=E7=9A=84=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- linkis-commons/linkis-module/pom.xml | 2 +- .../linkis/rpc/conf/RPCConfiguration.scala | 3 + .../linkis-computation-client/pom.xml | 2 +- .../linkis-engineconn-manager-server/pom.xml | 4 +- .../linkis-once-engineconn/pom.xml | 2 +- .../linkis-computation-engineconn/pom.xml | 16 +- .../linkis-entrance/pom.xml | 16 +- .../linkis-application-manager/pom.xml | 2 +- .../impl/LabelResourceServiceImpl.scala | 2 +- linkis-engineconn-plugins/jdbc/pom.xml | 2 +- linkis-engineconn-plugins/spark/pom.xml | 2 +- linkis-engineconn-plugins/sqoop/pom.xml | 2 +- .../linkis-bml-server/pom.xml | 4 +- .../src/main/assembly/distribution.xml | 0 .../linkis/bml/LinkisBMLApplication.java | 0 .../apache/linkis/bml/common/Constant.java | 0 .../linkis/bml/common/ExecutorManager.java | 0 .../linkis/bml/common/HdfsResourceHelper.java | 0 .../bml/common/LocalResourceHelper.java | 0 .../linkis/bml/common/OperationEnum.java | 0 .../linkis/bml/common/ResourceHelper.java | 0 .../bml/common/ResourceHelperFactory.java | 0 .../linkis/bml/common/ScheduledTask.java | 0 .../apache/linkis/bml/dao/BmlProjectDao.java | 0 .../apache/linkis/bml/dao/DownloadDao.java | 0 .../apache/linkis/bml/dao/ResourceDao.java | 0 .../org/apache/linkis/bml/dao/TaskDao.java | 0 .../org/apache/linkis/bml/dao/VersionDao.java | 0 .../apache/linkis/bml/entity/BmlProject.java | 0 .../linkis/bml/entity/DownloadModel.java | 0 .../apache/linkis/bml/entity/Resource.java | 0 .../linkis/bml/entity/ResourceTask.java | 0 .../linkis/bml/entity/ResourceVersion.java | 0 .../org/apache/linkis/bml/entity/Version.java | 0 .../errorcode/BmlServerErrorCodeSummary.java | 0 .../linkis/bml/restful/BmlProjectRestful.java | 0 .../linkis/bml/restful/BmlRestfulApi.java | 0 .../linkis/bml/restful/RestfulUtils.java | 0 .../linkis/bml/service/BmlProjectService.java | 0 .../apache/linkis/bml/service/BmlService.java | 0 .../bml/service/BmlShareResourceService.java | 0 .../linkis/bml/service/DownloadService.java | 0 .../linkis/bml/service/ResourceService.java | 0 .../linkis/bml/service/TaskService.java | 0 .../linkis/bml/service/VersionService.java | 0 .../service/impl/BmlProjectServiceImpl.java | 0 .../bml/service/impl/BmlServiceImpl.java | 0 .../impl/BmlShareResourceServiceImpl.java | 0 .../bml/service/impl/DownloadServiceImpl.java | 0 .../bml/service/impl/ResourceServiceImpl.java | 0 .../bml/service/impl/TaskServiceImpl.java | 0 .../bml/service/impl/VersionServiceImpl.java | 0 .../linkis/bml/threading/Scheduler.java | 0 .../org/apache/linkis/bml/threading/Task.java | 0 .../linkis/bml/threading/TaskState.java | 0 .../linkis/bml/util/HttpRequestHelper.java | 0 .../org/apache/linkis/bml/util/MD5Utils.java | 0 .../apache/linkis/bml/vo/ResourceBasicVO.java | 0 .../org/apache/linkis/bml/vo/ResourceVO.java | 0 .../linkis/bml/vo/ResourceVersionsVO.java | 0 .../mapper/common/BmlProjectMapper.xml | 0 .../mapper/common/DownloadMapper.xml | 0 .../mapper/common/ResourceMapper.xml | 0 .../resources/mapper/common/TaskMapper.xml | 0 .../resources/mapper/common/VersionMapper.xml | 0 .../bml/common/BmlAuthorityException.scala | 0 .../common/BmlPermissionDeniedException.scala | 0 .../bml/common/BmlQueryFailException.scala | 0 .../common/BmlResourceExpiredException.scala | 0 .../common/BmlServerParaErrorException.scala | 0 .../bml/conf/BmlServerConfiguration.scala | 0 .../bml/protocol/BmlServerProtocol.scala | 0 .../apache/linkis/bml/rpc/BmlReceiver.scala | 0 .../test/java/org/apache/linkis/bml/Scan.java | 0 .../linkis/bml/WebApplicationServer.java | 0 .../bml/common/HdfsResourceHelperTest.java | 0 .../bml/common/LocalResourceHelperTest.java | 0 .../bml/common/VersionServiceImplTest.java | 0 .../apache/linkis/bml/dao/BaseDaoTest.java | 0 .../linkis/bml/dao/BmlProjectDaoTest.java | 0 .../linkis/bml/dao/DownloadDaoTest.java | 0 .../linkis/bml/dao/ResourceDaoTest.java | 0 .../apache/linkis/bml/dao/TaskDaoTest.java | 0 .../apache/linkis/bml/dao/VersionDaoTest.java | 0 .../bml/service/BmlProjectServiceTest.java | 0 .../bml/service/DownloadServiceImplTest.java | 0 .../bml/service/ResourceServiceImplTest.java | 0 .../bml/service/TaskServiceImplTest.java | 0 .../bml/service/VersionServiceImplTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/create.sql | 0 .../BmlClientErrorCodeSummaryTest.java | 45 ---- .../linkis-bml/linkis-bml-common/pom.xml | 43 ---- linkis-public-enhancements/linkis-bml/pom.xml | 36 ---- .../builder/RPCHttpContextClientConfig.java | 20 -- .../builder/ContextClientFactoryTest.java | 35 --- .../builder/HttpContextClientConfigTest.java | 33 --- .../CsClientErrorCodeSummaryTest.java | 59 ------ .../apache/linkis/cs/client/test/Test.java | 134 ------------ .../test/bean/ClientTestContextKey.java | 67 ------ .../test/bean/ClientTestContextValue.java | 47 ----- .../client/test/bean/ResourceValueBean.java | 45 ---- .../listener/CommonContextKeyListener.java | 40 ---- .../test/no_context_search/TestClear.java | 60 ------ .../cs/client/test/restful/ListenerTest.java | 20 -- .../cs/client/test/restful/RestfulTest.java | 146 ------------- .../cs/client/test/service/TestInfo.java | 99 --------- .../cs/client/test/service/TestRemove.java | 113 ---------- .../test/service/TestSearchService.java | 113 ---------- .../test_multiuser/TestChangeContext.java | 110 ---------- .../test_multiuser/TestCreateContext.java | 122 ----------- .../client/utils/ContextClientConfTest.java | 40 ---- .../client/utils/ContextServiceUtilsTest.java | 103 --------- .../cs/client/utils/SerializeHelperTest.java | 60 ------ .../linkis-cs-common/pom.xml | 45 ---- .../entity/enumeration/ContextScopeTest.java | 40 ---- .../entity/enumeration/ContextTypeTest.java | 48 ----- .../common/entity/enumeration/DBTypeTest.java | 40 ---- .../entity/enumeration/ExpireTypeTest.java | 38 ---- .../entity/enumeration/WorkTypeTest.java | 40 ---- .../protocol/ContextHistoryTypeTest.java | 36 ---- .../cs/common/protocol/ContextIDTypeTest.java | 43 ---- .../common/protocol/ContextKeyTypeTest.java | 37 ---- .../protocol/ContextKeyValueTypeTest.java | 37 ---- .../common/protocol/ContextValueTypeTest.java | 37 ---- .../ContextSerializationHelperTest.java | 199 ------------------ ...CombinedNodeIDContextIDSerializerTest.java | 59 ------ .../CommonContextKeySerializerTest.java | 60 ------ .../LinkisBMLResourceSerializerTest.java | 63 ------ .../data/CSResultDataSerializerTest.java | 60 ------ .../data/LinkisJobDataSerializerTest.java | 61 ------ .../value/metadata/CSTableSerializerTest.java | 65 ------ .../object/CSFlowInfosSerializerTest.java | 57 ----- .../test/ContextSerializationHelperTest.java | 187 ---------------- .../cs/common/utils/CSCommonUtilsTest.java | 67 ------ .../utils/CSHighAvailableUtilsTest.java | 64 ------ .../linkis-cs-listener/pom.xml | 43 ---- .../callback/AbstractCallbackEngine.java | 24 --- .../cs/listener/test/TestContextID.java | 35 --- .../cs/listener/test/TestContextKey.java | 71 ------- .../cs/listener/test/TestContextKeyValue.java | 49 ----- .../cs/listener/test/TestContextValue.java | 44 ---- .../linkis-context-service/pom.xml | 40 ---- .../linkis-cs-server/pom.xml | 12 +- .../src/main/assembly/distribution.xml | 0 .../org/apache/linkis/cs/ContextSearch.java | 0 .../linkis/cs/DefaultContextSearch.java | 0 .../cs/condition/AbstractCommonCondition.java | 0 .../linkis/cs/condition/AtomicCondition.java | 0 .../cs/condition/BinaryLogicCondition.java | 0 .../apache/linkis/cs/condition/Condition.java | 0 .../linkis/cs/condition/ConditionType.java | 0 .../cs/condition/UnaryLogicCondition.java | 0 .../construction/AndConditionParser.java | 0 .../construction/ConditionBuilder.java | 0 .../construction/ConditionBuilderImpl.java | 0 .../construction/ConditionParser.java | 0 .../construction/ContainsConditionParser.java | 0 .../ContextScopeConditionParser.java | 0 .../ContextTypeConditionParser.java | 0 .../ContextValueTypeConditionParser.java | 0 .../construction/NearestConditionParser.java | 0 .../construction/NotConditionParser.java | 0 .../construction/OrConditionParser.java | 0 .../construction/RegexConditionParser.java | 0 .../cs/condition/impl/AndCondition.java | 0 .../cs/condition/impl/ContainsCondition.java | 0 .../condition/impl/ContextScopeCondition.java | 0 .../condition/impl/ContextTypeCondition.java | 0 .../impl/ContextValueTypeCondition.java | 0 .../cs/condition/impl/NearestCondition.java | 0 .../cs/condition/impl/NotCondition.java | 0 .../linkis/cs/condition/impl/OrCondition.java | 0 .../cs/condition/impl/RegexCondition.java | 0 .../cs/contextcache/ContextCacheService.java | 0 .../DefaultContextCacheService.java | 0 .../cs/contextcache/cache/ContextCache.java | 0 .../cache/DefaultContextAddListener.java | 0 .../cache/DefaultContextCache.java | 0 .../cache/csid/ContextIDValue.java | 0 .../cache/csid/ContextIDValueGenerator.java | 0 .../impl/ContextIDValueGeneratorImpl.java | 0 .../cache/csid/impl/ContextIDValueImpl.java | 0 .../cache/cskey/ContextKeyValueContext.java | 0 .../cache/cskey/ContextValueMapSet.java | 0 .../cskey/impl/ContextValueMapSetImpl.java | 0 .../impl/DefaultContextKeyValueContext.java | 0 .../cache/guava/ContextIDRemoveListener.java | 0 .../cs/contextcache/cleaner/AUTOCleaner.java | 0 .../contextcache/conf/ContextCacheConf.java | 0 .../index/ContextInvertedIndex.java | 0 .../index/ContextInvertedIndexSet.java | 0 .../index/ContextInvertedIndexSetImpl.java | 0 .../index/DefaultContextInvertedIndex.java | 0 .../metric/ContextCacheMetric.java | 0 .../contextcache/metric/ContextIDMetric.java | 0 .../metric/DefaultContextCacheMetric.java | 0 .../metric/DefaultContextIDMetric.java | 0 .../cs/contextcache/metric/Metrtic.java | 0 .../cs/contextcache/metric/ObjectInfo.java | 0 .../cs/contextcache/metric/SizeEstimator.java | 0 .../parser/ContextKeyValueParser.java | 0 .../parser/DefaultContextKeyValueParser.java | 0 .../contextcache/utils/ContextCacheUtils.java | 0 .../LinkisCsServerErrorCodeSummary.java | 0 .../ContextSearchFailedException.java | 0 .../execution/AbstractConditionExecution.java | 0 .../cs/execution/ConditionExecution.java | 0 .../fetcher/AbstractContextCacheFetcher.java | 0 .../fetcher/ContextCacheFetcher.java | 0 .../ContextTypeContextSearchFetcher.java | 0 .../fetcher/IterateContextCacheFetcher.java | 0 .../execution/impl/AndConditionExecution.java | 0 .../impl/BinaryLogicConditionExecution.java | 0 .../impl/ContainsConditionExecution.java | 0 .../impl/ContextScopeConditionExecution.java | 0 .../impl/ContextTypeConditionExecution.java | 0 .../ContextValueTypeConditionExecution.java | 0 .../impl/NearestConditionExecution.java | 0 .../execution/impl/NotConditionExecution.java | 0 .../execution/impl/OrConditionExecution.java | 0 .../impl/RegexConditionExecution.java | 0 .../impl/UnaryLogicConditionExecution.java | 0 .../matcher/AbstractContextSearchMatcher.java | 0 .../matcher/AndLogicContextSearchMatcher.java | 0 .../BinaryLogicContextSearchMatcher.java | 0 .../matcher/ConditionMatcherResolver.java | 0 .../matcher/ContainsContextSearchMatcher.java | 0 .../ContextScopeContextSearchMatcher.java | 0 .../matcher/ContextSearchMatcher.java | 0 .../ContextTypeContextSearchMatcher.java | 0 .../ContextValueTypeContextSearchMatcher.java | 0 .../NearestLogicContextSearchMatcher.java | 0 .../matcher/NotLogicContextSearchMatcher.java | 0 .../matcher/OrLogicContextSearchMatcher.java | 0 .../matcher/RegexContextSearchMatcher.java | 0 .../matcher/SkipContextSearchMather.java | 0 .../UnaryLogicContextSearchMatcher.java | 0 .../ruler/AbstractContextSearchRuler.java | 0 .../ruler/CommonListContextSearchRuler.java | 0 .../execution/ruler/ContextSearchRuler.java | 0 .../ruler/NearestContextSearchRuler.java | 0 .../AbstractContextHAManager.java | 0 .../cs/highavailable/ContextHAManager.java | 0 .../DefaultContextHAManager.java | 0 .../conf/ContextHighAvailableConf.java | 0 .../highavailable/exception/CSErrorCode.java | 0 .../ha/BackupInstanceGenerator.java | 0 .../cs/highavailable/ha/ContextHAChecker.java | 0 .../ha/ContextHAIDGenerator.java | 0 .../ha/impl/BackupInstanceGeneratorImpl.java | 0 .../ha/impl/ContextHACheckerImpl.java | 0 .../ha/impl/ContextHAIDGeneratorImpl.java | 0 .../HAContextPersistenceManagerImpl.java | 0 .../proxy/MethodInterceptorImpl.java | 0 .../cs/optimize/ConditionOptimizer.java | 0 .../cs/optimize/OptimizedCondition.java | 0 .../cost/ConditionCostCalculator.java | 0 .../linkis/cs/optimize/dfs/BinaryTree.java | 0 .../cs/optimize/dfs/MinCostBinaryTree.java | 0 .../apache/linkis/cs/optimize/dfs/Node.java | 0 .../impl/CostBasedConditionOptimizer.java | 0 .../persistence/ContextPersistenceBeans.java | 0 .../ContextPersistenceManager.java | 0 .../ContextPersistenceManagerImpl.java | 0 .../cs/persistence/annotation/Ignore.java | 0 .../cs/persistence/annotation/Tuning.java | 0 .../aop/PersistenceTuningAspect.java | 0 .../cs/persistence/conf/PersistenceConf.java | 0 .../persistence/dao/ContextHistoryMapper.java | 0 .../dao/ContextIDListenerMapper.java | 0 .../cs/persistence/dao/ContextIDMapper.java | 0 .../dao/ContextKeyListenerMapper.java | 0 .../cs/persistence/dao/ContextMapMapper.java | 0 .../persistence/entity/ExtraFieldClass.java | 0 .../entity/PersistenceContextHistory.java | 0 .../entity/PersistenceContextID.java | 0 .../entity/PersistenceContextIDListener.java | 0 .../entity/PersistenceContextKey.java | 0 .../entity/PersistenceContextKeyListener.java | 0 .../entity/PersistenceContextKeyValue.java | 0 .../entity/PersistenceContextValue.java | 0 .../exception/ThrowingFunction.java | 0 .../ContextHistoryPersistence.java | 0 .../ContextIDListenerPersistence.java | 0 .../persistence/ContextIDPersistence.java | 0 .../ContextKeyListenerPersistence.java | 0 .../persistence/ContextMapPersistence.java | 0 .../ContextMetricsPersistence.java | 0 .../KeywordContextHistoryPersistence.java | 0 .../persistence/TransactionManager.java | 0 .../impl/ContextHistoryPersistenceImpl.java | 0 .../ContextIDListenerPersistenceImpl.java | 0 .../impl/ContextIDPersistenceImpl.java | 0 .../ContextKeyListenerPersistenceImpl.java | 0 .../impl/ContextMapPersistenceImpl.java | 0 .../impl/ContextMetricsPersistenceImpl.java | 0 .../KeywordContextHistoryPersistenceImpl.java | 0 .../impl/TransactionManagerImpl.java | 0 .../cs/persistence/util/PersistenceUtils.java | 0 .../linkis/cs/server/LinkisCSApplication.java | 0 .../cs/server/conf/ContextServerConf.java | 0 .../cs/server/enumeration/ServiceMethod.java | 0 .../cs/server/enumeration/ServiceType.java | 0 .../server/label/CSInstanceLabelClient.java | 0 .../server/parser/DefaultKeywordParser.java | 0 .../cs/server/parser/KeywordMethodEntity.java | 0 .../cs/server/parser/KeywordParser.java | 0 .../protocol/AbstractHttpRequestProtocol.java | 0 .../protocol/ContextHistoryProtocol.java | 0 .../cs/server/protocol/ContextIDProtocol.java | 0 .../protocol/ContextListenerProtocol.java | 0 .../cs/server/protocol/ContextProtocol.java | 0 .../cs/server/protocol/HttpProtocol.java | 0 .../server/protocol/HttpRequestProtocol.java | 0 .../server/protocol/HttpResponseProtocol.java | 0 .../server/protocol/RestResponseProtocol.java | 0 .../restful/ContextHistoryRestfulApi.java | 0 .../server/restful/ContextIDRestfulApi.java | 0 .../restful/ContextListenerRestfulApi.java | 0 .../cs/server/restful/ContextRestfulApi.java | 0 .../cs/server/restful/CsRestfulParent.java | 0 .../cs/server/scheduler/CsScheduler.java | 0 .../server/scheduler/DefaultCsScheduler.java | 0 .../cs/server/scheduler/HttpAnswerJob.java | 0 .../scheduler/HttpAnswerJobBuilder.java | 0 .../linkis/cs/server/scheduler/HttpJob.java | 0 .../cs/server/scheduler/HttpJobBuilder.java | 0 .../cs/server/scheduler/HttpPriorityJob.java | 0 .../cs/server/scheduler/RestJobBuilder.java | 0 .../scheduler/impl/CsExecuteRequest.java | 0 .../impl/CsExecutorExecutionManager.java | 0 .../server/scheduler/impl/CsJobListener.java | 0 .../scheduler/impl/CsSchedulerBean.java | 0 .../server/scheduler/impl/CsSchedulerJob.java | 0 .../impl/JobToExecuteRequestConsumer.java | 0 .../cs/server/service/AbstractService.java | 0 .../server/service/ContextHistoryService.java | 0 .../cs/server/service/ContextIDService.java | 0 .../service/ContextListenerService.java | 0 .../cs/server/service/ContextService.java | 0 .../linkis/cs/server/service/Service.java | 0 .../impl/ContextHistoryServiceImpl.java | 0 .../service/impl/ContextIDServiceImpl.java | 0 .../impl/ContextListenerServiceImpl.java | 0 .../service/impl/ContextServiceImpl.java | 0 .../apache/linkis/cs/server/util/CsUtils.java | 0 .../src/main/resources/cs_ddl.sql | 0 .../mapper/common/contextHistoryMapper.xml | 0 .../mapper/common/contextIDListenerMapper.xml | 0 .../mapper/common/contextIDMapper.xml | 0 .../common/contextKeyListenerMapper.xml | 0 .../mapper/common/contextMapMapper.xml | 0 .../InstanceAliasConverter.scala | 0 .../instancealias/InstanceAliasManager.scala | 0 .../impl/DefaultInstanceAliasConverter.scala | 0 .../impl/InstanceAliasManagerImpl.scala | 0 .../RouteLabelInstanceAliasConverter.scala | 0 .../cs/server/scheduler/impl/CsExecutor.scala | 0 .../java/org/apache/linkis/cs/AndTest.java | 0 .../org/apache/linkis/cs/ContainsTest.java | 0 .../apache/linkis/cs/ContextScopeTest.java | 0 .../apache/linkis/cs/ContextSearchTest.java | 0 .../org/apache/linkis/cs/ContextTypeTest.java | 0 .../java/org/apache/linkis/cs/RegexTest.java | 0 .../test/java/org/apache/linkis/cs/Scan.java | 0 .../linkis/cs/WebApplicationServer.java | 0 .../contextcache/test/csid/TestContextID.java | 0 .../test/keyword/TestContextKey.java | 0 .../test/keyword/TestContextKeyValue.java | 0 .../keyword/TestContextKeyValueParser.java | 0 .../test/keyword/TestContextValue.java | 0 .../test/service/TestContextCacheService.java | 0 .../apache/linkis/cs/csid/TestContextID.java | 0 .../LinkisCsServerErrorCodeSummaryTest.java | 0 .../ContextSearchFailedExceptionTest.java | 0 .../test/TestContextHAManager.java | 0 .../cs/highavailable/test/haid/TestHAID.java | 0 .../test/persist/TestPersistence.java | 0 .../linkis/cs/keyword/TestContextKey.java | 0 .../cs/keyword/TestContextKeyValue.java | 0 .../linkis/cs/keyword/TestContextValue.java | 0 .../apache/linkis/cs/parser/ApiJsonTest.java | 0 .../cs/persistence/AContextHistory.java | 0 .../linkis/cs/persistence/AContextID.java | 0 .../cs/persistence/AContextIDListener.java | 0 .../linkis/cs/persistence/AContextKey.java | 0 .../cs/persistence/AContextKeyListener.java | 0 .../cs/persistence/AContextKeyValue.java | 0 .../linkis/cs/persistence/AContextValue.java | 0 .../cs/persistence/ContextHistoryTest.java | 0 .../cs/persistence/ContextIDListenerTest.java | 0 .../linkis/cs/persistence/ContextIDTest.java | 0 .../persistence/ContextKeyListenerTest.java | 0 .../linkis/cs/persistence/ContextMapTest.java | 0 .../cs/persistence/ExtraFieldClassTest.java | 0 .../linkis/cs/persistence/MapTypeAdapter.java | 0 .../linkis/cs/persistence/ProxyMethodA.java | 0 .../linkis/cs/persistence/ProxyTest.java | 0 .../apache/linkis/cs/persistence/Scan.java | 0 .../persistence/conf/PersistenceConfTest.java | 0 .../cs/persistence/dao/BaseDaoTest.java | 0 .../dao/ContextHistoryMapperTest.java | 0 .../dao/ContextIDListenerMapperTest.java | 0 .../persistence/dao/ContextIDMapperTest.java | 0 .../dao/ContextKeyListenerMapperTest.java | 0 .../utils/PersistenceUtilsTest.java | 0 .../linkis/cs/server/CsRestfulParent.java | 0 .../org/apache/linkis/cs/server/Scan.java | 0 .../linkis/cs/server/SchedulerTest.java | 0 .../cs/server/conf/ContextServerConfTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/application.yml | 0 .../src/test/resources/create.sql | 0 .../src/test/resources/linkis.properties | 0 .../src/test/resources/log4j2.xml | 0 .../linkis-datasource-client/pom.xml | 57 ----- .../client/TestDataSourceClient.scala | 123 ----------- .../datasource/client/TestHiveClient.scala | 144 ------------- .../datasource/client/TestMysqlClient.scala | 149 ------------- .../config/DatasourceClientConfigTest.java | 49 ----- .../DataSourceClientBuilderExceptionTest.java | 34 --- .../imp/LinkisDataSourceRemoteClientTest.java | 37 ---- .../linkis-datasource-manager/common/pom.xml | 55 ----- .../linkis-datasource-manager/server/pom.xml | 11 +- .../linkis-metadata-query/common/pom.xml | 69 ------ .../query/common/MdmConfigurationTest.java | 37 ---- .../common/cache/CacheConfigurationTest.java | 40 ---- .../common/cache/ConnCacheManagerTest.java | 48 ----- .../MetaMethodInvokeExceptionTest.java | 34 --- .../exception/MetaRuntimeExceptionTest.java | 34 --- .../linkis-metadata-query/server/pom.xml | 8 +- .../service/elasticsearch/pom.xml | 2 +- .../service/hdfs/pom.xml | 2 +- .../service/hive/pom.xml | 4 +- .../service/jdbc/pom.xml | 2 +- .../service/kafka/pom.xml | 4 +- .../service/mongodb/pom.xml | 2 +- .../linkis-datasource/pom.xml | 3 - .../linkis-error-code-server/pom.xml | 4 +- .../errorcode/server/ErrorCodeServer.java | 0 .../errorcode/server/dao/ErrorCodeMapper.java | 0 .../restful/LinkisErrorCodeRestful.java | 0 .../service/LinkisErrorCodeService.java | 0 .../impl/LinkisErrorCodeServiceImpl.java | 0 .../mapper/common/ErrorCodeMapper.xml | 0 .../apache/linkis/errorcode/server/Scan.java | 0 .../server/WebApplicationServer.java | 0 .../errorcode/server/dao/BaseDaoTest.java | 0 .../server/dao/ErrorCodeMapperTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/create.sql | 0 .../src/test/resources/data.sql | 0 .../src/test/resources/linkis.properties | 0 .../linkis-error-code-client/pom.xml | 59 ------ .../client/ClientConfigurationTest.java | 46 ---- .../client/ErrorCodeClientBuilderTest.java | 42 ---- .../client/LinkisErrorCodeClientTest.java | 44 ---- .../client/handler/ErrorCodeHandlerTest.java | 37 ---- .../handler/LinkisErrorCodeHandlerTest.java | 48 ----- .../manager/LinkisErrorCodeManagerTest.java | 45 ---- .../LinkisErrorCodeSynchronizerTest.java | 46 ---- .../client/action/ErrorCodeActionTest.scala | 41 ---- .../client/action/ErrorCodeMatcherTest.scala | 42 ---- .../linkis-error-code-common/pom.xml | 46 ---- .../errorcode/common/CommonConfTest.java | 33 --- .../common/LinkisErrorCodeTest.scala | 35 --- .../linkis-error-code/pom.xml | 39 ---- .../linkis-instance-label-server/pom.xml | 2 +- .../label/InsLabelAutoConfiguration.java | 0 .../label/async/AsyncConsumerQueue.java | 0 .../async/GenericAsyncConsumerQueue.java | 0 .../cache/InsLabelCacheConfiguration.java | 0 .../instance/label/conf/InsLabelConf.java | 0 .../label/dao/InsLabelRelationDao.java | 0 .../instance/label/dao/InstanceInfoDao.java | 0 .../instance/label/dao/InstanceLabelDao.java | 0 .../label/entity/InsPersistenceLabel.java | 0 .../entity/InsPersistenceLabelValue.java | 0 .../instance/label/entity/InstanceInfo.java | 0 .../LinkisInstanceLabelErrorCodeSummary.java | 0 .../exception/InstanceErrorException.java | 0 .../label/restful/InstanceRestful.java | 0 .../label/service/InsLabelAccessService.java | 0 .../label/service/InsLabelService.java | 0 .../label/service/InsLabelServiceAdapter.java | 0 .../label/service/annotation/AdapterMode.java | 0 .../service/impl/DefaultInsLabelService.java | 0 .../impl/DefaultInsLabelServiceAdapter.java | 0 .../service/impl/SpringInsLabelService.java | 0 .../instance/label/utils/EntityParser.java | 0 .../label/vo/InsPersistenceLabelSearchVo.java | 0 .../instance/label/vo/InstanceInfoVo.java | 0 .../mapper/common/InsLabelRelationMapper.xml | 0 .../mapper/common/InstanceInfoMapper.xml | 0 .../mapper/common/InstanceLabelMapper.xml | 0 .../label/service/InsLabelRpcService.scala | 0 .../rpc/DefaultInsLabelRpcService.scala | 0 .../apache/linkis/instance/label/Scan.java | 0 .../instance/label/WebApplicationServer.java | 0 .../instance/label/dao/BaseDaoTest.java | 0 .../label/dao/InsLabelRelationDaoTest.java | 0 .../label/dao/InstanceInfoDaoTest.java | 0 .../label/dao/InstanceLabelDaoTest.java | 0 .../impl/DefaultInsLabelServiceTest.java | 0 .../label/utils/EntityParserTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/create.sql | 0 .../pom.xml | 11 +- .../linkis/bml/client/AbstractBmlClient.java | 0 .../apache/linkis/bml/client/BmlClient.java | 0 .../linkis/bml/client/BmlClientFactory.java | 0 .../errorcode/BmlClientErrorCodeSummary.java | 0 .../cs/client/AbstractContextClient.java | 0 .../org/apache/linkis/cs/client/Context.java | 0 .../linkis/cs/client/ContextClient.java | 0 .../linkis/cs/client/LinkisContext.java | 0 .../cs/client/LinkisWorkFlowContext.java | 0 .../client/builder/ContextClientConfig.java | 0 .../client/builder/ContextClientFactory.java | 0 .../builder/HttpContextClientConfig.java | 0 .../errorcode/CsClientErrorCodeSummary.java | 0 .../client/http/ContextPostActionBuilder.java | 0 .../cs/client/http/HttpContextClient.java | 0 .../cs/client/http/HttpHeartBeater.java | 0 .../client/listener/ContextClientEvent.java | 0 .../listener/ContextClientListener.java | 0 .../listener/ContextClientListenerBus.java | 0 .../ContextClientListenerManager.java | 0 .../cs/client/listener/ContextIDListener.java | 0 .../client/listener/ContextKeyListener.java | 0 .../client/listener/ContextUpdateEvent.java | 0 .../cs/client/listener/HeartBeater.java | 0 .../cs/client/service/CSMetaDataService.java | 0 .../cs/client/service/CSNodeService.java | 0 .../cs/client/service/CSNodeServiceImpl.java | 0 .../cs/client/service/CSResourceService.java | 0 .../client/service/CSResultDataService.java | 0 .../service/CSResultDataServiceImpl.java | 0 .../cs/client/service/CSTableService.java | 0 .../cs/client/service/CSVariableService.java | 0 .../cs/client/service/CSWorkService.java | 0 .../cs/client/service/CSWorkServiceImpl.java | 0 .../service/ContextHistoryClientService.java | 0 .../ContextHistoryClientServiceImpl.java | 0 .../client/service/DefaultSearchService.java | 0 .../client/service/LinkisJobDataService.java | 0 .../service/LinkisJobDataServiceImpl.java | 0 .../cs/client/service/MetaDataService.java | 0 .../cs/client/service/ResourceService.java | 0 .../cs/client/service/SearchService.java | 0 .../cs/client/service/TableService.java | 0 .../cs/client/service/VariableService.java | 0 .../cs/client/utils/ContextServiceUtils.java | 0 .../cs/client/utils/ExceptionHelper.java | 0 .../cs/client/utils/SerializeHelper.java | 0 .../DatasourceClientErrorCodeSummary.java | 0 .../errorcode/client/ClientConfiguration.java | 0 .../client/ErrorCodeClientBuilder.java | 0 .../client/LinkisErrorCodeClient.java | 0 .../client/handler/ErrorCodeHandler.java | 0 .../handler/ExceptionErrorCodeHandler.java | 0 .../handler/LinkisErrorCodeFactory.java | 0 .../handler/LinkisErrorCodeHandler.java | 0 .../client/handler/LogErrorCodeHandler.java | 0 .../handler/LogFileErrorCodeHandler.java | 0 .../manager/LinkisErrorCodeManager.java | 0 .../LinkisErrorCodeSynchronizer.java | 0 .../linkis/errorcode/client/utils/Test.java | 0 .../bml/client/impl/HttpBmlClient.scala | 9 - .../bml/common/POSTActionFailException.scala | 0 .../linkis/bml/conf/BmlConfiguration.scala | 2 +- .../org/apache/linkis/bml/http/HttpConf.scala | 0 .../linkis/bml/request/BmlPOSTAction.scala | 0 .../linkis/bml/response/BmlResult.scala | 0 .../linkis/cs/client/http/ContextAction.scala | 0 .../linkis/cs/client/http/ContextResult.scala | 0 .../cs/client/utils/ContextClientConf.scala | 6 +- .../cs/client/utils/ContextClientUtils.scala | 0 .../client/utils/ContextServerHttpConf.scala | 0 .../client/AbstractRemoteClient.scala | 0 .../client/DataSourceRemoteClient.scala | 0 .../client/MetaDataRemoteClient.scala | 0 .../datasource/client/RemoteClient.scala | 0 .../config/DatasourceClientConfig.scala | 2 +- .../DataSourceClientBuilderException.scala | 0 .../impl/LinkisDataSourceRemoteClient.scala | 0 .../impl/LinkisMetaDataRemoteClient.scala | 0 .../request/CreateDataSourceAction.scala | 0 .../client/request/DataSourceAction.scala | 0 .../request/DataSourceTestConnectAction.scala | 0 .../request/DeleteDataSourceAction.scala | 0 .../request/ExpireDataSourceAction.scala | 0 .../request/GetAllDataSourceTypesAction.scala | 0 ...GetConnectParamsByDataSourceIdAction.scala | 0 ...tConnectParamsByDataSourceNameAction.scala | 0 .../request/GetDataSourceVersionsAction.scala | 0 .../request/GetInfoByDataSourceIdAction.scala | 0 .../GetInfoByDataSourceNameAction.scala | 0 ...tInfoPublishedByDataSourceNameAction.scala | 0 .../request/GetKeyTypeDatasourceAction.scala | 0 .../request/MetadataGetColumnsAction.scala | 5 + .../request/MetadataGetDatabasesAction.scala | 3 + .../request/MetadataGetPartitionsAction.scala | 0 .../request/MetadataGetTablePropsAction.scala | 0 .../request/MetadataGetTablesAction.scala | 4 + .../PublishDataSourceVersionAction.scala | 0 .../request/QueryDataSourceAction.scala | 0 .../request/QueryDataSourceEnvAction.scala | 0 .../request/UpdateDataSourceAction.scala | 0 .../UpdateDataSourceParameterAction.scala | 0 .../response/CreateDataSourceResult.scala | 0 .../DataSourceTestConnectResult.scala | 0 .../response/DeleteDataSourceResult.scala | 0 .../response/ExpireDataSourceResult.scala | 0 .../GetAllDataSourceTypesResult.scala | 0 ...GetConnectParamsByDataSourceIdResult.scala | 2 +- ...tConnectParamsByDataSourceNameResult.scala | 0 .../GetDataSourceVersionsResult.scala | 0 .../GetInfoByDataSourceIdResult.scala | 2 +- .../GetInfoByDataSourceNameResult.scala | 0 ...tInfoPublishedByDataSourceNameResult.scala | 0 .../response/GetKeyTypeDatasourceResult.scala | 0 .../response/MetadataGetColumnsResult.scala | 0 .../response/MetadataGetDatabasesResult.scala | 0 .../MetadataGetPartitionsResult.scala | 0 .../MetadataGetTablePropsResult.scala | 2 +- .../response/MetadataGetTablesResult.scala | 0 .../PublishDataSourceVersionResult.scala | 0 .../response/QueryDataSourceEnvResult.scala | 0 .../response/QueryDataSourceResult.scala | 0 .../UpdateDataSourceParameterResult.scala | 0 .../response/UpdateDataSourceResult.scala | 0 .../client/action/ErrorCodeAction.scala | 0 .../client/result/ErrorCodeResult.scala | 0 .../client/utils/ErrorCodeMatcher.scala | 0 .../filesystem/WorkspaceClientFactory.scala | 0 .../filesystem/WorkspaceClientImpl.scala | 0 .../action/OpenScriptFromBMLAction.scala | 0 .../action/WorkspacePOSTAction.scala | 0 .../filesystem/conf/WorkspaceClientConf.scala | 0 .../filesystem/request/WorkspaceClient.scala | 0 .../request/WorkspaceHttpConf.scala | 0 .../response/ScriptFromBMLResponse.scala | 0 .../response/WorkspaceResponse.scala | 0 .../result/AbstractWorkspaceResult.scala | 0 .../result/ScriptFromBMLResult.scala | 0 .../filesystem/result/ScriptToBMLResult.scala | 0 .../pom.xml | 29 ++- .../linkis/bml/model/AbstractAuditable.java | 0 .../cs/common/annotation/KeywordMethod.java | 0 .../cs/common/entity/data/CSResultData.java | 0 .../linkis/cs/common/entity/data/Data.java | 0 .../linkis/cs/common/entity/data/JobData.java | 0 .../cs/common/entity/data/LinkisJobData.java | 0 .../entity/enumeration/ContextScope.java | 0 .../entity/enumeration/ContextType.java | 0 .../cs/common/entity/enumeration/DBType.java | 0 .../common/entity/enumeration/ExpireType.java | 0 .../common/entity/enumeration/WorkType.java | 0 .../linkis/cs/common/entity/env/Env.java | 0 .../linkis/cs/common/entity/env/OSEnv.java | 0 .../cs/common/entity/env/SoftWareEnv.java | 0 .../cs/common/entity/env/SoftwareLibEnv.java | 0 .../history/AbstractContextHistory.java | 0 .../entity/history/CommonResourceHistory.java | 0 .../common/entity/history/ContextHistory.java | 0 .../entity/history/ContextHistoryIndexer.java | 0 .../entity/history/EnvContextHistory.java | 0 .../history/GlobalPropertyContextHistory.java | 0 .../entity/history/KeywordContextHistroy.java | 0 .../history/ResourceContextHistory.java | 0 .../metadata/CSTableLineageHistory.java | 0 .../CSTableMetadataContextHistory.java | 0 .../metadata/DBMetadataContextHistory.java | 0 .../metadata/MetadataContextHistory.java | 0 .../history/metadata/TableLineageHistory.java | 0 .../history/metadata/TableOperationType.java | 0 .../CommonContextIDListenerDomain.java | 0 .../CommonContextKeyListenerDomain.java | 0 .../listener/ContextIDListenerDomain.java | 0 .../listener/ContextKeyListenerDomain.java | 0 .../entity/listener/ListenerDomain.java | 0 .../cs/common/entity/metadata/CSColumn.java | 0 .../cs/common/entity/metadata/CSDB.java | 0 .../common/entity/metadata/CSPartition.java | 0 .../cs/common/entity/metadata/CSTable.java | 0 .../cs/common/entity/metadata/Column.java | 0 .../linkis/cs/common/entity/metadata/DB.java | 0 .../cs/common/entity/metadata/Partition.java | 0 .../cs/common/entity/metadata/Table.java | 0 .../cs/common/entity/object/CSFlowInfos.java | 0 .../cs/common/entity/object/CSInfos.java | 0 .../cs/common/entity/object/CSProperty.java | 0 .../object/CommonGlobalConfiguration.java | 0 .../common/entity/object/CommonProperty.java | 0 .../common/entity/object/LinkisVariable.java | 0 .../common/entity/resource/BMLResource.java | 0 .../entity/resource/CommonFxResource.java | 0 .../entity/resource/CommonUDFResource.java | 0 .../cs/common/entity/resource/FxResource.java | 0 .../entity/resource/LinkisBMLResource.java | 0 .../cs/common/entity/resource/Resource.java | 0 .../common/entity/resource/UDFResource.java | 0 .../source/CombinedNodeIDContextID.java | 0 .../common/entity/source/CommonContextID.java | 0 .../entity/source/CommonContextKey.java | 0 .../entity/source/CommonContextKeyValue.java | 0 .../entity/source/CommonContextValue.java | 0 .../entity/source/CommonHAContextID.java | 0 .../cs/common/entity/source/ContextID.java | 0 .../common/entity/source/ContextIDParser.java | 0 .../cs/common/entity/source/ContextKey.java | 0 .../common/entity/source/ContextKeyValue.java | 0 .../cs/common/entity/source/ContextValue.java | 0 .../entity/source/CreatorContextKey.java | 0 .../cs/common/entity/source/HAContextID.java | 0 .../source/LinkisHAWorkFlowContextID.java | 0 .../source/LinkisWorkflowContextID.java | 0 .../common/entity/source/OrderContextKey.java | 0 .../cs/common/entity/source/Source.java | 0 .../common/entity/source/UserContextID.java | 0 .../cs/common/entity/source/ValueBean.java | 0 .../entity/source/VersionContextKey.java | 0 .../entity/source/WorkflowContextID.java | 0 .../common/entity/source/YMLContextKey.java | 0 .../cs/common/exception/CSErrorException.java | 0 .../cs/common/exception/CSWarnException.java | 0 .../linkis/cs/common/exception/ErrorCode.java | 0 .../cs/common/listener/ContextIDListener.java | 0 .../common/listener/ContextKeyListener.java | 0 .../common/protocol/ContextHTTPConstant.java | 0 .../common/protocol/ContextHistoryType.java | 0 .../cs/common/protocol/ContextIDType.java | 0 .../cs/common/protocol/ContextKeyType.java | 0 .../common/protocol/ContextKeyValueType.java | 0 .../cs/common/protocol/ContextValueType.java | 0 .../ContextSearchConditionMapBuilder.java | 0 .../common/serialize/AbstractSerializer.java | 0 .../common/serialize/ContextSerializer.java | 0 .../helper/AbstractSerializationHelper.java | 0 .../helper/ContextSerializationHelper.java | 0 .../serialize/helper/SerializationHelper.java | 0 .../CombinedNodeIDContextIDSerializer.java | 0 .../context/CommonContextKeySerializer.java | 0 .../context/ContextKeyValueSerializer.java | 0 .../impl/context/ContextValueSerializer.java | 0 .../LinkisHAWorkFlowContextIDSerializer.java | 0 .../impl/history/CommonHistorySerializer.java | 0 .../CommonResourceHistorySerializer.java | 0 .../metadata/CSTableLineageSerializer.java | 0 .../CSTableMetadataHistorySerializer.java | 0 .../value/LinkisBMLResourceSerializer.java | 0 .../value/data/CSResultDataSerializer.java | 0 .../value/data/LinkisJobDataSerializer.java | 0 .../value/metadata/CSTableSerializer.java | 0 .../value/object/CSFlowInfosSerializer.java | 0 .../object/LinkisVariableSerializer.java | 0 .../linkis/cs/common/utils/CSCommonUtils.java | 0 .../cs/common/utils/CSHighAvailableUtils.java | 0 .../linkis/cs/listener/CSIDListener.java | 0 .../linkis/cs/listener/CSKeyListener.java | 0 .../listener/ContextAsyncEventListener.java | 0 .../ListenerBus/ContextAsyncListenerBus.java | 0 .../cs/listener/callback/CallbackEngine.java | 0 .../callback/ContextIDCallbackEngine.java | 0 .../callback/ContextKeyCallbackEngine.java | 0 .../callback/imp/ContextKeyValueBean.java | 0 .../imp/DefaultContextIDCallbackEngine.java | 0 .../imp/DefaultContextKeyCallbackEngine.java | 0 .../cs/listener/conf/ContextListenerConf.java | 0 .../cs/listener/event/ContextIDEvent.java | 0 .../cs/listener/event/ContextKeyEvent.java | 0 .../event/enumeration/OperateType.java | 0 .../event/impl/DefaultContextIDEvent.java | 0 .../event/impl/DefaultContextKeyEvent.java | 0 .../cs/listener/manager/ListenerManager.java | 0 .../imp/DefaultContextListenerManager.java | 0 .../datasourcemanager/common/DataSources.java | 0 .../common/ServiceErrorCode.java | 0 .../common/auth/AuthContext.java | 0 .../common/domain/DataSource.java | 0 .../common/domain/DataSourceEnv.java | 0 .../domain/DataSourceParamKeyDefinition.java | 0 .../common/domain/DataSourceParameter.java | 0 .../common/domain/DataSourceType.java | 0 .../common/domain/DatasourceVersion.java | 0 ...nkisDatasourceManagerErrorCodeSummary.java | 0 .../common/exception/JsonErrorException.java | 0 .../common/protocol/DsInfoQueryRequest.java | 2 +- .../common/protocol/DsInfoResponse.java | 0 .../common/util/CryptoUtils.java | 0 .../common/util/PatternInjectUtils.java | 0 .../common/util/json/Json.java | 0 .../linkis/errorcode/common/CommonConf.java | 0 .../query/common/MdmConfiguration.java | 0 .../common/cache/CacheConfiguration.java | 0 .../query/common/cache/CacheManager.java | 0 .../query/common/cache/ConnCacheManager.java | 0 .../query/common/domain/MetaColumnInfo.java | 9 + .../common/domain/MetaPartitionInfo.java | 0 .../LinkisMetadataQueryErrorCodeSummary.java | 0 .../exception/MetaMethodInvokeException.java | 0 .../exception/MetaRuntimeException.java | 0 .../service/AbstractCacheMetaService.java | 0 .../common/service/AbstractDbMetaService.java | 0 .../common/service/AbstractFsMetaService.java | 0 .../common/service/BaseMetadataService.java | 0 .../common/service/MetadataConnection.java | 0 .../common/service/MetadataDbService.java | 0 .../common/service/MetadataFsService.java | 0 .../org/apache/linkis/udf/entity/UDFInfo.java | 0 .../apache/linkis/udf/entity/UDFManager.java | 0 .../org/apache/linkis/udf/entity/UDFTree.java | 0 .../apache/linkis/udf/entity/UDFVersion.java | 0 .../linkis/udf/excepiton/UDFException.java | 0 .../apache/linkis/udf/utils/ConstantVar.java | 0 .../org/apache/linkis/udf/vo/DownloadVo.java | 0 .../org/apache/linkis/udf/vo/UDFAddVo.java | 0 .../org/apache/linkis/udf/vo/UDFInfoVo.java | 0 .../org/apache/linkis/udf/vo/UDFUpdateVo.java | 0 .../apache/linkis/udf/vo/UDFVersionVo.java | 0 .../linkis/bml/protocol/BmlProtocol.scala | 0 .../errorcode/common/AbstractErrorCode.scala | 0 .../linkis/errorcode/common/ErrorCode.scala | 0 .../errorcode/common/LinkisErrorCode.scala | 0 .../protocol/MetadataOperateProtocol.scala | 0 .../common/protocol/MetadataProtocol.scala | 0 .../protocol/MetadataQueryProtocol.scala | 0 .../linkis/udf/api/rpc/RequestUdfIds.scala | 0 .../linkis/udf/api/rpc/RequestUdfTree.scala | 0 .../linkis/udf/api/rpc/ResponseUdfTree.scala | 0 .../linkis/udf/api/rpc/ResponseUdfs.scala | 0 .../pom.xml | 17 +- .../label/client/InstanceLabelClient.scala | 0 .../SpringCloudInstanceLabelClient.scala | 0 .../org/apache/linkis/udf/UDFClient.scala | 0 .../linkis/udf/UDFClientConfiguration.scala | 0 .../udf/UDFClientConfigurationTest.scala | 0 .../linkis-storage-script-dev-client/pom.xml | 61 ------ .../WorkspaceClientFactoryTest.scala | 36 ---- .../filesystem/WorkspaceClientImplTest.scala | 36 ---- .../action/OpenScriptFromBMLActionTest.scala | 35 --- .../conf/WorkspaceClientConfTest.scala | 45 ---- .../response/ScriptFromBMLResponseTest.scala | 38 ---- .../src/test/resources/info.log | 19 -- .../linkis-storage-script-dev-server/pom.xml | 4 +- .../filesystem/LinkisPublicServiceApp.java | 0 .../conf/WorkSpaceConfiguration.java | 0 .../constant/WorkSpaceConstants.java | 0 .../linkis/filesystem/entity/DirFileTree.java | 0 .../linkis/filesystem/entity/LogLevel.java | 0 .../exception/WorkSpaceException.java | 0 .../exception/WorkspaceExceptionManager.java | 0 .../restful/api/BMLFsRestfulApi.java | 0 .../filesystem/restful/api/FsRestfulApi.java | 0 .../linkis/filesystem/util/WorkspaceUtil.java | 0 .../linkis/filesystem/bml/BMLHelper.scala | 0 .../linkis/filesystem/cache/FsCache.scala | 0 .../conf/WorkspaceSpringConfiguration.scala | 0 .../linkis/filesystem/entity/FSInfo.scala | 0 .../linkis/filesystem/quartz/FSQuartz.scala | 0 .../linkis/filesystem/service/FsService.scala | 0 .../filesystem/utils/UserGroupInfo.scala | 0 .../filesystem/validator/PathValidator.scala | 0 .../org/apache/linkis/filesystem/Scan.java | 0 .../filesystem/WebApplicationServer.java | 0 .../conf/WorkSpaceConfigurationTest.java | 0 .../constant/WorkSpaceConstantsTest.java | 0 .../exception/WorkSpaceExceptionTest.java | 0 .../WorkspaceExceptionManagerTest.java | 0 .../restful/api/BMLFsRestfulApiTest.java | 0 .../restful/api/FsRestfulApiTest.java | 0 .../filesystem/util/WorkspaceUtilTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/deleteFile.sql | 0 .../src/test/resources/existsSql.sql | 0 .../src/test/resources/linkis.properties | 0 .../src/test/resources/query.sql | 0 .../linkis/filesystem/entity/FSInfoTest.scala | 0 .../linkis-udf-service/pom.xml | 4 +- .../apache/linkis/udf/api/UDFRestfulApi.java | 0 .../org/apache/linkis/udf/dao/UDFDao.java | 0 .../org/apache/linkis/udf/dao/UDFTreeDao.java | 0 .../apache/linkis/udf/dao/UDFVersionDao.java | 0 .../apache/linkis/udf/service/UDFService.java | 0 .../linkis/udf/service/UDFTreeService.java | 0 .../udf/service/impl/UDFServiceImpl.java | 0 .../udf/service/impl/UDFTreeServiceImpl.java | 0 .../main/resources/mapper/common/UDFDao.xml | 0 .../resources/mapper/common/UDFTreeDao.xml | 0 .../resources/mapper/common/UDFVersionDao.xml | 0 .../linkis/udf/api/rpc/UdfReceiver.scala | 0 .../udf/api/rpc/UdfReceiverChooser.scala | 0 .../linkis/udf/utils/UdfConfiguration.scala | 0 .../test/java/org/apache/linkis/udf/Scan.java | 0 .../linkis/udf/WebApplicationServer.java | 0 .../linkis/udf/api/UDFRestfulApiTest.java | 0 .../apache/linkis/udf/dao/BaseDaoTest.java | 0 .../org/apache/linkis/udf/dao/UDFDaoTest.java | 0 .../apache/linkis/udf/dao/UDFTreeDaoTest.java | 0 .../linkis/udf/dao/UDFVersionDaoTest.java | 0 .../linkis/udf/service/UDFServiceTest.java | 0 .../udf/service/UDFTreeServiceTest.java | 0 .../src/test/resources/application.properties | 0 .../src/test/resources/create.sql | 0 .../src/test/resources/data.sql | 0 .../src/test/resources/linkis.properties | 0 .../udf/utils/UdfConfigurationTest.scala | 0 .../linkis-udf/linkis-udf-client/pom.xml | 56 ----- .../linkis-udf/linkis-udf-common/pom.xml | 56 ----- .../udf/excepiton/UDFExceptionTest.java | 33 --- .../linkis/udf/utils/ConstantVarTest.java | 48 ----- linkis-public-enhancements/pom.xml | 22 +- .../linkis-gateway-server-support/pom.xml | 2 +- 915 files changed, 115 insertions(+), 5392 deletions(-) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/pom.xml (97%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/assembly/distribution.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-bml => }/linkis-bml-server/src/test/resources/create.sql (100%) delete mode 100644 linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java delete mode 100644 linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-bml/pom.xml delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/RPCHttpContextClientConfig.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/AbstractCallbackEngine.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java delete mode 100644 linkis-public-enhancements/linkis-context-service/pom.xml rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/pom.xml (91%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/assembly/distribution.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/cs_ddl.sql (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/resources/application.yml (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/resources/create.sql (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/resources/linkis.properties (100%) rename linkis-public-enhancements/{linkis-context-service => }/linkis-cs-server/src/test/resources/log4j2.xml (100%) delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/pom.xml (94%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/resources/create.sql (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/resources/data.sql (100%) rename linkis-public-enhancements/{linkis-error-code => }/linkis-error-code-server/src/test/resources/linkis.properties (100%) delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeMatcherTest.scala delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala delete mode 100644 linkis-public-enhancements/linkis-error-code/pom.xml rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/pom.xml (97%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-instance-label => }/linkis-instance-label-server/src/test/resources/create.sql (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/pom.xml (93%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/java/org/apache/linkis/bml/client/BmlClient.java (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/Context.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/ContextClient.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/LinkisContext.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/SearchService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/TableService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/service/VariableService.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala (98%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala (96%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-client => linkis-pes-client}/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala (91%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-client}/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala (96%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala (93%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala (96%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala (94%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala (98%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala (99%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala (97%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-client => linkis-pes-client}/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-client => linkis-pes-client}/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala (100%) rename linkis-public-enhancements/{linkis-script-dev/linkis-storage-script-dev-client => linkis-pes-client}/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-client => linkis-pes-common}/pom.xml (80%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-common => linkis-pes-common}/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-listener => linkis-pes-common}/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java (98%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-datasource-manager/common => linkis-pes-common}/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java (92%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFManager.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFTree.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java (100%) rename linkis-public-enhancements/{linkis-bml/linkis-bml-common => linkis-pes-common}/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala (100%) rename linkis-public-enhancements/{linkis-instance-label/linkis-instance-label-client => linkis-pes-rpc-client}/pom.xml (86%) rename linkis-public-enhancements/{linkis-instance-label/linkis-instance-label-client => linkis-pes-rpc-client}/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala (100%) rename linkis-public-enhancements/{linkis-instance-label/linkis-instance-label-client => linkis-pes-rpc-client}/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-client => linkis-pes-rpc-client}/src/main/scala/org/apache/linkis/udf/UDFClient.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-client => linkis-pes-rpc-client}/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-client => linkis-pes-rpc-client}/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala (100%) delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala delete mode 100644 linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/pom.xml (96%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/resources/existsSql.sql (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/resources/linkis.properties (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/resources/query.sql (100%) rename linkis-public-enhancements/{linkis-script-dev => }/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/pom.xml (97%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/resources/application.properties (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/resources/create.sql (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/resources/data.sql (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/resources/linkis.properties (100%) rename linkis-public-enhancements/{linkis-udf => }/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala (100%) delete mode 100644 linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml delete mode 100644 linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java delete mode 100644 linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml index 638dc42550..86c2cb0afd 100644 --- a/linkis-commons/linkis-module/pom.xml +++ b/linkis-commons/linkis-module/pom.xml @@ -342,7 +342,7 @@ org.springframework.retry spring-retry - 2.0.5 + 1.3.4 diff --git a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala index b43f65521b..cb1ffb74bf 100644 --- a/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala +++ b/linkis-commons/linkis-rpc/src/main/scala/org/apache/linkis/rpc/conf/RPCConfiguration.scala @@ -118,6 +118,9 @@ object RPCConfiguration { val BDP_RPC_CACHE_CONF_EXPIRE_TIME: CommonVars[Long] = CommonVars("wds.linkis.rpc.cache.expire.time", 120000L) + val ENABLE_SPRING_PARAMS: Boolean = + CommonVars("wds.linkis.rpc.spring.params.enable", false).getValue + val RPC_READ_TIME_OUT: Int = CommonVars[Int]("spring.ribbon.ReadTimeout", 100000).getValue diff --git a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml index 36090c566a..e2cb1dda26 100644 --- a/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml +++ b/linkis-computation-governance/linkis-client/linkis-computation-client/pom.xml @@ -58,7 +58,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml index 9f46630b66..7b35922a2f 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/pom.xml @@ -30,7 +30,7 @@ org.apache.linkis - linkis-udf-client + linkis-pes-rpc-client ${project.version} @@ -55,7 +55,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml index 89aeec71cd..020e094f81 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml +++ b/linkis-computation-governance/linkis-engineconn/linkis-clustered-engineconn/linkis-once-engineconn/pom.xml @@ -41,7 +41,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml index 8d904174b8..a83d19b1e0 100644 --- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml +++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/pom.xml @@ -30,7 +30,7 @@ org.apache.linkis - linkis-udf-client + linkis-pes-rpc-client ${project.version} @@ -60,18 +60,6 @@ provided - - org.apache.linkis - linkis-cs-client - ${project.version} - - - org.reflections - reflections - - - - org.apache.linkis linkis-computation-governance-common @@ -80,7 +68,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-computation-governance/linkis-entrance/pom.xml b/linkis-computation-governance/linkis-entrance/pom.xml index b9ebec930e..a2f65bb99c 100644 --- a/linkis-computation-governance/linkis-entrance/pom.xml +++ b/linkis-computation-governance/linkis-entrance/pom.xml @@ -60,18 +60,6 @@ provided - - org.apache.linkis - linkis-cs-client - ${project.version} - - - - org.apache.linkis - linkis-error-code-client - ${project.version} - - org.apache.linkis linkis-computation-governance-common @@ -92,13 +80,13 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} org.apache.linkis - linkis-instance-label-client + linkis-pes-rpc-client ${project.version} diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml index 9d3cc8a048..a50c2be120 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/pom.xml @@ -43,7 +43,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala index 87a64b9900..f39fb654fc 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/scala/org/apache/linkis/manager/rm/service/impl/LabelResourceServiceImpl.scala @@ -55,7 +55,7 @@ class LabelResourceServiceImpl extends LabelResourceService with Logging { resourceLabelService.getResourceByLabel(label) @Retryable( - value = Array(Array(classOf[CannotGetJdbcConnectionException])), + value = Array(classOf[CannotGetJdbcConnectionException]), maxAttempts = 5, backoff = new Backoff(delay = 10000) ) diff --git a/linkis-engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/jdbc/pom.xml index 2450966e2f..d46f50f35b 100644 --- a/linkis-engineconn-plugins/jdbc/pom.xml +++ b/linkis-engineconn-plugins/jdbc/pom.xml @@ -188,7 +188,7 @@ org.apache.linkis - linkis-datasource-client + linkis-pes-client ${project.version} diff --git a/linkis-engineconn-plugins/spark/pom.xml b/linkis-engineconn-plugins/spark/pom.xml index 7a9cbd07f6..52afcc9e4c 100644 --- a/linkis-engineconn-plugins/spark/pom.xml +++ b/linkis-engineconn-plugins/spark/pom.xml @@ -427,7 +427,7 @@ org.apache.linkis - linkis-datasource-client + linkis-pes-client ${project.version} diff --git a/linkis-engineconn-plugins/sqoop/pom.xml b/linkis-engineconn-plugins/sqoop/pom.xml index 5a504004cb..7283b31e75 100644 --- a/linkis-engineconn-plugins/sqoop/pom.xml +++ b/linkis-engineconn-plugins/sqoop/pom.xml @@ -40,7 +40,7 @@ org.apache.linkis - linkis-datasource-client + linkis-pes-client ${project.version} diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml-server/pom.xml similarity index 97% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml rename to linkis-public-enhancements/linkis-bml-server/pom.xml index 8078966fcd..eee9f40f4d 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml +++ b/linkis-public-enhancements/linkis-bml-server/pom.xml @@ -21,7 +21,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-bmlserver @@ -34,7 +34,7 @@ org.apache.linkis - linkis-bml-common + linkis-pes-common ${project.version} diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/assembly/distribution.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/LinkisBMLApplication.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/Constant.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ExecutorManager.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/HdfsResourceHelper.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/LocalResourceHelper.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/OperationEnum.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelper.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ResourceHelperFactory.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/common/ScheduledTask.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/errorcode/BmlServerErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/RestfulUtils.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlProjectService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/BmlShareResourceService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlShareResourceServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Scheduler.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/Task.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/threading/TaskState.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/HttpRequestHelper.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/util/MD5Utils.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceBasicVO.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVO.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java b/linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java rename to linkis-public-enhancements/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/BmlProjectMapper.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/DownloadMapper.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/ResourceMapper.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/TaskMapper.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml b/linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml rename to linkis-public-enhancements/linkis-bml-server/src/main/resources/mapper/common/VersionMapper.xml diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlAuthorityException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlPermissionDeniedException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlQueryFailException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlResourceExpiredException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/common/BmlServerParaErrorException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/conf/BmlServerConfiguration.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/protocol/BmlServerProtocol.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala b/linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala rename to linkis-public-enhancements/linkis-bml-server/src/main/scala/org/apache/linkis/bml/rpc/BmlReceiver.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/Scan.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/HdfsResourceHelperTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/LocalResourceHelperTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/common/VersionServiceImplTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/BmlProjectDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/DownloadDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/ResourceDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/TaskDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/dao/VersionDaoTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/BmlProjectServiceTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/DownloadServiceImplTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/ResourceServiceImplTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/TaskServiceImplTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java b/linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java rename to linkis-public-enhancements/linkis-bml-server/src/test/java/org/apache/linkis/bml/service/VersionServiceImplTest.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-bml-server/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-bml-server/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-server/src/test/resources/create.sql rename to linkis-public-enhancements/linkis-bml-server/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java deleted file mode 100644 index 5cd4b35be6..0000000000 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/test/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummaryTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.bml.client.errorcode; - -import org.junit.jupiter.api.Test; - -import static org.apache.linkis.bml.client.errorcode.BmlClientErrorCodeSummary.BML_CLIENT_FAILED; -import static org.apache.linkis.bml.client.errorcode.BmlClientErrorCodeSummary.POST_REQUEST_RESULT_NOT_MATCH; -import static org.apache.linkis.bml.client.errorcode.BmlClientErrorCodeSummary.SERVER_URL_NOT_NULL; -import static org.junit.jupiter.api.Assertions.assertEquals; - -public class BmlClientErrorCodeSummaryTest { - @Test - void testGetErrorCode() { - assertEquals(20060, POST_REQUEST_RESULT_NOT_MATCH.getErrorCode()); - assertEquals(20061, BML_CLIENT_FAILED.getErrorCode()); - assertEquals(20062, SERVER_URL_NOT_NULL.getErrorCode()); - } - - @Test - void testGetErrorDesc() { - assertEquals( - "the result returned by the repository client POST request does not match(物料库客户端POST请求返回的result不匹配)", - POST_REQUEST_RESULT_NOT_MATCH.getErrorDesc()); - assertEquals( - "failed to copy inputStream and outputStream (inputStream和outputStream流copy失败)", - BML_CLIENT_FAILED.getErrorDesc()); - assertEquals("serverUrl cannot be null(serverUrl 不能为空)", SERVER_URL_NOT_NULL.getErrorDesc()); - } -} diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml deleted file mode 100644 index cd0df3540d..0000000000 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-bml-common - - - - - ${basedir}/src/main/resources - - - - - net.alchim31.maven - scala-maven-plugin - - - - - diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml deleted file mode 100644 index 9601b1db49..0000000000 --- a/linkis-public-enhancements/linkis-bml/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../pom.xml - - - linkis-bml - - pom - - linkis-bml-common - linkis-bml-server - linkis-bml-client - - - diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/RPCHttpContextClientConfig.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/RPCHttpContextClientConfig.java deleted file mode 100644 index d1cab66a56..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/RPCHttpContextClientConfig.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.builder; - -public class RPCHttpContextClientConfig {} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java deleted file mode 100644 index 3c6b064964..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/ContextClientFactoryTest.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.builder; - -import org.apache.linkis.cs.client.ContextClient; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextClientFactoryTest { - - @Test - @DisplayName("getOrCreateContextClientTest") - public void getOrCreateContextClientTest() { - - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - Assertions.assertNotNull(contextClient); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java deleted file mode 100644 index 1c9e700c6f..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/builder/HttpContextClientConfigTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.builder; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class HttpContextClientConfigTest { - - @Test - @DisplayName("httpContextClientConfigTest") - public void httpContextClientConfigTest() { - - HttpContextClientConfig httpContextClientConfig = new HttpContextClientConfig(); - Assertions.assertNotNull(httpContextClientConfig); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java deleted file mode 100644 index eb22ed9dce..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummaryTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.errorcode; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CsClientErrorCodeSummaryTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - String contextFailedErrorDesc = CsClientErrorCodeSummary.CREATE_CONTEXT_FAILED.getErrorDesc(); - String getContextValueFailedErrorDesc = - CsClientErrorCodeSummary.GET_CONTEXT_VALUE_FAILED.getErrorDesc(); - String updateContextFailedErrorDesc = - CsClientErrorCodeSummary.UPDATE_CONTEXT_FAILED.getErrorDesc(); - String resetContextFailedErrorDesc = - CsClientErrorCodeSummary.RESET_CONTEXT_FAILED.getErrorDesc(); - String removeContextFailedErrorDesc = - CsClientErrorCodeSummary.REMOVE_CONTEXT_FAILED.getErrorDesc(); - String bindContextidFailedErrorDesc = - CsClientErrorCodeSummary.BIND_CONTEXTID_FAILED.getErrorDesc(); - String searchConditionFailedErrorDesc = - CsClientErrorCodeSummary.SEARCH_CONDITION_FAILED.getErrorDesc(); - String executeFaliedErrorDesc = CsClientErrorCodeSummary.EXECUTE_FALIED.getErrorDesc(); - String haidbytimeFailedErrorDesc = CsClientErrorCodeSummary.HAIDBYTIME_FAILED.getErrorDesc(); - String clearContextHaidFailedErrorDesc = - CsClientErrorCodeSummary.CLEAR_CONTEXT_HAID_FAILED.getErrorDesc(); - - Assertions.assertNotNull(contextFailedErrorDesc); - Assertions.assertNotNull(getContextValueFailedErrorDesc); - Assertions.assertNotNull(updateContextFailedErrorDesc); - Assertions.assertNotNull(resetContextFailedErrorDesc); - Assertions.assertNotNull(removeContextFailedErrorDesc); - Assertions.assertNotNull(bindContextidFailedErrorDesc); - Assertions.assertNotNull(searchConditionFailedErrorDesc); - Assertions.assertNotNull(executeFaliedErrorDesc); - Assertions.assertNotNull(haidbytimeFailedErrorDesc); - Assertions.assertNotNull(clearContextHaidFailedErrorDesc); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java deleted file mode 100644 index b86ffbb9ab..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/Test.java +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test; - -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.client.utils.SerializeHelper; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.entity.source.*; -import org.apache.linkis.cs.common.serialize.helper.ContextSerializationHelper; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class Test { - public static void main(String[] args) throws Exception { - /*ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - ContextID contextID = new LinkisHAWorkFlowContextID(); - Context context = contextClient.createContext(contextID); - System.out.println(context.getContextID().getContextId()); - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("cooper.txt"); - contextKey.setKeywords("xddd"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.RESOURCE); - ContextValue contextValue = new CommonContextValue(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("456789"); - resource.setVersion("v00001"); - contextValue.setValue(resource); - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - context.setContextKeyAndValue(contextKeyValue); - ContextValue myValue = context.getContextValue(contextKey); - LinkisBMLResource linkisBMLResource = (LinkisBMLResource)myValue.getValue(); - System.out.println(linkisBMLResource.getResourceId()); - ContextClientListenerBus bus = ContextClientListenerManager.getContextClientListenerBus(); - ContextKeyListener listener = new CommonContextKeyListener(); - listener.setContextKey(contextKey); - listener.setContext(context); - context.onBind(contextKey, listener); - bus.addListener(listener); - List contains = new ArrayList<>(); - contains.add("cooper"); - contextClient.search(context.getContextID(), null, null, contains, null); - List list = context.searchContext(null, null, contains, null); - System.out.println("ret list is " + list); - Thread.sleep(5000); - contextClient.close();*/ - testCSFlowInfos(); - } - - public static void testCSFlowInfos() throws Exception { - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - LinkisHAWorkFlowContextID contextID = new LinkisHAWorkFlowContextID(); - contextID.setFlow("test"); - contextID.setProject("test"); - contextID.setWorkSpace("test1"); - contextID.setVersion("v00001"); - Context context = contextClient.createContext(contextID); - System.out.println(context.getContextID().getContextId()); - String csid = context.getContextID().getContextId(); - - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - CommonContextValue contextValue = new CommonContextValue(); - Map infos = new HashMap<>(); - List> edges = new ArrayList<>(); - Map edge = new HashMap<>(); - edge.put("source", "sql "); - edge.put("target", "hql"); - edge.put("sourceLocation", "bottom"); - edge.put("targetLocation", "top"); - edges.add(edge); - infos.put("edges", edges); - infos.put("parent", "flow2"); - Map idNodeName = new HashMap<>(); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c051", "sql"); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c052", "hql"); - infos.put("id_nodeName", idNodeName); - CSFlowInfos csFlowInfos = new CSFlowInfos(); - csFlowInfos.setInfos(infos); - contextValue.setValue(csFlowInfos); - - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("flow.infos"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.RESOURCE); - - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - context.setContextKeyAndValue(contextKeyValue); - ContextValue myValue = context.getContextValue(contextKey); - System.out.println(SerializeHelper.serializeContextID(context.getContextID())); - contextClient.removeAllValueByKeyAndContextType( - context.getContextID(), contextKey.getContextType(), contextKey.getKey()); - ContextValue delValue = context.getContextValue(contextKey); - if (null != delValue) { - System.err.println( - "contextValue : " - + myValue.getValue() - + " with key : " - + contextKey.getKey() - + " was not deleted."); - } - - List idList = new ArrayList<>(); - idList.add(csid); - // contextClient. - - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java deleted file mode 100644 index d0bbfa080f..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextKey.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.bean; - -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.source.ContextKey; - -public class ClientTestContextKey implements ContextKey { - - private final String key = "hadoop.txt"; - - @Override - public String getKey() { - return this.key; - } - - @Override - public void setKey(String key) {} - - @Override - public int getType() { - return 0; - } - - @Override - public void setType(int type) {} - - @Override - public ContextType getContextType() { - return null; - } - - @Override - public void setContextType(ContextType contextType) {} - - @Override - public ContextScope getContextScope() { - return null; - } - - @Override - public void setContextScope(ContextScope contextScope) {} - - @Override - public String getKeywords() { - return null; - } - - @Override - public void setKeywords(String keywords) {} -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java deleted file mode 100644 index 0ad3b675fb..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ClientTestContextValue.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.bean; - -import org.apache.linkis.cs.common.entity.source.ContextValue; - -public class ClientTestContextValue implements ContextValue { - - private Object value; - - private String keywords; - - @Override - public String getKeywords() { - return this.keywords; - } - - @Override - public void setKeywords(String keywords) { - this.keywords = keywords; - } - - @Override - public Object getValue() { - return this.value; - } - - @Override - public void setValue(Object value) { - this.value = value; - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java deleted file mode 100644 index 0eeeafb013..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/bean/ResourceValueBean.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.bean; - -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.resource.Resource; - -public class ResourceValueBean implements Resource { - - private String resourceId; - private String version; - - private final ContextType contextType = ContextType.RESOURCE; - - public String getResourceId() { - return resourceId; - } - - public void setResourceId(String resourceId) { - this.resourceId = resourceId; - } - - public String getVersion() { - return version; - } - - public void setVersion(String version) { - this.version = version; - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java deleted file mode 100644 index 3814eb59a9..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/listener/CommonContextKeyListener.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.listener; - -import org.apache.linkis.common.listener.Event; -import org.apache.linkis.cs.client.listener.ContextKeyListener; - -public class CommonContextKeyListener extends ContextKeyListener { - - @Override - public void onContextCreated(Event event) { - System.out.println("it is created"); - } - - @Override - public void onContextUpdated(Event event) { - super.onContextUpdated(event); - System.out.println("it is updated"); - } - - @Override - public void onEventError(Event event, Throwable t) { - System.out.println("it is not ok"); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java deleted file mode 100644 index fdc78abf20..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/no_context_search/TestClear.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.no_context_search; - -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; - -import java.util.List; - -public class TestClear { - - public static void main(String[] args) throws Exception { - - String createTimeStart = "2022-05-26 22:04:00"; - - String createTimeEnd = "2022-06-01 24:00:00"; - - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - - List idList = - contextClient.searchHAIDByTime( - createTimeStart, createTimeEnd, null, null, null, null, 0, 0); - - for (String id : idList) { - System.out.println(id); - } - - System.out.println("Got " + idList.size() + " ids."); - - if (idList.size() > 0) { - String id1 = idList.get(0); - System.out.println("will clear context of id : " + id1); - } - - // List tmpList = new ArrayList<>(); - // tmpList.add(id1); - // int num = contextClient.batchClearContextByHAID(tmpList); - // System.out.println("Succeed to clear " + num + " ids."); - // - int num1 = - contextClient.batchClearContextByTime( - createTimeStart, createTimeEnd, null, null, null, null); - System.out.println("Succeed to clear " + num1 + " ids by time."); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java deleted file mode 100644 index 11a592924a..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/ListenerTest.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.restful; - -public class ListenerTest {} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java deleted file mode 100644 index 84ca4a9051..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/restful/RestfulTest.java +++ /dev/null @@ -1,146 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.restful; - -import org.apache.linkis.common.exception.ErrorException; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.history.CommonResourceHistory; -import org.apache.linkis.cs.common.entity.history.ContextHistory; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.resource.Resource; -import org.apache.linkis.cs.common.entity.source.*; - -import java.util.List; - -public class RestfulTest { - /** setValueByKey */ - ContextClient contextClient = null; - - ContextID contextID = null; - - ContextKey contextKey = null; - - ContextValue contextValue = null; - - ContextKeyValue keyValue = null; - - CommonResourceHistory history = null; - - Resource resource = new LinkisBMLResource(); - - /*@BeforeEach*/ - public void init() { - contextClient = ContextClientFactory.getOrCreateContextClient(); - contextID = new LinkisHAWorkFlowContextID(); - contextID.setContextId("84716"); - - contextKey = new CommonContextKey(); - contextKey.setContextScope(ContextScope.FRIENDLY); - contextKey.setContextType(ContextType.ENV); - contextKey.setKey("project1.flow1.node1.key2"); - - contextValue = new CommonContextValue(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("dfasdfsr2456wertg"); - resource.setVersion("v000002"); - contextValue.setValue(resource); - - keyValue = new CommonContextKeyValue(); - keyValue.setContextKey(contextKey); - keyValue.setContextValue(contextValue); - - resource.setResourceId("edtr44356-34563456"); - resource.setVersion("v000004"); - - history = new CommonResourceHistory(); - history.setSource("history source"); - history.setResource(resource); - } - - /** - * setValueByKey - * - * @throws ErrorException - */ - /* @org.junit.Test*/ - public void test01() throws ErrorException { - contextClient.update(contextID, contextKey, contextValue); - } - - /** - * reset - * - * @throws ErrorException - */ - /* @org.junit.Test*/ - public void test02() throws ErrorException { - contextClient.reset(contextID, contextKey); - } - - /** createHistory */ - /* @org.junit.Test*/ - public void Test03() throws ErrorException { - contextClient.createHistory(contextID, history); - } - - /** - * removeHistory - * - * @throws ErrorException - */ - /*@org.junit.Test*/ - public void Test04() throws ErrorException { - contextClient.removeHistory(contextID, history); - } - - /** - * getHistories - * - * @throws ErrorException - */ - /*@org.junit.Test*/ - public void Test05() throws ErrorException { - List histories = contextClient.getHistories(contextID); - System.out.println(histories.size()); - } - - /** - * getHistoriy - * - * @throws ErrorException - */ - /* @org.junit.Test*/ - public void Test06() throws ErrorException { - ContextHistory getsource = contextClient.getHistory(contextID, "getsource"); - System.out.println(getsource.getSource()); - } - - /** - * searchHistory - * - * @throws ErrorException - */ - /*@org.junit.Test*/ - public void Test07() throws ErrorException { - List contextHistories = contextClient.searchHistory(contextID, "key1"); - System.out.println(contextHistories.size()); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java deleted file mode 100644 index 5fbea24eb8..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestInfo.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.service; - -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.client.service.DefaultSearchService; -import org.apache.linkis.cs.client.service.SearchService; -import org.apache.linkis.cs.client.utils.SerializeHelper; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.entity.resource.BMLResource; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; -import org.apache.linkis.cs.common.serialize.helper.ContextSerializationHelper; -import org.apache.linkis.cs.common.utils.CSCommonUtils; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.google.gson.GsonBuilder; - -// import org.apache.linkis.cs.client.service.DefaultSearchService; -// import org.apache.linkis.cs.common.utils.CSCommonUtils; - -public class TestInfo { - - public static void main(String[] args) throws Exception { - - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - LinkisHAWorkFlowContextID contextID = new LinkisHAWorkFlowContextID(); - contextID.setFlow("test"); - contextID.setProject("test"); - contextID.setWorkSpace("test1"); - contextID.setVersion("v00001"); - Context context = contextClient.createContext(contextID); - System.out.println(context.getContextID().getContextId()); - - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - CommonContextValue contextValue = new CommonContextValue(); - Map infos = new HashMap<>(); - List> edges = new ArrayList<>(); - Map edge = new HashMap<>(); - edge.put("source", "sql "); - edge.put("target", "hql"); - edge.put("sourceLocation", "bottom"); - edge.put("targetLocation", "top"); - edges.add(edge); - infos.put("edges", edges); - infos.put("parent", "flow2"); - Map idNodeName = new HashMap<>(); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c051", "sql"); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c052", "hql"); - infos.put("id_nodeName", idNodeName); - CSFlowInfos csFlowInfos = new CSFlowInfos(); - csFlowInfos.setInfos(infos); - contextValue.setValue(csFlowInfos); - - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("flow.infos"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.RESOURCE); - - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - context.setContextKeyAndValue(contextKeyValue); - ContextValue myValue = context.getContextValue(contextKey); - System.out.println(SerializeHelper.serializeContextID(context.getContextID())); - System.out.println(CSCommonUtils.gson.toJson(myValue)); - - SearchService searchService = DefaultSearchService.getInstance(); - BMLResource bmlResource = - searchService.searchContext(contextID, "ql", "sql", LinkisBMLResource.class); - System.out.println(new GsonBuilder().setPrettyPrinting().create().toJson(bmlResource)); - - contextClient.close(); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java deleted file mode 100644 index 65c49ab901..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestRemove.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.service; - -import org.apache.linkis.common.exception.ErrorException; -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.client.service.CSWorkService; -import org.apache.linkis.cs.client.service.CSWorkServiceImpl; -import org.apache.linkis.cs.client.utils.SerializeHelper; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.enumeration.WorkType; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -import static org.junit.jupiter.api.Assertions.*; - -public class TestRemove { - - private ContextClient contextClient; - private ContextID contextId; - private ContextKey contextKey; - private ContextValue contextValue; - private CSWorkService csWorkService; - private Gson gson; - - public static void main(String[] args) throws Exception { - TestRemove test = new TestRemove(); - test.init(); - test.testGetBeforeSet(); - test.testReset(); - test.testGetAfterSet(); - test.testClose(); - } - - public void init() throws Exception { - contextClient = ContextClientFactory.getOrCreateContextClient(); - csWorkService = CSWorkServiceImpl.getInstance(); - gson = new GsonBuilder().setPrettyPrinting().create(); - LinkisHAWorkFlowContextID haContextID = new LinkisHAWorkFlowContextID(); - haContextID.setWorkSpace("wp1"); - haContextID.setProject("p1"); - haContextID.setFlow("f1"); - haContextID.setVersion("v1"); - if (null == contextId) { - Context context = contextClient.createContext(haContextID); - contextId = context.getContextID(); - } - - contextKey = new CommonContextKey(); - contextKey.setContextScope(ContextScope.FRIENDLY); - contextKey.setContextType(ContextType.ENV); - contextKey.setKey("project.flow1.node1.key2"); - - contextValue = new CommonContextValue(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("dfasdfsr2456wertg"); - resource.setVersion("v000002"); - contextValue.setValue(resource); - - ContextKeyValue keyValue = new CommonContextKeyValue(); - keyValue.setContextKey(contextKey); - keyValue.setContextValue(contextValue); - - contextClient.setContextKeyValue(haContextID, keyValue); - } - - public void testGetBeforeSet() throws ErrorException { - ContextValue value = contextClient.getContextValue(contextId, contextKey); - LinkisBMLResource resourceOri = (LinkisBMLResource) contextValue.getValue(); - LinkisBMLResource resourceRs = (LinkisBMLResource) value.getValue(); - assertEquals(resourceOri.getResourceId(), resourceRs.getResourceId()); - assertEquals(resourceOri.getVersion(), resourceRs.getVersion()); - System.out.println(gson.toJson(resourceOri)); - System.out.println(gson.toJson(resourceRs)); - } - - public void testReset() throws ErrorException { - csWorkService.initContextServiceInfo( - SerializeHelper.serializeContextID(contextId), WorkType.PROJECT); - } - - public void testGetAfterSet() throws ErrorException { - ContextValue value = contextClient.getContextValue(contextId, contextKey); - assertEquals(null, value); - System.out.println(gson.toJson(contextValue)); - System.out.println(gson.toJson(value)); - } - - public void testClose() throws Exception { - contextClient.close(); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java deleted file mode 100644 index ba9d7cc94f..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/service/TestSearchService.java +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.service; - -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.client.service.DefaultSearchService; -import org.apache.linkis.cs.client.service.SearchService; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.entity.resource.BMLResource; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -public class TestSearchService { - - public static void main(String[] args) throws Exception { - - Gson gson = new GsonBuilder().setPrettyPrinting().create(); - SearchService searchService = DefaultSearchService.getInstance(); - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - LinkisHAWorkFlowContextID contextID = new LinkisHAWorkFlowContextID(); - { - contextID.setUser("test"); - contextID.setProject("test_client"); - contextID.setFlow("test_client"); - Context context = contextClient.createContext(contextID); - contextID = (LinkisHAWorkFlowContextID) context.getContextID(); - System.out.println(new GsonBuilder().setPrettyPrinting().create().toJson(contextID)); - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("node.resource.sql.cooper.txt"); - contextKey.setContextType(ContextType.RESOURCE); - contextKey.setContextScope(ContextScope.PUBLIC); - // contextKey.setKeywords("xddd"); - ContextValue contextValue = new CommonContextValue(); - LinkisBMLResource linkisBMLResource = new LinkisBMLResource(); - linkisBMLResource.setVersion("v000001"); - linkisBMLResource.setDownloadedFileName("t.txt"); - linkisBMLResource.setResourceId("adsf"); - contextValue.setValue(linkisBMLResource); - ContextKeyValue contextKeyValue = new CommonContextKeyValue(contextKey, contextValue); - contextClient.setContextKeyValue(contextID, contextKeyValue); - BMLResource resource = - searchService.getContextValue(contextID, contextKey, LinkisBMLResource.class); - System.out.println(gson.toJson(resource)); - ContextValue contextValue1 = contextClient.getContextValue(contextID, contextKey); - System.out.println(contextValue1.getValue()); - } - - { - CommonContextValue contextValue = new CommonContextValue(); - Map infos = new HashMap<>(); - List> edges = new ArrayList<>(); - Map edge = new HashMap<>(); - edge.put("source", "90a6ee94-4bd6-47d9-a536-f92660c4c051"); - edge.put("target", "90a6ee94-4bd6-47d9-a536-f92660c4c052"); - edge.put("sourceLocation", "bottom"); - edge.put("targetLocation", "top"); - edges.add(edge); - infos.put("edges", edges); - infos.put("parent", "flow2"); - Map idNodeName = new HashMap<>(); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c051", "sql"); - idNodeName.put("90a6ee94-4bd6-47d9-a536-f92660c4c052", "hql"); - infos.put("id_nodeName", idNodeName); - CSFlowInfos csFlowInfos = new CSFlowInfos(); - csFlowInfos.setInfos(infos); - contextValue.setValue(csFlowInfos); - - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("flow.infos"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.OBJECT); - - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - contextClient.setContextKeyValue(contextID, contextKeyValue); - Object flowInfoObject = searchService.getContextValue(contextID, contextKey, Object.class); - System.out.println(gson.toJson(flowInfoObject)); - } - - BMLResource bmlResource = - searchService.searchContext(contextID, "cooper", "sql", LinkisBMLResource.class); - contextClient.close(); - System.out.println(gson.toJson(bmlResource)); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java deleted file mode 100644 index 56f1a5b342..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestChangeContext.java +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.test_multiuser; - -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; -import org.apache.linkis.cs.common.serialize.helper.ContextSerializationHelper; -import org.apache.linkis.cs.common.serialize.helper.SerializationHelper; - -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; - -import com.google.gson.Gson; - -public class TestChangeContext { - - public static void main(String[] args) { - - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - try { - // 1, read context - File file = new File(TestCreateContext.CONTEXTID_PATH); - if (!file.exists()) { - System.out.println( - "Error, contextID serialize file : " + TestCreateContext.CONTEXTID_PATH + " invalid."); - return; - } - - String contextIDStr; - StringBuilder builder = new StringBuilder(); - try (FileReader fr = new FileReader(file); - BufferedReader br = new BufferedReader(fr)) { - String tmp = br.readLine(); - while (null != tmp) { - builder.append(tmp); - tmp = br.readLine(); - } - } - contextIDStr = builder.toString(); - System.out.println("Read contextID : " + contextIDStr); - - SerializationHelper serializationHelper = ContextSerializationHelper.getInstance(); - if (!serializationHelper.accepts(contextIDStr)) { - System.out.println("Invalid contextStr : " + contextIDStr + ", cannot be deserialized"); - return; - } - Object contextObject = serializationHelper.deserialize(contextIDStr); - System.out.println("Deserialized obj : " + new Gson().toJson(contextObject)); - if (!LinkisHAWorkFlowContextID.class.isInstance(contextObject)) { - System.out.println("Invalid contextObject, not LinkisHAWorkFlowContextID instance."); - return; - } - LinkisHAWorkFlowContextID contextID = (LinkisHAWorkFlowContextID) contextObject; - - Context context = contextClient.getContext(contextID); - // 2, update context - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("testchange.txt"); - contextKey.setKeywords("xddd"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.RESOURCE); - ContextValue contextValue = new CommonContextValue(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("456789"); - resource.setVersion("v00001"); - contextValue.setValue(resource); - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - context.setContextKeyAndValue(contextKeyValue); - - // 3, get context - ContextValue contextValueResult = context.getContextValue(contextKey); - System.out.println("Got contextValue : " + new Gson().toJson(contextValueResult)); - System.out.println("Original contextValue : " + new Gson().toJson(contextValue)); - - contextClient.close(); - } catch (Exception e) { - if (null != contextClient) { - try { - contextClient.close(); - } catch (Exception e1) { - - } - } - e.printStackTrace(); - } - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java deleted file mode 100644 index a31c2a5655..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/test/test_multiuser/TestCreateContext.java +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.test.test_multiuser; - -import org.apache.linkis.cs.client.Context; -import org.apache.linkis.cs.client.ContextClient; -import org.apache.linkis.cs.client.builder.ContextClientFactory; -import org.apache.linkis.cs.client.service.DefaultSearchService; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.resource.BMLResource; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; -import org.apache.linkis.cs.common.serialize.helper.ContextSerializationHelper; -import org.apache.linkis.cs.common.serialize.helper.SerializationHelper; - -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileWriter; -import java.util.ArrayList; -import java.util.List; - -import com.google.gson.Gson; - -public class TestCreateContext { - - public static final String CONTEXTID_PATH = "out/test-store-contextID.txt"; - - public static void main(String[] args) throws Exception { - - // 1, create contextid - ContextClient contextClient = ContextClientFactory.getOrCreateContextClient(); - FileWriter fr = null; - BufferedWriter bw = null; - try { - - Context context = contextClient.createContext("test_client", "test_client", "alex", null); - System.out.println(context.getContextID().getContextId()); - - // 2, save contxtid - ContextID contextID = context.getContextID(); - SerializationHelper serializationHelper = ContextSerializationHelper.getInstance(); - String contextIDStr = null; - if (serializationHelper.accepts(contextID)) { - contextIDStr = serializationHelper.serialize(contextID); - File file = new File(CONTEXTID_PATH); - fr = new FileWriter(file); - bw = new BufferedWriter(fr); - bw.write(contextIDStr); - bw.flush(); - System.out.println("ContextID saved at : " + file.getAbsolutePath()); - // test deserialize - System.out.println("contextIDStr: " + contextIDStr); - Object obj = serializationHelper.deserialize(contextIDStr); - System.out.println("Deserialize jsonstr : " + new Gson().toJson(obj)); - } else { - System.out.println("ContextID not saved."); - } - - // 3, test search - ContextKey contextKey = new CommonContextKey(); - contextKey.setKey("cooper.txt"); - contextKey.setKeywords("xddd"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.RESOURCE); - ContextValue contextValue = new CommonContextValue(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("456789"); - resource.setVersion("v00001"); - contextValue.setValue(resource); - ContextKeyValue contextKeyValue = new CommonContextKeyValue(); - contextKeyValue.setContextValue(contextValue); - contextKeyValue.setContextKey(contextKey); - context.setContextKeyAndValue(contextKeyValue); - ContextValue myValue = context.getContextValue(contextKey); - LinkisBMLResource linkisBMLResource = (LinkisBMLResource) myValue.getValue(); - System.out.println(linkisBMLResource.getResourceId()); - BMLResource rs = - DefaultSearchService.getInstance() - .getContextValue(contextID, contextKey, LinkisBMLResource.class); - System.out.println(new Gson().toJson(rs)); - List contains = new ArrayList<>(); - contains.add("cooper"); - List contextKeyValueList = - contextClient.search(context.getContextID(), null, null, contains, null); - System.out.println("ContextKVList : " + new Gson().toJson(contextKeyValueList)); - } catch (Exception e) { - contextClient.close(); - e.printStackTrace(); - } finally { - if (fr != null) { - try { - fr.close(); - } catch (Exception e) { - // ignore - } - } - if (bw != null) { - try { - bw.close(); - } catch (Exception e) { - // ignore - } - } - } - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java deleted file mode 100644 index 951cab6177..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextClientConfTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.utils; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextClientConfTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - String contextClientAuthKey = ContextClientConf.CONTEXT_CLIENT_AUTH_KEY().getValue(); - String contextClientAuthValue = ContextClientConf.CONTEXT_CLIENT_AUTH_VALUE().getValue(); - String urlPrefix = ContextClientConf.URL_PREFIX().getValue(); - String hearBeatEnabled = ContextClientConf.HEART_BEAT_ENABLED().getValue(); - - Assertions.assertEquals("Token-Code", contextClientAuthKey); - Assertions.assertEquals("BML-AUTH", contextClientAuthValue); - Assertions.assertEquals("/api/rest_j/v1/contextservice", urlPrefix); - Assertions.assertEquals("true", hearBeatEnabled); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java deleted file mode 100644 index cbc017d6bb..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/ContextServiceUtilsTest.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.utils; - -import org.apache.linkis.cs.common.entity.source.CombinedNodeIDContextID; -import org.apache.linkis.cs.common.entity.source.ContextID; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextServiceUtilsTest { - - @Test - @DisplayName("getContextIDStrByMapTest") - public void getContextIDStrByMapTest() { - - Map map = new HashMap<>(); - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - map.put("contextID", new Gson().toJson(contextID)); - String contextId = ContextServiceUtils.getContextIDStrByMap(map); - Assertions.assertNotNull(contextId); - } - - @Test - @DisplayName("getNodeNameStrByMapTest") - public void getNodeNameStrByMapTest() { - - Map map = new HashMap<>(); - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - map.put("contextID", new Gson().toJson(contextID)); - map.put("nodeName", "flow1"); - - String nameStrByMap = ContextServiceUtils.getNodeNameStrByMap(map); - Assertions.assertNotNull(nameStrByMap); - } - - @Test - @DisplayName("getContextIDStrByPropertiesTest") - public void getContextIDStrByPropertiesTest() { - - Properties properties = new Properties(); - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - properties.put("contextID", new Gson().toJson(contextID)); - - String idStrByProperties = ContextServiceUtils.getContextIDStrByProperties(properties); - Assertions.assertNotNull(idStrByProperties); - } - - @Test - @DisplayName("getNodeNameStrByPropertiesTest") - public void getNodeNameStrByPropertiesTest() { - - Properties properties = new Properties(); - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - properties.put("contextID", new Gson().toJson(contextID)); - properties.put("nodeName", "flow1"); - - String strByProperties = ContextServiceUtils.getNodeNameStrByProperties(properties); - Assertions.assertNotNull(strByProperties); - } - - @Test - @DisplayName("getNodeNameByCombinedNodeIDContextIDTest") - public void getNodeNameByCombinedNodeIDContextIDTest() { - - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - String contextIDStr = new Gson().toJson(contextID); - - String nodeIDContextID = ContextServiceUtils.getNodeNameByCombinedNodeIDContextID(contextIDStr); - Assertions.assertNull(nodeIDContextID); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java deleted file mode 100644 index 9b5484407f..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/test/java/org/apache/linkis/cs/client/utils/SerializeHelperTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.client.utils; - -import org.apache.linkis.common.exception.ErrorException; -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.source.CombinedNodeIDContextID; -import org.apache.linkis.cs.common.entity.source.CommonContextKey; -import org.apache.linkis.cs.common.entity.source.ContextID; -import org.apache.linkis.cs.common.entity.source.ContextKey; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class SerializeHelperTest { - - @Test - @DisplayName("serializeContextIDTest") - public void serializeContextIDTest() throws ErrorException { - - ContextID contextID = new CombinedNodeIDContextID(); - contextID.setContextId("90a6ee94-4bd6-47d9-a536-f92660c4c052"); - contextID.setContextIDType(1); - - String serializeContextID = SerializeHelper.serializeContextID(contextID); - Assertions.assertNotNull(serializeContextID); - } - - @Test - @DisplayName("serializeContextKeyTest") - public void serializeContextKeyTest() throws ErrorException { - - ContextKey contextKey = new CommonContextKey(); - contextKey.setType(1); - contextKey.setKey("key"); - contextKey.setKeywords("keywords"); - contextKey.setContextScope(ContextScope.PUBLIC); - contextKey.setContextType(ContextType.DATA); - - String serializeContextKey = SerializeHelper.serializeContextKey(contextKey); - Assertions.assertNotNull(serializeContextKey); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml deleted file mode 100644 index 40538fd875..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-cs-common - - - - org.apache.linkis - linkis-common - ${project.version} - provided - - - - com.google.code.gson - gson - provided - - - - - diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java deleted file mode 100644 index abb4b4611d..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.entity.enumeration; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextScopeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - String publicStr = ContextScope.PUBLIC.toString(); - String privateStr = ContextScope.PRIVATE.toString(); - String projectedStr = ContextScope.PROTECTED.toString(); - String friendlyStr = ContextScope.FRIENDLY.toString(); - - Assertions.assertEquals("PUBLIC", publicStr); - Assertions.assertEquals("PRIVATE", privateStr); - Assertions.assertEquals("PROTECTED", projectedStr); - Assertions.assertEquals("FRIENDLY", friendlyStr); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java deleted file mode 100644 index da8e8a3b01..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.entity.enumeration; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - String metaData = ContextType.METADATA.toString(); - String data = ContextType.DATA.toString(); - String resource = ContextType.RESOURCE.toString(); - String object = ContextType.OBJECT.toString(); - String env = ContextType.ENV.toString(); - String cost = ContextType.COST.toString(); - String udf = ContextType.UDF.toString(); - String variable = ContextType.Variable.toString(); - - Assertions.assertEquals("METADATA", metaData); - Assertions.assertEquals("DATA", data); - Assertions.assertEquals("RESOURCE", resource); - Assertions.assertEquals("OBJECT", object); - Assertions.assertEquals("ENV", env); - Assertions.assertEquals("COST", cost); - Assertions.assertEquals("UDF", udf); - Assertions.assertEquals("Variable", variable); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java deleted file mode 100644 index 6516f1c769..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.entity.enumeration; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class DBTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - String cs = DBType.CS.toString(); - String hive = DBType.HIVE.toString(); - String mide = DBType.MIDE.toString(); - String es = DBType.ES.toString(); - - Assertions.assertEquals("CS", cs); - Assertions.assertEquals("HIVE", hive); - Assertions.assertEquals("MIDE", mide); - Assertions.assertEquals("ES", es); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java deleted file mode 100644 index 22ab0a71cb..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.entity.enumeration; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ExpireTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - Integer todayId = ExpireType.TODAY.getId(); - Integer maxExistsTimeId = ExpireType.MAX_EXISTS_TIME.getId(); - Integer neverId = ExpireType.NEVER.getId(); - - Assertions.assertTrue(0 == todayId.intValue()); - Assertions.assertTrue(1 == maxExistsTimeId.intValue()); - Assertions.assertTrue(2 == neverId.intValue()); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java deleted file mode 100644 index e9e8bc379b..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.entity.enumeration; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class WorkTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - String workSpace = WorkType.WORKSPACE.toString(); - String project = WorkType.PROJECT.toString(); - String flow = WorkType.FLOW.toString(); - String node = WorkType.NODE.toString(); - - Assertions.assertEquals("WORKSPACE", workSpace); - Assertions.assertEquals("PROJECT", project); - Assertions.assertEquals("FLOW", flow); - Assertions.assertEquals("NODE", node); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java deleted file mode 100644 index ce71de626d..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.protocol; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextHistoryTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - int index = ContextHistoryType.COMMON_CONTEXT_HISTORY_TYPE.getIndex(); - String typeName = ContextHistoryType.COMMON_CONTEXT_HISTORY_TYPE.getTypeName(); - - Assertions.assertTrue(0 == index); - Assertions.assertEquals("org.apache.linkis.cs.common.entity.source.CommonContextID", typeName); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java deleted file mode 100644 index cdd5343dd1..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.protocol; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextIDTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - int commonIndex = ContextIDType.COMMON_CONTEXT_ID_TYPE.getIndex(); - String commonTypeName = ContextIDType.COMMON_CONTEXT_ID_TYPE.getTypeName(); - int linkisIndex = ContextIDType.LINKIS_WORKFLOW_CONTEXT_ID_TYPE.getIndex(); - String linkisTypeName = ContextIDType.LINKIS_WORKFLOW_CONTEXT_ID_TYPE.getTypeName(); - - Assertions.assertTrue(0 == commonIndex); - Assertions.assertTrue(1 == linkisIndex); - - Assertions.assertEquals( - "org.apache.linkis.cs.common.entity.source.CommonContextID", commonTypeName); - Assertions.assertEquals( - "org.apache.linkis.cs.common.entity.source.LinkisWorkflowContextID", linkisTypeName); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java deleted file mode 100644 index cfe2da3edf..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.protocol; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextKeyTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - int ymlIndex = ContextKeyType.YML_CONTEXT_KEY.getIndex(); - String ymlTypeName = ContextKeyType.YML_CONTEXT_KEY.getTypeName(); - - Assertions.assertTrue(1 == ymlIndex); - Assertions.assertEquals( - "org.apache.linkis.cs.common.entity.source.CommonContextKey", ymlTypeName); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java deleted file mode 100644 index d9cd12c63e..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.protocol; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextKeyValueTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - int commonIndex = ContextKeyValueType.COMMON_CONTEXT_KV_TYPE.getIndex(); - String commonTypeName = ContextKeyValueType.COMMON_CONTEXT_KV_TYPE.getTypeName(); - - Assertions.assertTrue(0 == commonIndex); - Assertions.assertEquals( - "org.apache.linkis.cs.common.entity.source.CommonContextID", commonTypeName); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java deleted file mode 100644 index 1397661674..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.protocol; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextValueTypeTest { - - @Test - @DisplayName("enumTest") - public void enumTest() { - - int commonIndex = ContextValueType.COMMON_CONTEXT_VALUE_TYPE.getIndex(); - String commonTypeName = ContextValueType.COMMON_CONTEXT_VALUE_TYPE.getTypeName(); - - Assertions.assertEquals( - "org.apache.linkis.cs.common.entity.source.CommonContextValue", commonTypeName); - Assertions.assertTrue(1 == commonIndex); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java deleted file mode 100644 index 7eaf19d2c8..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java +++ /dev/null @@ -1,199 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.helper; - -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.history.CommonResourceHistory; -import org.apache.linkis.cs.common.entity.history.metadata.CSTableLineageHistory; -import org.apache.linkis.cs.common.entity.history.metadata.CSTableMetadataContextHistory; -import org.apache.linkis.cs.common.entity.history.metadata.TableOperationType; -import org.apache.linkis.cs.common.entity.metadata.CSTable; -import org.apache.linkis.cs.common.entity.metadata.Table; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ContextSerializationHelperTest { - - @Test - @DisplayName("initTest") - public void initTest() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - - CSTable csTable = new CSTable(); - csTable.setCreator("hadoop"); - csTable.setName("table1"); - - CSTable csTable1 = new CSTable(); - csTable1.setCreator("hadoop"); - csTable1.setName("table2"); - CSTableMetadataContextHistory csTableMetadataContextHistory = - new CSTableMetadataContextHistory(); - csTableMetadataContextHistory.setTable(csTable); - csTableMetadataContextHistory.setOperationType(TableOperationType.ACCESS); - csTableMetadataContextHistory.setSource("SparkEngine"); - String serialize = contextSerializationHelper.serialize(csTableMetadataContextHistory); - Object deserialize = contextSerializationHelper.deserialize(serialize); - Assertions.assertNotNull(deserialize); - } - - @Test - @DisplayName("testLineageHistoryTest") - public void testLineageHistoryTest() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - List tables = new ArrayList<>(); - CSTable csTable = new CSTable(); - csTable.setCreator("hadoop"); - csTable.setName("table1"); - - CSTable csTable1 = new CSTable(); - csTable1.setCreator("hadoop"); - csTable1.setName("table2"); - tables.add(csTable); - tables.add(csTable1); - CSTableLineageHistory history = new CSTableLineageHistory(); - history.setSourceTables(tables); - history.setTable(csTable1); - history.setSource("test"); - String serialize = contextSerializationHelper.serialize(history); - Object deserialize = contextSerializationHelper.deserialize(serialize); - CSTableLineageHistory deserialize1 = (CSTableLineageHistory) deserialize; - List
sourceTables = deserialize1.getSourceTables(); - - Assertions.assertTrue(sourceTables.size() > 0); - Assertions.assertNotNull(serialize); - } - - @Test - @DisplayName("testCommonResourceHistory") - public void testCommonResourceHistory() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("dfasdfsr2456wertg"); - resource.setVersion("v000002"); - - resource.setResourceId("edtr44356-34563456"); - resource.setVersion("v000004"); - - CommonResourceHistory history = new CommonResourceHistory(); - history.setSource("history source"); - history.setResource(resource); - String serialize = contextSerializationHelper.serialize(history); - Object deserialize = contextSerializationHelper.deserialize(serialize); - - Assertions.assertNotNull(deserialize); - } - - @Test - @DisplayName("testHAContextID") - public void testHAContextID() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - LinkisHAWorkFlowContextID haWorkFlowContextID = new LinkisHAWorkFlowContextID(); - haWorkFlowContextID.setBackupInstance("test123"); - haWorkFlowContextID.setInstance("test1234"); - haWorkFlowContextID.setUser("hadoop"); - haWorkFlowContextID.setContextId("hello"); - haWorkFlowContextID.setFlow("hellof"); - String json = contextSerializationHelper.serialize(haWorkFlowContextID); - String objstr = - "{\"type\": \"HAWorkFlowContextID\",\"value\": \"{\\n \\\"instance\\\": null,\\n \\\"backupInstance\\\": null,\\n \\\"user\\\": \\\"hadoop\\\",\\n \\\"workspaceID\\\": null,\\n \\\"project\\\": \\\"test01_neiljianliu\\\",\\n \\\"flow\\\": \\\"dedede\\\",\\n \\\"contextId\\\": \\\"24-24--YmRwZHdzMTEwMDAxOjkxMTY\\\\u003dYmRwZHdzMTEwMDAxOjkxMTY\\\\u003d85197\\\",\\n \\\"version\\\": \\\"v000001\\\",\\n \\\"env\\\": null\\n}\"}\n"; - Object deserialize = contextSerializationHelper.deserialize(objstr); - - Assertions.assertNotNull(json); - Assertions.assertNotNull(deserialize); - } - - @Test - @DisplayName("testCSFlowInfos") - public void testCSFlowInfos() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - CommonContextValue contextValue = new CommonContextValue(); - contextValue.setKeywords("test.123.test"); - - Map infos = new HashMap<>(); - List> edges = new ArrayList<>(); - for (int i = 0; i < 10; i++) { - Map edge = new HashMap<>(); - edge.put("source", "job_export_tb1_crdtloan " + i); - edge.put("target", "job_export_tb1_crdtloan"); - edge.put("sourceLocation", "top"); - edge.put("targetLocation", "left"); - edges.add(edge); - } - infos.put("edges", edges); - infos.put("parent", "flow2"); - Map idNodeName = new HashMap<>(); - idNodeName.put("12345", "job_export_tb1_crdtloan"); - infos.put("id_nodeName", idNodeName); - CSFlowInfos csFlowInfos = new CSFlowInfos(); - csFlowInfos.setInfos(infos); - contextValue.setValue(csFlowInfos); - Object deserialize = - contextSerializationHelper.deserialize(contextSerializationHelper.serialize(contextValue)); - ContextValue contextValue1 = (ContextValue) deserialize; - CSFlowInfos value1 = (CSFlowInfos) contextValue1.getValue(); - - Assertions.assertNotNull(value1); - } - - @Test - @DisplayName("testSrialzer") - public void testSrialzer() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - - CommonContextKey contextKey = new CommonContextKey(); - contextKey.setContextScope(ContextScope.FRIENDLY); - contextKey.setContextType(ContextType.OBJECT); - contextKey.setKey("test"); - - LinkisBMLResource linkisBMLResource = new LinkisBMLResource(); - linkisBMLResource.setResourceId("12345"); - linkisBMLResource.setVersion("v01"); - - CommonContextValue contextValue = new CommonContextValue(); - contextValue.setKeywords("test.123.test"); - contextValue.setValue(linkisBMLResource); - - CommonContextKeyValue contextKeyValue = new CommonContextKeyValue(); - - contextKeyValue.setContextKey(contextKey); - contextKeyValue.setContextValue(contextValue); - - String json = contextSerializationHelper.serialize(contextKeyValue); - Object obj = contextSerializationHelper.deserialize(json); - - Assertions.assertNotNull(json); - Assertions.assertNotNull(obj); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java deleted file mode 100644 index 914b47da0b..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.context; - -import org.apache.linkis.cs.common.entity.source.CombinedNodeIDContextID; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CombinedNodeIDContextIDSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - CombinedNodeIDContextIDSerializer serializer = new CombinedNodeIDContextIDSerializer(); - String type = serializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - - CombinedNodeIDContextID contextID = new CombinedNodeIDContextID(); - CombinedNodeIDContextIDSerializer serializer = new CombinedNodeIDContextIDSerializer(); - boolean accepts = serializer.accepts(contextID); - Assertions.assertTrue(accepts); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - CombinedNodeIDContextID combinedNodeIDContextID = new CombinedNodeIDContextID(); - combinedNodeIDContextID.setNodeID("node123"); - CombinedNodeIDContextIDSerializer serializer = new CombinedNodeIDContextIDSerializer(); - CombinedNodeIDContextID json = serializer.fromJson(new Gson().toJson(combinedNodeIDContextID)); - Assertions.assertNotNull(json); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java deleted file mode 100644 index 60b2acfe04..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.context; - -import org.apache.linkis.cs.common.entity.source.CommonContextKey; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CommonContextKeySerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - CommonContextKeySerializer commonContextKeySerializer = new CommonContextKeySerializer(); - String type = commonContextKeySerializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - - CommonContextKey commonContextKey = new CommonContextKey(); - CommonContextKeySerializer commonContextKeySerializer = new CommonContextKeySerializer(); - boolean accepts = commonContextKeySerializer.accepts(commonContextKey); - Assertions.assertTrue(accepts); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - CommonContextKey commonContextKey = new CommonContextKey(); - commonContextKey.setKey("key"); - - CommonContextKeySerializer serializer = new CommonContextKeySerializer(); - CommonContextKey json = serializer.fromJson(new Gson().toJson(commonContextKey)); - Assertions.assertNotNull(json); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java deleted file mode 100644 index 282f239b5c..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.value; - -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisBMLResourceSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - LinkisBMLResourceSerializer bmlResourceSerializer = new LinkisBMLResourceSerializer(); - String type = bmlResourceSerializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - LinkisBMLResource linkisBMLResource = new LinkisBMLResource(); - linkisBMLResource.setUser("hadoop"); - linkisBMLResource.setResourceId("12345678"); - - String json = new Gson().toJson(linkisBMLResource); - - LinkisBMLResourceSerializer bmlResourceSerializer = new LinkisBMLResourceSerializer(); - LinkisBMLResource resource = bmlResourceSerializer.fromJson(json); - - Assertions.assertNotNull(resource); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - LinkisBMLResource linkisBMLResource = new LinkisBMLResource(); - LinkisBMLResourceSerializer bmlResourceSerializer = new LinkisBMLResourceSerializer(); - boolean accepts = bmlResourceSerializer.accepts(linkisBMLResource); - Assertions.assertTrue(accepts); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java deleted file mode 100644 index 8a7b3a918d..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.value.data; - -import org.apache.linkis.cs.common.entity.data.CSResultData; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CSResultDataSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - CSResultDataSerializer csResultDataSerializer = new CSResultDataSerializer(); - String type = csResultDataSerializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - CSResultData csResultData = new CSResultData(); - String json = new Gson().toJson(csResultData); - CSResultDataSerializer csResultDataSerializer = new CSResultDataSerializer(); - CSResultData resultData = csResultDataSerializer.fromJson(json); - Assertions.assertNotNull(resultData); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - - CSResultData csResultData = new CSResultData(); - CSResultDataSerializer csResultDataSerializer = new CSResultDataSerializer(); - boolean accepts = csResultDataSerializer.accepts(csResultData); - - Assertions.assertTrue(accepts); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java deleted file mode 100644 index 171d21e3d6..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.value.data; - -import org.apache.linkis.cs.common.entity.data.LinkisJobData; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisJobDataSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - LinkisJobDataSerializer serializer = new LinkisJobDataSerializer(); - String type = serializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - LinkisJobData linkisJobData = new LinkisJobData(); - linkisJobData.setJobID(1L); - - LinkisJobDataSerializer serializer = new LinkisJobDataSerializer(); - LinkisJobData jobData = serializer.fromJson(new Gson().toJson(linkisJobData)); - - Assertions.assertNotNull(jobData); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - - LinkisJobData linkisJobData = new LinkisJobData(); - LinkisJobDataSerializer serializer = new LinkisJobDataSerializer(); - boolean accepts = serializer.accepts(linkisJobData); - Assertions.assertTrue(accepts); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java deleted file mode 100644 index fa717cc7f3..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.value.metadata; - -import org.apache.linkis.cs.common.entity.metadata.CSTable; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CSTableSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - CSTableSerializer csTableSerializer = new CSTableSerializer(); - String type = csTableSerializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - CSTable csTable = new CSTable(); - csTable.setName("flow1"); - csTable.setAlias("flow1"); - csTable.setAvailable(true); - csTable.setCreator("hadoop"); - - CSTableSerializer csTableSerializer = new CSTableSerializer(); - CSTable json = csTableSerializer.fromJson(new Gson().toJson(csTable)); - - Assertions.assertNotNull(json); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - - CSTable csTable = new CSTable(); - CSTableSerializer csTableSerializer = new CSTableSerializer(); - - boolean accepts = csTableSerializer.accepts(csTable); - Assertions.assertTrue(accepts); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java deleted file mode 100644 index 4c6e656de3..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.impl.value.object; - -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.exception.CSErrorException; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CSFlowInfosSerializerTest { - - @Test - @DisplayName("getTypeTest") - public void getTypeTest() { - - CSFlowInfosSerializer csFlowInfosSerializer = new CSFlowInfosSerializer(); - String type = csFlowInfosSerializer.getType(); - Assertions.assertNotNull(type); - } - - @Test - @DisplayName("fromJsonTest") - public void fromJsonTest() throws CSErrorException { - - CSFlowInfos csFlowInfos = new CSFlowInfos(); - CSFlowInfosSerializer csFlowInfosSerializer = new CSFlowInfosSerializer(); - CSFlowInfos json = csFlowInfosSerializer.fromJson(new Gson().toJson(csFlowInfos)); - Assertions.assertNotNull(json); - } - - @Test - @DisplayName("acceptsTest") - public void acceptsTest() { - CSFlowInfos csFlowInfos = new CSFlowInfos(); - CSFlowInfosSerializer csFlowInfosSerializer = new CSFlowInfosSerializer(); - boolean accepts = csFlowInfosSerializer.accepts(csFlowInfos); - Assertions.assertTrue(accepts); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java deleted file mode 100644 index aaba695e50..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java +++ /dev/null @@ -1,187 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.serialize.test; - -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.history.CommonResourceHistory; -import org.apache.linkis.cs.common.entity.history.metadata.CSTableLineageHistory; -import org.apache.linkis.cs.common.entity.history.metadata.CSTableMetadataContextHistory; -import org.apache.linkis.cs.common.entity.history.metadata.TableOperationType; -import org.apache.linkis.cs.common.entity.metadata.CSTable; -import org.apache.linkis.cs.common.entity.metadata.Table; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; -import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; -import org.apache.linkis.cs.common.entity.source.*; -import org.apache.linkis.cs.common.serialize.helper.ContextSerializationHelper; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class ContextSerializationHelperTest { - - public static void main(String[] args) throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - - CSTable csTable = new CSTable(); - csTable.setCreator("hadoop"); - csTable.setName("table1"); - - CSTable csTable1 = new CSTable(); - csTable1.setCreator("hadoop"); - csTable1.setName("table2"); - CSTableMetadataContextHistory csTableMetadataContextHistory = - new CSTableMetadataContextHistory(); - csTableMetadataContextHistory.setTable(csTable); - csTableMetadataContextHistory.setOperationType(TableOperationType.ACCESS); - csTableMetadataContextHistory.setSource("SparkEngine"); - String serialize = contextSerializationHelper.serialize(csTableMetadataContextHistory); - Object deserialize = contextSerializationHelper.deserialize(serialize); - System.out.println("test"); - testLineageHistory(); - } - - public static void testLineageHistory() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - List
tables = new ArrayList<>(); - CSTable csTable = new CSTable(); - csTable.setCreator("hadoop"); - csTable.setName("table1"); - - CSTable csTable1 = new CSTable(); - csTable1.setCreator("hadoop"); - csTable1.setName("table2"); - tables.add(csTable); - tables.add(csTable1); - CSTableLineageHistory history = new CSTableLineageHistory(); - history.setSourceTables(tables); - history.setTable(csTable1); - history.setSource("test"); - String serialize = contextSerializationHelper.serialize(history); - Object deserialize = contextSerializationHelper.deserialize(serialize); - CSTableLineageHistory deserialize1 = (CSTableLineageHistory) deserialize; - List
sourceTables = deserialize1.getSourceTables(); - System.out.println(sourceTables.get(0).getName()); - System.out.println(serialize); - } - - public static void testCommonResourceHistory() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - LinkisBMLResource resource = new LinkisBMLResource(); - resource.setResourceId("dfasdfsr2456wertg"); - resource.setVersion("v000002"); - - resource.setResourceId("edtr44356-34563456"); - resource.setVersion("v000004"); - - CommonResourceHistory history = new CommonResourceHistory(); - history.setSource("history source"); - history.setResource(resource); - String serialize = contextSerializationHelper.serialize(history); - Object deserialize = contextSerializationHelper.deserialize(serialize); - System.out.println("test"); - } - - public static void testHAContextID() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - LinkisHAWorkFlowContextID haWorkFlowContextID = new LinkisHAWorkFlowContextID(); - haWorkFlowContextID.setBackupInstance("test123"); - haWorkFlowContextID.setInstance("test1234"); - haWorkFlowContextID.setUser("hadoop"); - haWorkFlowContextID.setContextId("hello"); - haWorkFlowContextID.setFlow("hellof"); - String json = contextSerializationHelper.serialize(haWorkFlowContextID); - String objstr = - "{\"type\": \"HAWorkFlowContextID\",\"value\": \"{\\n \\\"instance\\\": null,\\n \\\"backupInstance\\\": null,\\n \\\"user\\\": \\\"hadoop\\\",\\n \\\"workspaceID\\\": null,\\n \\\"project\\\": \\\"test01_neiljianliu\\\",\\n \\\"flow\\\": \\\"dedede\\\",\\n \\\"contextId\\\": \\\"24-24--YmRwZHdzMTEwMDAxOjkxMTY\\\\u003dYmRwZHdzMTEwMDAxOjkxMTY\\\\u003d85197\\\",\\n \\\"version\\\": \\\"v000001\\\",\\n \\\"env\\\": null\\n}\"}\n"; - Object deserialize = contextSerializationHelper.deserialize(objstr); - System.out.println(json); - } - - public static void testCSFlowInfos() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - CommonContextValue contextValue = new CommonContextValue(); - contextValue.setKeywords("test.123.test"); - - Map infos = new HashMap<>(); - List> edges = new ArrayList<>(); - for (int i = 0; i < 10; i++) { - Map edge = new HashMap<>(); - edge.put("source", "job_export_tb1_crdtloan " + i); - edge.put("target", "job_export_tb1_crdtloan"); - edge.put("sourceLocation", "top"); - edge.put("targetLocation", "left"); - edges.add(edge); - } - infos.put("edges", edges); - infos.put("parent", "flow2"); - Map idNodeName = new HashMap<>(); - idNodeName.put("12345", "job_export_tb1_crdtloan"); - infos.put("id_nodeName", idNodeName); - CSFlowInfos csFlowInfos = new CSFlowInfos(); - csFlowInfos.setInfos(infos); - contextValue.setValue(csFlowInfos); - System.out.println(contextSerializationHelper.serialize(contextValue)); - Object deserialize = - contextSerializationHelper.deserialize(contextSerializationHelper.serialize(contextValue)); - ContextValue contextValue1 = (ContextValue) deserialize; - CSFlowInfos value1 = (CSFlowInfos) contextValue1.getValue(); - System.out.println(value1.getInfos()); - } - - private static void testSrialzer() throws Exception { - ContextSerializationHelper contextSerializationHelper = - ContextSerializationHelper.getInstance(); - /* LinkisHAWorkFlowContextID haWorkFlowContextID = new LinkisHAWorkFlowContextID(); - haWorkFlowContextID.setBackupInstance("test123"); - haWorkFlowContextID.setInstance("test1234"); - haWorkFlowContextID.setUser("hadoop"); - haWorkFlowContextID.setContextId("hello"); - haWorkFlowContextID.setFlow("hellof"); - String json = contextSerializationHelper.serialize(haWorkFlowContextID); - */ - CommonContextKey contextKey = new CommonContextKey(); - contextKey.setContextScope(ContextScope.FRIENDLY); - contextKey.setContextType(ContextType.OBJECT); - contextKey.setKey("test"); - - LinkisBMLResource linkisBMLResource = new LinkisBMLResource(); - linkisBMLResource.setResourceId("12345"); - linkisBMLResource.setVersion("v01"); - - CommonContextValue contextValue = new CommonContextValue(); - contextValue.setKeywords("test.123.test"); - contextValue.setValue(linkisBMLResource); - - CommonContextKeyValue contextKeyValue = new CommonContextKeyValue(); - - contextKeyValue.setContextKey(contextKey); - contextKeyValue.setContextValue(contextValue); - - String json = contextSerializationHelper.serialize(contextKeyValue); - System.out.println(json); - Object obj = contextSerializationHelper.deserialize(json); - System.out.println("hello"); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java deleted file mode 100644 index 216664fb54..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.utils; - -import java.time.LocalDateTime; -import java.util.Date; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CSCommonUtilsTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - String contextIdStr = CSCommonUtils.CONTEXT_ID_STR; - String nodeNameStr = CSCommonUtils.NODE_NAME_STR; - String nodeId = CSCommonUtils.NODE_ID; - String idNodeName = CSCommonUtils.ID_NODE_NAME; - String flowInfos = CSCommonUtils.FLOW_INFOS; - String contextEnvDev = CSCommonUtils.CONTEXT_ENV_DEV; - String contextEnvProd = CSCommonUtils.CONTEXT_ENV_PROD; - - Assertions.assertEquals("contextID", contextIdStr); - Assertions.assertEquals("nodeName", nodeNameStr); - Assertions.assertEquals("nodeID", nodeId); - Assertions.assertEquals("id_nodeName", idNodeName); - Assertions.assertEquals("flow.infos", flowInfos); - Assertions.assertEquals("BDP_DEV", contextEnvDev); - Assertions.assertEquals("BDAP_PROD", contextEnvProd); - } - - @Test - @DisplayName("getTableKeyTest") - public void getTableKeyTest() { - - String tableKey = CSCommonUtils.getTableKey("node1", "table1"); - Assertions.assertNotNull(tableKey); - } - - @Test - @DisplayName("localDatetimeToDateTest") - public void localDatetimeToDateTest() { - - LocalDateTime now = LocalDateTime.now(); - Date date = CSCommonUtils.localDatetimeToDate(now); - - Assertions.assertNotNull(date); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java deleted file mode 100644 index 6af4668350..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.common.utils; - -import org.apache.linkis.cs.common.exception.CSErrorException; - -import java.util.ArrayList; -import java.util.List; - -import com.google.gson.Gson; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CSHighAvailableUtilsTest { - - @Test - @DisplayName("checkHAIDBasicFormatTest") - public void checkHAIDBasicFormatTest() { - - String haid = "24--24--YmRwaGRwMTFpZGUwMTo5MTE2YmRwaGRwMTFpZGUwMTo5MTE084835"; - boolean checkHAIDBasicFormat = CSHighAvailableUtils.checkHAIDBasicFormat(haid); - Assertions.assertFalse(checkHAIDBasicFormat); - } - - @Test - @DisplayName("encodeHAIDKeyTest") - public void encodeHAIDKeyTest() throws CSErrorException { - - String id = "8798"; - String instance = "jslfjslfjlsdjfljsdf==+"; - String backupInstance = "sjljsljflsdjflsjd"; - List list = new ArrayList<>(); - list.add(backupInstance); - list.add(instance); - String haid2 = CSHighAvailableUtils.encodeHAIDKey(id, instance, list); - Assertions.assertNotNull(haid2); - } - - @Test - @DisplayName("decodeHAIDTest") - public void decodeHAIDTest() throws CSErrorException { - - String haid3 = "24-24--YmRwaGRwMTFpZGUwMTo5MTE0YmRwaGRwMTFpZGUwMTo5MTE084855"; - String haidStr = new Gson().toJson(CSHighAvailableUtils.decodeHAID(haid3)); - - Assertions.assertNotNull(haidStr); - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml deleted file mode 100644 index a6e2b00165..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-cs-listener - - - - org.apache.linkis - linkis-common - ${project.version} - provided - - - org.apache.linkis - linkis-cs-common - ${project.version} - - - - diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/AbstractCallbackEngine.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/AbstractCallbackEngine.java deleted file mode 100644 index 8e4bb0545f..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/AbstractCallbackEngine.java +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.listener.callback; - -public interface AbstractCallbackEngine extends CallbackEngine { - // 实现事件的存储和按需消费:存储这些变化的事件，并且按需消费 - // 事件超过一定时间还没被消费，自动移除 - // cskey被五个client注册了listener，如果有挂掉，那么必须要一个最大消费时间的机制 -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java deleted file mode 100644 index 84d2354dce..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.listener.test; - -import org.apache.linkis.cs.common.entity.source.ContextID; - -public class TestContextID implements ContextID { - - String contextID; - - @Override - public String getContextId() { - return contextID; - } - - @Override - public void setContextId(String contextId) { - this.contextID = contextId; - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java deleted file mode 100644 index a343bf1f2c..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.listener.test; - -import org.apache.linkis.cs.common.entity.enumeration.ContextScope; -import org.apache.linkis.cs.common.entity.enumeration.ContextType; -import org.apache.linkis.cs.common.entity.source.ContextKey; - -public class TestContextKey implements ContextKey { - private String key; - private ContextType contextType; - - @Override - public String getKey() { - return this.key; - } - - @Override - public void setKey(String key) { - this.key = key; - } - - @Override - public ContextType getContextType() { - return this.contextType; - } - - @Override - public void setContextType(ContextType contextType) { - this.contextType = contextType; - } - - @Override - public ContextScope getContextScope() { - return null; - } - - @Override - public void setContextScope(ContextScope contextScope) {} - - @Override - public String getKeywords() { - return null; - } - - @Override - public void setKeywords(String keywords) {} - - @Override - public int getType() { - return 0; - } - - @Override - public void setType(int type) {} -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java deleted file mode 100644 index ee27609db2..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.listener.test; - -import org.apache.linkis.cs.common.entity.source.ContextKey; -import org.apache.linkis.cs.common.entity.source.ContextKeyValue; -import org.apache.linkis.cs.common.entity.source.ContextValue; - -public class TestContextKeyValue implements ContextKeyValue { - - private ContextKey contextKey; - - private ContextValue contextValue; - - @Override - public ContextKey getContextKey() { - return this.contextKey; - } - - @Override - public void setContextKey(ContextKey contextKey) { - this.contextKey = contextKey; - } - - @Override - public ContextValue getContextValue() { - return this.contextValue; - } - - @Override - public void setContextValue(ContextValue contextValue) { - this.contextValue = contextValue; - } -} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java deleted file mode 100644 index 8c4d4d1447..0000000000 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.cs.listener.test; - -import org.apache.linkis.cs.common.entity.source.ContextValue; - -public class TestContextValue implements ContextValue { - private Object value; - - private String keywords; - - @Override - public String getKeywords() { - return null; - } - - @Override - public void setKeywords(String keywords) {} - - @Override - public Object getValue() { - return this.value; - } - - @Override - public void setValue(Object value) { - this.value = value; - } -} diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml deleted file mode 100644 index e9f41641f3..0000000000 --- a/linkis-public-enhancements/linkis-context-service/pom.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../pom.xml - - - linkis-context-service - - pom - - - - linkis-cs-common - linkis-cs-listener - linkis-cs-client - linkis-cs-server - - - - diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-cs-server/pom.xml similarity index 91% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml rename to linkis-public-enhancements/linkis-cs-server/pom.xml index edddbbe207..0179b4aaf1 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml +++ b/linkis-public-enhancements/linkis-cs-server/pom.xml @@ -21,7 +21,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-cs-server @@ -29,7 +29,7 @@ org.apache.linkis - linkis-cs-common + linkis-pes-common ${project.version} @@ -41,13 +41,7 @@ org.apache.linkis - linkis-cs-listener - ${project.version} - - - - org.apache.linkis - linkis-instance-label-client + linkis-pes-rpc-client ${project.version} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-cs-server/src/main/assembly/distribution.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/assembly/distribution.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/assembly/distribution.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/ContextSearch.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/DefaultContextSearch.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AbstractCommonCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/AtomicCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/BinaryLogicCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/Condition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/ConditionType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/UnaryLogicCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/AndConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionBuilderImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContainsConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextScopeConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextTypeConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/ContextValueTypeConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NearestConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/NotConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/OrConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/construction/RegexConditionParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/AndCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContainsCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextScopeCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextTypeCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/ContextValueTypeCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NearestCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/NotCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/OrCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/condition/impl/RegexCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/ContextCacheService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/DefaultContextCacheService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/ContextCache.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextAddListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/DefaultContextCache.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/ContextIDValueGenerator.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueGeneratorImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/csid/impl/ContextIDValueImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextKeyValueContext.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/ContextValueMapSet.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/ContextValueMapSetImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/cskey/impl/DefaultContextKeyValueContext.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cache/guava/ContextIDRemoveListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/cleaner/AUTOCleaner.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/conf/ContextCacheConf.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndex.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSet.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/ContextInvertedIndexSetImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/index/DefaultContextInvertedIndex.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextCacheMetric.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ContextIDMetric.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextCacheMetric.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/DefaultContextIDMetric.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/Metrtic.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/ObjectInfo.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/metric/SizeEstimator.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/ContextKeyValueParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/parser/DefaultContextKeyValueParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/contextcache/utils/ContextCacheUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/exception/ContextSearchFailedException.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/AbstractConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/AbstractContextCacheFetcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextCacheFetcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/ContextTypeContextSearchFetcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/fetcher/IterateContextCacheFetcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/AndConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/BinaryLogicConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContainsConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextScopeConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextTypeConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/ContextValueTypeConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NearestConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/NotConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/OrConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/RegexConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/impl/UnaryLogicConditionExecution.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AbstractContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/AndLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/BinaryLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ConditionMatcherResolver.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContainsContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextScopeContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextTypeContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/ContextValueTypeContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NearestLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/NotLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/OrLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/RegexContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/SkipContextSearchMather.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/matcher/UnaryLogicContextSearchMatcher.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/AbstractContextSearchRuler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/CommonListContextSearchRuler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/ContextSearchRuler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/execution/ruler/NearestContextSearchRuler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/AbstractContextHAManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ContextHAManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/conf/ContextHighAvailableConf.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/exception/CSErrorCode.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/BackupInstanceGenerator.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAChecker.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/ContextHAIDGenerator.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/BackupInstanceGeneratorImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHACheckerImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/ha/impl/ContextHAIDGeneratorImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/pluggable/HAContextPersistenceManagerImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/ConditionOptimizer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/OptimizedCondition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/cost/ConditionCostCalculator.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/BinaryTree.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/MinCostBinaryTree.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/dfs/Node.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/optimize/impl/CostBasedConditionOptimizer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceBeans.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/ContextPersistenceManagerImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Ignore.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/annotation/Tuning.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/aop/PersistenceTuningAspect.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/conf/PersistenceConf.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextIDMapper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/dao/ContextMapMapper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/ExtraFieldClass.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextIDListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/entity/PersistenceContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/exception/ThrowingFunction.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextHistoryPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDListenerPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextIDPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextKeyListenerPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMapPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/ContextMetricsPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/KeywordContextHistoryPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/TransactionManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextHistoryPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDListenerPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextIDPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextKeyListenerPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMapPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/ContextMetricsPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/KeywordContextHistoryPersistenceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/persistence/impl/TransactionManagerImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/persistence/util/PersistenceUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/LinkisCSApplication.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/conf/ContextServerConf.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceMethod.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/enumeration/ServiceType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/label/CSInstanceLabelClient.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/DefaultKeywordParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordMethodEntity.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/parser/KeywordParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/AbstractHttpRequestProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextHistoryProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextIDProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextListenerProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/ContextProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpRequestProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/HttpResponseProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/protocol/RestResponseProtocol.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextHistoryRestfulApi.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextIDRestfulApi.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextListenerRestfulApi.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/ContextRestfulApi.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/restful/CsRestfulParent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/CsScheduler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/DefaultCsScheduler.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJob.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpAnswerJobBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJob.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpJobBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/HttpPriorityJob.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/RestJobBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecuteRequest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsExecutorExecutionManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsJobListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerBean.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/CsSchedulerJob.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/scheduler/impl/JobToExecuteRequestConsumer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/AbstractService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextHistoryService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextIDService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextListenerService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/ContextService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/Service.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextHistoryServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextIDServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextListenerServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/service/impl/ContextServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java b/linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java rename to linkis-public-enhancements/linkis-cs-server/src/main/java/org/apache/linkis/cs/server/util/CsUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql b/linkis-public-enhancements/linkis-cs-server/src/main/resources/cs_ddl.sql similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/cs_ddl.sql rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/cs_ddl.sql diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextHistoryMapper.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextIDListenerMapper.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextIDMapper.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextKeyListenerMapper.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml b/linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml rename to linkis-public-enhancements/linkis-cs-server/src/main/resources/mapper/common/contextMapMapper.xml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasConverter.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/InstanceAliasManager.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/DefaultInstanceAliasConverter.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/InstanceAliasManagerImpl.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/highavailable/ha/instancealias/impl/RouteLabelInstanceAliasConverter.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala b/linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala rename to linkis-public-enhancements/linkis-cs-server/src/main/scala/org/apache/linkis/cs/server/scheduler/impl/CsExecutor.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/AndTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContainsTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextScopeTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextSearchTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/ContextTypeTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/RegexTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/Scan.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/csid/TestContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextKeyValueParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/keyword/TestContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/contextcache/test/service/TestContextCacheService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/csid/TestContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/errorcode/LinkisCsServerErrorCodeSummaryTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/exception/ContextSearchFailedExceptionTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/TestContextHAManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/haid/TestHAID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/highavailable/test/persist/TestPersistence.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/keyword/TestContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/parser/ApiJsonTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextIDListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/AContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextHistoryTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDListenerTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextIDTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextKeyListenerTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ContextMapTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ExtraFieldClassTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/MapTypeAdapter.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyMethodA.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/ProxyTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/Scan.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/conf/PersistenceConfTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextHistoryMapperTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDListenerMapperTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextIDMapperTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/dao/ContextKeyListenerMapperTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/persistence/utils/PersistenceUtilsTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/CsRestfulParent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/Scan.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/SchedulerTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java b/linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java rename to linkis-public-enhancements/linkis-cs-server/src/test/java/org/apache/linkis/cs/server/conf/ContextServerConfTest.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml b/linkis-public-enhancements/linkis-cs-server/src/test/resources/application.yml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/application.yml rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/application.yml diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-cs-server/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/create.sql rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-cs-server/src/test/resources/linkis.properties similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/linkis.properties diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml b/linkis-public-enhancements/linkis-cs-server/src/test/resources/log4j2.xml similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-server/src/test/resources/log4j2.xml rename to linkis-public-enhancements/linkis-cs-server/src/test/resources/log4j2.xml diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml deleted file mode 100644 index 0b29d69373..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-datasource-client - - - - org.apache.linkis - linkis-gateway-httpclient-support - ${project.version} - - - - org.apache.linkis - linkis-datasource-manager-common - ${project.version} - - - - org.apache.linkis - linkis-metadata-query-common - ${project.version} - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala deleted file mode 100644 index 6efdfdf8af..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestDataSourceClient.scala +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client - -import org.apache.linkis.datasource.client.impl.LinkisDataSourceRemoteClient -import org.apache.linkis.datasource.client.request._ -import org.apache.linkis.httpclient.dws.authentication.{StaticAuthenticationStrategy, TokenAuthenticationStrategy} -import org.apache.linkis.httpclient.dws.config.DWSClientConfigBuilder - -import java.util.concurrent.TimeUnit - -object TestDataSourceClient { - def main(args: Array[String]): Unit = { - val clientConfig = DWSClientConfigBuilder.newBuilder() - .addServerUrl("http://127.0.0.1:9001") // set linkis-mg-gateway url: http://{ip}:{port} - .connectionTimeout(30000) // connection timtout - .discoveryEnabled(false) // disable discovery - .discoveryFrequency(1, TimeUnit.MINUTES) // discovery frequency - .loadbalancerEnabled(false) // enable loadbalance - .maxConnectionSize(5) // set max Connection - .retryEnabled(false) // set retry - .readTimeout(30000) // set read timeout - .setAuthenticationStrategy(new TokenAuthenticationStrategy()) // AuthenticationStrategy Linkis authen suppory static and Token - .setAuthTokenKey("Token-Code") // set submit user - .setAuthTokenValue("DSM-AUTH") // set passwd or token - .setDWSVersion("v1") // linkis rest version v1 - .build() - - /* val clientConfig = DWSClientConfigBuilder.newBuilder() - .addServerUrl("http://192.168.28.98:9001") - .connectionTimeout(30000) - .discoveryEnabled(false) - .discoveryFrequency(1, TimeUnit.MINUTES) - .loadbalancerEnabled(true) - .maxConnectionSize(5) - .retryEnabled(false) - .readTimeout(30000) - .setAuthenticationStrategy(new StaticAuthenticationStrategy()) - .setAuthTokenKey("linkis") - .setAuthTokenValue("123456") - .setDWSVersion("v1") - .build() */ - - val dataSourceClient = new LinkisDataSourceRemoteClient(clientConfig) - - val getDataSourceByName = dataSourceClient.getInfoByDataSourceName(GetInfoByDataSourceNameAction.builder() - .setDataSourceName("mysql_test_0706") - .setUser("hadoop") - .setSystem("").build()).getDataSource - - - - val getDataSourceByName2 = dataSourceClient.getInfoByDataSourceId(GetInfoByDataSourceIdAction.builder() - .setDataSourceId(2) - .setUser("hadoop") - .setSystem("").build()).getDataSource - - - - val dataSource = dataSourceClient.getInfoPublishedByDataSourceName(GetInfoPublishedByDataSourceNameAction.builder() - .setDataSourceName("mysql_test_0706") - .setUser("hadoop") - .setSystem("").build()).getDataSource - - - - - - - - - - - - - val getAllDataSourceTypesResult = dataSourceClient.getAllDataSourceTypes(GetAllDataSourceTypesAction.builder().setUser("linkis").build()).getAllDataSourceType - - val queryDataSourceEnvResult = dataSourceClient.queryDataSourceEnv( - QueryDataSourceEnvAction.builder() - .setName("mysql") - .setTypeId(2) - .setCurrentPage(1) - .setPageSize(1) - .setUser("hadoop") - .build()).getDataSourceEnv - - val getInfoByDataSourceIdResult = dataSourceClient.getInfoByDataSourceId( - GetInfoByDataSourceIdAction.builder().setDataSourceId(1).setSystem("xx").setUser("hadoop").build() - ).getDataSource - - val queryDataSourceResult = dataSourceClient.queryDataSource(QueryDataSourceAction.builder() - .setSystem("") - .setName("mysql") - .setTypeId(1) - .setIdentifies("") - .setCurrentPage(1) - .setPageSize(10) - .setUser("hadoop") - .build() - ).getAllDataSource - - val getConnectParamsByDataSourceIdResult = dataSourceClient.getConnectParams( - GetConnectParamsByDataSourceIdAction.builder().setDataSourceId(1).setSystem("xx").setUser("hadoop").build() - ) - - - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala deleted file mode 100644 index 723f9ec74a..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestHiveClient.scala +++ /dev/null @@ -1,144 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client - -import java.util -import java.util.concurrent.TimeUnit - -import org.apache.linkis.common.utils.JsonUtils -import org.apache.linkis.datasource.client.impl.{LinkisDataSourceRemoteClient, LinkisMetaDataRemoteClient} -import org.apache.linkis.datasource.client.request._ -import org.apache.linkis.datasource.client.response._ -import org.apache.linkis.datasourcemanager.common.domain.DataSource -import org.apache.linkis.httpclient.dws.authentication.StaticAuthenticationStrategy -import org.apache.linkis.httpclient.dws.config.DWSClientConfigBuilder -import org.junit.jupiter.api.{Disabled, Test} - -object TestHiveClient { - val gatewayUrl = "http://127.0.0.1:9001" - val clientConfig = DWSClientConfigBuilder.newBuilder - .addServerUrl(gatewayUrl) - .connectionTimeout(30000) - .discoveryEnabled(false) - .discoveryFrequency(1, TimeUnit.MINUTES) - .loadbalancerEnabled(true) - .maxConnectionSize(1) - .retryEnabled(false) - .readTimeout(30000) - .setAuthenticationStrategy(new StaticAuthenticationStrategy) - .setAuthTokenKey("hadoop") - .setAuthTokenValue("xxxxx") - .setDWSVersion("v1") - - val dataSourceclient = new LinkisDataSourceRemoteClient(clientConfig.build()) - - val clientConfig2 = DWSClientConfigBuilder.newBuilder - .addServerUrl(gatewayUrl) - .connectionTimeout(30000) - .discoveryEnabled(false) - .discoveryFrequency(1, TimeUnit.MINUTES) - .loadbalancerEnabled(true) - .maxConnectionSize(1) - .retryEnabled(false) - .readTimeout(30000) - .setAuthenticationStrategy(new StaticAuthenticationStrategy) - .setAuthTokenKey("hadoop") - .setAuthTokenValue("xxxxx") - .setDWSVersion("v1") - - val metaDataClient = new LinkisMetaDataRemoteClient(clientConfig2.build()) - - - @Test - @Disabled - def testCreateDataSourceMysql: Unit = { - val user = "hadoop" - val system = "Linkis" - val dataSourceName = "for-mysql-test" - val dataSource = new DataSource(); - dataSource.setDataSourceName(dataSourceName) - dataSource.setDataSourceDesc("this is for hive test") - dataSource.setCreateSystem(system) - dataSource.setDataSourceTypeId(4L) - - val map = JsonUtils.jackson.readValue(JsonUtils.jackson.writeValueAsString(dataSource), new util.HashMap[String, Any]().getClass) - val createDataSourceAction: CreateDataSourceAction = CreateDataSourceAction.builder() - .setUser(user) - .addRequestPayloads(map) - .build() - val createDataSourceResult: CreateDataSourceResult = dataSourceclient.createDataSource(createDataSourceAction) - val dataSourceId = createDataSourceResult.getInsertId - - // set connectParams - val params = new util.HashMap[String, Any] - val connectParams = new util.HashMap[String, Any] - connectParams.put("envId", "3") - params.put("connectParams", connectParams) - params.put("comment", "init") - - val updateParameterAction: UpdateDataSourceParameterAction = UpdateDataSourceParameterAction.builder() - .setUser(user) - .setDataSourceId(dataSourceId) - .addRequestPayloads(params) - .build() - val updateParameterResult: UpdateDataSourceParameterResult = dataSourceclient.updateDataSourceParameter(updateParameterAction) - - val version: Long = updateParameterResult.getVersion - - // publist dataSource version - dataSourceclient.publishDataSourceVersion( - PublishDataSourceVersionAction.builder() - .setDataSourceId(dataSourceId) - .setUser(user) - .setVersion(version) - .build()) - - // example of use - val metadataGetDatabasesAction: MetadataGetDatabasesAction = MetadataGetDatabasesAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setSystem(system) - .build() - val metadataGetDatabasesResult: MetadataGetDatabasesResult = metaDataClient.getDatabases(metadataGetDatabasesAction) - - val metadataGetTablesAction: MetadataGetTablesAction = MetadataGetTablesAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setDatabase("linkis_test_ind") - .setSystem(system) - .build() - val metadataGetTablesResult: MetadataGetTablesResult = metaDataClient.getTables(metadataGetTablesAction) - - - - val metadataGetColumnsAction = MetadataGetColumnsAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setDatabase("linkis_test_ind") - .setSystem(system) - .setTable("test") - .build() - val metadataGetColumnsResult: MetadataGetColumnsResult = metaDataClient.getColumns(metadataGetColumnsAction) - - - } -} - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala deleted file mode 100644 index b2b3d53ccd..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/TestMysqlClient.scala +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client -import java.util -import java.util.concurrent.TimeUnit - -import org.apache.linkis.common.utils.JsonUtils -import org.apache.linkis.datasource.client.impl.{LinkisDataSourceRemoteClient, LinkisMetaDataRemoteClient} -import org.apache.linkis.datasource.client.request._ -import org.apache.linkis.datasource.client.response._ -import org.apache.linkis.datasourcemanager.common.domain.DataSource -import org.apache.linkis.httpclient.dws.authentication.StaticAuthenticationStrategy -import org.apache.linkis.httpclient.dws.config.DWSClientConfigBuilder -import org.junit.jupiter.api.{Disabled, Test} - -object TestMysqlClient { - - val gatewayUrl = "http://127.0.0.1:9001" - val clientConfig = DWSClientConfigBuilder.newBuilder - .addServerUrl(gatewayUrl) - .connectionTimeout(30000) - .discoveryEnabled(false) - .discoveryFrequency(1, TimeUnit.MINUTES) - .loadbalancerEnabled(true) - .maxConnectionSize(1) - .retryEnabled(false) - .readTimeout(30000) - .setAuthenticationStrategy(new StaticAuthenticationStrategy) - .setAuthTokenKey("hadoop") - .setAuthTokenValue("xxxxx") - .setDWSVersion("v1") - - val dataSourceclient = new LinkisDataSourceRemoteClient(clientConfig.build()) - - val clientConfig2 = DWSClientConfigBuilder.newBuilder - .addServerUrl(gatewayUrl) - .connectionTimeout(30000) - .discoveryEnabled(false) - .discoveryFrequency(1, TimeUnit.MINUTES) - .loadbalancerEnabled(true) - .maxConnectionSize(1) - .retryEnabled(false) - .readTimeout(30000) - .setAuthenticationStrategy(new StaticAuthenticationStrategy) - .setAuthTokenKey("hadoop") - .setAuthTokenValue("xxxxx") - .setDWSVersion("v1") - - val metaDataClient = new LinkisMetaDataRemoteClient(clientConfig2.build()) - - @Test - @Disabled - def testCreateDataSourceMysql: Unit = { - val user = "hadoop" - val system = "Linkis" - val dataSource = new DataSource(); - val dataSourceName = "for-mysql-test" - dataSource.setDataSourceName(dataSourceName) - dataSource.setDataSourceDesc("this is for mysql test") - dataSource.setCreateSystem(system) - dataSource.setDataSourceTypeId(1L) - - val map = JsonUtils.jackson.readValue(JsonUtils.jackson.writeValueAsString(dataSource), new util.HashMap[String, Any]().getClass) - val createDataSourceAction: CreateDataSourceAction = CreateDataSourceAction.builder() - .setUser(user) - .addRequestPayloads(map) - .build() - val createDataSourceResult: CreateDataSourceResult = dataSourceclient.createDataSource(createDataSourceAction) - val dataSourceId = createDataSourceResult.getInsertId - - - // set connectParams - val params = new util.HashMap[String, Any] - - val connectParams = new util.HashMap[String, Any] - connectParams.put("host", "127.0.0.1") - connectParams.put("port", "36000") - connectParams.put("username", "db username") - connectParams.put("password", "db password") - - params.put("connectParams", connectParams) - params.put("comment", "init") - - val updateParameterAction: UpdateDataSourceParameterAction = UpdateDataSourceParameterAction.builder() - .setUser(user) - .setDataSourceId(dataSourceId) - .addRequestPayloads(params) - .build() - val updateParameterResult: UpdateDataSourceParameterResult = dataSourceclient.updateDataSourceParameter(updateParameterAction) - - val version: Long = updateParameterResult.getVersion - - // publist dataSource version - dataSourceclient.publishDataSourceVersion( - PublishDataSourceVersionAction.builder() - .setDataSourceId(dataSourceId) - .setUser(user) - .setVersion(version) - .build()) - - // example of use - val metadataGetDatabasesAction: MetadataGetDatabasesAction = MetadataGetDatabasesAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setSystem(system) - .build() - val metadataGetDatabasesResult: MetadataGetDatabasesResult = metaDataClient.getDatabases(metadataGetDatabasesAction) - - - val metadataGetTablesAction: MetadataGetTablesAction = MetadataGetTablesAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setDatabase("linkis") - .setSystem(system) - .build() - val metadataGetTablesResult: MetadataGetTablesResult = metaDataClient.getTables(metadataGetTablesAction) - - - - val metadataGetColumnsAction = MetadataGetColumnsAction.builder() - .setUser(user) - .setDataSourceName(dataSourceName) - .setDatabase("linkis") - .setSystem(system) - .setTable("linkis_datasource") - .build() - val metadataGetColumnsResult: MetadataGetColumnsResult = metaDataClient.getColumns(metadataGetColumnsAction) - - } -} - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java deleted file mode 100644 index 40db9eabfb..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/config/DatasourceClientConfigTest.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client.config; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class DatasourceClientConfigTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - String metaDataService = DatasourceClientConfig.METADATA_SERVICE_MODULE().getValue(); - String dataSourceService = DatasourceClientConfig.DATA_SOURCE_SERVICE_MODULE().getValue(); - String authTokenKey = DatasourceClientConfig.AUTH_TOKEN_KEY().getValue(); - String authTokenValue = DatasourceClientConfig.AUTH_TOKEN_VALUE().getValue(); - String dataSourceClientName = - DatasourceClientConfig.DATA_SOURCE_SERVICE_CLIENT_NAME().getValue(); - Object connectionMaxSize = DatasourceClientConfig.CONNECTION_MAX_SIZE().getValue(); - Object connectionTimeOut = DatasourceClientConfig.CONNECTION_TIMEOUT().getValue(); - Object connectionReadTimeOut = DatasourceClientConfig.CONNECTION_READ_TIMEOUT().getValue(); - - Assertions.assertNotNull(metaDataService); - Assertions.assertNotNull(dataSourceService); - Assertions.assertNotNull(authTokenKey); - Assertions.assertNotNull(authTokenValue); - Assertions.assertNotNull(dataSourceClientName); - Assertions.assertNotNull(connectionMaxSize); - Assertions.assertNotNull(connectionTimeOut); - Assertions.assertNotNull(connectionReadTimeOut); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java deleted file mode 100644 index 40c31beb49..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderExceptionTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client.exception; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class DataSourceClientBuilderExceptionTest { - - @Test - @DisplayName("exceptionTest") - public void exceptionTest() { - - String errorDesc = "this is error"; - DataSourceClientBuilderException exception = new DataSourceClientBuilderException(errorDesc); - Assertions.assertEquals(errorDesc, exception.getDesc()); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java deleted file mode 100644 index 779c4b99d3..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/test/java/org/apache/linkis/datasource/client/imp/LinkisDataSourceRemoteClientTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.datasource.client.imp; - -import org.apache.linkis.datasource.client.impl.LinkisDataSourceRemoteClient; -import org.apache.linkis.httpclient.dws.config.DWSClientConfig; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisDataSourceRemoteClientTest { - - @Test - @DisplayName("createClientConfigTest") - public void createClientConfigTest() { - - LinkisDataSourceRemoteClient client = new LinkisDataSourceRemoteClient(); - DWSClientConfig clientConfig = client.createClientConfig(); - Assertions.assertNotNull(clientConfig); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml deleted file mode 100644 index 07e770bfb1..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../../pom.xml - - - linkis-datasource-manager-common - - - - - org.apache.linkis - linkis-protocol - ${project.version} - provided - - - - org.apache.linkis - linkis-module - provided - - - org.ow2.asm - asm - - - - - - org.apache.commons - commons-text - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml index 876419156d..4eec1a4d64 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/pom.xml @@ -41,7 +41,7 @@ org.apache.linkis - linkis-datasource-manager-common + linkis-pes-common ${project.version} @@ -59,7 +59,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} @@ -91,12 +91,7 @@ ${project.version} provided - - - org.apache.linkis - linkis-metadata-query-common - ${project.version} - + diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml deleted file mode 100644 index 88e6dea1f6..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../../pom.xml - - - linkis-metadata-query-common - - - - org.apache.linkis - linkis-common - ${project.version} - provided - - - org.ow2.asm - asm - - - - - - org.apache.linkis - linkis-protocol - ${project.version} - provided - - - org.apache.linkis - linkis-datasource-manager-common - ${project.version} - - - - jakarta.annotation - jakarta.annotation-api - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java deleted file mode 100644 index f1d353890e..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.metadata.query.common; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class MdmConfigurationTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - String metaDataServiceApplication = MdmConfiguration.METADATA_SERVICE_APPLICATION.getValue(); - String dataSourceServiceApplication = - MdmConfiguration.DATA_SOURCE_SERVICE_APPLICATION.getValue(); - - Assertions.assertNotNull(metaDataServiceApplication); - Assertions.assertNotNull(dataSourceServiceApplication); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java deleted file mode 100644 index eaa3f69e52..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.metadata.query.common.cache; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CacheConfigurationTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - Long cacheExpireTimeValue = CacheConfiguration.CACHE_EXPIRE_TIME.getValue(); - Integer cacheInPoolSizeValue = CacheConfiguration.CACHE_IN_POOL_SIZE.getValue(); - Long cacheMaxSizeValue = CacheConfiguration.CACHE_MAX_SIZE.getValue(); - String mysqlRelationshipListValue = CacheConfiguration.MYSQL_RELATIONSHIP_LIST.getValue(); - - Assertions.assertTrue(cacheExpireTimeValue.longValue() == 600L); - Assertions.assertTrue(cacheInPoolSizeValue == 5); - Assertions.assertTrue(cacheMaxSizeValue == 1000L); - Assertions.assertNotNull(mysqlRelationshipListValue); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java deleted file mode 100644 index 589b023cef..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.metadata.query.common.cache; - -import com.google.common.cache.Cache; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ConnCacheManagerTest { - - @Test - @DisplayName("customTest") - public void customTest() { - - CacheManager cacheManager = ConnCacheManager.custom(); - Assertions.assertNotNull(cacheManager); - } - - @Test - @DisplayName("buildCacheTest") - public void buildCacheTest() { - - CacheManager cacheManager = ConnCacheManager.custom(); - Cache cache = - cacheManager.buildCache( - "key", - notification -> { - assert notification.getValue() != null; - }); - Assertions.assertNotNull(cache); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java deleted file mode 100644 index e0e8fcdb0a..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.metadata.query.common.exception; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class MetaMethodInvokeExceptionTest { - - @Test - @DisplayName("metaMethodInvokeExceptionTest") - public void metaMethodInvokeExceptionTest() { - String errorMsg = "Load meta service for mysql ail load [mysql] metadata service failed"; - MetaMethodInvokeException exception = - new MetaMethodInvokeException(500, errorMsg, new Exception()); - Assertions.assertEquals(errorMsg, exception.getDesc()); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java deleted file mode 100644 index 437e63842d..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.metadata.query.common.exception; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class MetaRuntimeExceptionTest { - - @Test - @DisplayName("metaRuntimeExceptionTest") - public void metaRuntimeExceptionTest() { - - String errorMsg = "Cannot find the keytab file in connect parameters"; - MetaRuntimeException exception = new MetaRuntimeException(errorMsg, new Exception()); - Assertions.assertEquals(errorMsg, exception.getDesc()); - } -} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml index 21705e23f9..3f3bce601c 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml @@ -26,16 +26,10 @@ linkis-metadata-query-server - - - org.apache.linkis - linkis-metadata-query-common - ${project.version} - org.apache.linkis - linkis-datasource-manager-common + linkis-pes-common ${project.version} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml index ec0e6daea8..fa6e381384 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/elasticsearch/pom.xml @@ -33,7 +33,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml index fc10752cf9..3e4bbd319c 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hdfs/pom.xml @@ -29,7 +29,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml index 4247acd8f4..311e59f596 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/hive/pom.xml @@ -34,7 +34,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided @@ -47,7 +47,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml index 8555623f2b..669a772f1d 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml @@ -33,7 +33,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml index 720e38129a..1cf433c847 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/kafka/pom.xml @@ -28,7 +28,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided @@ -41,7 +41,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} provided diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml index a040b09ff1..1546587310 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mongodb/pom.xml @@ -29,7 +29,7 @@ org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} provided diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml index a6a138f675..3c46c985c0 100644 --- a/linkis-public-enhancements/linkis-datasource/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/pom.xml @@ -27,9 +27,7 @@ linkis-datasource pom - linkis-datasource-manager/common linkis-datasource-manager/server - linkis-metadata-query/common linkis-metadata-query/service/elasticsearch linkis-metadata-query/service/hive linkis-metadata-query/service/kafka @@ -37,6 +35,5 @@ linkis-metadata-query/service/hdfs linkis-metadata-query/service/mongodb linkis-metadata-query/server - linkis-datasource-client diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml b/linkis-public-enhancements/linkis-error-code-server/pom.xml similarity index 94% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml rename to linkis-public-enhancements/linkis-error-code-server/pom.xml index 8c17af97ad..ecd62417ea 100644 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml +++ b/linkis-public-enhancements/linkis-error-code-server/pom.xml @@ -21,7 +21,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-error-code-server @@ -29,7 +29,7 @@ org.apache.linkis - linkis-error-code-common + linkis-pes-common ${project.version} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java b/linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java rename to linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/ErrorCodeServer.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java b/linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java rename to linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapper.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java b/linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java rename to linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/restful/LinkisErrorCodeRestful.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java b/linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java rename to linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/LinkisErrorCodeService.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java b/linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java rename to linkis-public-enhancements/linkis-error-code-server/src/main/java/org/apache/linkis/errorcode/server/service/impl/LinkisErrorCodeServiceImpl.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml b/linkis-public-enhancements/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml rename to linkis-public-enhancements/linkis-error-code-server/src/main/resources/mapper/common/ErrorCodeMapper.xml diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java b/linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java rename to linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/Scan.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java b/linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java rename to linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java b/linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java rename to linkis-public-enhancements/linkis-error-code-server/src/test/java/org/apache/linkis/errorcode/server/dao/ErrorCodeMapperTest.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-error-code-server/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-error-code-server/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-error-code-server/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/create.sql rename to linkis-public-enhancements/linkis-error-code-server/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/data.sql b/linkis-public-enhancements/linkis-error-code-server/src/test/resources/data.sql similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/data.sql rename to linkis-public-enhancements/linkis-error-code-server/src/test/resources/data.sql diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-error-code-server/src/test/resources/linkis.properties similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-server/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-error-code-server/src/test/resources/linkis.properties diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml deleted file mode 100644 index d532ca2464..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/pom.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-error-code-client - - - - - org.apache.linkis - linkis-error-code-common - ${project.version} - - - - org.apache.linkis - linkis-gateway-httpclient-support - ${project.version} - - - - com.google.code.gson - gson - - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - - diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java deleted file mode 100644 index 982a53d78d..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ClientConfigurationTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ClientConfigurationTest { - - @Test - @DisplayName("commonConstTest") - public void commonConstTest() { - - String linkisGatewayUrl = ClientConfiguration.LINKIS_GATEWAY_URL.getValue(); - String errorCodeUrlPrefix = ClientConfiguration.ERRORCODE_URL_PREFIX.getValue(); - String errorCodeGetUrl = ClientConfiguration.ERRORCODE_GET_URL.getValue(); - Long defaultConnectTimeOut = ClientConfiguration.DEFAULT_CONNECT_TIME_OUT.getValue(); - Long defaultReadTimeOut = ClientConfiguration.DEFAULT_READ_TIME_OUT.getValue(); - String authTokenValue = ClientConfiguration.AUTH_TOKEN_VALUE.getValue(); - Long futureTimeOut = ClientConfiguration.FUTURE_TIME_OUT.getValue(); - - Assertions.assertNotNull(linkisGatewayUrl); - Assertions.assertNotNull(errorCodeUrlPrefix); - Assertions.assertNotNull(errorCodeGetUrl); - Assertions.assertTrue(defaultConnectTimeOut.longValue() == 600000L); - Assertions.assertTrue(defaultReadTimeOut == 600000L); - Assertions.assertNotNull(authTokenValue); - Assertions.assertTrue(futureTimeOut.longValue() == 2000L); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java deleted file mode 100644 index 9f7b5dd811..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilderTest.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ErrorCodeClientBuilderTest { - - @Test - @DisplayName("buildTest") - public void buildTest() { - - LinkisErrorCodeClient linkisErrorCodeClient = new ErrorCodeClientBuilder().build(); - Assertions.assertNotNull(linkisErrorCodeClient); - } - - @Test - @DisplayName("setVersionTest") - public void setVersionTest() { - String version = "v2"; - LinkisErrorCodeClient linkisErrorCodeClient = - new ErrorCodeClientBuilder().setVersion(version).build(); - Assertions.assertNotNull(linkisErrorCodeClient); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java deleted file mode 100644 index 25a8119bac..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClientTest.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client; - -import org.apache.linkis.errorcode.client.action.ErrorCodeGetAllAction; -import org.apache.linkis.errorcode.common.LinkisErrorCode; -import org.apache.linkis.httpclient.dws.DWSHttpClient; - -import java.util.List; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; - -public class LinkisErrorCodeClientTest { - - @Test - @DisplayName("getErrorCodesFromServerTest") - public void getErrorCodesFromServerTest() { - - // Simulated pile driving - DWSHttpClient dwsHttpClient = Mockito.mock(DWSHttpClient.class); - Mockito.when(dwsHttpClient.execute(Mockito.any(ErrorCodeGetAllAction.class))).thenReturn(null); - LinkisErrorCodeClient linkisErrorCodeClient = new LinkisErrorCodeClient(dwsHttpClient); - List codes = linkisErrorCodeClient.getErrorCodesFromServer(); - Assertions.assertTrue(codes.size() == 0); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java deleted file mode 100644 index 0c13104660..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandlerTest.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.handler; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ErrorCodeHandlerTest { - - @Test - @DisplayName("constTest") - public void constTest() { - String errorCodePre = ErrorCodeHandler.ERROR_CODE_PRE; - String errorCodeOk = ErrorCodeHandler.ERROR_CODE_OK; - String errorCodeFailed = ErrorCodeHandler.ERROR_CODE_FAILED; - - Assertions.assertNotNull(errorCodePre); - Assertions.assertNotNull(errorCodeOk); - Assertions.assertNotNull(errorCodeFailed); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java deleted file mode 100644 index 8e4d14872d..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandlerTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.handler; - -import org.apache.linkis.errorcode.common.ErrorCode; - -import java.util.List; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisErrorCodeHandlerTest { - - @Test - @DisplayName("getInstanceTest") - public void getInstanceTest() { - - LinkisErrorCodeHandler instance = LinkisErrorCodeHandler.getInstance(); - Assertions.assertNotNull(instance); - } - - @Test - @DisplayName("handleTest") - public void handleTest() { - - String log = - "60001,Session creation failed. The ide queue does not exist. Please check whether the queue settings are correct"; - LinkisErrorCodeHandler instance = LinkisErrorCodeHandler.getInstance(); - List errorCodes = instance.handle(log); - Assertions.assertNotNull(errorCodes); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java deleted file mode 100644 index d1664e8f04..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManagerTest.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.manager; - -import org.apache.linkis.errorcode.common.LinkisErrorCode; - -import java.util.List; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisErrorCodeManagerTest { - - @Test - @DisplayName("getInstanceTest") - public void getInstanceTest() { - - LinkisErrorCodeManager instance = LinkisErrorCodeManager.getInstance(); - Assertions.assertNotNull(instance); - } - - @Test - @DisplayName("getLinkisErrorCodesTest") - public void getLinkisErrorCodesTest() { - - List errorCodes = LinkisErrorCodeManager.getInstance().getLinkisErrorCodes(); - Assertions.assertTrue(errorCodes.size() == 1); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java deleted file mode 100644 index 097d57105a..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizerTest.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.synchronizer; - -import org.apache.linkis.errorcode.common.LinkisErrorCode; - -import java.util.List; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class LinkisErrorCodeSynchronizerTest { - - @Test - @DisplayName("getInstanceTest") - public void getInstanceTest() { - - LinkisErrorCodeSynchronizer instance = LinkisErrorCodeSynchronizer.getInstance(); - Assertions.assertNotNull(instance); - } - - @Test - @DisplayName("synchronizeErrorCodesTest") - public void synchronizeErrorCodesTest() { - - List errorCodes = - LinkisErrorCodeSynchronizer.getInstance().synchronizeErrorCodes(); - Assertions.assertTrue(errorCodes.size() == 1); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala deleted file mode 100644 index 331acdc198..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeActionTest.scala +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.action - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class ErrorCodeActionTest { - - @Test - @DisplayName("constTest") - def constTest(): Unit = { - - val errorCodeAction = ErrorCodeGetAllAction() - val url = errorCodeAction.getURL - val user = errorCodeAction.getUser - val urlPrefix = errorCodeAction.urlPrefix - val allUrlSuffix = errorCodeAction.getAllUrlSuffix - - Assertions.assertNotNull(url) - Assertions.assertNotNull(urlPrefix) - Assertions.assertNotNull(allUrlSuffix) - Assertions.assertEquals("hadoop", user) - - } - -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeMatcherTest.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeMatcherTest.scala deleted file mode 100644 index 192558df18..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/test/scala/org/apache/linkis/errorcode/client/action/ErrorCodeMatcherTest.scala +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.client.action - -import org.apache.linkis.errorcode.client.utils.ErrorCodeMatcher -import org.apache.linkis.errorcode.common.LinkisErrorCode - -import java.util - -import org.junit.jupiter.api -import org.junit.jupiter.api.{Assertions, DisplayName} - -class ErrorCodeMatcherTest { - - @api.Test - @DisplayName("errorMatchTest") - def errorMatchTest(): Unit = { - val errorCodes = new util.ArrayList[LinkisErrorCode] - errorCodes.add(new LinkisErrorCode("01105", "机器内存不足，请联系管理员扩容", "Cannot allocate memory", 0)) - val test = ErrorCodeMatcher.errorMatch(errorCodes, "Cannot allocate memory") - if (test.isDefined) { - val errorDesc = test.get._2 - Assertions.assertEquals("机器内存不足，请联系管理员扩容", errorDesc) - } - } - -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml deleted file mode 100644 index f55fea97fb..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-error-code-common - - - - org.apache.linkis - linkis-common - ${project.version} - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - - diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java deleted file mode 100644 index 4459468a8a..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.common; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class CommonConfTest { - - @Test - @DisplayName("constTest") - public void constTest() { - - String errorcodeUrl = CommonConf.GET_ERRORCODE_URL; - Assertions.assertEquals("getAllErrorCodes", errorcodeUrl); - } -} diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala b/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala deleted file mode 100644 index 6e82f0ebcc..0000000000 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.errorcode.common - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class LinkisErrorCodeTest { - - @Test - @DisplayName("linkisErrorCodeTest") - def linkisErrorCodeTest(): Unit = { - val errorCode = new LinkisErrorCode( - "11000", - "Failed to get datasource info from datasource server(从数据源服务器获取数据源信息失败)" - ) - Assertions.assertEquals("11000", errorCode.getErrorCode) - - } - -} diff --git a/linkis-public-enhancements/linkis-error-code/pom.xml b/linkis-public-enhancements/linkis-error-code/pom.xml deleted file mode 100644 index bf346ac592..0000000000 --- a/linkis-public-enhancements/linkis-error-code/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../pom.xml - - - linkis-error-code - - pom - - - - linkis-error-code-client - linkis-error-code-common - linkis-error-code-server - - - - diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml b/linkis-public-enhancements/linkis-instance-label-server/pom.xml similarity index 97% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml rename to linkis-public-enhancements/linkis-instance-label-server/pom.xml index cfcf5ab9b4..8802a4fea6 100644 --- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/pom.xml +++ b/linkis-public-enhancements/linkis-instance-label-server/pom.xml @@ -21,7 +21,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-instance-label-server diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/InsLabelAutoConfiguration.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/AsyncConsumerQueue.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/async/GenericAsyncConsumerQueue.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/cache/InsLabelCacheConfiguration.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/conf/InsLabelConf.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InsLabelRelationDao.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceInfoDao.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/dao/InstanceLabelDao.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabel.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InsPersistenceLabelValue.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/entity/InstanceInfo.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/errorcode/LinkisInstanceLabelErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/exception/InstanceErrorException.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/restful/InstanceRestful.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelAccessService.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelService.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/InsLabelServiceAdapter.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/annotation/AdapterMode.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelService.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceAdapter.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/service/impl/SpringInsLabelService.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/utils/EntityParser.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InsPersistenceLabelSearchVo.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java b/linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java rename to linkis-public-enhancements/linkis-instance-label-server/src/main/java/org/apache/linkis/instance/label/vo/InstanceInfoVo.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InsLabelRelationMapper.xml diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InstanceInfoMapper.xml diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml b/linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml rename to linkis-public-enhancements/linkis-instance-label-server/src/main/resources/mapper/common/InstanceLabelMapper.xml diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala rename to linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/InsLabelRpcService.scala diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala b/linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala rename to linkis-public-enhancements/linkis-instance-label-server/src/main/scala/org/apache/linkis/instance/label/service/rpc/DefaultInsLabelRpcService.scala diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/Scan.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InsLabelRelationDaoTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceInfoDaoTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/dao/InstanceLabelDaoTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/service/impl/DefaultInsLabelServiceTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java b/linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java rename to linkis-public-enhancements/linkis-instance-label-server/src/test/java/org/apache/linkis/instance/label/utils/EntityParserTest.java diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-instance-label-server/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-instance-label-server/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql b/linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-server/src/test/resources/create.sql rename to linkis-public-enhancements/linkis-instance-label-server/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml b/linkis-public-enhancements/linkis-pes-client/pom.xml similarity index 93% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml rename to linkis-public-enhancements/linkis-pes-client/pom.xml index 4089111c31..f206b8b35d 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml +++ b/linkis-public-enhancements/linkis-pes-client/pom.xml @@ -6,9 +6,9 @@ ~ The ASF licenses this file to You under the Apache License, Version 2.0 ~ (the "License"); you may not use this file except in compliance with ~ the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,10 +21,10 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml - linkis-bml-client + linkis-pes-client 4.4 @@ -33,7 +33,7 @@ org.apache.linkis - linkis-bml-common + linkis-pes-common ${project.version} @@ -53,7 +53,6 @@ linkis-gateway-httpclient-support ${project.version} - diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/AbstractBmlClient.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClient.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/BmlClientFactory.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/bml/client/errorcode/BmlClientErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/AbstractContextClient.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/Context.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/Context.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/Context.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/Context.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/ContextClient.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisContext.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/LinkisWorkFlowContext.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientConfig.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/ContextClientFactory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/builder/HttpContextClientConfig.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/errorcode/CsClientErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/ContextPostActionBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpContextClient.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/http/HttpHeartBeater.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerBus.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextClientListenerManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextIDListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextKeyListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/ContextUpdateEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/listener/HeartBeater.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSMetaDataService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSNodeServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResourceService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSResultDataServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSTableService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSVariableService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/CSWorkServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ContextHistoryClientServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/DefaultSearchService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/LinkisJobDataServiceImpl.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/MetaDataService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/ResourceService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/SearchService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/TableService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/service/VariableService.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ContextServiceUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/ExceptionHelper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/cs/client/utils/SerializeHelper.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/datasource/client/errorcode/DatasourceClientErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ClientConfiguration.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/ErrorCodeClientBuilder.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/LinkisErrorCodeClient.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ErrorCodeHandler.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/ExceptionErrorCodeHandler.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeFactory.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LinkisErrorCodeHandler.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogErrorCodeHandler.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/handler/LogFileErrorCodeHandler.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/manager/LinkisErrorCodeManager.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/synchronizer/LinkisErrorCodeSynchronizer.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java b/linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java rename to linkis-public-enhancements/linkis-pes-client/src/main/java/org/apache/linkis/errorcode/client/utils/Test.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala similarity index 98% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala index be251d3b23..258b3feb9b 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/client/impl/HttpBmlClient.scala @@ -137,15 +137,6 @@ class HttpBmlClient( if (version != null) bmlDownloadAction.getParameters.asScala += "version" -> version bmlDownloadAction.setUser(user) val downloadResult = dwsClient.execute(bmlDownloadAction) - // val retIs = new ByteArrayInputStream(IOUtils.toString(bmlDownloadAction.getInputStream).getBytes("UTF-8")) - // if (downloadResult != null) { - // bmlDownloadAction.getResponse match { - // case r: CloseableHttpResponse => - // Utils.tryAndWarn(r.close()) - // case o: Any => - // info(s"Download response : ${o.getClass.getName} cannot close.") - // } - // } BmlDownloadResponse( isSuccess = true, bmlDownloadAction.getInputStream, diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/common/POSTActionFailException.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala similarity index 96% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala index 0f7d1e0d77..36ee0a8cc2 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/conf/BmlConfiguration.scala @@ -17,7 +17,7 @@ package org.apache.linkis.bml.conf -import org.apache.linkis.common.conf.{CommonVars, Configuration} +import org.apache.linkis.common.conf.CommonVars object BmlConfiguration { diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/http/HttpConf.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/request/BmlPOSTAction.scala diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/bml/response/BmlResult.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextAction.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/http/ContextResult.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala similarity index 91% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala index 73550855dd..21b9bdef88 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientConf.scala @@ -28,7 +28,11 @@ object ContextClientConf { CommonVars[String]("wds.linkis.context.client.auth.value", "LINKIS-AUTH-eTaYLbQpmIulPyrXcMl") val URL_PREFIX: CommonVars[String] = - CommonVars[String]("wds.linkis.cs.url.prefix", "/api/rest_j/v1/contextservice", "cs服务的url前缀") + CommonVars[String]( + "wds.linkis.cs.url.prefix", + "/api/rest_j/v1/contextservice", + "The url prefix of the cs service." + ) val HEART_BEAT_ENABLED: CommonVars[String] = CommonVars[String]("wds.linkis.cs.heartbeat.enabled", "true") diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextClientUtils.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/cs/client/utils/ContextServerHttpConf.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/AbstractRemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/DataSourceRemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/MetaDataRemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/RemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala similarity index 96% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala index e599b6e320..3c45a5a2d4 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/config/DatasourceClientConfig.scala @@ -17,7 +17,7 @@ package org.apache.linkis.datasource.client.config -import org.apache.linkis.common.conf.{CommonVars, Configuration} +import org.apache.linkis.common.conf.CommonVars object DatasourceClientConfig { diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/exception/DataSourceClientBuilderException.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisDataSourceRemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/impl/LinkisMetaDataRemoteClient.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/CreateDataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DataSourceTestConnectAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/DeleteDataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/ExpireDataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetAllDataSourceTypesAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceIdAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetConnectParamsByDataSourceNameAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetDataSourceVersionsAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceIdAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoByDataSourceNameAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetInfoPublishedByDataSourceNameAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/GetKeyTypeDatasourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala similarity index 93% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala index ae912d17f4..4184e52e4b 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetColumnsAction.scala @@ -120,6 +120,11 @@ object MetadataGetColumnsAction { metadataGetColumnsAction.database = this.database metadataGetColumnsAction.table = this.table metadataGetColumnsAction.setParameter("system", system) + if (StringUtils.isNotBlank(dataSourceName)) { + metadataGetColumnsAction.setParameter("dataSourceName", dataSourceName) + metadataGetColumnsAction.setParameter("database", database) + metadataGetColumnsAction.setParameter("table", table) + } metadataGetColumnsAction.setUser(user) metadataGetColumnsAction } diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala similarity index 96% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala index 53df5e331f..f20cd57fce 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetDatabasesAction.scala @@ -94,6 +94,9 @@ object MetadataGetDatabasesAction { metadataGetDatabasesAction.dataSourceId = this.dataSourceId metadataGetDatabasesAction.dataSourceName = this.dataSourceName metadataGetDatabasesAction.setParameter("system", system) + if (StringUtils.isNotBlank(dataSourceName)) { + metadataGetDatabasesAction.setParameter("dataSourceName", dataSourceName) + } metadataGetDatabasesAction.setUser(user) metadataGetDatabasesAction } diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetPartitionsAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablePropsAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala similarity index 94% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala index d2079bab46..adbe01478b 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/MetadataGetTablesAction.scala @@ -103,6 +103,10 @@ object MetadataGetTablesAction { metadataGetTablesAction.dataSourceName = this.dataSourceName metadataGetTablesAction.database = this.database metadataGetTablesAction.setParameter("system", system) + if (StringUtils.isNotBlank(dataSourceName)) { + metadataGetTablesAction.setParameter("dataSourceName", dataSourceName) + metadataGetTablesAction.setParameter("database", database) + } metadataGetTablesAction.setUser(user) metadataGetTablesAction } diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/PublishDataSourceVersionAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/QueryDataSourceEnvAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/request/UpdateDataSourceParameterAction.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/CreateDataSourceResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DataSourceTestConnectResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/DeleteDataSourceResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/ExpireDataSourceResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetAllDataSourceTypesResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala similarity index 98% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala index 37c346716b..bcfe5211cf 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceIdResult.scala @@ -22,7 +22,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult import scala.beans.BeanProperty -@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\S+)/connect-params") +@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/(\\d+)/connect-params") class GetConnectParamsByDataSourceIdResult extends DWSResult { @BeanProperty var connectParams: java.util.Map[String, Any] = _ } diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetConnectParamsByDataSourceNameResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetDataSourceVersionsResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala similarity index 99% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala index 4fcf865c08..be63623dff 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceIdResult.scala @@ -24,7 +24,7 @@ import org.apache.linkis.httpclient.dws.response.DWSResult import scala.beans.BeanProperty -@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\S+)") +@DWSHttpMessageResult("/api/rest_j/v\\d+/data-source-manager/info/(\\d+)") class GetInfoByDataSourceIdResult extends DWSResult { @BeanProperty var info: java.util.Map[String, Any] = _ diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoByDataSourceNameResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetInfoPublishedByDataSourceNameResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/GetKeyTypeDatasourceResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetColumnsResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetDatabasesResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetPartitionsResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala similarity index 97% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala index ac79a3638b..d2ee1092c3 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala +++ b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablePropsResult.scala @@ -25,7 +25,7 @@ import java.util import scala.beans.BeanProperty @DWSHttpMessageResult( - "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTableProp|props)(\\S+/db/\\S+/table/\\S+)?" + "/api/rest_j/v\\d+/(metadataQuery|metadatamanager)/(getTableProps|props)(\\S+/db/\\S+/table/\\S+)?" ) class MetadataGetTablePropsResult extends DWSResult { @BeanProperty var props: util.Map[String, String] = _ diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/MetadataGetTablesResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/PublishDataSourceVersionResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceEnvResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/QueryDataSourceResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceParameterResult.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/datasource/client/response/UpdateDataSourceResult.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/action/ErrorCodeAction.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/result/ErrorCodeResult.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/errorcode/client/utils/ErrorCodeMatcher.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientFactory.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/WorkspaceClientImpl.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLAction.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/action/WorkspacePOSTAction.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConf.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceClient.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/request/WorkspaceHttpConf.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponse.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/response/WorkspaceResponse.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/AbstractWorkspaceResult.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptFromBMLResult.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala b/linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala rename to linkis-public-enhancements/linkis-pes-client/src/main/scala/org/apache/linkis/filesystem/result/ScriptToBMLResult.scala diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml b/linkis-public-enhancements/linkis-pes-common/pom.xml similarity index 80% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml rename to linkis-public-enhancements/linkis-pes-common/pom.xml index 087d48a17b..264eb1fa67 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml +++ b/linkis-public-enhancements/linkis-pes-common/pom.xml @@ -6,9 +6,9 @@ ~ The ASF licenses this file to You under the Apache License, Version 2.0 ~ (the "License"); you may not use this file except in compliance with ~ the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,10 +21,10 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml - linkis-cs-client + linkis-pes-common @@ -34,22 +34,22 @@ provided + + javax.validation + validation-api + 2.0.1.Final + + org.apache.linkis - linkis-gateway-httpclient-support + linkis-protocol ${project.version} - - - org.apache.linkis - linkis-storage - - + provided - org.apache.linkis - linkis-cs-listener - ${project.version} + org.apache.commons + commons-text @@ -57,7 +57,6 @@ gson provided - diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/bml/model/AbstractAuditable.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/annotation/KeywordMethod.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/CSResultData.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/Data.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/JobData.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/data/LinkisJobData.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextScope.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ContextType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/DBType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/ExpireType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/enumeration/WorkType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/Env.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/OSEnv.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftWareEnv.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/env/SoftwareLibEnv.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/AbstractContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/CommonResourceHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ContextHistoryIndexer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/EnvContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/GlobalPropertyContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/KeywordContextHistroy.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/ResourceContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableLineageHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/CSTableMetadataContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/DBMetadataContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/MetadataContextHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableLineageHistory.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/history/metadata/TableOperationType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextIDListenerDomain.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/CommonContextKeyListenerDomain.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextIDListenerDomain.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ContextKeyListenerDomain.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/listener/ListenerDomain.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSColumn.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSDB.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSPartition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/CSTable.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Column.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/DB.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Partition.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/metadata/Table.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSFlowInfos.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSInfos.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CSProperty.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonGlobalConfiguration.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/CommonProperty.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/object/LinkisVariable.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/BMLResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonFxResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/CommonUDFResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/FxResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/LinkisBMLResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/Resource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/resource/UDFResource.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CombinedNodeIDContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CommonHAContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextIDParser.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextKeyValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ContextValue.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/CreatorContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/HAContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisHAWorkFlowContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/LinkisWorkflowContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/OrderContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/Source.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/UserContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/ValueBean.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/VersionContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/WorkflowContextID.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/entity/source/YMLContextKey.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSErrorException.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/CSWarnException.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/exception/ErrorCode.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextIDListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/listener/ContextKeyListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHTTPConstant.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextHistoryType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextIDType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextKeyValueType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/protocol/ContextValueType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/search/ContextSearchConditionMapBuilder.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/AbstractSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/ContextSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/AbstractSerializationHelper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/helper/SerializationHelper.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextKeyValueSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/ContextValueSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/context/LinkisHAWorkFlowContextIDSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonHistorySerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/CommonResourceHistorySerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableLineageSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/history/metadata/CSTableMetadataHistorySerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/serialize/impl/value/object/LinkisVariableSerializer.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSCommonUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtils.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-listener/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/DataSources.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/ServiceErrorCode.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/auth/AuthContext.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSource.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceEnv.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParamKeyDefinition.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceParameter.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DataSourceType.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/domain/DatasourceVersion.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/errorcode/LinkisDatasourceManagerErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/exception/JsonErrorException.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java similarity index 98% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java index f0da052731..26d1a93ba0 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoQueryRequest.java @@ -19,7 +19,7 @@ import org.apache.linkis.protocol.message.RequestProtocol; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; public class DsInfoQueryRequest implements RequestProtocol { private String id; diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/protocol/DsInfoResponse.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/CryptoUtils.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/PatternInjectUtils.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/datasourcemanager/common/util/json/Json.java diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/errorcode/common/CommonConf.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/MdmConfiguration.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheManager.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManager.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java similarity index 92% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java index 1a6c838685..ee565708bb 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java @@ -32,6 +32,15 @@ public class MetaColumnInfo implements Serializable { private String type; private int length; private String colComment; + private boolean isNullable; + + public boolean isNullable() { + return isNullable; + } + + public void setNullable(boolean nullable) { + isNullable = nullable; + } public String getColComment() { return colComment; diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaPartitionInfo.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/errorcode/LinkisMetadataQueryErrorCodeSummary.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeException.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeException.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractCacheMetaService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractDbMetaService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/AbstractFsMetaService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/BaseMetadataService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataConnection.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataDbService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/MetadataFsService.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFManager.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFTree.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/entity/UDFVersion.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/excepiton/UDFException.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/utils/ConstantVar.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/DownloadVo.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFAddVo.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFInfoVo.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFUpdateVo.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/udf/vo/UDFVersionVo.java diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala similarity index 100% rename from linkis-public-enhancements/linkis-bml/linkis-bml-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/bml/protocol/BmlProtocol.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/AbstractErrorCode.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/ErrorCode.scala diff --git a/linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/errorcode/common/LinkisErrorCode.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataOperateProtocol.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataProtocol.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/metadata/query/common/protocol/MetadataQueryProtocol.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfIds.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/RequestUdfTree.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfTree.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala b/linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala rename to linkis-public-enhancements/linkis-pes-common/src/main/scala/org/apache/linkis/udf/api/rpc/ResponseUdfs.scala diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml b/linkis-public-enhancements/linkis-pes-rpc-client/pom.xml similarity index 86% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml rename to linkis-public-enhancements/linkis-pes-rpc-client/pom.xml index 9c4add9a3c..2d9e98a58d 100644 --- a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/pom.xml +++ b/linkis-public-enhancements/linkis-pes-rpc-client/pom.xml @@ -6,9 +6,9 @@ ~ The ASF licenses this file to You under the Apache License, Version 2.0 ~ (the "License"); you may not use this file except in compliance with ~ the License. You may obtain a copy of the License at - ~ + ~ ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ + ~ ~ Unless required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,12 +21,19 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml - linkis-instance-label-client + linkis-pes-rpc-client + + + org.apache.linkis + linkis-pes-common + ${project.version} + + org.apache.linkis linkis-rpc @@ -39,9 +46,7 @@ linkis-label-common ${project.version} - - diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/InstanceLabelClient.scala diff --git a/linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-instance-label/linkis-instance-label-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/instance/label/client/SpringCloudInstanceLabelClient.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClient.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala rename to linkis-public-enhancements/linkis-pes-rpc-client/src/main/scala/org/apache/linkis/udf/UDFClientConfiguration.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala b/linkis-public-enhancements/linkis-pes-rpc-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala rename to linkis-public-enhancements/linkis-pes-rpc-client/src/test/scala/org/apache/linkis/udf/UDFClientConfigurationTest.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml deleted file mode 100644 index 68a6469255..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/pom.xml +++ /dev/null @@ -1,61 +0,0 @@ - - - - 4.0.0 - - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - - linkis-storage-script-dev-client - - - 4.4 - - - - - org.apache.linkis - linkis-common - ${project.version} - - - org.apache.linkis - linkis-gateway-httpclient-support - ${project.version} - - - - com.google.code.gson - gson - - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala deleted file mode 100644 index c284a14c33..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientFactoryTest.scala +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.filesystem - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class WorkspaceClientFactoryTest { - - @Test - @DisplayName("getClientTest") - def getClientTest(): Unit = { - - val user = "hadoop" - val token = "abc" - val gatewayAddress = "127.0.0.1:9001" - - val client = WorkspaceClientFactory.getClient(user, token, gatewayAddress) - Assertions.assertNotNull(client) - } - -} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala deleted file mode 100644 index 83408ed7e8..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/WorkspaceClientImplTest.scala +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.filesystem - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class WorkspaceClientImplTest { - - @Test - @DisplayName("createObject") - def createObject(): Unit = { - - val user = "hadoop" - val token = "abc" - val gatewayAddress = "127.0.0.1:9001" - - val client = new WorkspaceClientImpl(user, token, gatewayAddress) - Assertions.assertNotNull(client) - } - -} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala deleted file mode 100644 index 5b5d6cc323..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/action/OpenScriptFromBMLActionTest.scala +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.filesystem.action - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class OpenScriptFromBMLActionTest { - - @Test - @DisplayName("commonConstTest") - def commonConstTest(): Unit = { - val user = "hadoop" - val action = new OpenScriptFromBMLAction - action.setUser(user) - - Assertions.assertEquals(user, action.getUser) - Assertions.assertNotNull(action.getURL) - } - -} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala deleted file mode 100644 index 312c1f27d7..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/conf/WorkspaceClientConfTest.scala +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.filesystem.conf - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class WorkspaceClientConfTest { - - @Test - @DisplayName("commonConstTest") - def commonConstTest(): Unit = { - - val gateway = WorkspaceClientConf.gateway - val prefix = WorkspaceClientConf.prefix - val scriptFromBML = WorkspaceClientConf.scriptFromBML - val dwsVersion = WorkspaceClientConf.dwsVersion - val tokenKey = WorkspaceClientConf.tokenKey - val tokenValue = WorkspaceClientConf.tokenValue - val scriptFromBMLUrl = WorkspaceClientConf.scriptFromBMLUrl - - Assertions.assertEquals("", gateway) - Assertions.assertNotNull(prefix) - Assertions.assertNotNull(scriptFromBML) - Assertions.assertEquals("v1", dwsVersion) - Assertions.assertNotNull(tokenKey) - Assertions.assertNotNull(tokenValue) - Assertions.assertNotNull(scriptFromBMLUrl) - } - -} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala deleted file mode 100644 index c4e9e386cb..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-client/src/test/scala/org/apache/linkis/filesystem/response/ScriptFromBMLResponseTest.scala +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.filesystem.response - -import org.junit.jupiter.api.{Assertions, DisplayName, Test} - -class ScriptFromBMLResponseTest { - - @Test - @DisplayName("commonConst") - def commonConst(): Unit = { - val scriptContent = "show databases;" - val response = new ScriptFromBMLResponse( - scriptContent, - new java.util.HashMap[String, java.util.Map[String, Object]] - ) - - Assertions.assertEquals(scriptContent, response.scriptContent) - Assertions.assertTrue(response.metadata.size() == 0) - - } - -} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log b/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log deleted file mode 100644 index 153f737caf..0000000000 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/info.log +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. -*/ -2022-09-18 01:03:35.133 INFO [SpringContextShutdownHook] com.netflix.discovery.DiscoveryClient 935 shutdown - Shutting down DiscoveryClient ... -2022-09-18 01:03:38.135 INFO [SpringContextShutdownHook] com.netflix.discovery.DiscoveryClient 971 unregister - Unregistering ... -2022-09-18 01:03:38.138 INFO [SpringContextShutdownHook] com.netflix.discovery.DiscoveryClient 973 unregister - DiscoveryClient_LINKIS-CG-ENGINECONN/bd210:linkis-cg-engineconn:43115 - deregister status: 200 diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml b/linkis-public-enhancements/linkis-storage-script-dev-server/pom.xml similarity index 96% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml rename to linkis-public-enhancements/linkis-storage-script-dev-server/pom.xml index d69164b3fd..bb2f598681 100644 --- a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/pom.xml +++ b/linkis-public-enhancements/linkis-storage-script-dev-server/pom.xml @@ -22,7 +22,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-storage-script-dev-server jar @@ -31,7 +31,7 @@ org.apache.linkis - linkis-bml-client + linkis-pes-client ${project.version} diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/LinkisPublicServiceApp.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/conf/WorkSpaceConfiguration.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/constant/WorkSpaceConstants.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/DirFileTree.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/entity/LogLevel.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkSpaceException.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManager.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApi.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/restful/api/FsRestfulApi.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/java/org/apache/linkis/filesystem/util/WorkspaceUtil.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/bml/BMLHelper.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/cache/FsCache.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/conf/WorkspaceSpringConfiguration.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/entity/FSInfo.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/quartz/FSQuartz.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/service/FsService.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/utils/UserGroupInfo.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/main/scala/org/apache/linkis/filesystem/validator/PathValidator.scala diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/Scan.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/conf/WorkSpaceConfigurationTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/constant/WorkSpaceConstantsTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkSpaceExceptionTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/exception/WorkspaceExceptionManagerTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/BMLFsRestfulApiTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/restful/api/FsRestfulApiTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/java/org/apache/linkis/filesystem/util/WorkspaceUtilTest.java diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/deleteFile.sql diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/existsSql.sql b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/existsSql.sql similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/existsSql.sql rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/existsSql.sql diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/linkis.properties similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/linkis.properties diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/query.sql b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/query.sql similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/resources/query.sql rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/resources/query.sql diff --git a/linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala b/linkis-public-enhancements/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala similarity index 100% rename from linkis-public-enhancements/linkis-script-dev/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala rename to linkis-public-enhancements/linkis-storage-script-dev-server/src/test/scala/org/apache/linkis/filesystem/entity/FSInfoTest.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml b/linkis-public-enhancements/linkis-udf-service/pom.xml similarity index 97% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml rename to linkis-public-enhancements/linkis-udf-service/pom.xml index fd45ce7d9e..4c3a87f7bd 100644 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml +++ b/linkis-public-enhancements/linkis-udf-service/pom.xml @@ -22,7 +22,7 @@ org.apache.linkis linkis ${revision} - ../../../pom.xml + ../../pom.xml linkis-udf-service jar @@ -35,7 +35,7 @@ org.apache.linkis - linkis-udf-common + linkis-pes-client ${project.version} diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/api/UDFRestfulApi.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFDao.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFTreeDao.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/dao/UDFVersionDao.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFService.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/UDFTreeService.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFServiceImpl.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java b/linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java rename to linkis-public-enhancements/linkis-udf-service/src/main/java/org/apache/linkis/udf/service/impl/UDFTreeServiceImpl.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFDao.xml diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFTreeDao.xml diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml b/linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml rename to linkis-public-enhancements/linkis-udf-service/src/main/resources/mapper/common/UDFVersionDao.xml diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiver.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/api/rpc/UdfReceiverChooser.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala b/linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala rename to linkis-public-enhancements/linkis-udf-service/src/main/scala/org/apache/linkis/udf/utils/UdfConfiguration.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/Scan.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/api/UDFRestfulApiTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/BaseDaoTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFDaoTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFTreeDaoTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/dao/UDFVersionDaoTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFServiceTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java b/linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java rename to linkis-public-enhancements/linkis-udf-service/src/test/java/org/apache/linkis/udf/service/UDFTreeServiceTest.java diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties b/linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/application.properties rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/application.properties diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create.sql b/linkis-public-enhancements/linkis-udf-service/src/test/resources/create.sql similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/create.sql rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/create.sql diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/data.sql b/linkis-public-enhancements/linkis-udf-service/src/test/resources/data.sql similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/data.sql rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/data.sql diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/linkis.properties b/linkis-public-enhancements/linkis-udf-service/src/test/resources/linkis.properties similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/resources/linkis.properties rename to linkis-public-enhancements/linkis-udf-service/src/test/resources/linkis.properties diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala b/linkis-public-enhancements/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala rename to linkis-public-enhancements/linkis-udf-service/src/test/scala/org/apache/linkis/udf/utils/UdfConfigurationTest.scala diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml deleted file mode 100644 index a901a1bf88..0000000000 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - linkis-udf-client - jar - linkis-udf-client - - - - - org.apache.linkis - linkis-udf-common - ${project.version} - - - - org.apache.linkis - linkis-rpc - ${project.version} - provided - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - - diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml deleted file mode 100644 index ca5476f516..0000000000 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../pom.xml - - linkis-udf-common - jar - linkis-udf-common - - - - - org.apache.linkis - linkis-rpc - ${project.version} - provided - - - - org.apache.linkis - linkis-bml-client - ${project.version} - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - - diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java deleted file mode 100644 index 298418e05e..0000000000 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.udf.excepiton; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class UDFExceptionTest { - - @Test - @DisplayName("udfExceptionTest") - public void udfExceptionTest() { - String errorMsg = "udf is not exist"; - UDFException udfException = new UDFException(errorMsg); - Assertions.assertEquals(errorMsg, udfException.getDesc()); - } -} diff --git a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java b/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java deleted file mode 100644 index fa325dfc52..0000000000 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.linkis.udf.utils; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -public class ConstantVarTest { - - @Test - @DisplayName("staticConstTest") - public void staticConstTest() { - - Assertions.assertTrue(ConstantVar.UDF_JAR == 0); - Assertions.assertTrue(ConstantVar.UDF_PY == 1); - Assertions.assertTrue(ConstantVar.UDF_SCALA == 2); - Assertions.assertTrue(ConstantVar.FUNCTION_PY == 3); - Assertions.assertTrue(ConstantVar.FUNCTION_SCALA == 4); - - Assertions.assertEquals("function", ConstantVar.FUNCTION); - Assertions.assertEquals("udf", ConstantVar.UDF); - Assertions.assertEquals("all", ConstantVar.ALL); - - Assertions.assertEquals("sys", ConstantVar.SYS_USER); - Assertions.assertEquals("bdp", ConstantVar.BDP_USER); - Assertions.assertEquals("self", ConstantVar.SELF_USER); - Assertions.assertEquals("share", ConstantVar.SHARE_USER); - Assertions.assertEquals("expire", ConstantVar.EXPIRE_USER); - - Assertions.assertTrue(ConstantVar.specialTypes.length == 4); - } -} diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml index c3eb423cff..64687caaee 100644 --- a/linkis-public-enhancements/pom.xml +++ b/linkis-public-enhancements/pom.xml @@ -28,23 +28,23 @@ pom - linkis-bml - linkis-context-service + linkis-pes-common + linkis-pes-client + linkis-pes-rpc-client + linkis-ps-common-lock + linkis-bml-server + linkis-cs-server linkis-datasource/linkis-metadata linkis-datasource - linkis-udf/linkis-udf-client - linkis-udf/linkis-udf-common - linkis-udf/linkis-udf-service + linkis-udf-service linkis-jobhistory linkis-configuration linkis-variable - linkis-instance-label/linkis-instance-label-client - linkis-instance-label/linkis-instance-label-server - linkis-script-dev/linkis-storage-script-dev-client - linkis-script-dev/linkis-storage-script-dev-server + linkis-instance-label-server + linkis-storage-script-dev-server linkis-basedata-manager - linkis-error-code - linkis-ps-common-lock + linkis-error-code-server + diff --git a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml index b0151452cc..1fb7d04579 100644 --- a/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml +++ b/linkis-spring-cloud-services/linkis-service-gateway/linkis-gateway-server-support/pom.xml @@ -70,7 +70,7 @@ org.apache.linkis - linkis-cs-common + linkis-pes-common ${project.version}