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 2017/10/18 09:39:49 UTC
[1/2] syncope git commit: Minor cleanup
Repository: syncope
Updated Branches:
refs/heads/2_0_X 2d853137d -> b0dcf9d5a
refs/heads/master b59af7276 -> 01dba3430
Minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b0dcf9d5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b0dcf9d5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b0dcf9d5
Branch: refs/heads/2_0_X
Commit: b0dcf9d5a40e95258d080aff38a5296a6f36ce0f
Parents: 2d85313
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Oct 18 11:37:07 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Oct 18 11:37:07 2017 +0200
----------------------------------------------------------------------
.../java/propagation/AbstractPropagationTaskExecutor.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/b0dcf9d5/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index 1b125c8..4029556 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -194,7 +194,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
*
* @see org.identityconnectors.framework.common.objects.AttributeUtil#toMap(java.util.Collection)
*/
- private Map<String, Attribute> toMap(final Collection<? extends Attribute> attributes) {
+ protected Map<String, Attribute> toMap(final Collection<? extends Attribute> attributes) {
Map<String, Attribute> map = new HashMap<>();
for (Attribute attr : attributes) {
map.put(attr.getName().toUpperCase(), attr);
@@ -239,7 +239,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
new ObjectClass(task.getObjectClassName()), attributes, null, propagationAttempted);
} else {
// 1. check if rename is really required
- Name newName = (Name) AttributeUtil.find(Name.NAME, attributes);
+ Name newName = AttributeUtil.getNameFromAttributes(attributes);
LOG.debug("Rename required with value {}", newName);
@@ -266,7 +266,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
if (originalAttrs.equals(attributes)) {
LOG.debug("Don't need to propagate anything: {} is equal to {}", originalAttrs, attributes);
- result = (Uid) AttributeUtil.find(Uid.NAME, attributes);
+ result = AttributeUtil.getUidAttribute(attributes);
} else {
LOG.debug("Attributes that would be updated {}", attributes);
[2/2] syncope git commit: Minor cleanup
Posted by il...@apache.org.
Minor cleanup
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/01dba343
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/01dba343
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/01dba343
Branch: refs/heads/master
Commit: 01dba343087df9b0f8f4b8c66f636b9ea9aa6f18
Parents: b59af72
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Oct 18 11:37:07 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Oct 18 11:39:38 2017 +0200
----------------------------------------------------------------------
.../java/propagation/AbstractPropagationTaskExecutor.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/01dba343/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
----------------------------------------------------------------------
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
index e4f443f..fa5442a 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/propagation/AbstractPropagationTaskExecutor.java
@@ -209,7 +209,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
new ObjectClass(task.getObjectClassName()), attributes, null, propagationAttempted);
} else {
// 1. check if rename is really required
- Name newName = (Name) AttributeUtil.find(Name.NAME, attributes);
+ Name newName = AttributeUtil.getNameFromAttributes(attributes);
LOG.debug("Rename required with value {}", newName);
@@ -238,7 +238,7 @@ public abstract class AbstractPropagationTaskExecutor implements PropagationTask
if (originalAttrs.equals(attributes)) {
LOG.debug("Don't need to propagate anything: {} is equal to {}", originalAttrs, attributes);
- result = (Uid) AttributeUtil.find(Uid.NAME, attributes);
+ result = AttributeUtil.getUidAttribute(attributes);
} else {
LOG.debug("Attributes that would be updated {}", attributes);