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

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

@@ -929,6 +929,13 @@ public String dumpDeltas() {
         return sb.toString();
     }
 
+    public void recordEmptyDeltaForAccountByUsername(String accountUsername, DummyDeltaType deltaType) throws InterruptedException, FileNotFoundException, ConnectException, SchemaViolationException, ConflictException {
+        DummyAccount account = getAccountByUsername(accountUsername);
+        DummyDelta delta = new DummyDelta(nextSyncToken(), account.getClass(), account.getId(), account.getName(), deltaType);
+        // No delta details here, no addeded/removed attributes, nothing
+        deltas.add(delta);
+    }
+
     void breakIt(BreakMode breakMode, String operation) throws ConnectException, FileNotFoundException, SchemaViolationException, ConflictException {
         if (breakMode == BreakMode.NONE) {
             return;

infra/schema/src/main/java/com/evolveum/midpoint/schema/util/ResourceTypeUtil.java

@@ -670,10 +670,7 @@ public static ShadowCheckType getShadowConstraintsCheck(ResourceType resource) {
 
     public static boolean isValidateSchema(ResourceType resource) {
         ResourceConsistencyType consistency = resource.getConsistency();
-        if (consistency == null) {
-            return false;
-        }
-        return Boolean.TRUE.equals(consistency.isValidateSchema());
+        return consistency != null && Boolean.TRUE.equals(consistency.isValidateSchema());
     }
 
     // TODO: maybe later move to ResourceSchema?

model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java

@@ -190,7 +190,9 @@ public void swallowToProjectionWaveSecondaryDelta(ItemDelta<?,?> propDelta) thro
         secondaryDelta.swallow(propDelta);
     }
 
-    // TODO is this method ever needed?
+    // This method may be useful for hooks. E.g. if a hook wants to insert a special secondary delta to avoid
+    // splitting the changes to several audit records. It is not entirely clean and we should think about a better
+    // solution in the future. But it is good enough for now.
     @SuppressWarnings("unused")
     public void swallowToWave0SecondaryDelta(ItemDelta<?,?> propDelta) throws SchemaException {
           ObjectDelta<O> secondaryDelta = getSecondaryDelta(0);

provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ConnectorManager.java

@@ -22,6 +22,7 @@
 
 import com.evolveum.midpoint.CacheInvalidationContext;
 import com.evolveum.midpoint.common.refinery.RefinedResourceSchemaImpl;
+import com.evolveum.midpoint.provisioning.ucf.api.connectors.AbstractManagedConnectorInstance;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.SingleCacheStateInformationType;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
@@ -259,6 +260,11 @@ private ConnectorInstance createConnectorInstance(ConnectorSpec connectorSpec, O
                     connectorSpec.getResource().getName().toString(),
                     connectorSpec.toString());
 
+            // FIXME temporary -- remove when no longer needed (MID-5931)
+            if (connector instanceof AbstractManagedConnectorInstance) {
+                ((AbstractManagedConnectorInstance) connector).setResourceOid(connectorSpec.getResource().getOid());
+            }
+
         } catch (ObjectNotFoundException e) {
             result.recordFatalError(e.getMessage(), e);
             throw new ObjectNotFoundException(e.getMessage(), e);

provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/ResourceManager.java

@@ -227,11 +227,11 @@ public void deleteResource(String oid, ProvisioningOperationOptions options, Tas
      * @return completed resource
      */
     private PrismObject<ResourceType> completeResource(PrismObject<ResourceType> repoResource, ResourceSchema resourceSchema,
-            boolean fetchedSchema, Map<String,Collection<Object>> capabilityMap, GetOperationOptions options, Task task, OperationResult parentResult) throws ObjectNotFoundException, SchemaException,
-            CommunicationException, ConfigurationException, ExpressionEvaluationException {
+            boolean fetchedSchema, Map<String,Collection<Object>> capabilityMap, GetOperationOptions options, Task task, OperationResult parentResult)
+            throws ObjectNotFoundException, SchemaException, ExpressionEvaluationException {
 
         // do not add as a subresult..it will be added later, if the completing
-        // of resource will be successfull.if not, it will be only set as a
+        // of resource will be successful.if not, it will be only set as a
         // fetch result in the resource..
         OperationResult result = parentResult.createMinorSubresult(OPERATION_COMPLETE_RESOURCE);
 
@@ -286,23 +286,16 @@ private PrismObject<ResourceType> completeResource(PrismObject<ResourceType> rep
 
 
             try {
-                // Now we need to re-read the resource from the repository and re-aply the schemas. This ensures that we will
+                // Now we need to re-read the resource from the repository and re-apply the schemas. This ensures that we will
                 // cache the correct version and that we avoid race conditions, etc.
 
                 newResource = readResourceFromRepository(repoResource.getOid(), null, result);
                 applyConnectorSchemaToResource(newResource, task, result);
 
-            } catch (SchemaException e) {
-                result.recordFatalError(e);
-                throw e;
-            } catch (ObjectNotFoundException e) {
-                result.recordFatalError(e);
-                throw e;
-            } catch (RuntimeException e) {
+            } catch (SchemaException | ObjectNotFoundException | RuntimeException e) {
                 result.recordFatalError(e);
                 throw e;
             }
-
         }
 
         try {
@@ -381,12 +374,10 @@ private void completeSchemaAndCapabilities(PrismObject<ResourceType> resource, R
 
         if (fetchedSchema) {
             adjustSchemaForSimulatedCapabilities(resource, resourceSchema);
-            ContainerDelta<XmlSchemaType> schemaContainerDelta = createSchemaUpdateDelta(resource, resourceSchema);
-            modifications.add(schemaContainerDelta);
+            modifications.add(createSchemaUpdateDelta(resource, resourceSchema));
 
             // We have successfully fetched the resource schema. Therefore the resource must be up.
             modifications.add(createResourceAvailabilityStatusDelta(resource, AvailabilityStatusType.UP));
-
         } else {
             if (resourceSchema != null) {
                 CachingMetadataType schemaCachingMetadata = resource.asObjectable().getSchema().getCachingMetadata();
@@ -404,17 +395,14 @@ private void completeSchemaAndCapabilities(PrismObject<ResourceType> resource, R
 
         if (!modifications.isEmpty()) {
             try {
-                if (LOGGER.isTraceEnabled()) {
-                    LOGGER.trace("Completing {}:\n{}", resource, DebugUtil.debugDump(modifications, 1));
-                }
+                LOGGER.trace("Completing {}:\n{}", resource, DebugUtil.debugDumpLazily(modifications, 1));
                 repositoryService.modifyObject(ResourceType.class, resource.getOid(), modifications, result);
                 InternalMonitor.recordCount(InternalCounters.RESOURCE_REPOSITORY_MODIFY_COUNT);
             } catch (ObjectAlreadyExistsException ex) {
                 // This should not happen
                 throw new SystemException(ex);
             }
         }
-
     }
 
     private void completeCapabilities(PrismObject<ResourceType> resource, boolean forceRefresh, Map<String,Collection<Object>> capabilityMap, Collection<ItemDelta<?, ?>> modifications,
@@ -493,18 +481,14 @@ private void completeConnectorCapabilities(ConnectorSpec connectorSpec, Capabili
     }
 
     private ContainerDelta<XmlSchemaType> createSchemaUpdateDelta(PrismObject<ResourceType> resource, ResourceSchema resourceSchema) throws SchemaException {
-        Document xsdDoc = null;
+        Document xsdDoc;
         try {
             xsdDoc = resourceSchema.serializeToXsd();
-
             if (LOGGER.isTraceEnabled()) {
-                LOGGER.trace("Serialized XSD resource schema for {}:\n{}",
-                        resource, DOMUtil.serializeDOMToString(xsdDoc));
+                LOGGER.trace("Serialized XSD resource schema for {}:\n{}", resource, DOMUtil.serializeDOMToString(xsdDoc));
             }
-
         } catch (SchemaException e) {
-            throw new SchemaException("Error processing resource schema for "
-                    + resource + ": " + e.getMessage(), e);
+            throw new SchemaException("Error processing resource schema for " + resource + ": " + e.getMessage(), e);
         }
 
         Element xsdElement = DOMUtil.getFirstChildElement(xsdDoc);
@@ -736,7 +720,7 @@ public void testConnection(PrismObject<ResourceType> resource, Task task, Operat
         OperationResult schemaResult = parentResult.createSubresult(ConnectorTestOperation.RESOURCE_SCHEMA
                 .getOperation());
 
-        ResourceSchema schema = null;
+        ResourceSchema schema;
         try {
 
             schema = fetchResourceSchema(resource, capabilityMap, task, schemaResult);
@@ -755,11 +739,15 @@ public void testConnection(PrismObject<ResourceType> resource, Task task, Operat
             return;
         } catch (ObjectNotFoundException e) {
             modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
-            schemaResult.recordFatalError("Configuration error: " + e.getMessage(), e);
+            schemaResult.recordFatalError("Object not found: " + e.getMessage(), e);
             return;
         } catch (SchemaException e) {
             modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
-            schemaResult.recordFatalError("Configuration error: " + e.getMessage(), e);
+            schemaResult.recordFatalError("Schema error: " + e.getMessage(), e);
+            return;
+        } catch (RuntimeException e) {
+            modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
+            schemaResult.recordFatalError("Unexpected error: " + e.getMessage(), e);
             return;
         }
 
@@ -781,12 +769,9 @@ public void testConnection(PrismObject<ResourceType> resource, Task task, Operat
             }
         }
 
-        // Invoke completeResource(). This will store the fetched schema to the
-        // ResourceType
-        // if there is no <schema> definition already. Therefore the
-        // testResource() can be used to
-        // generate the resource schema - until we have full schema caching
-        // capability.
+        // Invoke completeResource(). This will store the fetched schema to the ResourceType if there is no <schema>
+        // definition already. Therefore the testResource() can be used to generate the resource schema - until we
+        // have full schema caching capability.
         try {
             resource = completeResource(resource, schema, true, capabilityMap, null, task, schemaResult);
         } catch (ObjectNotFoundException e) {
@@ -799,18 +784,14 @@ public void testConnection(PrismObject<ResourceType> resource, Task task, Operat
             schemaResult.recordFatalError(
                     "Schema processing error (probably connector bug): " + e.getMessage(), e);
             return;
-        } catch (CommunicationException e) {
-            modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
-            schemaResult.recordFatalError("Communication error: " + e.getMessage(), e);
-            return;
-        } catch (ConfigurationException e) {
-            modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
-            schemaResult.recordFatalError("Configuration error: " + e.getMessage(), e);
-            return;
         } catch (ExpressionEvaluationException e) {
             modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
             schemaResult.recordFatalError("Expression error: " + e.getMessage(), e);
             return;
+        } catch (RuntimeException e) {
+            modifyResourceAvailabilityStatus(resource, AvailabilityStatusType.BROKEN, parentResult);
+            schemaResult.recordFatalError("Unspecified exception: " + e.getMessage(), e);
+            return;
         }
 
         schemaResult.recordSuccess();

provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/ConnectorFactory.java

@@ -40,7 +40,7 @@
  */
 public interface ConnectorFactory {
 
-    String OPERATION_LIST_CONNECTOR = ConnectorFactory.class.getName()+".listConnectors";
+    String OPERATION_LIST_CONNECTORS = ConnectorFactory.class.getName()+".listConnectors";
 
     PrismSchema generateConnectorConfigurationSchema(ConnectorType connectorType) throws ObjectNotFoundException;
 
@@ -56,12 +56,12 @@ public interface ConnectorFactory {
      * a different factory.
      * TODO: Better error handling
      *
-     * @param resource resource definition
      * @return configured and initialized connector instance
-     * @throws ObjectNotFoundException is the specified connector was not found
-     * @throws SchemaException
+     * @throws ObjectNotFoundException if the specified connector was not found
+     * @throws SchemaException if there's any schema issue
      */
-    public ConnectorInstance createConnectorInstance(ConnectorType connectorType, String namespace, String instanceName, String desc) throws ObjectNotFoundException, SchemaException;
+    ConnectorInstance createConnectorInstance(ConnectorType connectorType, String namespace, String instanceName, String desc)
+            throws ObjectNotFoundException, SchemaException;
 
     /**
      * Returns a list of all known connectors.
@@ -77,12 +77,12 @@ public interface ConnectorFactory {
      * @param host definition of a connector host or null for local connector list
      * @return list of all known connectors.
      */
-    public Set<ConnectorType> listConnectors(ConnectorHostType host, OperationResult parentRestul) throws CommunicationException;
+    Set<ConnectorType> listConnectors(ConnectorHostType host, OperationResult parentResult) throws CommunicationException;
 
     /**
      * Execute self-test for each connector framework that is capable of executing tests.
      */
-    public void selfTest(OperationResult parentTestResult);
+    void selfTest(OperationResult parentTestResult);
 
     boolean supportsFramework(String frameworkIdentifier);
 

provisioning/ucf-api/src/main/java/com/evolveum/midpoint/provisioning/ucf/api/connectors/AbstractManagedConnectorInstance.java

@@ -45,6 +45,7 @@ public abstract class AbstractManagedConnectorInstance implements ConnectorInsta
     private boolean configured = false;
 
     private String instanceName; // resource name
+    private String resourceOid; // FIXME temporary -- remove when no longer needed (MID-5931)
 
     public ConnectorType getConnectorObject() {
         return connectorObject;
@@ -103,9 +104,8 @@ protected void setCapabilities(Collection<Object> capabilities) {
     }
 
     @Override
-    public void initialize(ResourceSchema resourceSchema, Collection<Object> capabilities,
-            boolean caseIgnoreAttributeNames, OperationResult parentResult)
-            throws CommunicationException, GenericFrameworkException, ConfigurationException {
+    public void initialize(ResourceSchema resourceSchema, Collection<Object> capabilities, boolean caseIgnoreAttributeNames,
+            OperationResult parentResult) {
 
         OperationResult result = parentResult.createSubresult(ConnectorInstance.OPERATION_INITIALIZE);
         result.addContext("connector", getConnectorObject().toString());
@@ -124,8 +124,7 @@ public void updateSchema(ResourceSchema resourceSchema) {
 
     @Override
     public void configure(PrismContainerValue<?> configuration, List<QName> generateObjectClasses, OperationResult parentResult)
-            throws CommunicationException, GenericFrameworkException, SchemaException,
-            ConfigurationException {
+            throws SchemaException, ConfigurationException {
 
         OperationResult result = parentResult.createSubresult(ConnectorInstance.OPERATION_CONFIGURE);
 
@@ -217,4 +216,12 @@ public String getInstanceName() {
     public void setInstanceName(String instanceName) {
         this.instanceName = instanceName;
     }
+
+    public String getResourceOid() {
+        return resourceOid;
+    }
+
+    public void setResourceOid(String resourceOid) {
+        this.resourceOid = resourceOid;
+    }
 }

provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ConnectorFactoryBuiltinImpl.java

@@ -225,8 +225,8 @@ private ItemDefinition<?> createPropertyDefinition(MutablePrismContainerDefiniti
     }
 
     @Override
-    public ConnectorInstance createConnectorInstance(ConnectorType connectorType, String namespace,
-            String instanceName, String desc) throws ObjectNotFoundException, SchemaException {
+    public ConnectorInstance createConnectorInstance(ConnectorType connectorType, String namespace, String instanceName,
+            String desc) throws ObjectNotFoundException {
         ConnectorStruct struct = getConnectorStruct(connectorType);
         Class<? extends ConnectorInstance> connectorClass = struct.connectorClass;
         ConnectorInstance connectorInstance;
@@ -257,8 +257,8 @@ public ConnectorInstance createConnectorInstance(ConnectorType connectorType, St
         if (connectorInstance instanceof TracerAware) {
             ((TracerAware) connectorInstance).setTracer(tracer);
         }
-        if (connectorInstance instanceof TaskManagerAware) {
-            ((TaskManagerAware) connectorInstance).setTaskManager(taskManager);
+        if (connectorInstance instanceof RepositoryAware) {
+            ((RepositoryAware) connectorInstance).setRepositoryService(repositoryService);
         }
         return connectorInstance;
     }

provisioning/ucf-impl-builtin/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/builtin/ManualConnectorInstance.java

@@ -150,7 +150,7 @@ protected String createTicketAdd(PrismObject<? extends ShadowType> object,
     protected String createTicketModify(ObjectClassComplexTypeDefinition objectClass,
             PrismObject<ShadowType> shadow, Collection<? extends ResourceAttribute<?>> identifiers, String resourceOid, Collection<Operation> changes,
             OperationResult result) throws SchemaException, ObjectAlreadyExistsException {
-        LOGGER.debug("Creating case to modify account {}:\n{}", identifiers, DebugUtil.debugDump(changes, 1));
+        LOGGER.debug("Creating case to modify account {}:\n{}", identifiers, DebugUtil.debugDumpLazily(changes, 1));
         if (InternalsConfig.isSanityChecks()) {
             if (MiscUtil.hasDuplicates(changes)) {
                 throw new SchemaException("Duplicated changes: "+changes);