Version 1.0.1 of DSS is adapted to Apache of linkis #444

JackChen0810 · JackChen0810 · commit 98a21fd4ba03 · 2021-11-13T17:48:34.000+08:00
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/conf/DSSCommonConf.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/conf/DSSCommonConf.java
@@ -18,9 +18,6 @@
 
 import org.apache.linkis.common.conf.CommonVars;
 
-/**
- * @Date 2020/3/27
- */
 public class DSSCommonConf {
 
     public static final CommonVars<String> DSS_IO_ENV = CommonVars.apply("wds.dss.server.io.env", "BDAP_DEV");
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/DSSWorkspace.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/DSSWorkspace.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.entity;
 
-/**
- * @Date 2021/7/1.
- */
 public interface DSSWorkspace {
 
     String getWorkspaceName();
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/PublishType.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/PublishType.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.entity;
 
-/**
- * @date 2020/12/16 11:53
- */
 public enum PublishType {
     FULL,DELTA
 }
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/Layout.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/node/Layout.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.entity.node;
 
-/**
- * @Date 2019/11/12.
- */
 public class Layout {
     private float x;
     private float y;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/Project.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/entity/project/Project.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.entity.project;
 
-/**
- * @Date 2019/9/16.
- */
 public interface Project {
     Long getId();
 
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/DSSErrorException.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/DSSErrorException.java
@@ -18,9 +18,6 @@
 
 import org.apache.linkis.common.exception.ErrorException;
 
-/**
- * @Date 2019/11/6.
- */
 public class DSSErrorException extends ErrorException {
 
     public DSSErrorException(int errCode, String desc) {
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/DSSRuntimeException.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/DSSRuntimeException.java
@@ -18,9 +18,6 @@
 
 import org.apache.linkis.common.exception.WarnException;
 
-/**
- * @Date 2019/9/24.
- */
 public class DSSRuntimeException extends WarnException {
 
     public DSSRuntimeException(String msg){
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ErrorCode.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ErrorCode.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.exception;
 
-/**
- * @Date 2020/3/20
- */
 public class ErrorCode {
 
     public static final int INVALID_PARAMS = 71001;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ThrowingConsumer.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ThrowingConsumer.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.exception;
 
-/**
- * @Date 2019/9/20.
- */
 @FunctionalInterface
 public interface ThrowingConsumer<T,E extends Exception> {
     void accept(T t) throws E;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ThrowingFunction.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/exception/ThrowingFunction.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.exception;
 
-/**
- * @Date 2019/11/13.
- */
 @FunctionalInterface
 public interface ThrowingFunction <T,R,E extends Exception> {
     R accept(T t) throws E;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/label/LabelInstanceFactory.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/label/LabelInstanceFactory.java
@@ -23,10 +23,6 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * @Date 2021/7/16
- * @description:
- */
 public class LabelInstanceFactory {
 
     private static final Logger log = LoggerFactory.getLogger(LabelInstanceFactory.class);
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/label/LabelKeyConvertor.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/label/LabelKeyConvertor.java
@@ -22,10 +22,6 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/**
- * @Date 2021/7/16
- * @description:
- */
 public class LabelKeyConvertor {
 
     private static final Logger log = LoggerFactory.getLogger(LabelKeyConvertor.class);
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/JobStatus.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/JobStatus.java
@@ -16,10 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.protocol;
 
-/**
- * @Date 2020/11/17
- * Description:
- */
 public enum JobStatus {
 
     /**
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectInfoRequest.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectInfoRequest.java
@@ -16,9 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.protocol.project;
 
-/**
- * @Date 2021/7/2.
- */
 public class ProjectInfoRequest {
 
     private long projectId;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectRelationRequest.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectRelationRequest.java
@@ -21,10 +21,6 @@
 
 import java.util.List;
 
-/**
- * @Date 2021/1/18
- * Description:
- */
 public class ProjectRelationRequest {
 
     private Long dssProjectId;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectRelationResponse.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/protocol/project/ProjectRelationResponse.java
@@ -21,10 +21,6 @@
 
 import java.util.List;
 
-/**
- * @Date 2021/1/18
- * Description:
- */
 public class ProjectRelationResponse {
 
     private Long dssProjectId;
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ClassUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ClassUtils.java
@@ -25,9 +25,6 @@
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.reflections.Reflections;
 
-/**
- * @Date 2021/6/24.
- */
 public class ClassUtils {
 
     private static final ClassHelper CLASS_HELPER = new ClassHelper() {
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSCommonUtils.java
@@ -20,9 +20,6 @@
 import com.google.gson.GsonBuilder;
 import org.apache.linkis.common.conf.CommonVars;
 
-/**
- * @Date 2020/3/16
- */
 public class DSSCommonUtils {
 
     public static final String FLOW_RESOURCE_NAME = "resources";
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSExceptionUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/DSSExceptionUtils.java
@@ -29,9 +29,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @Date 2019/9/24.
- */
 public class DSSExceptionUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DSSExceptionUtils.class);
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/FileHelper.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/FileHelper.java
@@ -18,10 +18,6 @@
 
 import java.io.File;
 
-/**
- * @Date 2019/6/14
- * Description: FileHelper 是 linux 文件系统的帮助类，检查目录是否存在等
- */
 public class FileHelper {
 
     public static boolean checkDirExists(String dir){
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/IoUtils.java
@@ -29,10 +29,6 @@
 import java.util.Date;
 import java.util.Properties;
 
-/**
- * @version 2.0.0
- * @date 2020/03/11 11:18 AM
- */
 public class IoUtils {
 
     private static Logger logger = LoggerFactory.getLogger(IoUtils.class);
diff --git a/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java b/dss-commons/dss-common/src/main/java/com/webank/wedatasphere/dss/common/utils/ZipHelper.java
@@ -30,10 +30,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * @Date 2019/6/13
- * Description:
- */
 public class ZipHelper {
 
     private static final Logger logger = LoggerFactory.getLogger(ZipHelper.class);
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/label/LabelBuilder.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/label/LabelBuilder.scala
@@ -23,11 +23,6 @@ import java.util
 
 import org.apache.linkis.manager.label.builder.factory.{LabelBuilderFactory, LabelBuilderFactoryContext}
 
-
-/**
- * @author: jinyangrao on 2021/7/16
- * @description:
- */
 object LabelBuilder {
 
   def buildLabel(labelMap: util.Map[String, Object]): util.Map[String, Label[_]] = {
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocol.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocol.scala
@@ -16,10 +16,6 @@
 
 package com.webank.wedatasphere.dss.common.protocol
 
-/**
- * @Date 2020/11/17
- * Description:
- */
 trait DSSProtocol {
 
 }
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/DSSProtocolObject.scala
@@ -18,13 +18,6 @@ package com.webank.wedatasphere.dss.common.protocol
 
 import com.webank.wedatasphere.dss.common.label.DSSLabel
 
-
-/**
- * @Date 2019/11/8.
- */
-
-
-
 case class ResponseCreateOrchestrator(orchestratorId: Long,
                                       orchestratorVersionId: Long)
 
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/framework/ReleaseOrchestratorRequest.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/protocol/framework/ReleaseOrchestratorRequest.scala
@@ -18,25 +18,13 @@ package com.webank.wedatasphere.dss.common.protocol.framework
 
 import com.webank.wedatasphere.dss.common.protocol.DSSProtocol
 
-
-/**
- * @Date 2020/11/17
- * Description:
- * DSS框架RPC所需要用到RPC
- */
-
-
-
 trait FrameworkProtocol extends DSSProtocol
 
-
 case class ReleaseOrchestratorRequest(releaseUser:String, orchestratorVersionId:Long, orchestratorId:Long,
                                       dssLabel:String, workspaceName:String, workSpaceStr: String) extends FrameworkProtocol
 
 case class ReleaseOrchestratorResponse(jobId:Long) extends FrameworkProtocol
 
-
-
 case class ReleaseOrchestratorStatusRequest(jobId:Long) extends FrameworkProtocol
 
 case class ReleaseOrchestratorStatusResponse(status:String, jobId:Long, errorMsg:String) extends FrameworkProtocol
diff --git a/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/utils/DSSMainHelper.scala b/dss-commons/dss-common/src/main/scala/com/webank/wedatasphere/dss/common/utils/DSSMainHelper.scala
@@ -20,10 +20,7 @@ import org.apache.linkis.common.conf.{BDPConfiguration, CommonVars, DSSConfigura
 
 import scala.collection.JavaConversions._
 
-/**
- * @author allenlliu
- * @date 2021/3/9 17:18
- */
+
 object DSSMainHelper {
 
 //  val DSS_DEFAULT_PROPERTY_FILE_NAME = CommonVars("wds.dss.default.property.file", "dss.properties")
diff --git a/dss-commons/dss-common/src/main/scala/org/apache/linkis/common/conf/DSSConfiguration.scala b/dss-commons/dss-common/src/main/scala/org/apache/linkis/common/conf/DSSConfiguration.scala
@@ -2,10 +2,6 @@ package org.apache.linkis.common.conf
 
 import java.util.Properties
 
-/**
- * @author allenlliu
- * @date 2021/3/10 17:32
- */
 object DSSConfiguration {
 
   def getAllProperties: Properties = BDPConfiguration.properties
diff --git a/dss-commons/dss-contextservice/src/main/java/com/webank/wedatasphere/dss/contextservice/service/ContextService.java b/dss-commons/dss-contextservice/src/main/java/com/webank/wedatasphere/dss/contextservice/service/ContextService.java
@@ -18,11 +18,6 @@
 
 import com.webank.wedatasphere.dss.common.exception.DSSErrorException;
 
-/**
- * Linkis ContextService访问接口工具类
- * 提供创建ContextID、存储状态信息等到CS服务的接口
- * @Date 2020-0318
- */
 public interface ContextService {
 
     /**
diff --git a/dss-commons/dss-contextservice/src/main/java/com/webank/wedatasphere/dss/contextservice/service/impl/ContextServiceImpl.java b/dss-commons/dss-contextservice/src/main/java/com/webank/wedatasphere/dss/contextservice/service/impl/ContextServiceImpl.java
@@ -43,9 +43,6 @@
 
 import java.util.*;
 
-/**
- * @Date 2020-0318
- */
 public class ContextServiceImpl implements ContextService {
 
     private static final Logger logger = LoggerFactory.getLogger(ContextServiceImpl.class);
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderService.java
@@ -20,9 +20,6 @@
 import org.apache.linkis.rpc.Sender;
 import java.util.List;
 
-/**
- * @date 2021/6/24 17:09
- */
 public interface DSSSenderService {
 
     Sender getOrcSender();
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderServiceFactory.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/DSSSenderServiceFactory.java
@@ -21,9 +21,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * @date 2021/6/28 11:41
- */
 public class DSSSenderServiceFactory {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DSSSenderServiceFactory.class);
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/conf/DSSSenderServiceConf.java
@@ -18,9 +18,6 @@
 
 import org.apache.linkis.common.conf.CommonVars;
 
-/**
- * @date 2021/6/24 17:23
- */
 public class DSSSenderServiceConf {
     public static final CommonVars<String> ORCHESTRATOR_SERVER_DEV_NAME =
             CommonVars.apply("wds.dss.orc.server.dev.name", "DSS-Framework-Orchestrator-Server-Dev");
diff --git a/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java b/dss-commons/dss-sender-service/src/main/java/com/webank/wedatasphere/dss/sender/service/impl/DSSSenderServiceImpl.java
@@ -22,9 +22,6 @@
 import org.apache.linkis.rpc.Sender;
 import java.util.List;
 
-/**
- * @date 2021/6/24 17:13
- */
 public class DSSSenderServiceImpl implements DSSSenderService {
 
     private final Sender orcSender = Sender.getSender(DSSSenderServiceConf.ORCHESTRATOR_SERVER_DEV_NAME.getValue());
diff --git a/dss-standard/development-standard/development-process-standard-execution/src/main/java/com/webank/wedatasphere/dss/standard/app/development/listener/core/LongTermRefExecutionOperation.java b/dss-standard/development-standard/development-process-standard-execution/src/main/java/com/webank/wedatasphere/dss/standard/app/development/listener/core/LongTermRefExecutionOperation.java
@@ -34,11 +34,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/**
- * Description: LongTermRefExecutionOperation is used to execute long-term tasks in external application systems.
- * Long-term task usually supports to execute asyncly and can fetch status and logs when it is submitted.
- *
- */
+
 public abstract class LongTermRefExecutionOperation implements RefExecutionOperation {
 
     private static final Logger logger = LoggerFactory.getLogger(LongTermRefExecutionOperation.class);

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,6 @@`
`16`	`16`
`17`	`17`	`package com.webank.wedatasphere.dss.common.entity;`
`18`	`18`
`19`		`-/**`
`20`		`- * @date 2020/12/16 11:53`
`21`		`- */`
`22`	`19`	`public enum PublishType {`
`23`	`20`	`FULL,DELTA`
`24`	`21`	`}`