When accepting data from resource, attribute names are matched case-i…

…nsensitively (MID-2085).
Evolveum · Nov 13, 2014 · e777d2c · e777d2c
1 parent a810e82
commit e777d2c
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 26 deletions.
diff --git a/...rs/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java b/...rs/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java
@@ -46,6 +46,7 @@ public class DummyConfiguration extends AbstractConfiguration {
     private boolean caseIgnoreValues = false;
     private boolean generateDefaultValues = false;
     private boolean tolerateDuplicateValues = true;
+	private boolean varyLetterCase = false;
     private String uselessString;
     private GuardedString uselessGuardedString;
 
@@ -225,6 +226,16 @@ public GuardedString getUselessGuardedString() {
 	public void setUselessGuardedString(GuardedString uselessGuardedString) {
 		this.uselessGuardedString = uselessGuardedString;
 	}
+
+	@ConfigurationProperty(displayMessageKey = "UI_VARY_LETTER_CASE",
+			helpMessageKey = "UI_VARY_LETTER_CASE_HELP")
+	public boolean isVaryLetterCase() {
+		return varyLetterCase;
+	}
+
+	public void setVaryLetterCase(boolean value) {
+		this.varyLetterCase = value;
+	}
 
 	/**
      * {@inheritDoc}

diff --git a/...ectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java b/...ectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java
@@ -15,7 +15,6 @@
  */
 package com.evolveum.icf.dummy.connector;
 
-import org.apache.commons.lang.StringUtils;
 import org.identityconnectors.framework.spi.operations.*;
 import org.identityconnectors.framework.common.exceptions.AlreadyExistsException;
 import org.identityconnectors.framework.common.exceptions.ConnectionFailedException;
@@ -50,10 +49,8 @@
 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.AbstractFilterTranslator;
 import org.identityconnectors.framework.common.objects.filter.Filter;
 import org.identityconnectors.framework.common.objects.filter.FilterTranslator;
-import org.identityconnectors.framework.spi.AttributeNormalizer;
 import org.identityconnectors.framework.spi.Configuration;
 import org.identityconnectors.framework.spi.Connector;
 import org.identityconnectors.framework.spi.ConnectorClass;
@@ -79,7 +76,6 @@
 import com.evolveum.icf.dummy.resource.ObjectAlreadyExistsException;
 import com.evolveum.icf.dummy.resource.ObjectDoesNotExistException;
 import com.evolveum.icf.dummy.resource.SchemaViolationException;
-import com.evolveum.icf.dummy.connector.Utils;
 
 /**
  * Connector for the Dummy Resource.
@@ -145,7 +141,7 @@ public void init(Configuration configuration) {
         resource.setEnforceUniqueName(this.configuration.isEnforceUniqueName());
         resource.setTolerateDuplicateValues(this.configuration.getTolerateDuplicateValues());
         resource.setGenerateDefaultValues(this.configuration.isGenerateDefaultValues());
-        
+
         resource.setUselessString(this.configuration.getUselessString());
         GuardedString uselessGuardedString = this.configuration.getUselessGuardedString();
         if (uselessGuardedString == null) {
@@ -1051,6 +1047,9 @@ private ConnectorObjectBuilder createConnectorObjectBuilderCommon(DummyObject du
 				}
 			}
 			Set<Object> values = dummyObject.getAttributeValues(name, Object.class);
+			if (configuration.isVaryLetterCase()) {
+				name = varyLetterCase(name);
+			}
 			builder.addAttribute(name, values);
 		}
 
@@ -1072,7 +1071,21 @@ private ConnectorObjectBuilder createConnectorObjectBuilderCommon(DummyObject du
 
 		return builder;
    }
-
+
+	private String varyLetterCase(String name) {
+		StringBuilder sb = new StringBuilder(name.length());
+		for (char c : name.toCharArray()) {
+			double a = Math.random();
+			if (a < 0.4) {
+				c = Character.toLowerCase(c);
+			} else if (a > 0.7) {
+				c = Character.toUpperCase(c);
+			}
+			sb.append(c);
+		}
+		return sb.toString();
+	}
+
 	private Long convertToLong(Date date) {
 		if (date == null) {
 			return null;

diff --git a/.../src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java b/.../src/main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinition.java
@@ -349,11 +349,14 @@ public void setDynamic(boolean dynamic) {
 
 	@Override
 	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz) {
-		return refinedAttributeDefinition.isValidFor(elementQName, clazz);
+		return isValidFor(elementQName, clazz, false);
+	}
+
+	@Override
+	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz, boolean caseInsensitive) {
+		return refinedAttributeDefinition.isValidFor(elementQName, clazz, caseInsensitive);
 	}
 
-
-
 	public Boolean getReturnedByDefault() {
 		return refinedAttributeDefinition.getReturnedByDefault();
 	}

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ComplexTypeDefinition.java
@@ -194,8 +194,12 @@ public <C extends Containerable> PrismContainerDefinition<C> findContainerDefini
     public <C extends Containerable> PrismContainerDefinition<C> findContainerDefinition(ItemPath path) {
     	return findItemDefinition(path, PrismContainerDefinition.class);
     }
-    
+
 	public <T extends ItemDefinition> T findItemDefinition(QName name, Class<T> clazz) {
+		return findItemDefinition(name, clazz, false);
+	}
+
+	public <T extends ItemDefinition> T findItemDefinition(QName name, Class<T> clazz, boolean caseInsensitive) {
         if (clazz == null) {
             throw new IllegalArgumentException("type not specified while searching for " + name + " in " + this);
         }
@@ -204,7 +208,7 @@ public <T extends ItemDefinition> T findItemDefinition(QName name, Class<T> claz
         }
 
         for (ItemDefinition def : getDefinitions()) {
-            if (isItemValid(def, name, clazz)) {
+            if (isItemValid(def, name, clazz, caseInsensitive)) {
                 return (T) def;
             }
         }
@@ -227,11 +231,11 @@ public <T extends ItemDefinition> T findItemDefinition(ItemPath path, Class<T> c
         return null;
     }
 
-	private <T extends ItemDefinition> boolean isItemValid(ItemDefinition def, QName name, Class<T> clazz) {
+	private <T extends ItemDefinition> boolean isItemValid(ItemDefinition def, QName name, Class<T> clazz, boolean caseInsensitive) {
 		if (def == null) {
     		return false;
     	}
-    	return def.isValidFor(name, clazz);
+    	return def.isValidFor(name, clazz, caseInsensitive);
 	}
 
 	/**

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/ItemDefinition.java
@@ -239,12 +239,16 @@ public void setCanAdd(boolean add) {
     public boolean canAdd() {
         return canAdd;
     }
-
-	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz) {
+
+    public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz) {
+        return isValidFor(elementQName, clazz, false);
+    }
+
+	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz, boolean caseInsensitive) {
 		if (!clazz.isAssignableFrom(this.getClass())) {
     		return false;
     	}
-        if (QNameUtil.match(elementQName, getName())) {
+        if (QNameUtil.match(elementQName, getName(), caseInsensitive)) {
         	return true;
         }
         return false;

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismContainerDefinition.java
@@ -154,7 +154,11 @@ public void revive(PrismContext prismContext) {
 		}
 	}
 
-	public <D extends ItemDefinition> D findItemDefinition(QName name, Class<D> clazz) {
+    public <D extends ItemDefinition> D findItemDefinition(QName name, Class<D> clazz) {
+        return findItemDefinition(name, clazz, false);
+    }
+
+    public <D extends ItemDefinition> D findItemDefinition(QName name, Class<D> clazz, boolean caseInsensitive) {
         if (clazz == null) {
             throw new IllegalArgumentException("type not specified while searching for " + name + " in " + this);
         }
@@ -167,7 +171,7 @@ public <D extends ItemDefinition> D findItemDefinition(QName name, Class<D> claz
         	return null;
         }
 
-        return complexTypeDefinition.findItemDefinition(name, clazz);
+        return complexTypeDefinition.findItemDefinition(name, clazz, caseInsensitive);
     }
 
     public <T extends ItemDefinition> T findItemDefinition(ItemPath path, Class<T> clazz) {

diff --git a/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java b/infra/prism/src/main/java/com/evolveum/midpoint/prism/PrismReferenceDefinition.java
@@ -87,13 +87,18 @@ public void setComposite(boolean isComposite) {
 
 	@Override
 	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz) {
+		return isValidFor(elementQName, clazz, false);
+	}
+
+	@Override
+	public boolean isValidFor(QName elementQName, Class<? extends ItemDefinition> clazz, boolean caseInsensitive) {
 		if (!clazz.isAssignableFrom(this.getClass())) {
     		return false;
     	}
-        if (QNameUtil.match(elementQName, getName())) {
+        if (QNameUtil.match(elementQName, getName(), caseInsensitive)) {
         	return true;
         }
-        if (QNameUtil.match(elementQName, getCompositeObjectElementName())) {
+        if (QNameUtil.match(elementQName, getCompositeObjectElementName(), caseInsensitive)) {
         	return true;
         }
         return false;

diff --git a/...ain/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java b/...ain/java/com/evolveum/midpoint/schema/processor/ResourceAttributeContainerDefinition.java
@@ -314,13 +314,17 @@ protected void copyDefinitionData(ResourceAttributeContainerDefinition clone) {
 //	}
 
 	public ResourceAttributeDefinition findAttributeDefinition(QName elementQName) {
-		return findItemDefinition(elementQName, ResourceAttributeDefinition.class);
+		return findAttributeDefinition(elementQName, false);
+	}
+
+	public ResourceAttributeDefinition findAttributeDefinition(QName elementQName, boolean caseInsensitive) {
+		return findItemDefinition(elementQName, ResourceAttributeDefinition.class, caseInsensitive);
 	}
 
 	public ResourceAttributeDefinition findAttributeDefinition(ItemPath elementPath) {
 		return findItemDefinition(elementPath, ResourceAttributeDefinition.class);
 	}
-	
+
 	public ResourceAttributeDefinition findAttributeDefinition(String elementLocalname) {
 		QName elementQName = new QName(getName().getNamespaceURI(),elementLocalname);
 		return findAttributeDefinition(elementQName);

diff --git a/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java b/infra/util/src/main/java/com/evolveum/midpoint/util/QNameUtil.java
@@ -85,17 +85,36 @@ public static boolean compareQName(QName qname, Node node) {
 	 * Matching with considering wildcard namespace (null).
 	 */
 	public static boolean match(QName a, QName b) {
+		return match(a, b, false);
+	}
+
+	// case insensitive is related to local parts
+	public static boolean match(QName a, QName b, boolean caseInsensitive) {
 		if (a == null && b == null) {
 			return true;
 		}
 		if (a == null || b == null) {
 			return false;
 		}
-		if (StringUtils.isBlank(a.getNamespaceURI()) || StringUtils.isBlank(b.getNamespaceURI())) {
-			return a.getLocalPart().equals(b.getLocalPart());
+		if (!caseInsensitive) {
+			// traditional comparison
+			if (StringUtils.isBlank(a.getNamespaceURI()) || StringUtils.isBlank(b.getNamespaceURI())) {
+				return a.getLocalPart().equals(b.getLocalPart());
+			} else {
+				return a.equals(b);
+			}
 		} else {
-			return a.equals(b);
+			// relaxed (case-insensitive) one
+			if (!a.getLocalPart().equalsIgnoreCase(b.getLocalPart())) {
+				return false;
+			}
+			if (StringUtils.isBlank(a.getNamespaceURI()) || StringUtils.isBlank(b.getNamespaceURI())) {
+				return true;
+			} else {
+				return a.getNamespaceURI().equals(b.getNamespaceURI());
+			}
 		}
+
 	}
 
 	public static QName resolveNs(QName a, Collection<QName> col){

diff --git a/model/model-intest/src/test/resources/common/resource-dummy.xml b/model/model-intest/src/test/resources/common/resource-dummy.xml
@@ -49,6 +49,7 @@
 				<clearValue>whatever</clearValue>
 			</icfi:uselessGuardedString>
 			<icfi:uselessString>USEless</icfi:uselessString>
+			<icfi:varyLetterCase>true</icfi:varyLetterCase>
 		</icfc:configurationProperties>
 
 	</connectorConfiguration>

diff --git a/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java b/...isioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
@@ -187,12 +187,14 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 			}
 
 			QName qname = icfNameMapper.convertAttributeNameToQName(icfAttr.getName(), resourceSchemaNamespace);
-			ResourceAttributeDefinition attributeDefinition = attributesContainerDefinition.findAttributeDefinition(qname);
+			ResourceAttributeDefinition attributeDefinition = attributesContainerDefinition.findAttributeDefinition(qname, true);       // TODO configure whether we want the case insensitivity!
 
 			if (attributeDefinition == null) {
 				throw new SchemaException("Unknown attribute "+qname+" in definition of object class "+attributesContainerDefinition.getTypeName()+". Original ICF name: "+icfAttr.getName(), qname);
 			}
 
+			qname = attributeDefinition.getName();			// normalized version
+
 			ResourceAttribute<Object> resourceAttribute = attributeDefinition.instantiate(qname);
 
 			// if true, we need to convert whole connector object to the