Merge branch 'feature/connid-name-hint'

build-system/pom.xml

@@ -80,7 +80,7 @@
         <activiti-spring.version>5.19.0.2</activiti-spring.version>
         <commons-email.version>1.3</commons-email.version>
         <xmlsec.version>2.0.6</xmlsec.version>
-        <connid.version>1.4.2.16</connid.version>
+        <connid.version>1.4.2.18</connid.version>
         <jasper.version>6.1.1</jasper.version>
         <derby.version>10.11.1.1</derby.version>
         <wro4j.version>1.8.0</wro4j.version>
@@ -603,7 +603,7 @@
             <dependency>
                 <groupId>com.evolveum.polygon</groupId>
                 <artifactId>connector-ldap</artifactId>
-                <version>1.4.2.18</version>
+                <version>1.4.2.19</version>
                 <exclusions>
 					<exclusion> <!-- Version in dependency of org.apache.servicemix.bundles:org.apache.servicemix.bundles.dom4j conflicts with xalan. Can be removed when connector version is bumped beyond 1.4.2.17 -->
                         <groupId>xml-apis</groupId>

icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConfiguration.java

@@ -59,6 +59,7 @@ public class DummyConfiguration extends AbstractConfiguration {
 	private Integer minPasswordLength = null;
 	private boolean addConnectorStateAttributes = false;
 	private boolean supportReturnDefaultAttributes = false;				// used e.g. for livesync vs. auxiliary object classes test
+	private boolean requireNameHint = false;
 
 	/**
      * Defines name of the dummy resource instance. There may be several dummy resource running in
@@ -345,6 +346,15 @@ public void setSupportReturnDefaultAttributes(boolean supportReturnDefaultAttrib
 		this.supportReturnDefaultAttributes = supportReturnDefaultAttributes;
 	}
 
+	@ConfigurationProperty
+	public boolean isRequireNameHint() {
+		return requireNameHint;
+	}
+
+	public void setRequireNameHint(boolean requireNameHint) {
+		this.requireNameHint = requireNameHint;
+	}
+
 	/**
      * {@inheritDoc}
      */

icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/DummyConnector.java

@@ -49,6 +49,7 @@
 import org.identityconnectors.framework.common.objects.filter.EqualsFilter;
 import org.identityconnectors.framework.common.objects.filter.Filter;
 import org.identityconnectors.framework.common.objects.filter.FilterTranslator;
+import org.identityconnectors.framework.common.objects.filter.FilterVisitor;
 import org.identityconnectors.framework.common.objects.filter.GreaterThanFilter;
 import org.identityconnectors.framework.common.objects.filter.GreaterThanOrEqualFilter;
 import org.identityconnectors.framework.common.objects.filter.LessThanFilter;
@@ -289,6 +290,7 @@ public Uid create(final ObjectClass objectClass, final Set<Attribute> createAttr
     public Uid update(ObjectClass objectClass, Uid uid, Set<Attribute> replaceAttributes, OperationOptions options) {
         log.info("update::begin");
         validate(objectClass);
+        validate(uid);
 
         try {
 
@@ -514,6 +516,7 @@ public Uid update(ObjectClass objectClass, Uid uid, Set<Attribute> replaceAttrib
      */
     public Uid addAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> valuesToAdd, OperationOptions options) {
         validate(objectClass);
+        validate(uid);
 
         try {
 
@@ -705,6 +708,7 @@ public Uid addAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> v
      */
     public Uid removeAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute> valuesToRemove, OperationOptions options) {
         validate(objectClass);
+        validate(uid);
 
         try {
 
@@ -881,10 +885,12 @@ public Uid removeAttributeValues(ObjectClass objectClass, Uid uid, Set<Attribute
     public void delete(final ObjectClass objectClass, final Uid uid, final OperationOptions options) {
         log.info("delete::begin");
         validate(objectClass);
+        validate(uid);
 
         String id = uid.getUidValue();
 
         try {
+
         	if (ObjectClass.ACCOUNT.is(objectClass.getObjectClassValue())) {
         		if (configuration.getUidMode().equals(DummyConfiguration.UID_MODE_NAME)) {
         			resource.deleteAccountByName(id);
@@ -1142,6 +1148,7 @@ public FilterTranslator<Filter> createFilterTranslator(ObjectClass objectClass,
     public void executeQuery(ObjectClass objectClass, Filter query, ResultsHandler handler, OperationOptions options) {
         log.info("executeQuery({0},{1},{2},{3})", objectClass, query, handler, options);
         validate(objectClass);
+        validate(query);
         notNull(handler, "Results handled object can't be null.");
 
         Collection<String> attributesToGet = getAttrsToGet(options);
@@ -1442,7 +1449,11 @@ public void sync(ObjectClass objectClass, SyncToken token, SyncResultsHandler ha
 	        	if (configuration.getUidMode().equals(DummyConfiguration.UID_MODE_NAME)) {
 		        	uid = new Uid(delta.getObjectName());
 		        } else if (configuration.getUidMode().equals(DummyConfiguration.UID_MODE_UUID)) {
-		        	uid = new Uid(delta.getObjectId());
+		        	if (nameHintChecksEnabled()) {
+		        		uid = new Uid(delta.getObjectId(), new Name(delta.getObjectName()));
+		        	} else {
+		        		uid = new Uid(delta.getObjectId());
+		        	}
 		        } else {
 		        	throw new IllegalStateException("Unknown UID mode "+configuration.getUidMode());
 		        }
@@ -1898,4 +1909,113 @@ private boolean attributesToGetHasAttribute(Collection<String> attributesToGet,
 		return attributesToGet.contains(attrName);
 	}
 
+	public void validate(ObjectClass oc) {
+        if (oc == null) {
+            throw new IllegalArgumentException("Object class must not be null.");
+        }
+    }
+
+    public void validate(Uid uid) {
+    	if (uid == null) {
+    		throw new IllegalArgumentException("Uid must not be null.");
+    	}
+    	if (nameHintChecksEnabled()) {
+    		if (uid.getNameHint() == null) {
+    			throw new InvalidAttributeValueException("Uid name hint must not be null.");
+    		}
+    		if (StringUtils.isBlank(uid.getNameHintValue())) {
+    			throw new InvalidAttributeValueException("Uid name hint must not be empty.");
+    		}
+    	}
+    }
+
+	private void validate(Filter filter) {
+		if (filter == null) {
+    		return;
+    	}
+		if (nameHintChecksEnabled()) {
+			filter.accept(new FilterVisitor<String,String>() {
+
+				@Override
+				public String visitAndFilter(String p, AndFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitContainsFilter(String p, ContainsFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitContainsAllValuesFilter(String p, ContainsAllValuesFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitEqualsFilter(String p, EqualsFilter filter) {
+					if (filter.getAttribute().is(Uid.NAME)) {
+						Uid uid = (Uid)filter.getAttribute();
+						if (uid.getNameHint() == null) {
+			    			throw new InvalidAttributeValueException("Uid name hint must not be null in filter "+filter);
+			    		}
+			    		if (StringUtils.isBlank(uid.getNameHintValue())) {
+			    			throw new InvalidAttributeValueException("Uid name hint must not be empty in filter "+filter);
+			    		}
+					}
+					return null;
+				}
+
+				@Override
+				public String visitExtendedFilter(String p, Filter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitGreaterThanFilter(String p, GreaterThanFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitGreaterThanOrEqualFilter(String p, GreaterThanOrEqualFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitLessThanFilter(String p, LessThanFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitLessThanOrEqualFilter(String p, LessThanOrEqualFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitNotFilter(String p, NotFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitOrFilter(String p, OrFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitStartsWithFilter(String p, StartsWithFilter filter) {
+					return null;
+				}
+
+				@Override
+				public String visitEndsWithFilter(String p, EndsWithFilter filter) {
+					return null;
+				}
+
+			}, null);
+		}
+	}
+
+	private boolean nameHintChecksEnabled() {
+		return configuration.isRequireNameHint() && !resource.isDisableNameHintChecks();
+	}
+
 }

icf-connectors/dummy-connector/src/main/java/com/evolveum/icf/dummy/connector/Utils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010-2013 Evolveum
+ * Copyright (c) 2010-201ž Evolveum
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,12 +58,6 @@ public static <T> T getAttributeSingleValue(Set<Attribute> attributes, String at
 		return null;
 	}
 
-    public static void validate(ObjectClass oc) {
-        if (oc == null) {
-            throw new IllegalArgumentException("Object class must not be null.");
-        }
-    }
-
     public static void notNull(Object object, String message) {
         if (object == null) {
             throw new IllegalArgumentException(message);

icf-connectors/dummy-resource/src/main/java/com/evolveum/icf/dummy/resource/DummyResource.java

@@ -110,6 +110,8 @@ public class DummyResource implements DebugDumpable {
 
 	private boolean generateAccountDescriptionOnCreate = false;		   // simulates volatile behavior (on create)
 	private boolean generateAccountDescriptionOnUpdate = false;        // simulates volatile behavior (on update)
+
+	private boolean disableNameHintChecks = false;
 
 	// Following two properties are just copied from the connector
 	// configuration and can be checked later. They are otherwise
@@ -315,6 +317,14 @@ public void setGenerateAccountDescriptionOnUpdate(boolean generateAccountDescrip
 		this.generateAccountDescriptionOnUpdate = generateAccountDescriptionOnUpdate;
 	}
 
+	public boolean isDisableNameHintChecks() {
+		return disableNameHintChecks;
+	}
+
+	public void setDisableNameHintChecks(boolean disableNameHintChecks) {
+		this.disableNameHintChecks = disableNameHintChecks;
+	}
+
 	public Collection<String> getForbiddenNames() {
 		return forbiddenNames;
 	}

infra/schema/src/main/java/com/evolveum/midpoint/schema/internals/InternalMonitor.java

@@ -72,7 +72,7 @@ public static long getResourceSchemaParseCount() {
 	public synchronized static void recordResourceSchemaParse() {
 		resourceSchemaParseCount++;
 		if (traceShadowFetchOperation) {
-			traceOperation("resource schema parse", resourceSchemaParseCount);
+			traceOperation("resource schema parse", resourceSchemaParseCount, true);
 		}
 	}
 
@@ -92,7 +92,7 @@ public synchronized static void recordResourceSchemaFetch() {
 		resourceSchemaFetchCount++;
 		provisioningAllExtOperationCount++;
 		if (traceShadowFetchOperation) {
-			traceOperation("resource schema fetch", resourceSchemaFetchCount);
+			traceOperation("resource schema fetch", resourceSchemaFetchCount, true);
 		}
 	}
 
@@ -153,7 +153,7 @@ public static void recordShadowFetchOperation() {
 		shadowFetchOperationCount++;
 		provisioningAllExtOperationCount++;
 		if (traceShadowFetchOperation) {
-			traceOperation("shadow fetch", shadowFetchOperationCount);
+			traceOperation("shadow fetch", shadowFetchOperationCount, true);
 		}
 	}
 
@@ -192,7 +192,7 @@ public static long getConnectorOperationCount() {
 	public static void recordConnectorOperation(String name) {
 		connectorOperationCount++;
 		if (traceConnectorOperation) {
-			traceOperation("connector "+name, connectorOperationCount);
+			traceOperation("connector "+name, connectorOperationCount, true);
 		}
 	}
 
@@ -203,7 +203,7 @@ public static long getConnectorSimulatedPagingSearchCount() {
 	public static void recordConnectorSimulatedPagingSearchCount() {
 		connectorSimulatedPagingSearchCount++;
 		if (traceConnectorOperation) {
-			traceOperation("simulated paged search", connectorSimulatedPagingSearchCount);
+			traceOperation("simulated paged search", connectorSimulatedPagingSearchCount, true);
 		}
 	}
 
@@ -258,7 +258,7 @@ public synchronized <O extends Objectable> void afterObjectClone(PrismObject<O>
 			LOGGER.debug("MONITOR prism object clone end: {}", orig);
 		}
 		if (tracePrismObjectClone) {
-			traceOperation("prism object clone", prismObjectCloneCount);
+			traceOperation("prism object clone", prismObjectCloneCount, false);
 		}
 	}
 
@@ -288,7 +288,7 @@ public static void reset() {
 		connectorOperationCount = 0;
 	}
 
-	private static void traceOperation(String opName, long counter) {
+	private static void traceOperation(String opName, long counter, boolean traceAndDebug) {
 		LOGGER.info("MONITOR {} ({})", opName, counter);
 		if (LOGGER.isDebugEnabled()) {
 			StackTraceElement[] fullStack = Thread.currentThread().getStackTrace();
@@ -308,7 +308,9 @@ private static void traceOperation(String opName, long counter) {
 				sb.append(stackElement.toString());
 				sb.append("\n");
 			}
-			LOGGER.debug("MONITOR {} ({}): {} {}", new Object[]{opName, counter, immediateClass, immediateMethod});
+			if (traceAndDebug) {
+				LOGGER.debug("MONITOR {} ({}): {} {}", new Object[]{opName, counter, immediateClass, immediateMethod});
+			}
 			LOGGER.trace("MONITOR {} ({}):\n{}", new Object[]{opName, counter, sb});
 		}
 	}