Another cosmetics

Evolveum · Aug 24, 2016 · beee6a5 · beee6a5
1 parent 5838cc4
commit beee6a5
Showing 1 changed file with 15 additions and 12 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java b/...rc/main/java/com/evolveum/midpoint/model/impl/lens/projector/ObjectTemplateProcessor.java
@@ -31,6 +31,7 @@
 import com.evolveum.midpoint.prism.match.MatchingRuleRegistry;
 import com.evolveum.midpoint.prism.util.ItemPathUtil;
 import com.evolveum.midpoint.prism.util.PrismUtil;
+import org.jetbrains.annotations.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -93,29 +94,29 @@ public class ObjectTemplateProcessor {
 
 	private static final Trace LOGGER = TraceManager.getTrace(ObjectTemplateProcessor.class);
 
-	@Autowired(required = true)
+	@Autowired
 	private MappingFactory mappingFactory;
 
-	@Autowired(required = true)
+	@Autowired
 	private PrismContext prismContext;
 
-	@Autowired(required = true)
+	@Autowired
 	private PasswordPolicyProcessor passwordPolicyProcessor;
 
-	@Autowired(required = true)
+	@Autowired
 	private ModelObjectResolver modelObjectResolver;
 
-	@Autowired(required = true)
+	@Autowired
 	private ActivationComputer activationComputer;
 
-	@Autowired(required = true)
+	@Autowired
 	private ExpressionFactory expressionFactory;
 
-	@Autowired(required = true)
+	@Autowired
 	@Qualifier("cacheRepositoryService")
 	private transient RepositoryService cacheRepositoryService;
 
-	@Autowired(required = true)
+	@Autowired
     private MappingEvaluator mappingEvaluator;
 
 	@Autowired
@@ -142,8 +143,8 @@ public <F extends FocusType> void processTemplate(LensContext<F> context, Object
 		ObjectDeltaObject<F> focusOdo = focusContext.getObjectDeltaObject();
 		PrismObjectDefinition<F> focusDefinition = getFocusDefinition(focusContext.getObjectTypeClass());
 
-		LOGGER.trace("Applying {} to {}, iteration {} ({}), phase {}", 
-				new Object[]{objectTemplate, focusContext.getObjectNew(), iteration, iterationToken, phase});
+		LOGGER.trace("Applying {} to {}, iteration {} ({}), phase {}",
+				objectTemplate, focusContext.getObjectNew(), iteration, iterationToken, phase);
 
 		Map<ItemPath,DeltaSetTriple<? extends ItemValueWithOrigin<?,?>>> outputTripleMap = new HashMap<>();
 
@@ -222,7 +223,7 @@ private Map<ItemPath, ObjectTemplateItemDefinitionType> collectItemDefinitionsFr
 	}
 
 	<F extends FocusType> Collection<ItemDelta<?,?>> computeItemDeltas(Map<ItemPath, DeltaSetTriple<? extends ItemValueWithOrigin<?,?>>> outputTripleMap,
-			Map<ItemPath,ObjectTemplateItemDefinitionType> itemDefinitionsMap,	// may be null
+			@Nullable Map<ItemPath,ObjectTemplateItemDefinitionType> itemDefinitionsMap,
 			ObjectDeltaObject<F> focusOdo, PrismObjectDefinition<F> focusDefinition, String contextDesc) throws ExpressionEvaluationException, PolicyViolationException, SchemaException {
 
 		Collection<ItemDelta<?,?>> itemDeltas = new ArrayList<>();
@@ -242,9 +243,11 @@ <F extends FocusType> Collection<ItemDelta<?,?>> computeItemDeltas(Map<ItemPath,
 			if (LOGGER.isTraceEnabled()) {
 				LOGGER.trace("Computed triple for {}:\n{}", itemPath, outputTriple.debugDump());
 			}
-			ObjectTemplateItemDefinitionType templateItemDefinition = null;
+			final ObjectTemplateItemDefinitionType templateItemDefinition;
 			if (itemDefinitionsMap != null) {
 				templateItemDefinition = ItemPathUtil.getFromMap(itemDefinitionsMap, itemPath);
+			} else {
+				templateItemDefinition = null;
 			}
 			boolean isNonTolerant = templateItemDefinition != null && Boolean.FALSE.equals(templateItemDefinition.isTolerant());