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 2018/10/12 07:20:37 UTC
[4/7] syncope git commit: [SYNCOPE-1383] Completely removing
ResultsHandler - and fixing unused imports
[SYNCOPE-1383] Completely removing ResultsHandler - and fixing unused imports
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/a17460de
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/a17460de
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/a17460de
Branch: refs/heads/2_1_X
Commit: a17460de027086d989efbea25724c6f0b49ddc9f
Parents: 75f4fc4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 09:19:06 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 09:19:06 2018 +0200
----------------------------------------------------------------------
.../core/provisioning/api/Connector.java | 8 ++---
.../provisioning/java/ConnectorFacadeProxy.java | 34 ++++++++++++--------
.../provisioning/java/pushpull/PullUtils.java | 16 +++++++--
.../provisioning/java/pushpull/PushUtils.java | 22 +++++++++----
4 files changed, 54 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/a17460de/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
----------------------------------------------------------------------
diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
index b699c87..e5a7939 100644
--- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
+++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/Connector.java
@@ -23,18 +23,18 @@ import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.syncope.core.persistence.api.dao.search.OrderByClause;
import org.apache.syncope.core.persistence.api.entity.ConnInstance;
+import org.apache.syncope.core.provisioning.api.pushpull.ReconFilterBuilder;
import org.identityconnectors.framework.common.objects.Attribute;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.ObjectClass;
import org.identityconnectors.framework.common.objects.ObjectClassInfo;
import org.identityconnectors.framework.common.objects.OperationOptions;
-import org.identityconnectors.framework.common.objects.ResultsHandler;
import org.identityconnectors.framework.common.objects.SyncResultsHandler;
import org.identityconnectors.framework.common.objects.SyncToken;
import org.identityconnectors.framework.common.objects.Uid;
import org.identityconnectors.framework.common.objects.filter.Filter;
-import org.apache.syncope.core.provisioning.api.pushpull.ReconFilterBuilder;
import org.identityconnectors.framework.common.objects.SearchResult;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
/**
* Entry point for making requests on underlying connector bundles.
@@ -165,7 +165,7 @@ public interface Connector {
SearchResult search(
ObjectClass objectClass,
Filter filter,
- ResultsHandler handler,
+ SearchResultsHandler handler,
OperationOptions options);
/**
@@ -185,7 +185,7 @@ public interface Connector {
SearchResult search(
ObjectClass objectClass,
Filter filter,
- ResultsHandler handler,
+ SearchResultsHandler handler,
int pageSize,
String pagedResultsCookie,
List<OrderByClause> orderBy,
http://git-wip-us.apache.org/repos/asf/syncope/blob/a17460de/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 dfca75d..1608d83 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
@@ -32,6 +32,7 @@ import org.apache.syncope.core.provisioning.api.ConnIdBundleManager;
import org.apache.syncope.core.provisioning.api.utils.ConnPoolConfUtils;
import org.apache.syncope.core.provisioning.api.Connector;
import org.apache.syncope.core.provisioning.api.TimeoutException;
+import org.apache.syncope.core.provisioning.api.pushpull.ReconFilterBuilder;
import org.apache.syncope.core.persistence.api.dao.search.OrderByClause;
import org.apache.syncope.core.spring.ApplicationContextProvider;
import org.identityconnectors.common.security.GuardedByteArray;
@@ -47,7 +48,6 @@ import org.identityconnectors.framework.common.objects.ObjectClass;
import org.identityconnectors.framework.common.objects.ObjectClassInfo;
import org.identityconnectors.framework.common.objects.OperationOptions;
import org.identityconnectors.framework.common.objects.OperationOptionsBuilder;
-import org.identityconnectors.framework.common.objects.ResultsHandler;
import org.identityconnectors.framework.common.objects.SearchResult;
import org.identityconnectors.framework.common.objects.SortKey;
import org.identityconnectors.framework.common.objects.SyncDeltaBuilder;
@@ -62,7 +62,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ClassUtils;
-import org.apache.syncope.core.provisioning.api.pushpull.ReconFilterBuilder;
public class ConnectorFacadeProxy implements Connector {
@@ -326,12 +325,23 @@ public class ConnectorFacadeProxy implements Connector {
actualOptions = filterBuilder.build(actualOptions);
}
- search(objectClass, filter, object -> handler.handle(new SyncDeltaBuilder().
- setObject(object).
- setUid(object.getUid()).
- setDeltaType(SyncDeltaType.CREATE_OR_UPDATE).
- setToken(new SyncToken("")).
- build()), actualOptions);
+ search(objectClass, filter, new SearchResultsHandler() {
+
+ @Override
+ public void handleResult(final SearchResult result) {
+ // nothing to do
+ }
+
+ @Override
+ public boolean handle(final ConnectorObject object) {
+ return handler.handle(new SyncDeltaBuilder().
+ setObject(object).
+ setUid(object.getUid()).
+ setDeltaType(SyncDeltaType.CREATE_OR_UPDATE).
+ setToken(new SyncToken("")).
+ build());
+ }
+ }, actualOptions);
}
@Override
@@ -423,7 +433,7 @@ public class ConnectorFacadeProxy implements Connector {
public SearchResult search(
final ObjectClass objectClass,
final Filter filter,
- final ResultsHandler handler,
+ final SearchResultsHandler handler,
final OperationOptions options) {
SearchResult result = null;
@@ -443,9 +453,7 @@ public class ConnectorFacadeProxy implements Connector {
@Override
public void handleResult(final SearchResult result) {
- if (handler instanceof SearchResultsHandler) {
- SearchResultsHandler.class.cast(handler).handleResult(result);
- }
+ handler.handleResult(result);
cookies[0] = result.getPagedResultsCookie();
}
@@ -470,7 +478,7 @@ public class ConnectorFacadeProxy implements Connector {
public SearchResult search(
final ObjectClass objectClass,
final Filter filter,
- final ResultsHandler handler,
+ final SearchResultsHandler handler,
final int pageSize,
final String pagedResultsCookie,
final List<OrderByClause> orderBy,
http://git-wip-us.apache.org/repos/asf/syncope/blob/a17460de/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 2344c69..34175db 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
@@ -65,7 +65,9 @@ import org.identityconnectors.framework.common.objects.AttributeUtil;
import org.identityconnectors.framework.common.objects.ConnectorObject;
import org.identityconnectors.framework.common.objects.Name;
import org.identityconnectors.framework.common.objects.OperationalAttributes;
+import org.identityconnectors.framework.common.objects.SearchResult;
import org.identityconnectors.framework.common.objects.filter.FilterBuilder;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -137,8 +139,18 @@ public class PullUtils {
Name nameAttr = new Name(name);
connector.search(provision.get().getObjectClass(),
ignoreCaseMatch ? FilterBuilder.equalsIgnoreCase(nameAttr) : FilterBuilder.equalTo(nameAttr),
- obj -> found.add(obj),
- MappingUtils.buildOperationOptions(
+ new SearchResultsHandler() {
+
+ @Override
+ public void handleResult(final SearchResult result) {
+ // nothing to do
+ }
+
+ @Override
+ public boolean handle(final ConnectorObject connectorObject) {
+ return found.add(connectorObject);
+ }
+ }, MappingUtils.buildOperationOptions(
MappingUtils.getPullItems(provision.get().getMapping().getItems()).iterator()));
if (found.isEmpty()) {
http://git-wip-us.apache.org/repos/asf/syncope/blob/a17460de/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
index 65a34b7..b260fb5 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/PushUtils.java
@@ -34,6 +34,8 @@ import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.apache.syncope.core.spring.ImplementationManager;
import org.identityconnectors.framework.common.objects.AttributeBuilder;
import org.identityconnectors.framework.common.objects.ConnectorObject;
+import org.identityconnectors.framework.common.objects.SearchResult;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,13 +88,19 @@ public class PushUtils {
List<ConnectorObject> objs = new ArrayList<>();
try {
- connector.search(
- provision.getObjectClass(),
- rule.getFilter(any, provision),
- obj -> {
- objs.add(obj);
- return true;
- }, MappingUtils.buildOperationOptions(provision.getMapping().getItems().iterator()));
+ connector.search(provision.getObjectClass(), rule.getFilter(any, provision), new SearchResultsHandler() {
+
+ @Override
+ public void handleResult(final SearchResult result) {
+ // nothing to do
+ }
+
+ @Override
+ public boolean handle(final ConnectorObject connectorObject) {
+ objs.add(connectorObject);
+ return true;
+ }
+ }, MappingUtils.buildOperationOptions(provision.getMapping().getItems().iterator()));
} catch (TimeoutException toe) {
LOG.debug("Request timeout", toe);
throw toe;