Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Aug 28, 2014 · 0800d43 · 0800d43
2 parents 9234e71 + 43361a4
commit 0800d43
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/...n/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java b/...n/java/com/evolveum/midpoint/provisioning/consistency/impl/ObjectAlreadyExistHandler.java
@@ -22,7 +22,6 @@
 import javax.xml.namespace.QName;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import com.evolveum.midpoint.prism.PrismContext;
@@ -33,25 +32,23 @@
 import com.evolveum.midpoint.prism.query.EqualFilter;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.query.RefFilter;
-import com.evolveum.midpoint.provisioning.api.ChangeNotificationDispatcher;
 import com.evolveum.midpoint.provisioning.api.ProvisioningService;
 import com.evolveum.midpoint.provisioning.api.ResourceObjectShadowChangeDescription;
 import com.evolveum.midpoint.provisioning.consistency.api.ErrorHandler;
 import com.evolveum.midpoint.provisioning.ucf.api.GenericFrameworkException;
-import com.evolveum.midpoint.provisioning.util.ProvisioningUtil;
-import com.evolveum.midpoint.repo.api.RepositoryService;
 import com.evolveum.midpoint.schema.ResultHandler;
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
 import com.evolveum.midpoint.task.api.Task;
-import com.evolveum.midpoint.task.api.TaskManager;
 import com.evolveum.midpoint.util.QNameUtil;
 import com.evolveum.midpoint.util.exception.CommunicationException;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.ObjectAlreadyExistsException;
 import com.evolveum.midpoint.util.exception.ObjectNotFoundException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.util.exception.SecurityViolationException;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;
 
 @Component
@@ -61,6 +58,8 @@ public class ObjectAlreadyExistHandler extends ErrorHandler {
 	private ProvisioningService provisioningService;
 	@Autowired(required = true)
 	private PrismContext prismContext;
+
+	private static final Trace LOGGER = TraceManager.getTrace(ObjectAlreadyExistHandler.class);
 
 	@Override
 	public <T extends ShadowType> T handleError(T shadow, FailedOperation op, Exception ex, boolean compensate, 
@@ -71,6 +70,8 @@ public <T extends ShadowType> T handleError(T shadow, FailedOperation op, Except
 			throw new ObjectAlreadyExistsException();
 		}
 
+		LOGGER.trace("Start to hanlde ObjectAlreadyExitsException.");
+
 		OperationResult operationResult = parentResult
 				.createSubresult("Discovery for object already exists situation. Operation: " + op.name());
 		operationResult.addParam("shadow", shadow);
@@ -89,6 +90,8 @@ public <T extends ShadowType> T handleError(T shadow, FailedOperation op, Except
 		if (!foundAccount.isEmpty() && foundAccount.size() == 1) {
 			resourceAccount = foundAccount.get(0);
 		}
+
+		LOGGER.trace("Found conflicting resource account: {}", resourceAccount);
 
 		try{
 		if (resourceAccount != null) {

diff --git a/...cy-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java b/...cy-mechanism/src/test/java/com/evolveum/midpoint/testing/consistency/ConsistencyTest.java
@@ -929,7 +929,9 @@ public void test016addAccountDirrectAlreadyExists() throws Exception {
 					ShadowType.class, abombaOid, null, parentResult)
 					.asObjectable();
 			assertShadowName(abombaShadow,
-					"uid=abomba,OU=people,DC=example,DC=com");
+					"uid=abomba,ou=people,dc=example,dc=com");
+
+//			assertAttribute(abombaShadow, SchemaConstants.ICFS_NAME, "uid=abomba,OU=people,DC=example,DC=com");
 
 			repoAddObjectFromFile(USER_ABOM_FILENAME, UserType.class,
 					parentResult);
@@ -942,7 +944,7 @@ public void test016addAccountDirrectAlreadyExists() throws Exception {
 					ShadowType.class, abomOid, null, parentResult)
 					.asObjectable();
 			assertShadowName(abomShadow,
-					"uid=abomba1,OU=people,DC=example,DC=com");
+					"uid=abomba1,ou=people,dc=example,dc=com");
 
 			ReferenceDelta abombaDeleteAccDelta = ReferenceDelta
 					.createModificationDelete(ShadowType.class,
@@ -989,7 +991,7 @@ public void test016addAccountDirrectAlreadyExists() throws Exception {
 					ShadowType.class, abombaOid2, null, result)
 					.asObjectable();
 			assertShadowName(abombaShadow2,
-					"uid=abomba,OU=people,DC=example,DC=com");
+					"uid=abomba,ou=people,dc=example,dc=com");
 
 
 			result.computeStatus();

diff --git a/testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml b/testing/consistency-mechanism/src/test/resources/repo/resource-opendj.xml
@@ -60,8 +60,13 @@
                 <clearValue>secret</clearValue>
             </icfcldap:credentials>
             <icfcldap:vlvSortAttribute>uid</icfcldap:vlvSortAttribute>
+
             <icfcldap:accountOperationalAttributes>ds-pwp-account-disabled</icfcldap:accountOperationalAttributes>
         </icfc:configurationProperties>
+         <icfc:resultsHandlerConfiguration>
+   <icfc:enableFilteredResultsHandler>true</icfc:enableFilteredResultsHandler>
+   <icfc:enableCaseInsensitiveFilter>true</icfc:enableCaseInsensitiveFilter>
+  </icfc:resultsHandlerConfiguration>
 
         <!-- Generic ICF configuration -->