Interim commit.

Evolveum · Dec 6, 2016 · e9343e6 · e9343e6
1 parent e8167ab
commit e9343e6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...c/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java b/...c/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalRequestImpl.java
@@ -84,7 +84,9 @@ public ApprovalRequestImpl(I itemToApprove, PcpAspectConfigurationType config, A
         setSchemaFromConfigAndParameters(config, approvalSchema, approverRef, approverExpression, automaticallyApproved, prismContext);
     }
 
-    protected void setSchemaFromConfigAndParameters(PcpAspectConfigurationType config, ApprovalSchemaType approvalSchema, List<ObjectReferenceType> approverRef, List<ExpressionType> approverExpression, ExpressionType automaticallyApproved, PrismContext prismContext) {
+    private void setSchemaFromConfigAndParameters(PcpAspectConfigurationType config, ApprovalSchemaType approvalSchema,
+            List<ObjectReferenceType> approverRef, List<ExpressionType> approverExpression, ExpressionType automaticallyApproved,
+            PrismContext prismContext) {
         if (config != null &&
                 (!config.getApproverRef().isEmpty() ||
                 config.getApprovalSchema() != null ||

diff --git a/...rc/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java b/...rc/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ApprovalSchemaImpl.java
@@ -86,12 +86,7 @@ public void setDescription(String description) {
     @Override
     public List<? extends ApprovalLevel> getLevels() {
 		List<ApprovalLevelImpl> rv = new ArrayList<>(levels);
-		Collections.sort(rv, new Comparator<ApprovalLevelImpl>() {
-			@Override
-			public int compare(ApprovalLevelImpl o1, ApprovalLevelImpl o2) {
-				return Integer.compare(o1.getOrder(), o2.getOrder());
-			}
-		});
+		Collections.sort(rv, Comparator.comparingInt(ApprovalLevelImpl::getOrder));
         return Collections.unmodifiableList(rv);
     }