You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by al...@apache.org on 2021/11/11 07:25:20 UTC
[incubator-linkis] branch dev-1.0.3 updated: Unify the exception
class of engineConnPlugin in one package close #1077
This is an automated email from the ASF dual-hosted git repository.
allenlliu pushed a commit to branch dev-1.0.3
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.0.3 by this push:
new c88008e Unify the exception class of engineConnPlugin in one package close #1077
new d18047f Merge pull request #1083 from peacewong/dev-1.0.3
c88008e is described below
commit c88008e719d522639c22b4a6eada7dc492c91aa7
Author: peacewong <wp...@gmail.com>
AuthorDate: Thu Nov 11 12:01:10 2021 +0800
Unify the exception class of engineConnPlugin in one package
close #1077
---
.../manager/engineplugin/cache/GuavaEngineConnPluginCache.java | 2 +-
.../{loader => }/exception/EngineConnPluginLoadException.scala | 8 ++++----
.../exception/EngineConnPluginLoadResourceException.scala | 8 ++++----
.../exception/EngineConnPluginNotFoundException.scala | 8 ++++----
.../manager/loaders/DefaultEngineConnPluginLoader.java | 4 ++--
.../manager/loaders/EngineConnPluginsResourceLoader.java | 2 +-
.../loaders/resource/BmlEngineConnPluginResourceLoader.java | 2 +-
7 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-cache/src/main/java/org/apache/linkis/manager/engineplugin/cache/GuavaEngineConnPluginCache.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-cache/src/main/java/org/apache/linkis/manager/engineplugin/cache/GuavaEngineConnPluginCache.java
index 5fb74b2..9284f5b 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-cache/src/main/java/org/apache/linkis/manager/engineplugin/cache/GuavaEngineConnPluginCache.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-cache/src/main/java/org/apache/linkis/manager/engineplugin/cache/GuavaEngineConnPluginCache.java
@@ -26,7 +26,7 @@ import org.apache.linkis.manager.engineplugin.cache.config.EngineConnPluginCache
import org.apache.linkis.manager.engineplugin.cache.refresh.*;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInfo;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInstance;
-import org.apache.linkis.manager.engineplugin.common.loader.exception.EngineConnPluginNotFoundException;
+import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadException.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadException.scala
similarity index 93%
rename from linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadException.scala
rename to linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadException.scala
index 48e4167..36e2296 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadException.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadException.scala
@@ -5,17 +5,17 @@
* 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.manager.engineplugin.common.loader.exception
+
+package org.apache.linkis.manager.engineplugin.common.exception
import org.apache.linkis.common.exception.ErrorException
import org.apache.linkis.manager.engineplugin.common.loader.conf.PluginLoaderConstant
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadResourceException.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadResourceException.scala
similarity index 93%
rename from linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadResourceException.scala
rename to linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadResourceException.scala
index e3cf0cf..ee23473 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginLoadResourceException.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginLoadResourceException.scala
@@ -5,17 +5,17 @@
* 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.manager.engineplugin.common.loader.exception
+
+package org.apache.linkis.manager.engineplugin.common.exception
import org.apache.linkis.common.exception.ErrorException
import org.apache.linkis.manager.engineplugin.common.loader.conf.PluginLoaderConstant
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginNotFoundException.scala b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginNotFoundException.scala
similarity index 93%
rename from linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginNotFoundException.scala
rename to linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginNotFoundException.scala
index 68dfb74..27b53e4 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/loader/exception/EngineConnPluginNotFoundException.scala
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-core/src/main/scala/org/apache/linkis/manager/engineplugin/common/exception/EngineConnPluginNotFoundException.scala
@@ -5,17 +5,17 @@
* 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.manager.engineplugin.common.loader.exception
+
+package org.apache.linkis.manager.engineplugin.common.exception
import org.apache.linkis.common.exception.ErrorException
import org.apache.linkis.manager.engineplugin.common.loader.conf.PluginLoaderConstant
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/DefaultEngineConnPluginLoader.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/DefaultEngineConnPluginLoader.java
index 568b2cb..06b7c01 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/DefaultEngineConnPluginLoader.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/DefaultEngineConnPluginLoader.java
@@ -21,8 +21,8 @@ import org.apache.linkis.common.exception.ErrorException;
import org.apache.linkis.manager.engineplugin.common.EngineConnPlugin;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInfo;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInstance;
-import org.apache.linkis.manager.engineplugin.common.loader.exception.EngineConnPluginLoadException;
-import org.apache.linkis.manager.engineplugin.common.loader.exception.EngineConnPluginNotFoundException;
+import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginLoadException;
+import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginNotFoundException;
import org.apache.linkis.manager.engineplugin.manager.classloader.EngineConnPluginClassLoader;
import org.apache.linkis.manager.engineplugin.manager.config.EngineConnPluginLoaderConf;
import org.apache.linkis.manager.engineplugin.manager.loaders.resource.LocalEngineConnPluginResourceLoader;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/EngineConnPluginsResourceLoader.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/EngineConnPluginsResourceLoader.java
index 6967754..eb400f9 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/EngineConnPluginsResourceLoader.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/EngineConnPluginsResourceLoader.java
@@ -18,7 +18,7 @@
package org.apache.linkis.manager.engineplugin.manager.loaders;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInfo;
-import org.apache.linkis.manager.engineplugin.common.loader.exception.EngineConnPluginLoadResourceException;
+import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginLoadResourceException;
import org.apache.linkis.manager.engineplugin.manager.loaders.resource.PluginResource;
diff --git a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
index ebd6f1b..7ae8783 100644
--- a/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
+++ b/linkis-engineconn-plugins/linkis-engineconn-plugin-framework/linkis-engineconn-plugin-loader/src/main/java/org/apache/linkis/manager/engineplugin/manager/loaders/resource/BmlEngineConnPluginResourceLoader.java
@@ -23,7 +23,7 @@ import org.apache.linkis.bml.protocol.BmlDownloadResponse;
import org.apache.linkis.bml.protocol.Version;
import org.apache.linkis.common.io.FsPath;
import org.apache.linkis.manager.engineplugin.common.loader.entity.EngineConnPluginInfo;
-import org.apache.linkis.manager.engineplugin.common.loader.exception.EngineConnPluginLoadResourceException;
+import org.apache.linkis.manager.engineplugin.common.exception.EngineConnPluginLoadResourceException;
import org.apache.linkis.manager.engineplugin.manager.config.EngineConnPluginLoaderConf;
import org.apache.linkis.manager.engineplugin.manager.loaders.EngineConnPluginsResourceLoader;
import org.apache.linkis.manager.engineplugin.manager.utils.EngineConnPluginUtils;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org