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:34 UTC
[1/7] syncope git commit: Upgrading maven-surefire-plugin and
maven-failsafe-plugin
Repository: syncope
Updated Branches:
refs/heads/2_0_X e16293b36 -> 78845fa96
refs/heads/2_1_X 239bdd48f -> a17460de0
refs/heads/master 295f0e95c -> 28e8cd3fe
Upgrading maven-surefire-plugin and maven-failsafe-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e2eb2f14
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e2eb2f14
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e2eb2f14
Branch: refs/heads/2_0_X
Commit: e2eb2f144b44c113f0bf550f025660a0fb7af049
Parents: e16293b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 08:57:38 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 08:57:38 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/e2eb2f14/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 86213cd..cfcf323 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1974,7 +1974,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1985,7 +1985,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
[4/7] syncope git commit: [SYNCOPE-1383] Completely removing
ResultsHandler - and fixing unused imports
Posted by il...@apache.org.
[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;
[7/7] syncope git commit: Fix references to master branch
Posted by il...@apache.org.
Fix references to master branch
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/28e8cd3f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/28e8cd3f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/28e8cd3f
Branch: refs/heads/master
Commit: 28e8cd3fe21025f760ad84feb9fd8388cec4cff4
Parents: 4f79720
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 09:20:25 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 09:20:25 2018 +0200
----------------------------------------------------------------------
src/main/asciidoc/reference-guide/concepts/workflow.adoc | 4 ++--
.../reference-guide/workingwithapachesyncope/customization.adoc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/28e8cd3f/src/main/asciidoc/reference-guide/concepts/workflow.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/concepts/workflow.adoc b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
index b5e2e1f..c739530 100644
--- a/src/main/asciidoc/reference-guide/concepts/workflow.adoc
+++ b/src/main/asciidoc/reference-guide/concepts/workflow.adoc
@@ -265,7 +265,7 @@ ifeval::["{snapshotOrRelease}" == "release"]
https://github.com/apache/syncope/blob/syncope-{docVersion}/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/api/DropdownValueProvider.java[DropdownValueProvider^]
endif::[]
ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/blob/2_1_X/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/api/DropdownValueProvider.java[DropdownValueProvider^]
+https://github.com/apache/syncope/blob/master/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/api/DropdownValueProvider.java[DropdownValueProvider^]
endif::[]
interface
<3> the second form is a traditional approval form, as seen <<sample-selfreg-approval,above>>
@@ -274,7 +274,7 @@ ifeval::["{snapshotOrRelease}" == "release"]
https://github.com/apache/syncope/blob/syncope-{docVersion}/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/task/FlowableServiceTask.java[FlowableServiceTask^]
endif::[]
ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/blob/2_1_X/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/task/FlowableServiceTask.java[FlowableServiceTask^]
+https://github.com/apache/syncope/blob/master/ext/flowable/flowable-bpmn/src/main/java/org/apache/syncope/core/flowable/task/FlowableServiceTask.java[FlowableServiceTask^]
endif::[]
implementation which takes care of establishing the relationship
====
http://git-wip-us.apache.org/repos/asf/syncope/blob/28e8cd3f/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
index 504590c..891c25a 100644
--- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
+++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc
@@ -873,7 +873,7 @@ ifeval::["{snapshotOrRelease}" == "release"]
https://github.com/apache/syncope/blob/syncope-{docVersion}/client/enduser/src/test/resources/customTemplate.json[customTemplate.json^].
endif::[]
ifeval::["{snapshotOrRelease}" == "snapshot"]
-https://github.com/apache/syncope/blob/2_1_X/client/enduser/src/test/resources/customTemplate.json[customTemplate.json^].
+https://github.com/apache/syncope/blob/master/client/enduser/src/test/resources/customTemplate.json[customTemplate.json^].
endif::[]
In order to apply them, that content must be copied to your `customTemplate.json` file.
[5/7] syncope git commit: Upgrading maven-surefire-plugin and
maven-failsafe-plugin
Posted by il...@apache.org.
Upgrading maven-surefire-plugin and maven-failsafe-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b043feba
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b043feba
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b043feba
Branch: refs/heads/master
Commit: b043febae3e08bf657ecfb1c23b80d2973bd68a6
Parents: 295f0e9
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 08:57:38 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 09:19:13 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b043feba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a7a9b71..d712c64 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1902,7 +1902,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1920,7 +1920,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
[6/7] syncope git commit: [SYNCOPE-1383] Completely removing
ResultsHandler - and fixing unused imports
Posted by il...@apache.org.
[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/4f797206
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4f797206
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4f797206
Branch: refs/heads/master
Commit: 4f797206318fc00f6b0e31f30c98c0da7ea838c0
Parents: b043feb
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:16 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/4f797206/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/4f797206/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/4f797206/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/4f797206/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;
[2/7] syncope git commit: [SYNCOPE-1383] Completely removing
ResultsHandler - and fixing unused imports
Posted by il...@apache.org.
[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) {
[3/7] syncope git commit: Upgrading maven-surefire-plugin and
maven-failsafe-plugin
Posted by il...@apache.org.
Upgrading maven-surefire-plugin and maven-failsafe-plugin
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/75f4fc47
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/75f4fc47
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/75f4fc47
Branch: refs/heads/2_1_X
Commit: 75f4fc4730d4aa3f412b0e9ef27aa8e762a1fe9c
Parents: 239bdd4
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Oct 12 08:57:38 2018 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Oct 12 08:58:42 2018 +0200
----------------------------------------------------------------------
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/75f4fc47/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc85f9e..8c86300 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1902,7 +1902,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>
@@ -1920,7 +1920,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.22.0</version>
+ <version>2.22.1</version>
<configuration>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<encoding>utf-8</encoding>