You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/09/21 11:28:36 UTC
[incubator-linkis] branch dev-1.3.1 updated: Move Java classes in scala into Java packages (#3495)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new c45ffe0b8 Move Java classes in scala into Java packages (#3495)
c45ffe0b8 is described below
commit c45ffe0b86f47247fe34ef0692aa1ca60e87b42f
Author: 成彬彬 <10...@users.noreply.github.com>
AuthorDate: Wed Sep 21 19:28:30 2022 +0800
Move Java classes in scala into Java packages (#3495)
---
.../engineconn/EngineConnExecutorErrorCode.java | 24 ++++++++---------
.../EngineConnExecutorErrorException.java | 31 +++++++++++-----------
.../executor/execute/EngineExecutionContext.scala | 2 +-
.../service/TaskExecutionServiceImpl.scala | 6 ++---
.../engineconn/launch/EngineConnServer.scala | 4 +--
.../service/EngineConnTimedLockService.scala | 2 +-
6 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
similarity index 66%
rename from linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java
rename to linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
index 3ba29aa39..8e53c46e2 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorCode.java
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorCode.java
@@ -5,36 +5,36 @@
* 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.governance.common.exception.engineconn;
+
+package org.apache.linkis.governance.exception.engineconn;
/**
* ErrorCode of Engine start with 40000
+ *
* <p>
*/
public class EngineConnExecutorErrorCode {
- public static final int INVALID_ENGINE_TYPE = 40100;
-
- public static final int INVALID_METHOD = 40101;
+ public static final int INVALID_ENGINE_TYPE = 40100;
- public static final int INVALID_PARAMS = 40102;
+ public static final int INVALID_METHOD = 40101;
- public static final int INVALID_LOCK = 40103;
+ public static final int INVALID_PARAMS = 40102;
- public static final int INVALID_TASK = 40104;
+ public static final int INVALID_LOCK = 40103;
- public static final int SEND_TO_ENTRANCE_ERROR = 40105;
+ public static final int INVALID_TASK = 40104;
- public static final int INIT_EXECUTOR_FAILED = 40106;
+ public static final int SEND_TO_ENTRANCE_ERROR = 40105;
+ public static final int INIT_EXECUTOR_FAILED = 40106;
}
diff --git a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
similarity index 65%
rename from linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java
rename to linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
index b7adc0ac5..2f0983df7 100644
--- a/linkis-computation-governance/linkis-computation-governance-common/src/main/scala/org/apache/linkis/governance/common/exception/engineconn/EngineConnExecutorErrorException.java
+++ b/linkis-computation-governance/linkis-computation-governance-common/src/main/java/org/apache/linkis/governance/exception/engineconn/EngineConnExecutorErrorException.java
@@ -5,34 +5,33 @@
* 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.governance.common.exception.engineconn;
+
+package org.apache.linkis.governance.exception.engineconn;
import org.apache.linkis.common.exception.ErrorException;
public class EngineConnExecutorErrorException extends ErrorException {
- public EngineConnExecutorErrorException(int errCode, String desc) {
- super(errCode, desc);
- }
-
- public EngineConnExecutorErrorException(int errCode, String desc, String ip, int port, String serviceKind) {
- super(errCode, desc, ip, port, serviceKind);
- }
-
- public EngineConnExecutorErrorException(int errCode, String desc, Throwable e) {
- this(errCode, desc);
- initCause(e);
- }
+ public EngineConnExecutorErrorException(int errCode, String desc) {
+ super(errCode, desc);
+ }
+ public EngineConnExecutorErrorException(
+ int errCode, String desc, String ip, int port, String serviceKind) {
+ super(errCode, desc, ip, port, serviceKind);
+ }
+ public EngineConnExecutorErrorException(int errCode, String desc, Throwable e) {
+ this(errCode, desc);
+ initCause(e);
+ }
}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
index 933929ea4..e54f67597 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/execute/EngineExecutionContext.scala
@@ -36,7 +36,7 @@ import org.apache.linkis.engineconn.executor.listener.{
EngineConnSyncListenerBus,
ExecutorListenerBusContext
}
-import org.apache.linkis.governance.common.exception.engineconn.EngineConnExecutorErrorException
+import org.apache.linkis.governance.exception.engineconn.EngineConnExecutorErrorException
import org.apache.linkis.protocol.engine.JobProgressInfo
import org.apache.linkis.scheduler.executer.{AliasOutputExecuteResponse, OutputExecuteResponse}
import org.apache.linkis.storage.{LineMetaData, LineRecord}
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
index 608c2da2a..981d12d91 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-computation-engineconn/src/main/scala/org/apache/linkis/engineconn/computation/executor/service/TaskExecutionServiceImpl.scala
@@ -50,12 +50,12 @@ import org.apache.linkis.engineconn.executor.entity.ResourceFetchExecutor
import org.apache.linkis.engineconn.executor.listener.ExecutorListenerBusContext
import org.apache.linkis.engineconn.executor.listener.event.EngineConnSyncEvent
import org.apache.linkis.governance.common.entity.ExecutionNodeStatus
-import org.apache.linkis.governance.common.exception.engineconn.{
+import org.apache.linkis.governance.common.protocol.task._
+import org.apache.linkis.governance.common.utils.JobUtils
+import org.apache.linkis.governance.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
-import org.apache.linkis.governance.common.protocol.task._
-import org.apache.linkis.governance.common.utils.JobUtils
import org.apache.linkis.manager.common.entity.enumeration.NodeStatus
import org.apache.linkis.manager.common.protocol.resource.{
ResponseTaskRunningInfo,
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
index 88f9112b3..d72ec939d 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-core/src/main/scala/org/apache/linkis/engineconn/launch/EngineConnServer.scala
@@ -35,11 +35,11 @@ import org.apache.linkis.engineconn.core.execution.{
import org.apache.linkis.engineconn.core.hook.ShutdownHook
import org.apache.linkis.engineconn.core.util.EngineConnUtils
import org.apache.linkis.governance.common.conf.GovernanceCommonConf
-import org.apache.linkis.governance.common.exception.engineconn.{
+import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
+import org.apache.linkis.governance.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
-import org.apache.linkis.governance.common.utils.EngineConnArgumentsParser
import org.apache.linkis.manager.engineplugin.common.launch.process.Environment
import org.apache.linkis.manager.label.builder.factory.{
LabelBuilderFactory,
diff --git a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
index 4d85fab48..8823053fd 100644
--- a/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
+++ b/linkis-computation-governance/linkis-engineconn/linkis-engineconn-executor/accessible-executor/src/main/scala/org/apache/linkis/engineconn/acessible/executor/service/EngineConnTimedLockService.scala
@@ -27,7 +27,7 @@ import org.apache.linkis.engineconn.acessible.executor.listener.event.{
import org.apache.linkis.engineconn.acessible.executor.lock.EngineConnTimedLock
import org.apache.linkis.engineconn.core.executor.ExecutorManager
import org.apache.linkis.engineconn.executor.listener.ExecutorListenerBusContext
-import org.apache.linkis.governance.common.exception.engineconn.{
+import org.apache.linkis.governance.exception.engineconn.{
EngineConnExecutorErrorCode,
EngineConnExecutorErrorException
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org