Skip to content

Commit a32d1de

Browse files
authored
New wrapper class PrincipalArray replaces dangerous int[] use (#62)
1 parent 880a7e0 commit a32d1de

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

src/org/labkey/workflow/model/WorkflowTaskImpl.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import com.fasterxml.jackson.annotation.JsonIgnore;
1919
import org.activiti.engine.task.TaskInfo;
2020
import org.apache.commons.collections4.CollectionUtils;
21-
import org.apache.commons.lang3.ArrayUtils;
2221
import org.jetbrains.annotations.NotNull;
2322
import org.jetbrains.annotations.Nullable;
2423
import org.labkey.api.action.Marshal;
@@ -35,24 +34,20 @@
3534
import org.labkey.workflow.WorkflowManager;
3635
import org.labkey.workflow.WorkflowModule;
3736

38-
import java.util.Arrays;
3937
import java.util.Collections;
4038
import java.util.Date;
4139
import java.util.List;
4240
import java.util.Map;
4341
import java.util.Set;
42+
import java.util.stream.Collectors;
4443

45-
/**
46-
* Created by susanh on 5/3/15.
47-
*/
4844
@Marshal(Marshaller.Jackson)
4945
public abstract class WorkflowTaskImpl implements WorkflowTask
5046
{
5147
protected TaskInfo _taskInfo;
5248
protected String _id;
5349
protected String _executionId;
5450
protected List<Integer> _groupIds = null;
55-
private Map<String, TaskFormField> _formFields = Collections.emptyMap();
5651
private WorkflowProcess _processInstance = null;
5752
private PermissionsHandler _permissionsHandler = null;
5853

@@ -279,7 +274,7 @@ public String getContainer()
279274
@Override
280275
public boolean isInCandidateGroups(User user)
281276
{
282-
return hasCandidateGroups() && CollectionUtils.containsAny(getGroupIds(), Arrays.asList(ArrayUtils.toObject(user.getGroups())));
277+
return hasCandidateGroups() && CollectionUtils.containsAny(getGroupIds(), user.getGroups().stream().collect(Collectors.toSet()));
283278
}
284279

285280
@Override
@@ -352,5 +347,4 @@ public Map<String, TaskFormField> getFormFields()
352347
{
353348
return WorkflowManager.get().getFormFields(getId());
354349
}
355-
356350
}

0 commit comments

Comments
 (0)