Feat remove linkis annotations (#943)

* fix: remove linkis annotation

.gitignore

@@ -1,110 +1,33 @@
-.idea
-.idea/*
-
 .DS_Store
+.cache
 
-assembly/target
-assembly/dss-package/target
-
-
-# dss-commons
-dss-commons/dss-sender-service/target
-
-# dss-appconn
-dss-appconn/appconns/dss-datachecker-appconn/target
-dss-appconn/appconns/dss-eventchecker-appconn/target
-dss-appconn/appconns/dss-orchestrator-framework-appconn/target
-dss-appconn/appconns/dss-schedulis-appconn/target
-dss-appconn/appconns/dss-sendemail-appconn/esb-email-support/target
-dss-appconn/appconns/dss-sendemail-appconn/sendemail-appconn-core/target
-dss-appconn/appconns/dss-workflow-appconn/target
-dss-appconn/appconns/dss-sso-appconn/target
-dss-appconn/appconns/dss-scriptis-appconn-appconn/target
-dss-appconn/dss-appconn-core/target
-dss-appconn/dss-appconn-loader/target
-dss-appconn/dss-schedule-appconn-core/target
-dss-appconn/linkis-appconn-engineplugin/target
-dss-appconn/appconns/dss-dolphinscheduler-appconn/target
-dss-appconn/dss-appconn-manager/dss-appconn-manager-client/target
-dss-appconn/dss-appconn-manager/dss-appconn-manager-core/target
-dss-appconn/dss-scheduler-appconn/target
-
-# dss-apps
-dss-apps/dss-apiservice-server/target
-dss-apps/dss-scriptis-server/target
-
-#dss-guide
-dss-apps/dss-user-guide/dss-user-guide-server/src/main/resources/
-dss-apps/dss-user-guide/dss-user-guide-server/target
-
-# dss-commons
-dss-commons/dss-common/target
-dss-commons/dss-contextservice/target
-
-# dss-framework
-dss-framework/dss-appconn-framework/target
-dss-framework/dss-framework-common/target
-dss-framework/dss-framework-orchestrator-server/target
-dss-framework/dss-framework-project-server/target
-dss-framework/dss-framework-workspace-server/target
-dss-framework/framework-plugins/dss-framework-orchestrator-publish/target
-dss-framework/framework-plugins/dss-framework-release-server/target
-dss-framework/framework-plugins/dss-framework-migrate-server/target
-dss-framework/dss-framework-admin/target
-dss-framework/dss-framework-sql-template/target
-dss-framework/dss-framework-dbapi-server/target
-dss-framework/dss-framework-admin-service/target
-
-
-# dss-orchestrator
-dss-orchestrator/dss-orchestrator-common/target
-dss-orchestrator/dss-orchestrator-core/target
-dss-orchestrator/dss-orchestrator-db/target
-dss-orchestrator/dss-orchestrator-loader/target
-dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/target
-dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-common/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/target
-dss-orchestrator/dss-orchestrator-conversion-standard/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-conversion-standard/target
-dss-orchestrator/orchestrators/dss-workflow/dss-workflow-sdk/target
-
-# dss-standars
-dss-standard/dss-standard-common/target
-dss-standard/sso-standard/origin-sso-integration-standard/target
-dss-standard/sso-standard/spring-origin-sso-integration-plugin/target
-dss-standard/sso-standard/sso-integration-standard/target
-dss-standard/development-standard/development-process-standard/target
-dss-standard/development-standard/development-process-standard-execution/target
-dss-standard/structure-standard/dss-project-plugin/target
-dss-standard/structure-standard/dss-role-plugin/target
-dss-standard/structure-standard/dss-structure-integration-standard/target
-dss-standard/structure-standard/spring-origin-dss-project-plugin/target
-
-#dss-data-api
-dss-apps/dss-data-api/dss-data-api-server/src/main/resources
-dss-apps/dss-data-api/dss-api-sql-template/target
-dss-apps/dss-data-api/dss-data-api-server/target
-
-#dss-data-governance
-dss-apps/dss-data-governance/dss-data-governance-server/src/main/resources
-dss-apps/dss-data-governance/dss-data-governance-server/target
-dss-apps/dss-data-governance/dss-data-governance-common/target
-dss-apps/dss-data-governance/dss-data-asset-server/target
-dss-apps/dss-data-governance/dss-data-classification-server/target
-dss-apps/dss-data-governance/dss-data-warehouse-dao/target
-dss-apps/dss-data-governance/dss-data-warehouse-service/target
-dss-apps/dss-data-governance/dss-data-warehouse-server/target
-
-
-# plugins
-plugins/azkaban/linkis-jobtype/target
-plugins/linkis/dss-gateway-support/target
-
-logs
-logs/*
-
+# for ide
 *.iml
-/plugins/dolphinscheduler/dss-dolphinscheduler-client/target
-/plugins/dolphinscheduler/dolphinscheduler-prod-metrics/target
-/plugins/dolphinscheduler/dss-dolphinscheduler-token/target
+*.ipr
+*.iws
+*.pyc
+*.pyo
+*.swp
+.idea/
+.idea_modules/
+.project
+.pydevproject
+.scala_dependencies
+.settings
+.classpath
+
+# For SBT
+.jvmopts
+
+# For Node.js
+node_modules/
+
+# generated file
+.mvn/wrapper/maven-wrapper.jar
+dist/
+out/
+target/
+
+# log folder
+logs/
+*.log

conf/log4j2.xml

@@ -21,8 +21,8 @@
             <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level [%t] %logger{36} %L %M - %msg%xEx%n"/>
         </Console>
-        <RollingFile name="RollingFile" fileName="logs/dss-server.log"
-                     filePattern="logs/$${date:yyyy-MM}/${serviceName}-log-%d{yyyy-MM-dd}-%i.log">
+        <RollingFile name="RollingFile" fileName="${env:DSS_LOG_DIR:-logs}/${sys:serviceName}.log"
+                     filePattern="${env:DSS_LOG_DIR:-logs}/$${date:yyyy-MM}/${sys:serviceName}-log-%d{yyyy-MM-dd}-%i.log">
             <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%-40t] %c{1.} (%L) [%M] - %msg%xEx%n"/>
             <SizeBasedTriggeringPolicy size="100MB"/>
             <DefaultRolloverStrategy max="20"/>

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowEntranceRestfulApi.java

@@ -26,7 +26,6 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.linkis.common.log.LogUtils;
 import org.apache.linkis.entrance.EntranceServer;
-import org.apache.linkis.entrance.annotation.EntranceServerBeanAnnotation;
 import org.apache.linkis.entrance.execute.EntranceJob;
 import org.apache.linkis.entrance.restful.EntranceRestfulApi;
 import org.apache.linkis.entrance.utils.JobHistoryHelper;
@@ -64,7 +63,7 @@ public class FlowEntranceRestfulApi extends EntranceRestfulApi {
     @Autowired
     private TaskMapper taskMapper;
     @Override
-    @EntranceServerBeanAnnotation.EntranceServerAutowiredAnnotation
+    @Autowired
     public void setEntranceServer(EntranceServer entranceServer) {
         super.setEntranceServer(entranceServer);
         this.entranceServer = entranceServer;

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/java/com/webank/wedatasphere/dss/flow/execution/entrance/restful/FlowExecutionRestfulApi.java

@@ -21,7 +21,6 @@
 import com.webank.wedatasphere.dss.flow.execution.entrance.job.FlowEntranceJob;
 import com.webank.wedatasphere.dss.flow.execution.entrance.service.WorkflowExecutionInfoService;
 import org.apache.linkis.entrance.EntranceServer;
-import org.apache.linkis.entrance.annotation.EntranceServerBeanAnnotation;
 import org.apache.linkis.protocol.utils.ZuulEntranceUtils;
 import org.apache.linkis.scheduler.queue.Job;
 import org.apache.linkis.scheduler.queue.SchedulerEventState;
@@ -30,7 +29,11 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import scala.Enumeration;
 import scala.Option;
 
@@ -46,7 +49,7 @@ public class FlowExecutionRestfulApi {
 
     private static final Logger logger = LoggerFactory.getLogger(FlowExecutionRestfulApi.class);
 
-    @EntranceServerBeanAnnotation.EntranceServerAutowiredAnnotation
+    @Autowired
     public void setEntranceServer(EntranceServer entranceServer) {
         this.entranceServer = entranceServer;
     }

dss-orchestrator/orchestrators/dss-workflow/dss-flow-execution-server/src/main/scala/com/webank/wedatasphere/dss/flow/execution/entrance/conf/FlowExecutionEntranceSpringConfiguration.scala

@@ -20,34 +20,30 @@ import com.webank.wedatasphere.dss.flow.execution.entrance.engine.{FlowEntranceE
 import com.webank.wedatasphere.dss.flow.execution.entrance.entranceparser.FlowExecutionParser
 import com.webank.wedatasphere.dss.flow.execution.entrance.persistence.WorkflowPersistenceEngine
 import org.apache.linkis.entrance.EntranceParser
-import org.apache.linkis.entrance.annotation.{EntranceExecutorManagerBeanAnnotation, EntranceParserBeanAnnotation, PersistenceEngineBeanAnnotation, PersistenceManagerBeanAnnotation}
 import org.apache.linkis.entrance.persistence.{PersistenceEngine, PersistenceManager}
 import org.apache.linkis.scheduler.executer.ExecutorManager
 import org.slf4j.LoggerFactory
-import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.context.annotation.Configuration
-
+import org.springframework.context.annotation.{Bean, Configuration}
 
 @Configuration
 class FlowExecutionEntranceSpringConfiguration {
   private val logger = LoggerFactory.getLogger(classOf[FlowExecutionEntranceSpringConfiguration])
 
-  @EntranceExecutorManagerBeanAnnotation
-  def generateExternalEntranceExecutorManager(@Autowired flowEntranceEngine:FlowEntranceEngine): ExecutorManager = {
+  @Bean
+  def executorManager(flowEntranceEngine: FlowEntranceEngine): ExecutorManager = {
     logger.info("begin to get FlowExecution Entrance EntranceExecutorManager")
     new FlowExecutionExecutorManagerImpl(flowEntranceEngine)
   }
 
-  @PersistenceEngineBeanAnnotation
-  def generatePersistenceEngine(): PersistenceEngine ={
+  @Bean
+  def persistenceEngine(): PersistenceEngine ={
     new WorkflowPersistenceEngine()
   }
 
-  @EntranceParserBeanAnnotation
-  def generateEntranceParser(@PersistenceManagerBeanAnnotation.PersistenceManagerAutowiredAnnotation persistenceManager: PersistenceManager): EntranceParser = {
+  @Bean
+  def entranceParser(persistenceManager: PersistenceManager): EntranceParser = {
     logger.info("begin to get FlowExecution Entrance parser")
     new FlowExecutionParser(persistenceManager)
   }
 
-
 }