syncrhonization service cleanup (service accounts)

Evolveum · Jul 18, 2018 · 1f2fa21 · 1f2fa21
1 parent a2e3bd9
commit 1f2fa21
Show file tree

Hide file tree

Showing 3 changed files with 254 additions and 237 deletions.
diff --git a/...in/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java b/...in/java/com/evolveum/midpoint/model/impl/integrity/ShadowIntegrityCheckResultHandler.java
@@ -518,9 +518,7 @@ private void doFixIntent(ShadowCheckResult checkResult, PrismObject<ShadowType>
 
         ObjectSynchronizationType synchronizationPolicy;
         try {
-        	SynchronizationContext<? extends FocusType> syncCtx = new SynchronizationContext<>(fullShadow, fullShadow, resource, task.getChannel());
-
-            synchronizationService.determineSynchronizationPolicy(syncCtx, task, result);
+        	SynchronizationContext<? extends FocusType> syncCtx = synchronizationService.loadSynchronizationContext(fullShadow, fullShadow, resource, task.getChannel(), systemObjectCache.getSystemConfiguration(result), task, result);
             synchronizationPolicy = syncCtx.getObjectSynchronization();            
         } catch (SchemaException | ObjectNotFoundException | ExpressionEvaluationException | RuntimeException | CommunicationException | ConfigurationException | SecurityViolationException e) {
             checkResult.recordError(ShadowStatistics.CANNOT_APPLY_FIX, new SystemException("Couldn't prepare fix for missing intent, because the synchronization policy couldn't be determined", e));

diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/sync/SynchronizationService.java
@@ -33,7 +33,9 @@
  */
 public interface SynchronizationService extends ResourceObjectChangeListener {
 
-	<F extends FocusType> void determineSynchronizationPolicy(SynchronizationContext<F> syncCtx, Task task, OperationResult result) throws
+	<F extends FocusType> SynchronizationContext<F> loadSynchronizationContext(PrismObject<ShadowType> applicableShadow, PrismObject<ShadowType> currentShadow, PrismObject<ResourceType> resource,
+			String sourceChanel, PrismObject<SystemConfigurationType> configuration,
+			Task task, OperationResult result) throws
 			SchemaException, ObjectNotFoundException, ExpressionEvaluationException, CommunicationException, ConfigurationException, SecurityViolationException;
 
 	<F extends FocusType> boolean matchUserCorrelationRule(PrismObject<ShadowType> shadow, PrismObject<F> focus,