增强callback

Author: LinuxSuRen

src/main/java/org/suren/autotest/web/framework/data/CallbackDynamicData.java

@@ -1,25 +1,81 @@
-/**
- * http://surenpi.com
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 package org.suren.autotest.web.framework.data;
 
+import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.stereotype.Component;
 
 /**
  * @author suren
  * @date 2017年1月11日 下午1:32:02
  */
 @Component
-public class CallbackDynamicData implements DynamicData
+public class CallbackDynamicData implements DynamicData, ApplicationContextAware
 {
+	private static final String DYNAMIC_DATA = "dynamic.data";
+	
+	private ApplicationContext context;
+	private Map<String, Object> data;
 
 	@Override
 	public String getValue(String orginData)
 	{
+		String type = dataPrepare();
+		
+		Map<String, DynamicData> dynamicDataMap = context.getBeansOfType(DynamicData.class);
+		for(DynamicData dynamicData : dynamicDataMap.values())
+		{
+			if(dynamicData == this)
+			{
+				continue;
+			}
+			
+			if(dynamicData.getType().equals(type))
+			{
+				dynamicData.setData(data);
+				return dynamicData.getValue(orginData);
+			}
+		}
+		
 		return orginData;
 	}
+	
+	/**
+	 * 默认参数准备
+	 */
+	private String dataPrepare()
+	{
+		if(data == null)
+		{
+			data = new HashMap<String, Object>();
+		}
+		
+		if(!data.containsKey(DYNAMIC_DATA))
+		{
+			data.put(DYNAMIC_DATA, "freemarker");
+		}
+		
+		return (String) data.get(DYNAMIC_DATA);
+	}
 
 	@Override
 	public String getType()
@@ -30,6 +86,14 @@ public String getType()
 	@Override
 	public void setData(Map<String, Object> data)
 	{
+		this.data = data;
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context)
+			throws BeansException
+	{
+		this.context = context;
 	}
 
 }

src/main/java/org/suren/autotest/web/framework/data/XmlDataSource.java

@@ -154,19 +154,6 @@ public void visit(Element node)
 				String type = node.attributeValue("type", "simple");
 				String field = node.attributeValue("field", "value");
 				String callback = node.attributeValue("callback", "");
-				
-				LOGGER.debug("Field [{}], value [{}], type [{}], field [{}].", fieldName, value, type, field);
-				
-				DynamicData dynamicData = getDynamicDataByType(type);
-				if(dynamicData != null)
-				{
-					dynamicData.setData(globalMap);
-					value = dynamicData.getValue(value);
-				}
-				else
-				{
-					throw new RuntimeException("Not support dynamic data type : " + type);
-				}
 
 				Method getterMethod = BeanUtils.findMethod(page.getClass(),
 						"get" + fieldName.substring(0, 1).toUpperCase()
@@ -187,8 +174,23 @@ public void visit(Element node)
 					AbstractElement absEle = (AbstractElement) eleObj;
 					absEle.putData("DataType", type);
 
-					//解析数据源中单个数据项的扩展参数
-					parseDataParamList(absEle, node);
+					LOGGER.debug("Field [{}], value [{}], type [{}], field [{}].", fieldName, value, type, field);
+					
+					DynamicData dynamicData = getDynamicDataByType(type);
+					if(dynamicData != null)
+					{
+						Map<String, Object> tmpMap = new HashMap<String, Object>(globalMap);
+						
+						//解析数据源中单个数据项的扩展参数
+						parseDataParamList(absEle, node, tmpMap);
+						
+						dynamicData.setData(tmpMap);
+						value = dynamicData.getValue(value);
+					}
+					else
+					{
+						throw new RuntimeException("Not support dynamic data type : " + type);
+					}
 
 					if(eleObj instanceof Text)
 					{
@@ -242,7 +244,7 @@ else if(eleObj instanceof Button)
 	 * @param absEle
 	 * @param node
 	 */
-	private void parseDataParamList(AbstractElement absEle, Element node)
+	private void parseDataParamList(AbstractElement absEle, Element node, Map<String, Object> tmpMap)
 	{
 		@SuppressWarnings("unchecked")
 		List<Element> paramEleList = node.elements("param");
@@ -256,6 +258,7 @@ private void parseDataParamList(AbstractElement absEle, Element node)
 			String key = element.attributeValue("name");
 			String value = element.attributeValue("value");
 			absEle.putData(key, value);
+			tmpMap.put(key, value);
 		}
 	}