This is an automated email from the ASF dual-hosted git repository.
pefernan pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 35b4028566 incubator-kie-issues#1626: Fix Typo in public API method
for custom User Task assignment strategy (#3786)
35b4028566 is described below
commit 35b4028566fca2d3d1d18bb4842533df08571920
Author: Pere Fernández <[email protected]>
AuthorDate: Tue Nov 19 19:33:27 2024 +0100
incubator-kie-issues#1626: Fix Typo in public API method for custom User
Task assignment strategy (#3786)
- Included reassignments typos.
---
.../org/kie/kogito/usertask/UserTaskAssignmentStrategy.java | 2 +-
.../main/java/org/kie/kogito/usertask/model/Reassignment.java | 2 +-
.../java/org/kie/kogito/usertask/impl/AbstractUserTask.java | 10 +++++-----
.../kogito/usertask/impl/BasicUserTaskAssignmentStrategy.java | 2 +-
.../org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java | 8 ++++----
.../usertask/impl/lifecycle/DefaultUserTaskLifeCycle.java | 2 +-
.../org/kie/kogito/usertask/impl/model/DeadlineHelper.java | 4 ++--
.../org/kie/kogito/usertask/impl/model/DeadlineHelperTest.java | 6 +++---
.../java/org/kie/kogito/codegen/usertask/UserTaskCodegen.java | 4 ++--
9 files changed, 20 insertions(+), 20 deletions(-)
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
index 985a5d2557..4708628650 100644
---
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 @@ public interface UserTaskAssignmentStrategy {
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
index 89bda5921f..dc1c6e90b4 100644
---
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 class Reassignment {
@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
index 8fb214c0b1..1f10311529 100644
---
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 abstract class AbstractUserTask implements UserTask {
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,11 +223,11 @@ public abstract class AbstractUserTask implements
UserTask {
@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
@@ -235,7 +235,7 @@ public abstract class AbstractUserTask implements UserTask {
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
index 076a62c313..2d6fddcdff 100644
---
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 class BasicUserTaskAssignmentStrategy implements
UserTaskAssignmentStrate
}
@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
index 15e2477fc1..26cfb631a8 100644
---
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 class DefaultUserTaskInstance implements
UserTaskInstance {
@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
index 5b871d2a8f..986de80780 100644
---
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 class DefaultUserTaskLifeCycle implements
UserTaskLifeCycle {
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
index 3e0793830b..e492bfcc73 100644
---
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 class DeadlineHelper {
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 @@ public class DeadlineHelper {
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
index 2c022d7672..2f83ce3753 100644
---
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 class DeadlineHelperTest {
@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
index 9f4e1abb8d..83a6c998f3 100644
---
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 class UserTaskCodegen extends AbstractGenerator {
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 @@ public class UserTaskCodegen extends AbstractGenerator {
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());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
