From 3a066f2272049d6b6e8a6a6ca5393ba95c749f66 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Tue, 7 Apr 2020 17:17:39 +0800 Subject: [PATCH] javadoc compile error modify --- .../org/apache/dolphinscheduler/dao/AlertDao.java | 5 ++++- .../dao/datasource/BaseDataSource.java | 1 + .../dao/datasource/DataSourceFactory.java | 6 ++++++ .../dao/datasource/SQLServerDataSource.java | 1 - .../dao/datasource/SpringConnectionFactory.java | 3 ++- .../dao/mapper/ProcessInstanceMapper.java | 14 ++++++++++++++ .../dao/mapper/ResourceMapper.java | 11 ++++++++--- 7 files changed, 35 insertions(+), 6 deletions(-) diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java index d61a18156..49b8c01ec 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/AlertDao.java @@ -135,11 +135,14 @@ public class AlertDao extends AbstractBaseDao { alertMapper.insert(alert); } + /** * task timeout warn * @param alertgroupId alertgroupId * @param receivers receivers * @param receiversCc receiversCc + * @param processInstanceId processInstanceId + * @param processInstanceName processInstanceName * @param taskId taskId * @param taskName taskName */ @@ -171,7 +174,7 @@ public class AlertDao extends AbstractBaseDao { /** * for test - * @return + * @return AlertMapper */ public AlertMapper getAlertMapper() { return alertMapper; diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java index 6f9502675..1132147fa 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/BaseDataSource.java @@ -81,6 +81,7 @@ public abstract class BaseDataSource { /** * gets the JDBC url for the data source connection + * @return getJdbcUrl */ public String getJdbcUrl() { StringBuilder jdbcUrl = new StringBuilder(getAddress()); diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java index 9571f9c9f..cca1fa041 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/DataSourceFactory.java @@ -29,6 +29,12 @@ public class DataSourceFactory { private static final Logger logger = LoggerFactory.getLogger(DataSourceFactory.class); + /** + * getDatasource + * @param dbType dbType + * @param parameter parameter + * @return getDatasource + */ public static BaseDataSource getDatasource(DbType dbType, String parameter) { try { switch (dbType) { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java index cf6ecd84a..e4b8f4bf1 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SQLServerDataSource.java @@ -51,7 +51,6 @@ public class SQLServerDataSource extends BaseDataSource { /** * test whether the data source can be connected successfully - * @throws Exception */ @Override public void isConnectable() { diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java index 4bdbaa29c..1d6dc5f51 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/datasource/SpringConnectionFactory.java @@ -134,7 +134,8 @@ public class SpringConnectionFactory { /** * get sql session - * @return sqlSession + * @return SqlSession + * @throws Exception */ @Bean public SqlSession sqlSession() throws Exception{ diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java index 9a5f26125..5ca192811 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java @@ -78,6 +78,20 @@ public interface ProcessInstanceMapper extends BaseMapper { * @param endTime endTime * @return process instance IPage */ + + /** + * process instance page + * @param page page + * @param projectId projectId + * @param processDefinitionId processDefinitionId + * @param searchVal searchVal + * @param executorId executorId + * @param statusArray statusArray + * @param host host + * @param startTime startTime + * @param endTime endTime + * @return process instance page + */ IPage queryProcessInstanceListPaging(Page page, @Param("projectId") int projectId, @Param("processDefinitionId") Integer processDefinitionId, diff --git a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java index 0f58f664e..6d3ff60dc 100644 --- a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java +++ b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.java @@ -49,13 +49,15 @@ public interface ResourceMapper extends BaseMapper { @Param("userId") int userId, @Param("type") int type); + /** * resource page * @param page page - * @param userId query all if 0, then query the authed resources + * @param userId userId + * @param id id * @param type type * @param searchVal searchVal - * @return resource list + * @return resource page */ IPage queryResourcePaging(IPage page, @Param("userId") int userId, @@ -94,10 +96,13 @@ public interface ResourceMapper extends BaseMapper { */ List listAuthorizedResource(@Param("userId") int userId,@Param("resNames")T[] resNames); + + /** * list authorized resource * @param userId userId - * @param resIds resource ids + * @param resIds resIds + * @param T * @return resource list */ List listAuthorizedResourceById(@Param("userId") int userId,@Param("resIds")T[] resIds); -- GitLab