Repository: syncope Updated Branches: refs/heads/2_0_X 6c0c93c82 -> 7018907ae refs/heads/2_1_X 10ee5750f -> cd6a56bb5 refs/heads/master 2170e4d50 -> 6fc42652b
[SYNCOPE-1338] Do not apply conversion pattern twice during Pull Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7018907a Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7018907a Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7018907a Branch: refs/heads/2_0_X Commit: 7018907aec54b918b1c04140ddcb6240e2f8539f Parents: 6c0c93c Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Jul 16 11:47:19 2018 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Jul 16 11:47:19 2018 +0200 ---------------------------------------------------------------------- .../core/provisioning/api/MappingManager.java | 5 +--- .../provisioning/java/MappingManagerImpl.java | 31 +++++--------------- .../java/utils/ConnObjectUtils.java | 2 +- 3 files changed, 9 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/7018907a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/MappingManager.java ---------------------------------------------------------------------- diff --git a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/MappingManager.java b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/MappingManager.java index b62e221..b030782 100644 --- a/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/MappingManager.java +++ b/core/provisioning-api/src/main/java/org/apache/syncope/core/provisioning/api/MappingManager.java @@ -24,7 +24,6 @@ import org.apache.commons.lang3.tuple.Pair; import org.apache.syncope.common.lib.to.AnyTO; import org.apache.syncope.common.lib.to.RealmTO; import org.apache.syncope.core.persistence.api.entity.Any; -import org.apache.syncope.core.persistence.api.entity.AnyUtils; import org.apache.syncope.core.persistence.api.entity.PlainAttrValue; import org.apache.syncope.core.persistence.api.entity.Realm; import org.apache.syncope.core.persistence.api.entity.resource.Item; @@ -93,9 +92,8 @@ public interface MappingManager { * @param mapItem mapping item * @param attr attribute received from connector * @param anyTO any object - * @param anyUtils any utils */ - <T extends AnyTO> void setIntValues(Item mapItem, Attribute attr, T anyTO, AnyUtils anyUtils); + <T extends AnyTO> void setIntValues(Item mapItem, Attribute attr, T anyTO); /** * Set attribute values, according to the given {@link Item}, to realm from attribute received from @@ -106,5 +104,4 @@ public interface MappingManager { * @param realmTO realm */ void setIntValues(Item orgUnitItem, Attribute attr, RealmTO realmTO); - } http://git-wip-us.apache.org/repos/asf/syncope/blob/7018907a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java ---------------------------------------------------------------------- diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java index 8c6764b..4fa0e8e 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/MappingManagerImpl.java @@ -43,7 +43,6 @@ import org.apache.syncope.common.lib.to.RealmTO; import org.apache.syncope.common.lib.to.UserTO; import org.apache.syncope.common.lib.types.AnyTypeKind; import org.apache.syncope.common.lib.types.AttrSchemaType; -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.AnyTypeDAO; import org.apache.syncope.core.persistence.api.dao.DerSchemaDAO; @@ -98,6 +97,7 @@ 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.data.ItemTransformer; +import org.identityconnectors.common.Base64; import org.identityconnectors.framework.common.objects.Name; @Component @@ -686,7 +686,7 @@ public class MappingManagerImpl implements MappingManager { @Transactional(readOnly = true) @Override - public void setIntValues(final Item mapItem, final Attribute attr, final AnyTO anyTO, final AnyUtils anyUtils) { + public void setIntValues(final Item mapItem, final Attribute attr, final AnyTO anyTO) { List<Object> values = null; if (attr != null) { values = attr.getValue(); @@ -698,7 +698,7 @@ public class MappingManagerImpl implements MappingManager { IntAttrName intAttrName; try { - intAttrName = intAttrNameParser.parse(mapItem.getIntAttrName(), anyUtils.anyTypeKind()); + intAttrName = intAttrNameParser.parse(mapItem.getIntAttrName(), AnyTypeKind.fromTOClass(anyTO.getClass())); } catch (ParseException e) { LOG.error("Invalid intAttrName '{}' specified, ignoring", mapItem.getIntAttrName(), e); return; @@ -775,27 +775,11 @@ public class MappingManagerImpl implements MappingManager { for (Object value : values) { AttrSchemaType schemaType = schema == null ? AttrSchemaType.String : schema.getType(); if (value != null) { - PlainAttrValue attrValue = anyUtils.newPlainAttrValue(); - switch (schemaType) { - case String: - attrValue.setStringValue(value.toString()); - break; - - case Binary: - attrValue.setBinaryValue((byte[]) value); - break; - - default: - try { - attrValue.parseValue(schema, value.toString()); - } catch (ParsingValidationException e) { - LOG.error("While parsing provided value {}", value, e); - attrValue.setStringValue(value.toString()); - schemaType = AttrSchemaType.String; - } - break; + if (schemaType == AttrSchemaType.Binary) { + attrTO.getValues().add(Base64.encode((byte[]) value)); + } else { + attrTO.getValues().add(value.toString()); } - attrTO.getValues().add(attrValue.getValueAsString(schemaType)); } } @@ -886,5 +870,4 @@ public class MappingManagerImpl implements MappingManager { } } } - } http://git-wip-us.apache.org/repos/asf/syncope/blob/7018907a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/utils/ConnObjectUtils.java ---------------------------------------------------------------------- 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 a17b168..78c2f61 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 @@ -317,7 +317,7 @@ public class ConnObjectUtils { // 1. fill with data from connector object anyTO.setRealm(pullTask.getDestinatioRealm().getFullPath()); for (Item item : MappingUtils.getPullItems(provision.getMapping().getItems())) { - mappingManager.setIntValues(item, obj.getAttributeByName(item.getExtAttrName()), anyTO, anyUtils); + mappingManager.setIntValues(item, obj.getAttributeByName(item.getExtAttrName()), anyTO); } // 2. add data from defined template (if any)
