From 8bafafe58880f755f48823c6a94aad8ce26c3d5e Mon Sep 17 00:00:00 2001 From: gf13871 Date: Mon, 3 Jul 2023 06:32:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?1=E3=80=81upgrade=20commons=20lang2->common?= =?UTF-8?q?s=20lang3=202=E3=80=81optimize=20pes-common=20module,reduce=20t?= =?UTF-8?q?oo=20many=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operator/EngineConnLogOperator.java | 2 +- .../engine/DefaultEngineReuseService.java | 2 +- .../rm/service/impl/UserResourceService.java | 2 +- .../impl/ElasticSearchExecutorImpl.java | 2 +- .../client/thrift/ImpalaThriftClient.java | 2 +- .../executor/SparkDataCalcExecutor.scala | 2 +- .../linkis-bml/linkis-bml-client/pom.xml | 2 +- .../linkis-bml/linkis-bml-common/pom.xml | 43 ----- .../linkis-bml/linkis-bml-server/pom.xml | 2 +- linkis-public-enhancements/linkis-bml/pom.xml | 1 - .../api/TenantConfigrationRestfulApi.java | 2 +- .../api/UserIpConfigrationRestfulApi.java | 2 +- .../service/impl/TenantConfigServiceImpl.java | 2 +- .../service/impl/UserIpConfigServiceImpl.java | 2 +- .../linkis-cs-client/pom.xml | 2 +- .../linkis-cs-common/pom.xml | 45 ----- .../linkis-cs-listener/pom.xml | 2 +- .../linkis-cs-server/pom.xml | 8 +- .../linkis-context-service/pom.xml | 2 - .../linkis-datasource-client/pom.xml | 8 +- .../linkis-datasource-manager/common/pom.xml | 55 ------ .../linkis-datasource-manager/server/pom.xml | 8 +- .../linkis-metadata-query/server/pom.xml | 8 +- .../service/elasticsearch/pom.xml | 2 +- .../service/hdfs/pom.xml | 2 +- .../service/hive/pom.xml | 2 +- .../service/jdbc/pom.xml | 2 +- .../service/kafka/pom.xml | 2 +- .../service/mongodb/pom.xml | 2 +- .../linkis-datasource/pom.xml | 2 - .../linkis-error-code-client/pom.xml | 2 +- .../linkis-error-code-common/pom.xml | 46 ----- .../linkis-error-code-server/pom.xml | 2 +- .../linkis-error-code/pom.xml | 1 - .../common => linkis-pes-common}/pom.xml | 54 +++--- .../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 .../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 .../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/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 .../value/LinkisBMLResourceSerializer.java | 2 +- .../linkis/cs/listener/CSIDListener.java | 29 +++ .../linkis/cs/listener/CSKeyListener.java | 30 +++ .../listener/ContextAsyncEventListener.java | 25 +++ .../ListenerBus/ContextAsyncListenerBus.java | 56 ++++++ .../cs/listener/callback/CallbackEngine.java | 30 +++ .../callback/ContextIDCallbackEngine.java | 25 +++ .../callback/ContextKeyCallbackEngine.java | 24 +++ .../callback/imp/ContextKeyValueBean.java | 72 +++++++ .../imp/DefaultContextIDCallbackEngine.java | 165 ++++++++++++++++ .../imp/DefaultContextKeyCallbackEngine.java | 178 ++++++++++++++++++ .../cs/listener/conf/ContextListenerConf.java | 32 ++++ .../cs/listener/event/ContextIDEvent.java | 26 +++ .../cs/listener/event/ContextKeyEvent.java | 22 +++ .../event/enumeration/OperateType.java | 30 +++ .../event/impl/DefaultContextIDEvent.java | 47 +++++ .../event/impl/DefaultContextKeyEvent.java | 66 +++++++ .../cs/listener/manager/ListenerManager.java | 30 +++ .../imp/DefaultContextListenerManager.java | 60 ++++++ .../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/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 .../common/domain/DataSourceTypeEnum.java | 0 .../query/common/domain/GenerateSqlInfo.java | 0 .../query/common/domain/MetaColumnInfo.java | 0 .../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/GenerateSqlTemplate.java | 0 .../common/service/MetadataConnection.java | 0 .../common/service/MetadataDbService.java | 0 .../common/service/MetadataFsService.java | 0 .../apache/linkis/udf/entity/UDFManager.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 .../entity/enumeration/ContextScopeTest.java | 0 .../entity/enumeration/ContextTypeTest.java | 0 .../common/entity/enumeration/DBTypeTest.java | 0 .../entity/enumeration/ExpireTypeTest.java | 0 .../entity/enumeration/WorkTypeTest.java | 0 .../ContextSerializationHelperTest.java | 3 +- .../metadata/CSTableSerializerTest.java | 4 +- .../object/CSFlowInfosSerializerTest.java | 4 +- .../protocol/ContextHistoryTypeTest.java | 0 .../cs/common/protocol/ContextIDTypeTest.java | 0 .../common/protocol/ContextKeyTypeTest.java | 0 .../protocol/ContextKeyValueTypeTest.java | 0 .../common/protocol/ContextValueTypeTest.java | 0 ...CombinedNodeIDContextIDSerializerTest.java | 0 .../CommonContextKeySerializerTest.java | 0 .../data/CSResultDataSerializerTest.java | 0 .../data/LinkisJobDataSerializerTest.java | 0 .../test/ContextSerializationHelperTest.java | 0 .../cs/common/utils/CSCommonUtilsTest.java | 0 .../utils/CSHighAvailableUtilsTest.java | 0 .../LinkisBMLResourceSerializerTest.java | 2 +- .../cs/listener/test/TestContextID.java | 35 ++++ .../cs/listener/test/TestContextKey.java | 71 +++++++ .../cs/listener/test/TestContextKeyValue.java | 49 +++++ .../cs/listener/test/TestContextValue.java | 44 +++++ .../errorcode/common/CommonConfTest.java | 0 .../query/common/MdmConfigurationTest.java | 0 .../common/cache/CacheConfigurationTest.java | 0 .../common/cache/ConnCacheManagerTest.java | 0 .../MetaMethodInvokeExceptionTest.java | 0 .../exception/MetaRuntimeExceptionTest.java | 0 .../udf/excepiton/UDFExceptionTest.java | 0 .../linkis/udf/utils/ConstantVarTest.java | 0 .../common/LinkisErrorCodeTest.scala | 0 .../linkis-udf/linkis-udf-client/pom.xml | 2 +- .../linkis-udf/linkis-udf-common/pom.xml | 56 ------ .../linkis-udf/linkis-udf-service/pom.xml | 7 +- linkis-public-enhancements/pom.xml | 2 +- .../linkis-gateway-server-support/pom.xml | 2 +- 256 files changed, 1221 insertions(+), 334 deletions(-) delete mode 100644 linkis-public-enhancements/linkis-bml/linkis-bml-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-context-service/linkis-cs-common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/common/pom.xml delete mode 100644 linkis-public-enhancements/linkis-error-code/linkis-error-code-common/pom.xml rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/pom.xml (56%) 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/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/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/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-common/src/main/java/org/apache/linkis/cs/common/serialize/impl => linkis-pes-common/src/main/java/org/apache/linkis/cs/common}/value/LinkisBMLResourceSerializer.java (96%) create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java 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/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/DataSourceTypeEnum.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/GenerateSqlInfo.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 (100%) 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/GenerateSqlTemplate.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/UDFManager.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-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize => linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity}/helper/ContextSerializationHelperTest.java (98%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value => linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity}/metadata/CSTableSerializerTest.java (93%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value => linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity}/object/CSFlowInfosSerializerTest.java (93%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common => linkis-pes-common}/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java (100%) rename linkis-public-enhancements/{linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl => linkis-pes-common/src/test/java/org/apache/linkis/cs/common}/value/LinkisBMLResourceSerializerTest.java (97%) create mode 100644 linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java create mode 100644 linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java (100%) rename linkis-public-enhancements/{linkis-datasource/linkis-metadata-query/common => linkis-pes-common}/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java (100%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java (100%) rename linkis-public-enhancements/{linkis-error-code/linkis-error-code-common => linkis-pes-common}/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala (100%) delete mode 100644 linkis-public-enhancements/linkis-udf/linkis-udf-common/pom.xml diff --git a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.java b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.java index c6f8368a1c..3d62df5c90 100644 --- a/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.java +++ b/linkis-computation-governance/linkis-engineconn-manager/linkis-engineconn-manager-server/src/main/java/org/apache/linkis/ecm/server/operator/EngineConnLogOperator.java @@ -25,7 +25,7 @@ import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.ReversedLinesFileReader; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Triple; import java.io.File; diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.java index 53c4fd3f13..67f0b1b11a 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/am/service/engine/DefaultEngineReuseService.java @@ -47,7 +47,7 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.compress.utils.Lists; -import org.apache.commons.lang.exception.ExceptionUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.tuple.MutablePair; import org.springframework.beans.factory.annotation.Autowired; diff --git a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/UserResourceService.java b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/UserResourceService.java index 8ef4bf7689..4092e24f8f 100644 --- a/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/UserResourceService.java +++ b/linkis-computation-governance/linkis-manager/linkis-application-manager/src/main/java/org/apache/linkis/manager/rm/service/impl/UserResourceService.java @@ -38,7 +38,7 @@ import org.apache.linkis.server.BDPJettyServerHelper; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.java b/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.java index ba21ff56cf..ca889dd5b2 100644 --- a/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.java +++ b/linkis-engineconn-plugins/elasticsearch/src/main/java/org/apache/linkis/engineplugin/elasticsearch/executor/client/impl/ElasticSearchExecutorImpl.java @@ -22,7 +22,7 @@ import org.apache.linkis.protocol.constants.TaskConstant; import org.apache.linkis.storage.utils.StorageUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import java.util.Locale; import java.util.Map; diff --git a/linkis-engineconn-plugins/impala/src/main/java/org/apache/linkis/engineplugin/impala/client/thrift/ImpalaThriftClient.java b/linkis-engineconn-plugins/impala/src/main/java/org/apache/linkis/engineplugin/impala/client/thrift/ImpalaThriftClient.java index 63d363fa9d..5cbbec4132 100644 --- a/linkis-engineconn-plugins/impala/src/main/java/org/apache/linkis/engineplugin/impala/client/thrift/ImpalaThriftClient.java +++ b/linkis-engineconn-plugins/impala/src/main/java/org/apache/linkis/engineplugin/impala/client/thrift/ImpalaThriftClient.java @@ -26,7 +26,7 @@ import org.apache.linkis.engineplugin.impala.client.protocol.ExecSummary; import org.apache.linkis.engineplugin.impala.client.util.ThriftUtil; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.hive.service.rpc.thrift.TExecuteStatementReq; import org.apache.hive.service.rpc.thrift.TExecuteStatementResp; import org.apache.hive.service.rpc.thrift.TOperationHandle; diff --git a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkDataCalcExecutor.scala b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkDataCalcExecutor.scala index c2757c34e0..7a0523719c 100644 --- a/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkDataCalcExecutor.scala +++ b/linkis-engineconn-plugins/spark/src/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkDataCalcExecutor.scala @@ -34,7 +34,7 @@ import org.apache.linkis.scheduler.executer.{ SuccessExecuteResponse } -import org.apache.commons.lang.exception.ExceptionUtils +import org.apache.commons.lang3.exception.ExceptionUtils import java.lang.reflect.InvocationTargetException diff --git a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml index 4089111c31..4042b8e06e 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-client/pom.xml @@ -33,7 +33,7 @@ org.apache.linkis - linkis-bml-common + linkis-pes-common ${project.version} 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/linkis-bml-server/pom.xml b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml index 9a68d4ec6f..0764146762 100644 --- a/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml +++ b/linkis-public-enhancements/linkis-bml/linkis-bml-server/pom.xml @@ -34,7 +34,7 @@ org.apache.linkis - linkis-bml-common + linkis-pes-common ${project.version} diff --git a/linkis-public-enhancements/linkis-bml/pom.xml b/linkis-public-enhancements/linkis-bml/pom.xml index 9601b1db49..1642c3288a 100644 --- a/linkis-public-enhancements/linkis-bml/pom.xml +++ b/linkis-public-enhancements/linkis-bml/pom.xml @@ -28,7 +28,6 @@ pom - linkis-bml-common linkis-bml-server linkis-bml-client diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java index 9a41fe67cc..3bd5b80834 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java +++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java @@ -25,7 +25,7 @@ import org.apache.linkis.server.Message; import org.apache.linkis.server.utils.ModuleUserUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java index 78e7003d49..ad692703f3 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java +++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/restful/api/UserIpConfigrationRestfulApi.java @@ -25,7 +25,7 @@ import org.apache.linkis.server.Message; import org.apache.linkis.server.utils.ModuleUserUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DuplicateKeyException; diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java index bf9755a307..a675c1663d 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java +++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java @@ -25,7 +25,7 @@ import org.apache.linkis.governance.common.constant.job.JobRequestConstants; import org.apache.commons.collections.MapUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java index 9c96121156..66f900b2a3 100644 --- a/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java +++ b/linkis-public-enhancements/linkis-configuration/src/main/java/org/apache/linkis/configuration/service/impl/UserIpConfigServiceImpl.java @@ -24,7 +24,7 @@ import org.apache.linkis.configuration.util.CommonUtils; import org.apache.linkis.governance.common.constant.job.JobRequestConstants; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml index 087d48a17b..5db6f5689b 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-client/pom.xml @@ -48,7 +48,7 @@ org.apache.linkis - linkis-cs-listener + linkis-pes-common ${project.version} 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-listener/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml index a6e2b00165..7bbb11eb6e 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-listener/pom.xml @@ -35,7 +35,7 @@ org.apache.linkis - linkis-cs-common + linkis-pes-common ${project.version} diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml index 9d52ba6231..20d938b81f 100644 --- a/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-server/pom.xml @@ -29,7 +29,7 @@ org.apache.linkis - linkis-cs-common + linkis-pes-common ${project.version} @@ -39,12 +39,6 @@ ${project.version} - - org.apache.linkis - linkis-cs-listener - ${project.version} - - org.apache.linkis linkis-instance-label-client diff --git a/linkis-public-enhancements/linkis-context-service/pom.xml b/linkis-public-enhancements/linkis-context-service/pom.xml index e9f41641f3..2ce4f7831d 100644 --- a/linkis-public-enhancements/linkis-context-service/pom.xml +++ b/linkis-public-enhancements/linkis-context-service/pom.xml @@ -30,8 +30,6 @@ - linkis-cs-common - linkis-cs-listener linkis-cs-client linkis-cs-server diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml index 0b29d69373..fa610c70d1 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-client/pom.xml @@ -35,13 +35,7 @@ org.apache.linkis - linkis-datasource-manager-common - ${project.version} - - - - org.apache.linkis - linkis-metadata-query-common + linkis-pes-common ${project.version} 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..396b612c9d 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} @@ -91,12 +91,6 @@ ${project.version} provided - - - org.apache.linkis - linkis-metadata-query-common - ${project.version} - 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 29865be768..db6e68ae55 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 @@ -32,7 +32,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/jdbc/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/pom.xml index 1449c4855a..135026cccc 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 @@ -34,7 +34,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..99793675a5 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 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 6c4541969a..c11e0bc64d 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..345fed5d65 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 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 index d532ca2464..d10076a3a8 100644 --- 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 @@ -30,7 +30,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-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-server/pom.xml b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml index 8c17af97ad..85d8b017e5 100644 --- a/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml +++ b/linkis-public-enhancements/linkis-error-code/linkis-error-code-server/pom.xml @@ -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/pom.xml b/linkis-public-enhancements/linkis-error-code/pom.xml index bf346ac592..c1ed695f2b 100644 --- a/linkis-public-enhancements/linkis-error-code/pom.xml +++ b/linkis-public-enhancements/linkis-error-code/pom.xml @@ -31,7 +31,6 @@ linkis-error-code-client - linkis-error-code-common linkis-error-code-server diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml b/linkis-public-enhancements/linkis-pes-common/pom.xml similarity index 56% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml rename to linkis-public-enhancements/linkis-pes-common/pom.xml index 88e6dea1f6..508683342d 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/pom.xml +++ b/linkis-public-enhancements/linkis-pes-common/pom.xml @@ -1,32 +1,28 @@ - 4.0.0 org.apache.linkis linkis ${revision} - ../../../../pom.xml + ../../pom.xml - linkis-metadata-query-common + linkis-pes-common + + + org.apache.commons + commons-text + + + + com.google.code.gson + gson + provided + + org.apache.linkis linkis-common @@ -39,26 +35,39 @@ - + org.apache.linkis linkis-protocol ${project.version} provided + - org.apache.linkis - linkis-datasource-manager-common - ${project.version} + javax.validation + validation-api + 2.0.1.Final + + + org.apache.commons + commons-lang3 + + jakarta.annotation jakarta.annotation-api + + + + ${basedir}/src/main/resources + + net.alchim31.maven @@ -66,4 +75,5 @@ + 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/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/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/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-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/value/LinkisBMLResourceSerializer.java similarity index 96% 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/value/LinkisBMLResourceSerializer.java index 0fab839cdd..7632b1c64e 100644 --- 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/value/LinkisBMLResourceSerializer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.linkis.cs.common.serialize.impl.value; +package org.apache.linkis.cs.common.value; import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; import org.apache.linkis.cs.common.exception.CSErrorException; diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..efb92dc02f --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSIDListener.java @@ -0,0 +1,29 @@ +/* + * 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; + +import org.apache.linkis.cs.listener.event.ContextIDEvent; + +public interface CSIDListener extends ContextAsyncEventListener { + + void onCSIDAccess(ContextIDEvent contextIDEvent); + + void onCSIDADD(ContextIDEvent contextIDEvent); + + void onCSIDRemoved(ContextIDEvent contextIDEvent); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..ab5bab1d9b --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/CSKeyListener.java @@ -0,0 +1,30 @@ +/* + * 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; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.cs.listener.event.ContextKeyEvent; + +public interface CSKeyListener extends ContextAsyncEventListener { + @Override + void onEvent(Event event); + + void onCSKeyUpdate(ContextKeyEvent contextKeyEvent); + + void onCSKeyAccess(ContextKeyEvent contextKeyEvent); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..3e03638e32 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ContextAsyncEventListener.java @@ -0,0 +1,25 @@ +/* + * 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; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.common.listener.EventListener; + +public interface ContextAsyncEventListener extends EventListener { + void onEvent(Event event); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..c6e4116c1d --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/ListenerBus/ContextAsyncListenerBus.java @@ -0,0 +1,56 @@ +/* + * 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.ListenerBus; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.common.listener.ListenerEventBus; +import org.apache.linkis.cs.listener.ContextAsyncEventListener; +import org.apache.linkis.cs.listener.conf.ContextListenerConf; + +public class ContextAsyncListenerBus + extends ListenerEventBus { + + private static final String NAME = "ContextAsyncListenerBus"; + + public ContextAsyncListenerBus() { + super( + ContextListenerConf.WDS_CS_LISTENER_ASYN_QUEUE_CAPACITY, + NAME, + ContextListenerConf.WDS_CS_LISTENER_ASYN_CONSUMER_THREAD_MAX, + ContextListenerConf.WDS_CS_LISTENER_ASYN_CONSUMER_THREAD_FREE_TIME_MAX); + } + + @Override + public void doPostEvent(L listener, E event) { + listener.onEvent(event); + } + + private static ContextAsyncListenerBus contextAsyncListenerBus = null; + + public static ContextAsyncListenerBus getInstance() { + if (contextAsyncListenerBus == null) { + synchronized (ContextAsyncListenerBus.class) { + if (contextAsyncListenerBus == null) { + contextAsyncListenerBus = new ContextAsyncListenerBus(); + contextAsyncListenerBus.start(); + } + } + } + return contextAsyncListenerBus; + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..151fcfb407 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/CallbackEngine.java @@ -0,0 +1,30 @@ +/* + * 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; + +import org.apache.linkis.cs.listener.callback.imp.ContextKeyValueBean; + +import java.util.ArrayList; + +public interface CallbackEngine { + + // 某个client发送心跳的时候， + // 这个callbackengine就需要将这个client已经注册的所有cskey更改的内容进行通知给client， + // 应该是返回一个数组的形式或者为空 + ArrayList getListenerCallback(String source); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..1d1dc9da39 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextIDCallbackEngine.java @@ -0,0 +1,25 @@ +/* + * 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; + +import org.apache.linkis.cs.common.entity.listener.ListenerDomain; + +/** ContextIDCallbackEngine 只监听ContextID ，对csKeys无感，可为空 */ +public interface ContextIDCallbackEngine extends CallbackEngine { + void registerClient(ListenerDomain listenerDomain); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..45def3bb1c --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/ContextKeyCallbackEngine.java @@ -0,0 +1,24 @@ +/* + * 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; + +import org.apache.linkis.cs.common.entity.listener.ListenerDomain; + +public interface ContextKeyCallbackEngine extends CallbackEngine { + void registerClient(ListenerDomain listenerDomain); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..91d6f8fb86 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/ContextKeyValueBean.java @@ -0,0 +1,72 @@ +/* + * 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.imp; + +import org.apache.linkis.cs.common.entity.source.ContextID; +import org.apache.linkis.cs.common.entity.source.ContextKey; +import org.apache.linkis.cs.common.entity.source.ContextValue; + +import java.util.Objects; + +public class ContextKeyValueBean { + + private ContextKey csKey; + private ContextValue csValue; + private ContextID csID; + + public ContextID getCsID() { + return csID; + } + + public void setCsID(ContextID csID) { + this.csID = csID; + } + + public ContextKey getCsKey() { + return csKey; + } + + public void setCsKey(ContextKey csKey) { + this.csKey = csKey; + } + + public ContextValue getCsValue() { + return csValue; + } + + public void setCsValue(ContextValue csValue) { + this.csValue = csValue; + } + + @Override + public int hashCode() { + return Objects.hash(csKey, csValue); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ContextKeyValueBean csmapKey = (ContextKeyValueBean) o; + return Objects.equals(csKey, csmapKey.csKey) && Objects.equals(csValue, csmapKey.csValue); + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..3910deef77 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextIDCallbackEngine.java @@ -0,0 +1,165 @@ +/* + * 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.imp; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.cs.common.entity.listener.CommonContextIDListenerDomain; +import org.apache.linkis.cs.common.entity.listener.ListenerDomain; +import org.apache.linkis.cs.common.entity.source.ContextID; +import org.apache.linkis.cs.listener.CSIDListener; +import org.apache.linkis.cs.listener.callback.ContextIDCallbackEngine; +import org.apache.linkis.cs.listener.event.ContextIDEvent; +import org.apache.linkis.cs.listener.event.impl.DefaultContextIDEvent; +import org.apache.linkis.cs.listener.manager.imp.DefaultContextListenerManager; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import com.google.common.collect.HashMultimap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DefaultContextIDCallbackEngine implements CSIDListener, ContextIDCallbackEngine { + + private static final Logger logger = + LoggerFactory.getLogger(DefaultContextIDCallbackEngine.class); + private HashMultimap registerCSIDcsClients = + HashMultimap.create(); // key为clientSource的instance值 + + private List removedContextIDS = new ArrayList<>(); + + // 不关心返回ContextKeyValueBean里面的cskeys和 value + @Override + public ArrayList getListenerCallback(String source) { + Set ContextIDSets = registerCSIDcsClients.get(source); + ArrayList contextKeyValueBeans = new ArrayList<>(); + for (ContextID contextID : removedContextIDS) { + if (ContextIDSets.contains(contextID)) { + ContextKeyValueBean contextKeyValueBean = new ContextKeyValueBean(); + contextKeyValueBean.setCsID(contextID); + contextKeyValueBeans.add(contextKeyValueBean); + } + } + return contextKeyValueBeans; + } + + // ContextIDCallbackEngine 只监听ContextID ，对csKeys无感，可为空 + // @Override + // public void registerClient(ContextID csId, List csKeys, ClientSource csClient) + // { + // + // String instance = csClient.getInstance(); + // if (instance != null && csId != null) { + // synchronized (registerCSIDcsClients) { + // registerCSIDcsClients.put(instance, csId); + // } + // } + // } + + @Override + public void registerClient(ListenerDomain listenerDomain) { + if (listenerDomain != null && listenerDomain instanceof CommonContextIDListenerDomain) { + CommonContextIDListenerDomain commonContextIDListenerDomain = + (CommonContextIDListenerDomain) listenerDomain; + String source = commonContextIDListenerDomain.getSource(); + ContextID contextID = commonContextIDListenerDomain.getContextID(); + if (source != null && contextID != null) { + synchronized (registerCSIDcsClients) { + registerCSIDcsClients.put(source, contextID); + } + } + } + } + + @Override + public void onEvent(Event event) { + DefaultContextIDEvent defaultContextIDEvent = null; + if (event != null && event instanceof DefaultContextIDEvent) { + defaultContextIDEvent = (DefaultContextIDEvent) event; + } + if (null == defaultContextIDEvent) { + logger.warn("defaultContextIDEvent event 为空"); + return; + } + switch (defaultContextIDEvent.getOperateType()) { + // ADD, UPDATE, DELETE, REMOVEALL, ACCESS + case REMOVEALL: + onCSIDRemoved(defaultContextIDEvent); + break; + case ADD: + onCSIDADD(defaultContextIDEvent); + break; + case ACCESS: + onCSIDAccess(defaultContextIDEvent); + break; + case UPDATE: + break; + case DELETE: + break; + default: + logger.info( + "check defaultContextIDEvent event operate type(检查defaultContextIDEvent event操作类型)"); + } + } + + @Override + public void onCSIDAccess(ContextIDEvent contextIDEvent) {} + + @Override + public void onCSIDADD(ContextIDEvent contextIDEvent) {} + + @Override + public void onCSIDRemoved(ContextIDEvent contextIDEvent) { + + DefaultContextIDEvent defaultContextIDEvent = null; + if (contextIDEvent != null && contextIDEvent instanceof DefaultContextIDEvent) { + defaultContextIDEvent = (DefaultContextIDEvent) contextIDEvent; + } + if (null == defaultContextIDEvent) { + return; + } + synchronized (removedContextIDS) { + removedContextIDS.add(defaultContextIDEvent.getContextID()); + } + } + + @Override + public void onEventError(Event event, Throwable t) {} + + private static DefaultContextIDCallbackEngine singleDefaultContextIDCallbackEngine = null; + + private DefaultContextIDCallbackEngine() {} + + public static DefaultContextIDCallbackEngine getInstance() { + if (singleDefaultContextIDCallbackEngine == null) { + synchronized (DefaultContextIDCallbackEngine.class) { + if (singleDefaultContextIDCallbackEngine == null) { + singleDefaultContextIDCallbackEngine = new DefaultContextIDCallbackEngine(); + DefaultContextListenerManager instanceContextListenerManager = + DefaultContextListenerManager.getInstance(); + instanceContextListenerManager + .getContextAsyncListenerBus() + .addListener(singleDefaultContextIDCallbackEngine); + logger.info("add listerner singleDefaultContextIDCallbackEngine success"); + } + } + } + return singleDefaultContextIDCallbackEngine; + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..c78fdc58d2 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/callback/imp/DefaultContextKeyCallbackEngine.java @@ -0,0 +1,178 @@ +/* + * 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.imp; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.cs.common.entity.listener.CommonContextKeyListenerDomain; +import org.apache.linkis.cs.common.entity.listener.ListenerDomain; +import org.apache.linkis.cs.common.entity.source.ContextID; +import org.apache.linkis.cs.common.entity.source.ContextKey; +import org.apache.linkis.cs.listener.CSKeyListener; +import org.apache.linkis.cs.listener.callback.ContextKeyCallbackEngine; +import org.apache.linkis.cs.listener.event.ContextKeyEvent; +import org.apache.linkis.cs.listener.event.impl.DefaultContextKeyEvent; +import org.apache.linkis.cs.listener.manager.imp.DefaultContextListenerManager; + +import java.util.ArrayList; +import java.util.Set; + +import com.google.common.collect.HashMultimap; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class DefaultContextKeyCallbackEngine implements CSKeyListener, ContextKeyCallbackEngine { + private static final Logger logger = + LoggerFactory.getLogger(DefaultContextKeyCallbackEngine.class); + + private HashMultimap registerCSIDcsClients = + HashMultimap.create(); // key为clientSource的instance值 + + private HashMultimap registerCSIDcsKeyValues = + HashMultimap.create(); // key为 contextId 的ID值 + + // 注册csClient及其监听的csKeys + @Override + public void registerClient(ListenerDomain listenerDomain) { + if (listenerDomain != null && listenerDomain instanceof CommonContextKeyListenerDomain) { + CommonContextKeyListenerDomain commonContextKeyListenerDomain = + (CommonContextKeyListenerDomain) listenerDomain; + String source = commonContextKeyListenerDomain.getSource(); + ContextID contextID = commonContextKeyListenerDomain.getContextID(); + ContextKey contextKey = commonContextKeyListenerDomain.getContextKey(); + if (source != null && contextID != null) { + synchronized (registerCSIDcsClients) { + logger.info("要注册的csClient和contextId: " + source + ":" + contextID); + registerCSIDcsClients.put(source, contextID); + } + } + // 针对cskey生成一个bean，cskey对应的value值目前为空 + if (contextKey != null) { + ContextKeyValueBean contextKeyValueBean = new ContextKeyValueBean(); + contextKeyValueBean.setCsKey(contextKey); + contextKeyValueBean.setCsID(contextID); + synchronized (registerCSIDcsKeyValues) { + logger.info("要注册的contextId: " + contextID.getContextId()); + registerCSIDcsKeyValues.put(contextID.getContextId(), contextKeyValueBean); + } + } + } + } + + // 通过 source 拿到 ContextID，遍历 ContextID，返回监听的 beans + @Override + public ArrayList getListenerCallback(String source) { + ArrayList arrayContextKeyValueBeans = new ArrayList<>(); + Set contextIDS = registerCSIDcsClients.get(source); + // 返回所有的 ContextKeyValueBean + if (contextIDS.size() > 0) { + for (ContextID csId : contextIDS) { + arrayContextKeyValueBeans.addAll(registerCSIDcsKeyValues.get(csId.getContextId())); + } + } + return arrayContextKeyValueBeans; + } + + @Override + public void onEvent(Event event) { + DefaultContextKeyEvent defaultContextKeyEvent = null; + if (event != null && event instanceof DefaultContextKeyEvent) { + defaultContextKeyEvent = (DefaultContextKeyEvent) event; + } + if (null == defaultContextKeyEvent) { + if (logger.isDebugEnabled()) { + logger.debug("defaultContextKeyEvent event 为空"); + } + return; + } + logger.info( + "defaultContextKeyEvent 要更新事件的ID: " + defaultContextKeyEvent.getContextID().getContextId()); + logger.info( + "defaultContextKeyEvent 要更新事件的key: " + + defaultContextKeyEvent.getContextKeyValue().getContextKey().getKey()); + logger.info( + "defaultContextKeyEvent 要更新的value" + + defaultContextKeyEvent.getContextKeyValue().getContextValue().getValue()); + switch (defaultContextKeyEvent.getOperateType()) { + case UPDATE: + onCSKeyUpdate(defaultContextKeyEvent); + break; + case ACCESS: + onCSKeyAccess(defaultContextKeyEvent); + break; + default: + logger.info( + "检查defaultContextKeyEvent event操作类型: {}", defaultContextKeyEvent.getOperateType()); + } + } + + // 更新 cskey 对应的 value 值 + @Override + public void onCSKeyUpdate(ContextKeyEvent cskeyEvent) { + DefaultContextKeyEvent defaultContextKeyEvent = null; + if (cskeyEvent != null && cskeyEvent instanceof DefaultContextKeyEvent) { + defaultContextKeyEvent = (DefaultContextKeyEvent) cskeyEvent; + } + if (null == defaultContextKeyEvent) { + return; + } + + synchronized (registerCSIDcsKeyValues) { + // 遍历所有csid,如果csid跟事件中的相同，则取出该csid所有的bean,更新所有bean中的csvalue. + Set contextKeyValueBeans = + registerCSIDcsKeyValues.get(defaultContextKeyEvent.getContextID().getContextId()); + for (ContextKeyValueBean contextKeyValueBean : contextKeyValueBeans) { + if (contextKeyValueBean + .getCsKey() + .getKey() + .equals(defaultContextKeyEvent.getContextKeyValue().getContextKey().getKey())) { + contextKeyValueBean.setCsValue( + defaultContextKeyEvent.getContextKeyValue().getContextValue()); + } + } + } + } + + // 暂时先不实现 + @Override + public void onCSKeyAccess(ContextKeyEvent cskeyEvent) {} + + // 暂时先不实现 + @Override + public void onEventError(Event event, Throwable t) {} + + private static DefaultContextKeyCallbackEngine singleDefaultContextKeyCallbackEngine = null; + + private DefaultContextKeyCallbackEngine() {} + + public static DefaultContextKeyCallbackEngine getInstance() { + if (singleDefaultContextKeyCallbackEngine == null) { + synchronized (DefaultContextKeyCallbackEngine.class) { + if (singleDefaultContextKeyCallbackEngine == null) { + singleDefaultContextKeyCallbackEngine = new DefaultContextKeyCallbackEngine(); + DefaultContextListenerManager instanceContextListenerManager = + DefaultContextListenerManager.getInstance(); + instanceContextListenerManager + .getContextAsyncListenerBus() + .addListener(singleDefaultContextKeyCallbackEngine); + logger.info("add listerner singleDefaultContextKeyCallbackEngine success"); + } + } + } + return singleDefaultContextKeyCallbackEngine; + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..d693363174 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/conf/ContextListenerConf.java @@ -0,0 +1,32 @@ +/* + * 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.conf; + +import org.apache.linkis.common.conf.CommonVars; + +public class ContextListenerConf { + public static final Integer WDS_CS_LISTENER_ASYN_CONSUMER_THREAD_MAX = + Integer.parseInt( + CommonVars.apply("wds.linkis.cs.listener.asyn.consumer.thread.max", "5").getValue()); + public static final Long WDS_CS_LISTENER_ASYN_CONSUMER_THREAD_FREE_TIME_MAX = + Long.parseLong( + CommonVars.apply("wds.linkis.cs.listener.asyn.consumer.freeTime.max", "5000").getValue()); + public static final Integer WDS_CS_LISTENER_ASYN_QUEUE_CAPACITY = + Integer.parseInt( + CommonVars.apply("wds.linkis.cs.listener.asyn.queue.size.max", "300").getValue()); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..33c4afa51b --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextIDEvent.java @@ -0,0 +1,26 @@ +/* + * 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.event; + +import org.apache.linkis.common.listener.Event; +import org.apache.linkis.cs.common.entity.source.ContextID; + +public interface ContextIDEvent extends Event { + + ContextID getContextID(); +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..7ca6ebb2cf --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/ContextKeyEvent.java @@ -0,0 +1,22 @@ +/* + * 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.event; + +import org.apache.linkis.common.listener.Event; + +public interface ContextKeyEvent extends Event {} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..dc6fe68725 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/enumeration/OperateType.java @@ -0,0 +1,30 @@ +/* + * 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.event.enumeration; + +public enum OperateType { + + /** 对contextKey和contextId的一些操作 */ + ADD, + UPDATE, + DELETE, + REMOVEALL, + ACCESS, + CREATE, + REMOVE +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..75a7524a55 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextIDEvent.java @@ -0,0 +1,47 @@ +/* + * 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.event.impl; + +import org.apache.linkis.cs.common.entity.source.ContextID; +import org.apache.linkis.cs.listener.event.ContextIDEvent; +import org.apache.linkis.cs.listener.event.enumeration.OperateType; + +public class DefaultContextIDEvent implements ContextIDEvent { + + private ContextID contextID; + + public OperateType getOperateType() { + return operateType; + } + + public void setOperateType(OperateType operateType) { + this.operateType = operateType; + } + + // TODO + private OperateType operateType; + + @Override + public ContextID getContextID() { + return contextID; + } + + public void setContextID(ContextID contextID) { + this.contextID = contextID; + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..5f024114cc --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/event/impl/DefaultContextKeyEvent.java @@ -0,0 +1,66 @@ +/* + * 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.event.impl; + +import org.apache.linkis.cs.common.entity.source.ContextID; +import org.apache.linkis.cs.common.entity.source.ContextKeyValue; +import org.apache.linkis.cs.listener.event.ContextKeyEvent; +import org.apache.linkis.cs.listener.event.enumeration.OperateType; + +public class DefaultContextKeyEvent implements ContextKeyEvent { + + private ContextID contextID; + + private ContextKeyValue contextKeyValue; + + private ContextKeyValue oldValue; + + private OperateType operateType; + + public ContextID getContextID() { + return contextID; + } + + public void setContextID(ContextID contextID) { + this.contextID = contextID; + } + + public ContextKeyValue getContextKeyValue() { + return contextKeyValue; + } + + public void setContextKeyValue(ContextKeyValue contextKeyValue) { + this.contextKeyValue = contextKeyValue; + } + + public OperateType getOperateType() { + return operateType; + } + + public void setOperateType(OperateType operateType) { + this.operateType = operateType; + } + + public ContextKeyValue getOldValue() { + return oldValue; + } + + public void setOldValue(ContextKeyValue oldValue) { + this.oldValue = oldValue; + } +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..e1f38782c1 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/ListenerManager.java @@ -0,0 +1,30 @@ +/* + * 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.manager; + +import org.apache.linkis.cs.listener.ListenerBus.ContextAsyncListenerBus; +import org.apache.linkis.cs.listener.callback.imp.DefaultContextIDCallbackEngine; +import org.apache.linkis.cs.listener.callback.imp.DefaultContextKeyCallbackEngine; + +public interface ListenerManager { + public ContextAsyncListenerBus getContextAsyncListenerBus(); // 单例 + + public DefaultContextIDCallbackEngine getContextIDCallbackEngine(); // 单例 + + public DefaultContextKeyCallbackEngine getContextKeyCallbackEngine(); // 单例 +} diff --git a/linkis-public-enhancements/linkis-pes-common/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 new file mode 100644 index 0000000000..51b9e78d08 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/cs/listener/manager/imp/DefaultContextListenerManager.java @@ -0,0 +1,60 @@ +/* + * 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.manager.imp; + +import org.apache.linkis.cs.listener.ListenerBus.ContextAsyncListenerBus; +import org.apache.linkis.cs.listener.callback.imp.DefaultContextIDCallbackEngine; +import org.apache.linkis.cs.listener.callback.imp.DefaultContextKeyCallbackEngine; +import org.apache.linkis.cs.listener.manager.ListenerManager; + +public class DefaultContextListenerManager implements ListenerManager { + @Override + public ContextAsyncListenerBus getContextAsyncListenerBus() { + ContextAsyncListenerBus contextAsyncListenerBus = ContextAsyncListenerBus.getInstance(); + return contextAsyncListenerBus; + } + + @Override + public DefaultContextIDCallbackEngine getContextIDCallbackEngine() { + DefaultContextIDCallbackEngine instanceIdCallbackEngine = + DefaultContextIDCallbackEngine.getInstance(); + return instanceIdCallbackEngine; + } + + @Override + public DefaultContextKeyCallbackEngine getContextKeyCallbackEngine() { + DefaultContextKeyCallbackEngine instanceKeyCallbackEngine = + DefaultContextKeyCallbackEngine.getInstance(); + return instanceKeyCallbackEngine; + } + + private static DefaultContextListenerManager singleDefaultContextListenerManager = null; + + private DefaultContextListenerManager() {} + + public static DefaultContextListenerManager getInstance() { + if (singleDefaultContextListenerManager == null) { + synchronized (DefaultContextListenerManager.class) { + if (singleDefaultContextListenerManager == null) { + singleDefaultContextListenerManager = new DefaultContextListenerManager(); + } + } + } + return singleDefaultContextListenerManager; + } +} 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/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/DataSourceTypeEnum.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.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/DataSourceTypeEnum.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/DataSourceTypeEnum.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.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/GenerateSqlInfo.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.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 100% 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 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/GenerateSqlTemplate.java b/linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.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/GenerateSqlTemplate.java rename to linkis-public-enhancements/linkis-pes-common/src/main/java/org/apache/linkis/metadata/query/common/service/GenerateSqlTemplate.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/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/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-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextScopeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ContextTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/DBTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/ExpireTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/enumeration/WorkTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/helper/ContextSerializationHelperTest.java similarity index 98% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/helper/ContextSerializationHelperTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/helper/ContextSerializationHelperTest.java index 7eaf19d2c8..f253f72875 100644 --- 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/helper/ContextSerializationHelperTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.linkis.cs.common.serialize.helper; +package org.apache.linkis.cs.common.entity.helper; import org.apache.linkis.cs.common.entity.enumeration.ContextScope; import org.apache.linkis.cs.common.entity.enumeration.ContextType; @@ -28,6 +28,7 @@ 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; 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/metadata/CSTableSerializerTest.java similarity index 93% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/metadata/CSTableSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/metadata/CSTableSerializerTest.java index fa717cc7f3..38fd00419d 100644 --- 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/metadata/CSTableSerializerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.linkis.cs.common.serialize.impl.value.metadata; +package org.apache.linkis.cs.common.entity.metadata; -import org.apache.linkis.cs.common.entity.metadata.CSTable; import org.apache.linkis.cs.common.exception.CSErrorException; +import org.apache.linkis.cs.common.serialize.impl.value.metadata.CSTableSerializer; import com.google.gson.Gson; import org.junit.jupiter.api.Assertions; 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/object/CSFlowInfosSerializerTest.java similarity index 93% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/object/CSFlowInfosSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/entity/object/CSFlowInfosSerializerTest.java index 4c6e656de3..1d0c150bbd 100644 --- 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-pes-common/src/test/java/org/apache/linkis/cs/common/entity/object/CSFlowInfosSerializerTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package org.apache.linkis.cs.common.serialize.impl.value.object; +package org.apache.linkis.cs.common.entity.object; -import org.apache.linkis.cs.common.entity.object.CSFlowInfos; import org.apache.linkis.cs.common.exception.CSErrorException; +import org.apache.linkis.cs.common.serialize.impl.value.object.CSFlowInfosSerializer; import com.google.gson.Gson; import org.junit.jupiter.api.Assertions; 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-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextHistoryTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextIDTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextKeyValueTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/protocol/ContextValueTypeTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CombinedNodeIDContextIDSerializerTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/context/CommonContextKeySerializerTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/CSResultDataSerializerTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/data/LinkisJobDataSerializerTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/serialize/test/ContextSerializationHelperTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSCommonUtilsTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java similarity index 100% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/utils/CSHighAvailableUtilsTest.java 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-pes-common/src/test/java/org/apache/linkis/cs/common/value/LinkisBMLResourceSerializerTest.java similarity index 97% rename from linkis-public-enhancements/linkis-context-service/linkis-cs-common/src/test/java/org/apache/linkis/cs/common/serialize/impl/value/LinkisBMLResourceSerializerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/common/value/LinkisBMLResourceSerializerTest.java index 282f239b5c..2b44ac75eb 100644 --- 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-pes-common/src/test/java/org/apache/linkis/cs/common/value/LinkisBMLResourceSerializerTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.linkis.cs.common.serialize.impl.value; +package org.apache.linkis.cs.common.value; import org.apache.linkis.cs.common.entity.resource.LinkisBMLResource; import org.apache.linkis.cs.common.exception.CSErrorException; diff --git a/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java new file mode 100644 index 0000000000..84d2354dce --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextID.java @@ -0,0 +1,35 @@ +/* + * 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-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java new file mode 100644 index 0000000000..a343bf1f2c --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKey.java @@ -0,0 +1,71 @@ +/* + * 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-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java new file mode 100644 index 0000000000..ee27609db2 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextKeyValue.java @@ -0,0 +1,49 @@ +/* + * 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-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java new file mode 100644 index 0000000000..8c4d4d1447 --- /dev/null +++ b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/cs/listener/test/TestContextValue.java @@ -0,0 +1,44 @@ +/* + * 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-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java b/linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/errorcode/common/CommonConfTest.java 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-pes-common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/MdmConfigurationTest.java 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-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/CacheConfigurationTest.java 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-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/cache/ConnCacheManagerTest.java 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-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaMethodInvokeExceptionTest.java 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-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/metadata/query/common/exception/MetaRuntimeExceptionTest.java 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-pes-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/excepiton/UDFExceptionTest.java 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-pes-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java similarity index 100% rename from linkis-public-enhancements/linkis-udf/linkis-udf-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java rename to linkis-public-enhancements/linkis-pes-common/src/test/java/org/apache/linkis/udf/utils/ConstantVarTest.java 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-pes-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala similarity index 100% rename from linkis-public-enhancements/linkis-error-code/linkis-error-code-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.scala rename to linkis-public-enhancements/linkis-pes-common/src/test/scala/org/apache/linkis/errorcode/common/LinkisErrorCodeTest.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 index a901a1bf88..9fe54c1c28 100644 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml +++ b/linkis-public-enhancements/linkis-udf/linkis-udf-client/pom.xml @@ -32,7 +32,7 @@ org.apache.linkis - linkis-udf-common + linkis-pes-common ${project.version} 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-service/pom.xml b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml index fd45ce7d9e..5956215c20 100644 --- a/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml +++ b/linkis-public-enhancements/linkis-udf/linkis-udf-service/pom.xml @@ -35,10 +35,15 @@ org.apache.linkis - linkis-udf-common + linkis-pes-common ${project.version} + + org.apache.linkis + linkis-bml-client + ${project.version} + org.apache.linkis linkis-rpc diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml index c3eb423cff..1a66462a1d 100644 --- a/linkis-public-enhancements/pom.xml +++ b/linkis-public-enhancements/pom.xml @@ -28,12 +28,12 @@ pom + linkis-pes-common linkis-bml linkis-context-service linkis-datasource/linkis-metadata linkis-datasource linkis-udf/linkis-udf-client - linkis-udf/linkis-udf-common linkis-udf/linkis-udf-service linkis-jobhistory linkis-configuration 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 c4e68f9eb6..b089c4bfe9 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} From db8676c1fd5d93c53ff025031cdf72a4298d0bd8 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Mon, 3 Jul 2023 06:33:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1=E3=80=81upgrade=20commons=20lang2->common?= =?UTF-8?q?s=20lang3=202=E3=80=81optimize=20pes-common=20module,reduce=20t?= =?UTF-8?q?oo=20many=20modules?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cs/common/entity/history/ResourceContextHistory.java | 4 ++-- .../org/apache/linkis/cs/common/entity/metadata/CSDB.java | 2 +- .../datasourcemanager/common/protocol/DsInfoQueryRequest.java | 2 +- .../src/main/java/org/apache/linkis/udf/entity/UDFInfo.java | 2 +- .../src/main/java/org/apache/linkis/udf/entity/UDFTree.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 (99%) 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 (99%) 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-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFInfo.java (99%) rename linkis-public-enhancements/{linkis-udf/linkis-udf-common => linkis-pes-common}/src/main/java/org/apache/linkis/udf/entity/UDFTree.java (99%) 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 99% 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 index 4fe4b6aa21..2994203376 100644 --- 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 @@ -29,10 +29,10 @@ public interface ResourceContextHistory extends ContextHistory { @Override default ContextType getContextType() { return ContextType.RESOURCE; - }; + } @Override default void setContextType(ContextType contextType) { // nothing to do - }; + } } 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 99% 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 index 66f4ce5b38..e91cb9f5e7 100644 --- 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 @@ -34,7 +34,7 @@ public class CSDB implements DB { public static DB build() { return null; - }; + } @Override @KeywordMethod 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-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 99% 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 index 502047ac6a..c116b96847 100644 --- 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 @@ -34,7 +34,7 @@ public class UDFInfo { private Boolean isLoad; - public UDFInfo() {}; + public UDFInfo() {} public UDFInfo( Long id, 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 99% 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 index cb3f015e77..4c9c5460bf 100644 --- 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 @@ -38,7 +38,7 @@ public class UDFTree { private List udfInfos; private List childrens; - public UDFTree() {}; + public UDFTree() {} public UDFTree( Long id, From 80175eb61e8993d940e781f0d2a284a88612c7a7 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Mon, 3 Jul 2023 06:39:26 +0800 Subject: [PATCH 3/3] add license --- .../linkis-pes-common/pom.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/linkis-public-enhancements/linkis-pes-common/pom.xml b/linkis-public-enhancements/linkis-pes-common/pom.xml index 508683342d..66c630ce31 100644 --- a/linkis-public-enhancements/linkis-pes-common/pom.xml +++ b/linkis-public-enhancements/linkis-pes-common/pom.xml @@ -1,4 +1,20 @@ + 4.0.0