[dolphinscheduler] branch dev updated: [fix-14123] remove the equals and hashcode in Project pojo (#14167)

[xincheng]

This is an automated email from the ASF dual-hosted git repository.

xincheng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 61118d4467 [fix-14123] remove the equals and hashcode in Project pojo 
(#14167)
61118d4467 is described below

commit 61118d4467e24f012e7ebc4872d223f8bf95e92b
Author: xuankun zheng <zhxuan...@163.com>
AuthorDate: Tue Jun 13 11:19:04 2023 +0800

    [fix-14123] remove the equals and hashcode in Project pojo (#14167)
    
    * [fix] remove the equals and hashcode in Project pojo
    
    * [fix]fix the Strict Problem in Mockito by using `doReturn()` instead of 
`when()` functionw
    
    ---------
    
    Co-authored-by: xuankun zheng <zhxuan...@gmail.com>
---
 .../api/service/ProcessDefinitionServiceTest.java  | 10 +++++----
 .../dolphinscheduler/dao/entity/Project.java       | 25 ----------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 3cdd21f195..f1a0a66213 100644
--- 
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++ 
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -383,8 +383,9 @@ public class ProcessDefinitionServiceTest extends 
BaseServiceTestTool {
         
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
         Map<String, Object> result = new HashMap<>();
         putMsg(result, Status.SUCCESS, projectCode);
-        Mockito.when(projectService.checkProjectAndAuth(user, project, 
projectCode, WORKFLOW_BATCH_COPY))
-                .thenReturn(result);
+        Mockito.doReturn(result)
+                .when(projectService)
+                .checkProjectAndAuth(user, project, projectCode, 
WORKFLOW_BATCH_COPY);
 
         // copy project definition ids empty test
         Map<String, Object> map =
@@ -402,8 +403,9 @@ public class ProcessDefinitionServiceTest extends 
BaseServiceTestTool {
         // project check auth success, target project name not equal project 
name, check auth target project fail
         Project project1 = getProject(projectCodeOther);
         
Mockito.when(projectMapper.queryByCode(projectCodeOther)).thenReturn(project1);
-        Mockito.when(projectService.checkProjectAndAuth(user, project, 
projectCodeOther, WORKFLOW_BATCH_COPY))
-                .thenReturn(result);
+        Mockito.doReturn(result)
+                .when(projectService)
+                .checkProjectAndAuth(user, project1, projectCodeOther, 
WORKFLOW_BATCH_COPY);
 
         putMsg(result, Status.SUCCESS, projectCodeOther);
         ProcessDefinition definition = getProcessDefinition();
diff --git 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
index 962a9ba6d6..f3a626f5cd 100644
--- 
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
+++ 
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Project.java
@@ -96,29 +96,4 @@ public class Project {
      */
     @TableField(exist = false)
     private int instRunningCount;
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) {
-            return true;
-        }
-        if (o == null || getClass() != o.getClass()) {
-            return false;
-        }
-
-        Project project = (Project) o;
-
-        if (id != project.id) {
-            return false;
-        }
-        return name.equals(project.name);
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = id;
-        result = 31 * result + name.hashCode();
-        return result;
-    }
 }