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:35 UTC
[2/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/78845fa9
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/78845fa9
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/78845fa9
Branch: refs/heads/2_0_X
Commit: 78845fa962ec9497a4c390111c0976c15ea46c11
Parents: e2eb2f1
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 08:58:09 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 08:58:09 2018 +0200
----------------------------------------------------------------------
.../core/provisioning/api/Connector.java | 6 ++---
.../provisioning/java/ConnectorFacadeProxy.java | 9 +++-----
.../provisioning/java/pushpull/PullUtils.java | 23 +++++++++-----------
3 files changed, 16 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/78845fa9/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 2098466..95f4af0 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
@@ -28,13 +28,13 @@ 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.ReconciliationFilterBuilder;
import org.identityconnectors.framework.common.objects.SearchResult;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
/**
* Entry point for making requests on underlying connector bundles.
@@ -160,7 +160,7 @@ public interface Connector {
SearchResult search(
ObjectClass objectClass,
Filter filter,
- ResultsHandler handler,
+ SearchResultsHandler handler,
OperationOptions options);
/**
@@ -180,7 +180,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/78845fa9/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 d50ddb1..46393b5 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
@@ -51,7 +51,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;
@@ -437,7 +436,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;
@@ -457,9 +456,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();
}
@@ -484,7 +481,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/78845fa9/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 be656d4..7345fb7 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
@@ -24,9 +24,8 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
-import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.policy.PullPolicySpec;
-import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
+import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.core.persistence.api.attrvalue.validation.ParsingValidationException;
import org.apache.syncope.core.persistence.api.dao.AnyObjectDAO;
import org.apache.syncope.core.persistence.api.dao.AnySearchDAO;
@@ -51,26 +50,26 @@ import org.apache.syncope.core.persistence.api.entity.resource.Provision;
import org.apache.syncope.core.persistence.api.entity.task.ProvisioningTask;
import org.apache.syncope.core.persistence.api.entity.user.User;
import org.apache.syncope.core.provisioning.api.Connector;
-import org.apache.syncope.core.provisioning.java.IntAttrNameParser;
import org.apache.syncope.core.provisioning.api.IntAttrName;
+import org.apache.syncope.core.provisioning.api.data.ItemTransformer;
+import org.apache.syncope.core.provisioning.api.pushpull.PullCorrelationRule;
+import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
+import org.apache.syncope.core.provisioning.api.utils.EntityUtils;
+import org.apache.syncope.core.provisioning.java.IntAttrNameParser;
+import org.apache.syncope.core.provisioning.java.utils.MappingUtils;
import org.identityconnectors.framework.common.objects.Attribute;
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.ResultsHandler;
+import org.identityconnectors.framework.common.objects.SearchResult;
import org.identityconnectors.framework.common.objects.filter.EqualsFilter;
+import org.identityconnectors.framework.spi.SearchResultsHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-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,9 +132,7 @@ public class PullUtils {
AnyUtils anyUtils = anyUtilsFactory.getInstance(anyType.getKind());
final List<ConnectorObject> found = new ArrayList<>();
- connector.search(provision.getObjectClass(),
- new EqualsFilter(new Name(name)),
- new SearchResultsHandler() {
+ connector.search(provision.getObjectClass(), new EqualsFilter(new Name(name)), new SearchResultsHandler() {
@Override
public boolean handle(final ConnectorObject obj) {