incubator-kie-issues#1626: Fix Typo in public API method for custom User Task assignment strategy

pefernan · pefernan · commit 315dbd045566 · 2024-11-19T12:25:25.000+01:00
- Included reassignments typos.
diff --git a/api/kogito-api/src/main/java/org/kie/kogito/usertask/UserTaskAssignmentStrategy.java b/api/kogito-api/src/main/java/org/kie/kogito/usertask/UserTaskAssignmentStrategy.java
@@ -30,6 +30,6 @@ default String getName() {
         return getClass().getName();
     }
 
-    Optional<String> computeAssigment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider);
+    Optional<String> computeAssignment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider);
 
 }
diff --git a/api/kogito-api/src/main/java/org/kie/kogito/usertask/model/Reassignment.java b/api/kogito-api/src/main/java/org/kie/kogito/usertask/model/Reassignment.java
@@ -52,7 +52,7 @@ public Set<String> getPotentialGroups() {
 
     @Override
     public String toString() {
-        return "Reassigment [potentialUsers=" + potentialUsers + ", potentialGroups=" + potentialGroups + "]";
+        return "Reassignment [potentialUsers=" + potentialUsers + ", potentialGroups=" + potentialGroups + "]";
     }
 
     @Override
diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/AbstractUserTask.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/AbstractUserTask.java
@@ -46,7 +46,7 @@ public abstract class AbstractUserTask implements UserTask {
     private Set<String> excludedUsers;
     private Collection<DeadlineInfo<Notification>> startDeadlines;
     private Collection<DeadlineInfo<Notification>> endDeadlines;
-    private Collection<DeadlineInfo<Reassignment>> startReassigments;
+    private Collection<DeadlineInfo<Reassignment>> startReassignments;
     private Collection<DeadlineInfo<Reassignment>> endReassignments;
 
     public AbstractUserTask(String id, String name) {
@@ -60,7 +60,7 @@ public AbstractUserTask(String id, String name) {
         this.excludedUsers = new HashSet<>();
         this.startDeadlines = new HashSet<>();
         this.endDeadlines = new HashSet<>();
-        this.startReassigments = new HashSet<>();
+        this.startReassignments = new HashSet<>();
         this.endReassignments = new HashSet<>();
     }
 
@@ -223,19 +223,19 @@ public void setNotCompletedDeadlines(String notStarted) {
 
     @Override
     public Collection<DeadlineInfo<Reassignment>> getNotStartedReassignments() {
-        return startReassigments;
+        return startReassignments;
     }
 
     public void setNotStartedReassignments(String reassignments) {
-        this.startReassigments = DeadlineHelper.parseReassignments(reassignments);
+        this.startReassignments = DeadlineHelper.parseReassignments(reassignments);
     }
 
     @Override
     public Collection<DeadlineInfo<Reassignment>> getNotCompletedReassignments() {
         return endReassignments;
     }
 
-    public void setNotCompletedReassigments(String reassignments) {
+    public void setNotCompletedReassignments(String reassignments) {
         this.endReassignments = DeadlineHelper.parseReassignments(reassignments);
     }
 
diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/BasicUserTaskAssignmentStrategy.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/BasicUserTaskAssignmentStrategy.java
@@ -34,7 +34,7 @@ public String getName() {
     }
 
     @Override
-    public Optional<String> computeAssigment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {
+    public Optional<String> computeAssignment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {
         Set<String> users = new HashSet<>(userTaskInstance.getPotentialUsers());
         users.removeAll(userTaskInstance.getExcludedUsers());
         if (users.size() == 1) {
diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java
@@ -105,7 +105,7 @@ public class DefaultUserTaskInstance implements UserTaskInstance {
 
     private Collection<DeadlineInfo<Reassignment>> notStartedReassignments;
 
-    private Collection<DeadlineInfo<Reassignment>> notCompletedReassigments;
+    private Collection<DeadlineInfo<Reassignment>> notCompletedReassignments;
 
     private Map<String, Notification> notStartedDeadlinesTimers;
 
@@ -643,11 +643,11 @@ public void setNotStartedReassignments(Collection<DeadlineInfo<Reassignment>> no
 
     @Override
     public Collection<DeadlineInfo<Reassignment>> getNotCompletedReassignments() {
-        return notCompletedReassigments;
+        return notCompletedReassignments;
     }
 
-    public void setNotCompletedReassignments(Collection<DeadlineInfo<Reassignment>> notCompletedReassigments) {
-        this.notCompletedReassigments = notCompletedReassigments;
+    public void setNotCompletedReassignments(Collection<DeadlineInfo<Reassignment>> notCompletedReassignments) {
+        this.notCompletedReassignments = notCompletedReassignments;
     }
 
     public void setJobsService(JobsService jobsService) {
diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/lifecycle/DefaultUserTaskLifeCycle.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/lifecycle/DefaultUserTaskLifeCycle.java
@@ -216,7 +216,7 @@ public Optional<UserTaskTransitionToken> fail(UserTaskInstance userTaskInstance,
 
     private String assignStrategy(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {
         UserTaskAssignmentStrategy assignmentStrategy = userTaskInstance.getUserTask().getAssignmentStrategy();
-        return assignmentStrategy.computeAssigment(userTaskInstance, identityProvider).orElse(null);
+        return assignmentStrategy.computeAssignment(userTaskInstance, identityProvider).orElse(null);
     }
 
     private void checkPermission(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {
diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/model/DeadlineHelper.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/model/DeadlineHelper.java
@@ -93,7 +93,7 @@ public static Collection<DeadlineInfo<Reassignment>> parseReassignments(Object t
         if (text instanceof String textString && textString.isBlank()) {
             return Collections.emptyList();
         }
-        return parseDeadlines(text, DeadlineHelper::parseReassigment, DeadlineHelper::getReassignmentSchedule);
+        return parseDeadlines(text, DeadlineHelper::parseReassignment, DeadlineHelper::getReassignmentSchedule);
     }
 
     public static Collection<DeadlineInfo<Notification>> parseDeadlines(Object text) {
@@ -221,7 +221,7 @@ private static Map<String, Object> asMap(String text) {
         return result;
     }
 
-    private static Reassignment parseReassigment(String text) {
+    private static Reassignment parseReassignment(String text) {
         Map<String, Object> map = asMap(text);
         return new Reassignment(parseSet(map.get("users")), parseSet(map.get("groups")));
     }
diff --git a/jbpm/jbpm-usertask/src/test/java/org/kie/kogito/usertask/impl/model/DeadlineHelperTest.java b/jbpm/jbpm-usertask/src/test/java/org/kie/kogito/usertask/impl/model/DeadlineHelperTest.java
@@ -239,10 +239,10 @@ public void testMultipleNotification() {
 
     @Test
     public void testReassignment() {
-        Collection<DeadlineInfo<Reassignment>> reassigments = DeadlineHelper.parseReassignments(
+        Collection<DeadlineInfo<Reassignment>> reassignments = DeadlineHelper.parseReassignments(
                 "[users:Pepe,Pepa|groups:Admin,Managers]@[1m]");
-        assertThat(reassigments).hasSize(1);
-        DeadlineInfo<Reassignment> reassignment = reassigments.iterator().next();
+        assertThat(reassignments).hasSize(1);
+        DeadlineInfo<Reassignment> reassignment = reassignments.iterator().next();
         assertThat(reassignment.getNotification().getPotentialUsers()).containsExactlyInAnyOrder("Pepe", "Pepa");
         assertThat(reassignment.getNotification().getPotentialGroups()).containsExactlyInAnyOrder("Admin", "Managers");
         assertThat(reassignment.getScheduleInfo().iterator().next().getDuration()).isEqualTo(Duration.ofMinutes(1));
diff --git a/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/usertask/UserTaskCodegen.java b/kogito-codegen-modules/kogito-codegen-processes/src/main/java/org/kie/kogito/codegen/usertask/UserTaskCodegen.java
@@ -227,7 +227,7 @@ public List<GeneratedFile> generateUserTask() {
             block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotStartedDeadLines", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotStartedNotify")))));
             block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedDeadlines", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedNotify")))));
             block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotStartedReassignments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotStartedReassign")))));
-            block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedReassigments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedReassign")))));
+            block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedReassignments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedReassign")))));
 
             generatedFiles.add(new GeneratedFile(GeneratedFileType.SOURCE, UserTaskCodegenHelper.path(info).resolve(className + ".java"), unit.toString()));
         }
@@ -240,7 +240,7 @@ private Expression toDeadlineExpression(Object parameter) {
                 DeadlineHelper.parseDeadlines(stringParam);
                 return toStringExpression(stringParam);
             } catch (Exception e) {
-                LOG.debug("to deadline calculation failure. {} it is not a proper expression");
+                LOG.debug("to deadline calculation failure. {} it is not a proper expression", stringParam);
             }
         }
         return new CastExpr(StaticJavaParser.parseType(String.class.getName()), new NullLiteralExpr());

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,6 @@ default String getName() {`
`30`	`30`	`return getClass().getName();`
`31`	`31`	`}`
`32`	`32`
`33`		`- Optional<String> computeAssigment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider);`
	`33`	`+ Optional<String> computeAssignment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider);`
`34`	`34`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public Set<String> getPotentialGroups() {`
`52`	`52`
`53`	`53`	`@Override`
`54`	`54`	`public String toString() {`
`55`		`- return "Reassigment [potentialUsers=" + potentialUsers + ", potentialGroups=" + potentialGroups + "]";`
	`55`	`+ return "Reassignment [potentialUsers=" + potentialUsers + ", potentialGroups=" + potentialGroups + "]";`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public String getName() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
`37`		`- public Optional<String> computeAssigment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {`
	`37`	`+ public Optional<String> computeAssignment(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {`
`38`	`38`	`Set<String> users = new HashSet<>(userTaskInstance.getPotentialUsers());`
`39`	`39`	`users.removeAll(userTaskInstance.getExcludedUsers());`
`40`	`40`	`if (users.size() == 1) {`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ public Optional<UserTaskTransitionToken> fail(UserTaskInstance userTaskInstance,`
`216`	`216`
`217`	`217`	`private String assignStrategy(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {`
`218`	`218`	`UserTaskAssignmentStrategy assignmentStrategy = userTaskInstance.getUserTask().getAssignmentStrategy();`
`219`		`- return assignmentStrategy.computeAssigment(userTaskInstance, identityProvider).orElse(null);`
	`219`	`+ return assignmentStrategy.computeAssignment(userTaskInstance, identityProvider).orElse(null);`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`private void checkPermission(UserTaskInstance userTaskInstance, IdentityProvider identityProvider) {`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public static Collection<DeadlineInfo<Reassignment>> parseReassignments(Object t`
`93`	`93`	`if (text instanceof String textString && textString.isBlank()) {`
`94`	`94`	`return Collections.emptyList();`
`95`	`95`	`}`
`96`		`- return parseDeadlines(text, DeadlineHelper::parseReassigment, DeadlineHelper::getReassignmentSchedule);`
	`96`	`+ return parseDeadlines(text, DeadlineHelper::parseReassignment, DeadlineHelper::getReassignmentSchedule);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`public static Collection<DeadlineInfo<Notification>> parseDeadlines(Object text) {`
`@@ -221,7 +221,7 @@ private static Map<String, Object> asMap(String text) {`
`221`	`221`	`return result;`
`222`	`222`	`}`
`223`	`223`
`224`		`- private static Reassignment parseReassigment(String text) {`
	`224`	`+ private static Reassignment parseReassignment(String text) {`
`225`	`225`	`Map<String, Object> map = asMap(text);`
`226`	`226`	`return new Reassignment(parseSet(map.get("users")), parseSet(map.get("groups")));`
`227`	`227`	`}`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public List<GeneratedFile> generateUserTask() {`
`227`	`227`	`block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotStartedDeadLines", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotStartedNotify")))));`
`228`	`228`	`block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedDeadlines", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedNotify")))));`
`229`	`229`	`block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotStartedReassignments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotStartedReassign")))));`
`230`		`- block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedReassigments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedReassign")))));`
	`230`	`+ block.addStatement(new MethodCallExpr(new ThisExpr(), "setNotCompletedReassignments", NodeList.nodeList(toDeadlineExpression(info.getParameter("NotCompletedReassign")))));`
`231`	`231`
`232`	`232`	`generatedFiles.add(new GeneratedFile(GeneratedFileType.SOURCE, UserTaskCodegenHelper.path(info).resolve(className + ".java"), unit.toString()));`
`233`	`233`	`}`
`@@ -240,7 +240,7 @@ private Expression toDeadlineExpression(Object parameter) {`
`240`	`240`	`DeadlineHelper.parseDeadlines(stringParam);`
`241`	`241`	`return toStringExpression(stringParam);`
`242`	`242`	`} catch (Exception e) {`
`243`		`- LOG.debug("to deadline calculation failure. {} it is not a proper expression");`
	`243`	`+ LOG.debug("to deadline calculation failure. {} it is not a proper expression", stringParam);`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`return new CastExpr(StaticJavaParser.parseType(String.class.getName()), new NullLiteralExpr());`