Onother possible fix.

Evolveum · Aug 18, 2014 · a4cd44e · a4cd44e
1 parent 0f38553
commit a4cd44e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 17 deletions.
diff --git a/...common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionFactory.java b/...common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionFactory.java
@@ -36,7 +36,7 @@
  */
 public class ExpressionFactory {
 
-	private Map<QName,ExpressionEvaluatorFactory> evaluatorFactories = new HashMap<QName, ExpressionEvaluatorFactory>();
+	private Map<QName,ExpressionEvaluatorFactory> evaluatorFactoriesMap = new HashMap<QName, ExpressionEvaluatorFactory>();
 	private ExpressionEvaluatorFactory defaultEvaluatorFactory;
 	private Map<ExpressionIdentifier, Expression<?>> cache = new HashMap<ExpressionIdentifier, Expression<?>>();
 	private PrismContext prismContext;
@@ -47,23 +47,16 @@ public ExpressionFactory(ObjectResolver objectResolver, PrismContext prismContex
 		this.objectResolver = objectResolver;
 		this.prismContext = prismContext;
 	}
+
+	public PrismContext getPrismContext() {
+		return prismContext;
+	}
 
-	/**
-	 * Factory method created especially to be used from the Spring context.
-	 */
-	public ExpressionFactory(ObjectResolver objectResolver, PrismContext prismContext, 
-			Collection<ExpressionEvaluatorFactory> evaluatorFactories) {
-		super();
-		this.objectResolver = objectResolver;
-		this.prismContext = prismContext;
+	public void setEvaluatorFactories(Collection<ExpressionEvaluatorFactory> evaluatorFactories) {
 		for (ExpressionEvaluatorFactory evaluatorFactory: evaluatorFactories) {
 			addEvaluatorFactory(evaluatorFactory);
 		}
 	}
-
-	public PrismContext getPrismContext() {
-		return prismContext;
-	}
 
 	public <V extends PrismValue> Expression<V> makeExpression(ExpressionType expressionType, 
 			ItemDefinition outputDefinition, String shortDesc, OperationResult result) 
@@ -86,11 +79,11 @@ private <V extends PrismValue> Expression<V> createExpression(ExpressionType exp
 	}
 
 	public <V extends PrismValue> ExpressionEvaluatorFactory getEvaluatorFactory(QName elementName) {
-		return evaluatorFactories.get(elementName);
+		return evaluatorFactoriesMap.get(elementName);
 	}
 
 	public void addEvaluatorFactory(ExpressionEvaluatorFactory factory) {
-		evaluatorFactories.put(factory.getElementName(), factory);
+		evaluatorFactoriesMap.put(factory.getElementName(), factory);
 	}
 
 	public ExpressionEvaluatorFactory getDefaultEvaluatorFactory() {

diff --git a/model/model-impl/src/main/resources/ctx-model.xml b/model/model-impl/src/main/resources/ctx-model.xml
@@ -186,7 +186,7 @@
         <constructor-arg>
         	<ref bean="prismContext"/>
         </constructor-arg>
-        <constructor-arg>
+        <property name="evaluatorFactories">
         	<list>
         		<ref bean="scriptExpressionEvaluatorFactory"/>
         		<ref bean="generateExpressionEvaluatorFactory"/>
@@ -197,7 +197,7 @@
         		<ref bean="associationTargetSearchExpressionEvaluatorFactory"/>
         		<ref bean="associationFromLinkExpressionEvaluatorFactory"/>
         	</list>
-        </constructor-arg>
+        </property>
         <property name="defaultEvaluatorFactory">
             <ref bean="asisExpressionEvaluatorFactory"/>
         </property>