From 08333d8a5831bc2b255923bce90aaf3e2c0cf4d3 Mon Sep 17 00:00:00 2001 From: gf13871 Date: Sun, 16 Jul 2023 12:14:38 +0800 Subject: [PATCH] merge datasource module --- .../linkis-datasource-manager/server/pom.xml | 4 + .../server/src/main/assembly/distribution.xml | 69 ++++++++++- .../LinkisMetadataQueryApplication.java | 0 .../server/loader/MetaClassLoaderManager.java | 0 .../server/restful/MetadataCoreRestful.java | 0 .../server/restful/MetadataQueryRestful.java | 0 .../server/service/MetadataQueryService.java | 0 .../impl/MetadataQueryServiceImpl.java | 0 .../query/server/utils/MetadataUtils.java | 0 .../server/receiver/BaseMetaReceiver.scala | 0 .../query/server/WebApplicationServer.java | 0 .../loader/MetaClassLoaderManagerTest.java | 0 .../server/receiver/BaseMetaReceiverTest.java | 0 .../restful/MetadataCoreRestfulTest.java | 0 .../restful/MetadataQueryRestfulTest.java | 0 .../query/server/restful/MvcUtils.java | 0 .../query/common/domain/GenerateSqlInfo.java | 0 .../linkis-metadata-query/server/pom.xml | 93 --------------- .../server/src/main/assembly/distribution.xml | 112 ------------------ .../src/test/resources/application.properties | 19 --- .../query/service/AbstractSqlConnection.java | 0 .../linkis-datasource/pom.xml | 1 - linkis-public-enhancements/pom.xml | 2 +- 23 files changed, 73 insertions(+), 227 deletions(-) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java (100%) rename linkis-public-enhancements/linkis-datasource/{linkis-metadata-query => linkis-datasource-manager}/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java (100%) mode change 100755 => 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml delete mode 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties mode change 100755 => 100644 linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java 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..0d09923dc0 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 @@ -101,6 +101,10 @@ + + net.alchim31.maven + scala-maven-plugin + org.apache.maven.plugins maven-assembly-plugin diff --git a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml index ec03bb0f03..8ff2fa8b51 100644 --- a/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml +++ b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/assembly/distribution.xml @@ -183,6 +183,73 @@ - + + + ${basedir}/../service/elasticsearch/target/out/lib + 0755 + lib/service/elasticsearch + + *.jar + + + *-javadoc.jar + + + + ${basedir}/../service/hive/target/out/lib + 0755 + lib/service/hive + + *.jar + + + *-javadoc.jar + + + + ${basedir}/../service/kafka/target/out/lib + 0755 + lib/service/kafka + + *.jar + + + *-javadoc.jar + + + + ${basedir}/../service/jdbc/target/out/lib + 0755 + lib/service/jdbc + + *.jar + + + *-javadoc.jar + + + + ${basedir}/../service/hdfs/target/out/lib + 0755 + lib/service/hdfs + + *.jar + + + *-javadoc.jar + + + + ${basedir}/../service/mongodb/target/out/lib + 0755 + lib/service/mongodb + + *.jar + + + *-javadoc.jar + + + diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/LinkisMetadataQueryApplication.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestful.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestful.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/MetadataQueryService.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/service/impl/MetadataQueryServiceImpl.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/java/org/apache/linkis/metadata/query/server/utils/MetadataUtils.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/main/scala/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiver.scala diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/WebApplicationServer.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManagerTest.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/receiver/BaseMetaReceiverTest.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataCoreRestfulTest.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MetadataQueryRestfulTest.java diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java b/linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java similarity index 100% rename from linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.java rename to linkis-public-enhancements/linkis-datasource/linkis-datasource-manager/server/src/test/java/org/apache/linkis/metadata/query/server/restful/MvcUtils.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-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/GenerateSqlInfo.java old mode 100755 new mode 100644 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 deleted file mode 100644 index 21705e23f9..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - 4.0.0 - - org.apache.linkis - linkis - ${revision} - ../../../../pom.xml - - linkis-metadata-query-server - - - - - org.apache.linkis - linkis-metadata-query-common - ${project.version} - - - - org.apache.linkis - linkis-datasource-manager-common - ${project.version} - - - org.ow2.asm - asm - - - - - - org.apache.linkis - linkis-rpc - ${project.version} - provided - - - - - - - net.alchim31.maven - scala-maven-plugin - - - - org.apache.maven.plugins - maven-assembly-plugin - false - - false - out - false - false - - src/main/assembly/distribution.xml - - - - - make-assembly - - single - - package - - - src/main/assembly/distribution.xml - - - - - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml deleted file mode 100644 index e0d152d64c..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/assembly/distribution.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - - linkis-metadata-query-server - - zip - dir - - false - linkis-mdm-server - - - - - - lib - true - true - false - false - true - - - - - - ${basedir}/../service/elasticsearch/target/out/lib - 0755 - lib/service/elasticsearch - - *.jar - - - *-javadoc.jar - - - - ${basedir}/../service/hive/target/out/lib - 0755 - lib/service/hive - - *.jar - - - *-javadoc.jar - - - - ${basedir}/../service/kafka/target/out/lib - 0755 - lib/service/kafka - - *.jar - - - *-javadoc.jar - - - - ${basedir}/../service/jdbc/target/out/lib - 0755 - lib/service/jdbc - - *.jar - - - *-javadoc.jar - - - - ${basedir}/../service/hdfs/target/out/lib - 0755 - lib/service/hdfs - - *.jar - - - *-javadoc.jar - - - - ${basedir}/../service/mongodb/target/out/lib - 0755 - lib/service/mongodb - - *.jar - - - *-javadoc.jar - - - - - - diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties deleted file mode 100644 index 5572769a68..0000000000 --- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/test/resources/application.properties +++ /dev/null @@ -1,19 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -#disable eureka discovery client -spring.cloud.service-registry.auto-registration.enabled=false -eureka.client.enabled=false -eureka.client.serviceUrl.registerWithEureka=false \ No newline at end of file diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java b/linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/jdbc/src/main/java/org/apache/linkis/metadata/query/service/AbstractSqlConnection.java old mode 100755 new mode 100644 diff --git a/linkis-public-enhancements/linkis-datasource/pom.xml b/linkis-public-enhancements/linkis-datasource/pom.xml index a6a138f675..19f68d6773 100644 --- a/linkis-public-enhancements/linkis-datasource/pom.xml +++ b/linkis-public-enhancements/linkis-datasource/pom.xml @@ -36,7 +36,6 @@ linkis-metadata-query/service/jdbc linkis-metadata-query/service/hdfs linkis-metadata-query/service/mongodb - linkis-metadata-query/server linkis-datasource-client diff --git a/linkis-public-enhancements/pom.xml b/linkis-public-enhancements/pom.xml index c3eb423cff..db9e993c20 100644 --- a/linkis-public-enhancements/pom.xml +++ b/linkis-public-enhancements/pom.xml @@ -65,7 +65,7 @@ org.apache.linkis - linkis-metadata-query-server + linkis-datasource-manager-server ${project.version}