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 2019/10/22 12:46:02 UTC
[syncope] branch master updated: Fixing bad cherry-pick
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 9c059cd Fixing bad cherry-pick
9c059cd is described below
commit 9c059cd836de7f0ceab30e084dab8a775a5c3480
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Tue Oct 22 14:45:51 2019 +0200
Fixing bad cherry-pick
---
.../core/provisioning/java/utils/ConnObjectUtils.java | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
index 3162765..477ab4f 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Base64;
import java.util.List;
-import java.util.Optional;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
@@ -116,21 +115,6 @@ public class ConnObjectUtils {
}
/**
- * <<<<<<< HEAD
- * Builds {@link ConnObjectTO} out of {@link ConnectorObject}.
- *
- * @param connObject connector object.
- * @return transfer object
- */
- public static ConnObjectTO getConnObjectTO(final ConnectorObject connObject) {
- return Optional.ofNullable(connObject)
- .map(object -> getConnObjectTO(object.getAttributes())).orElseGet(ConnObjectTO::new);
- }
-
- /**
- * =======
- * >>>>>>> 1b918568e... [SYNCOPE-1500] Reconciliation now supports single pull / push + [SYNCOPE-957] Reconciliation
- * now supports Linked Accounts + [SYNCOPE-1499] Use Push correlation rule wherever it makes sense
* Builds {@link ConnObjectTO} out of a collection of {@link Attribute} instances.
*
* @param attrs attributes