[Improvement][ALL] Remove some un-used code and code review #3639 (#3640)

* [Improvement][ALL] Remove some un-used code and code review #3639

* [Improvement][ALL] Remove some un-used code and code review #3639

* [Improvement][ALL] Remove some un-used code and code review #3639

* [Improvement][ALL] Remove some un-used code and code review

* [Improvement][ALL] Remove some un-used code and code review

* [Improvement][ALL] Remove some un-used code and code review

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/ServiceModelToSwagger2MapperImpl.java

@@ -220,11 +220,7 @@ public class ServiceModelToSwagger2MapperImpl extends ServiceModelToSwagger2Mapp
         if (resourceListing == null) {
             return null;
         }
-        ApiInfo info = resourceListing.getInfo();
-        if (info == null) {
-            return null;
-        }
-        return info;
+        return resourceListing.getInfo();
     }
 
     protected List<Tag> tagSetToTagList(Set<springfox.documentation.service.Tag> set) {

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilter.java

@@ -57,11 +57,10 @@ public class ResourceFilter implements IFilter {
      * @return file filtered by suffix
      */
     public Set<Resource> fileFilter(){
-        Set<Resource> resources = resourceList.stream().filter(t -> {
+        return resourceList.stream().filter(t -> {
             String alias = t.getAlias();
             return alias.endsWith(suffix);
         }).collect(Collectors.toSet());
-        return resources;
     }
 
     /**

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java

@@ -189,10 +189,7 @@ public class DataSourceService extends BaseService {
 
     private boolean checkName(String name) {
         List<DataSource> queryDataSource = dataSourceMapper.queryDataSourceByName(name.trim());
-        if (queryDataSource != null && queryDataSource.size() > 0) {
-            return true;
-        }
-        return false;
+        return queryDataSource != null && queryDataSource.size() > 0;
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java

@@ -272,10 +272,7 @@ public class ResourcesService extends BaseService {
     private boolean checkResourceExists(String fullName, int userId, int type ){
 
         List<Resource> resources = resourcesMapper.queryResourceList(fullName, userId, type);
-        if (resources != null && resources.size() > 0) {
-            return true;
-        }
-        return false;
+        return resources != null && resources.size() > 0;
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java

@@ -136,10 +136,7 @@ public class UdfFuncService extends BaseService{
      */
     private boolean checkUdfFuncNameExists(String name){
         List<UdfFunc> resource = udfFuncMapper.queryUdfByIdStr(null, name);
-        if(resource != null && resource.size() > 0){
-            return true;
-        }
-        return false;
+        return resource != null && resource.size() > 0;
     }
 
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java

@@ -120,7 +120,7 @@ public class AccessTokenServiceImpl extends BaseService implements AccessTokenSe
      */
     public Map<String, Object> generateToken(int userId, String expireTime) {
         Map<String, Object> result = new HashMap<>(5);
-        String token = EncryptionUtils.getMd5(userId + expireTime + String.valueOf(System.currentTimeMillis()));
+        String token = EncryptionUtils.getMd5(userId + expireTime + System.currentTimeMillis());
         result.put(Constants.DATA_LIST, token);
         putMsg(result, Status.SUCCESS);
         return result;

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java

@@ -1321,14 +1321,11 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
                 if (CollectionUtils.isNotEmpty(postNodeList)) {
                     for (String nextNodeName : postNodeList) {
                         List<TreeViewDto> treeViewDtoList = waitingRunningNodeMap.get(nextNodeName);
-                        if (CollectionUtils.isNotEmpty(treeViewDtoList)) {
-                            treeViewDtoList.add(treeViewDto);
-                            waitingRunningNodeMap.put(nextNodeName, treeViewDtoList);
-                        } else {
+                        if (CollectionUtils.isEmpty(treeViewDtoList)) {
                             treeViewDtoList = new ArrayList<>();
-                            treeViewDtoList.add(treeViewDto);
-                            waitingRunningNodeMap.put(nextNodeName, treeViewDtoList);
                         }
+                        treeViewDtoList.add(treeViewDto);
+                        waitingRunningNodeMap.put(nextNodeName, treeViewDtoList);
                     }
                 }
                 runningNodeMap.remove(nodeName);
@@ -1690,16 +1687,16 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
         if (processDefinition == null) {
             putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId);
             return result;
+        }
+
+        processDefinition.setProjectId(targetProject.getId());
+        processDefinition.setUpdateTime(new Date());
+        if (processDefineMapper.updateById(processDefinition) > 0) {
+            putMsg(result, Status.SUCCESS);
         } else {
-            processDefinition.setProjectId(targetProject.getId());
-            processDefinition.setUpdateTime(new Date());
-            if (processDefineMapper.updateById(processDefinition) > 0) {
-                putMsg(result, Status.SUCCESS);
-            } else {
-                putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
-            }
-            return result;
+            putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
         }
+        return result;
     }
 
     /**

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ResourcesControllerTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.dolphinscheduler.api.controller;
 
-import com.fasterxml.jackson.databind.node.ObjectNode;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.utils.Result;
 import org.apache.dolphinscheduler.common.enums.ResourceType;
@@ -53,8 +52,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -77,8 +74,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -280,8 +275,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -302,8 +295,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -323,8 +314,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -343,8 +332,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -364,8 +351,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -385,8 +370,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -405,8 +388,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -426,8 +407,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());
@@ -445,8 +424,6 @@ public class ResourcesControllerTest extends AbstractControllerTest{
                 .andReturn();
 
         Result result = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(), Result.class);
-        result.getCode().equals(Status.SUCCESS.getCode());
-        ObjectNode object = JSONUtils.parseObject(mvcResult.getResponse().getContentAsString());
 
         Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
         logger.info(mvcResult.getResponse().getContentAsString());

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilterTest.java

@@ -49,10 +49,9 @@ public class ResourceFilterTest {
         allList.add(resource6);
         allList.add(resource7);
 
-
         ResourceFilter resourceFilter = new ResourceFilter(".jar",allList);
         List<Resource> resourceList = resourceFilter.filter();
         Assert.assertNotNull(resourceList);
-        resourceList.stream().forEach(t-> logger.info(t.toString()));
+        resourceList.forEach(t -> logger.info(t.toString()));
     }
 }
\ No newline at end of file

dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/future/TaskFuture.java

@@ -31,7 +31,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
- *  task fulture
+ *  task future
  */
 public class TaskFuture {