You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2017/10/18 10:35:08 UTC
syncope git commit: Better usage of Java 8 APIs
Repository: syncope
Updated Branches:
refs/heads/master 01dba3430 -> 20f5c70e8
Better usage of Java 8 APIs
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/20f5c70e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/20f5c70e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/20f5c70e
Branch: refs/heads/master
Commit: 20f5c70e80b8004bec66782bebb061e63f32e720
Parents: 01dba34
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Oct 18 12:35:02 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Oct 18 12:35:02 2017 +0200
----------------------------------------------------------------------
.../org/apache/syncope/core/logic/ResourceLogic.java | 13 ++++---------
.../propagation/AbstractPropagationTaskExecutor.java | 6 ++----
.../provisioning/java/pushpull/PullJobDelegate.java | 10 ++++------
3 files changed, 10 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/20f5c70e/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
----------------------------------------------------------------------
diff --git a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
index 36b646e..b476387 100644
--- a/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
+++ b/core/logic/src/main/java/org/apache/syncope/core/logic/ResourceLogic.java
@@ -20,7 +20,6 @@ package org.apache.syncope.core.logic;
import java.lang.reflect.Method;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
@@ -319,10 +318,8 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> {
Optional<String> connObjectKeyValue = mappingManager.getConnObjectKeyValue(any, init.getRight());
// 3. determine attributes to query
- Set<MappingItem> linkinMappingItems = new HashSet<>();
- virSchemaDAO.findByProvision(init.getRight()).forEach(virSchema -> {
- linkinMappingItems.add(virSchema.asLinkingMappingItem());
- });
+ Set<MappingItem> linkinMappingItems = virSchemaDAO.findByProvision(init.getRight()).stream().
+ map(virSchema -> virSchema.asLinkingMappingItem()).collect(Collectors.toSet());
Iterator<MappingItem> mapItems = new IteratorChain<>(
init.getRight().getMapping().getItems().iterator(),
linkinMappingItems.iterator());
@@ -377,10 +374,8 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> {
objectClass = init.getRight().getObjectClass();
init.getRight().getMapping().getItems();
- Set<MappingItem> linkinMappingItems = new HashSet<>();
- virSchemaDAO.findByProvision(init.getRight()).forEach(virSchema -> {
- linkinMappingItems.add(virSchema.asLinkingMappingItem());
- });
+ Set<MappingItem> linkinMappingItems = virSchemaDAO.findByProvision(init.getRight()).stream().
+ map(virSchema -> virSchema.asLinkingMappingItem()).collect(Collectors.toSet());
Iterator<MappingItem> mapItems = new IteratorChain<>(
init.getRight().getMapping().getItems().iterator(),
linkinMappingItems.iterator());
http://git-wip-us.apache.org/repos/asf/syncope/blob/20f5c70e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index fa5442a..de55130 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -579,10 +579,8 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
? task.getConnObjectKey()
: task.getOldConnObjectKey();
- List<MappingItem> linkingMappingItems = new ArrayList<>();
- virSchemaDAO.findByProvision(provision).forEach(schema -> {
- linkingMappingItems.add(schema.asLinkingMappingItem());
- });
+ Set<MappingItem> linkingMappingItems = virSchemaDAO.findByProvision(provision).stream().
+ map(schema -> schema.asLinkingMappingItem()).collect(Collectors.toSet());
ConnectorObject obj = null;
try {
http://git-wip-us.apache.org/repos/asf/syncope/blob/20f5c70e/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java
index 05d7112..63e02de 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullJobDelegate.java
@@ -20,12 +20,12 @@ package org.apache.syncope.core.provisioning.java.pushpull;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.collections.IteratorChain;
import org.apache.syncope.common.lib.types.ConflictResolutionAction;
@@ -264,13 +264,11 @@ public class PullJobDelegate extends AbstractProvisioningJobDelegate<PullTask> i
}
try {
- Set<MappingItem> linkinMappingItems = new HashSet<>();
- virSchemaDAO.findByProvision(provision).forEach(virSchema -> {
- linkinMappingItems.add(virSchema.asLinkingMappingItem());
- });
+ Set<MappingItem> linkingMappingItems = virSchemaDAO.findByProvision(provision).stream().
+ map(schema -> schema.asLinkingMappingItem()).collect(Collectors.toSet());
Iterator<MappingItem> mapItems = new IteratorChain<>(
provision.getMapping().getItems().iterator(),
- linkinMappingItems.iterator());
+ linkingMappingItems.iterator());
OperationOptions options = MappingUtils.buildOperationOptions(mapItems);
switch (pullTask.getPullMode()) {