You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by fm...@apache.org on 2018/10/11 15:15:22 UTC
syncope git commit: [SYNCOPE-1383] missing some fixes for class cast
exception
Repository: syncope
Updated Branches:
refs/heads/2_0_X cfa980833 -> 03b0c294a
[SYNCOPE-1383] missing some fixes for class cast exception
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/03b0c294
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/03b0c294
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/03b0c294
Branch: refs/heads/2_0_X
Commit: 03b0c294a51ca61ed776aba4fae9195e699c302d
Parents: cfa9808
Author: fmartelli <fa...@gmail.com>
Authored: Thu Oct 11 17:15:11 2018 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Thu Oct 11 17:15:11 2018 +0200
----------------------------------------------------------------------
.../java/org/apache/syncope/core/logic/ResourceLogic.java | 9 ++++++++-
.../core/provisioning/java/ConnectorFacadeProxy.java | 7 ++++++-
.../syncope/core/provisioning/java/pushpull/PullUtils.java | 9 ++++++++-
3 files changed, 22 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/03b0c294/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 a993450..7883558 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
@@ -79,6 +79,7 @@ import org.identityconnectors.framework.common.objects.OperationOptions;
import org.identityconnectors.framework.common.objects.ResultsHandler;
import org.identityconnectors.framework.common.objects.SearchResult;
import org.identityconnectors.framework.common.objects.Uid;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Component;
@@ -406,7 +407,8 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> {
final List<ConnObjectTO> connObjects = new ArrayList<>();
- SearchResult searchResult = connFactory.getConnector(resource).search(objectClass, null, new ResultsHandler() {
+ SearchResult searchResult = connFactory.getConnector(resource).search(
+ objectClass, null, new SearchResultsHandler() {
private int count;
@@ -417,6 +419,11 @@ public class ResourceLogic extends AbstractTransactionalLogic<ResourceTO> {
count++;
return count < size;
}
+
+ @Override
+ public void handleResult(final SearchResult sr) {
+ // do nothing
+ }
}, size, pagedResultsCookie, orderBy, options);
return ImmutablePair.of(searchResult, connObjects);
http://git-wip-us.apache.org/repos/asf/syncope/blob/03b0c294/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
index aea4e27..d50ddb1 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/ConnectorFacadeProxy.java
@@ -329,7 +329,7 @@ public class ConnectorFacadeProxy implements Connector {
actualOptions = filterBuilder.build(actualOptions);
}
- search(objectClass, filter, new ResultsHandler() {
+ search(objectClass, filter, new SearchResultsHandler() {
@Transactional
@Override
@@ -341,6 +341,11 @@ public class ConnectorFacadeProxy implements Connector {
setToken(new SyncToken("")).
build());
}
+
+ @Override
+ public void handleResult(final SearchResult sr) {
+ // do nothing
+ }
}, actualOptions);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/03b0c294/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
index 28c31d1..be656d4 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PullUtils.java
@@ -69,6 +69,8 @@ import org.apache.syncope.core.provisioning.api.pushpull.PullCorrelationRule;
import org.apache.syncope.core.provisioning.api.utils.EntityUtils;
import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.provisioning.api.data.ItemTransformer;
+import org.identityconnectors.framework.common.objects.SearchResult;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
@Transactional(readOnly = true)
@Component
@@ -133,12 +135,17 @@ public class PullUtils {
final List<ConnectorObject> found = new ArrayList<>();
connector.search(provision.getObjectClass(),
new EqualsFilter(new Name(name)),
- new ResultsHandler() {
+ new SearchResultsHandler() {
@Override
public boolean handle(final ConnectorObject obj) {
return found.add(obj);
}
+
+ @Override
+ public void handleResult(final SearchResult sr) {
+ // do nothing
+ }
}, MappingUtils.buildOperationOptions(MappingUtils.getPullItems(provision.getMapping().getItems()).iterator()));
if (found.isEmpty()) {