properties, HttpClient httpClient, String uri)
+ {
+ super(id, name, properties);
+ this.httpClient = httpClient;
+ this.uri = uri;
+ }
+
+ public HttpClient getHttpClient()
+ {
+ return httpClient;
+ }
+
+ public void setHttpClient(HttpClient httpClient)
+ {
+ this.httpClient = httpClient;
+ }
+
+ public String getUri()
+ {
+ return uri;
+ }
+
+ /**
+ * 设置请求地址。
+ *
+ * 请求地址支持Freemarker模板语言。
+ *
+ *
+ * @param uri
+ */
+ public void setUri(String uri)
+ {
+ this.uri = uri;
+ }
+
+ public String getHeaderContent()
+ {
+ return headerContent;
+ }
+
+ /**
+ * 设置请求头JSON文本，格式应为：
+ *
+ *
+ *
+ * [
+ * {name: "...", value: "..."},
+ * {name: "...", value: "..."},
+ * ...
+ * ]
+ *
+ *
+ *
+ *
+ * 请求头JSON文本支持Freemarker模板语言。
+ *
+ *
+ * @param headerContent
+ */
+ public void setHeaderContent(String headerContent)
+ {
+ this.headerContent = headerContent;
+ }
+
+ public String getRequestMethod()
+ {
+ return requestMethod;
+ }
+
+ /**
+ * 设置HTTP方法，参考{@code REQUEST_METHOD_*}常量。
+ *
+ * @param requestMethod
+ */
+ public void setRequestMethod(String requestMethod)
+ {
+ this.requestMethod = requestMethod;
+ }
+
+ public String getRequestContentType()
+ {
+ return requestContentType;
+ }
+
+ /**
+ * 设置请求内容类型，允许的值为：
+ *
+ * {@linkplain #REQUEST_CONTENT_TYPE_FORM_URLENCODED}、{@linkplain #REQUEST_CONTENT_TYPE_JSON}。
+ *
+ *
+ * @param requestContentType
+ */
+ public void setRequestContentType(String requestContentType)
+ {
+ this.requestContentType = requestContentType;
+ }
+
+ public String getRequestContentCharset()
+ {
+ return requestContentCharset;
+ }
+
+ /**
+ * 设置请求内容编码。
+ *
+ * 默认请求内容编码为{@code UTF-8}。
+ *
+ *
+ * @param requestContentCharset
+ */
+ public void setRequestContentCharset(String requestContentCharset)
+ {
+ this.requestContentCharset = requestContentCharset;
+ }
+
+ public String getRequestContent()
+ {
+ return requestContent;
+ }
+
+ /**
+ * 设置请求内容JSON文本，为{@code null}或{@code ""}表示无请求内容。
+ *
+ * 当{@linkplain #getRequestContentType()}为{@linkplain #REQUEST_CONTENT_TYPE_FORM_URLENCODED}时，请求内容JSON文本格式应为：
+ *
+ *
+ *
+ * [
+ * {name: "...", value: "..."},
+ * {name: "...", value: "..."},
+ * ...
+ * ]
+ *
+ *
+ *
+ * 其中，{@code name}表示请求参数名，{@code value}表示请求参数值。
+ *
+ *
+ * 当{@linkplain #getRequestContentType()}为{@linkplain #REQUEST_CONTENT_TYPE_JSON}时，请求内容JSON文本没有特殊格式要求。
+ *
+ *
+ * 请求内容JSON文本支持Freemarker模板语言。
+ *
+ *
+ * @param requestContent
+ */
+ public void setRequestContent(String requestContent)
+ {
+ this.requestContent = requestContent;
+ }
+
+ public String getResponseContentType()
+ {
+ return responseContentType;
+ }
+
+ /**
+ * 设置相应类型。
+ *
+ * 目前仅支持{@linkplain #RESPONSE_CONTENT_TYPE_JSON}，且是默认值。
+ *
+ *
+ * @param responseContentType
+ */
+ public void setResponseContentType(String responseContentType)
+ {
+ this.responseContentType = responseContentType;
+ }
+
+ public String getResponseDataJsonPath()
+ {
+ return responseDataJsonPath;
+ }
+
+ /**
+ * 设置响应数据的JSON路径。
+ *
+ * 当希望返回的是响应原始JSON数据的指定JSON路径值时，可以设置此项。
+ *
+ *
+ * 具体格式参考{@linkplain AbstractJsonDataSet#setDataJsonPath(String)}。
+ *
+ *
+ * 默认无数据路径，将直接返回响应原始JSON数据。
+ *
+ *
+ * @param responseDataJsonPath
+ */
+ public void setResponseDataJsonPath(String responseDataJsonPath)
+ {
+ this.responseDataJsonPath = responseDataJsonPath;
+ }
+
+ @Override
+ public TemplateResolvedDataSetResult resolve(Map paramValues) throws DataSetException
+ {
+ return resolveResult(paramValues, null);
+ }
+
+ @Override
+ protected TemplateResolvedDataSetResult resolveResult(Map paramValues, List properties)
+ throws DataSetException
+ {
+ try
+ {
+ String uri = resolveTemplateUri(paramValues);
+ String headerContent = resolveTemplateHeaderContent(paramValues);
+ String requestContent = resolveTemplateRequestContent(paramValues);
+
+ ClassicHttpRequest request = createHttpRequest(uri);
+
+ setHttpHeaders(request, headerContent);
+ setHttpEntity(request, requestContent);
+
+ JsonResponseHandler responseHandler = new JsonResponseHandler();
+ responseHandler.setProperties(properties);
+ responseHandler.setResponseDataJsonPath(getResponseDataJsonPath());
+
+ ResolvedDataSetResult result = this.httpClient.execute(request, responseHandler);
+
+ String templateResult = "URI:" + System.lineSeparator() + uri //
+ + System.lineSeparator() + "-----------------------------------------" + System.lineSeparator() //
+ + "Request headers:" + System.lineSeparator() + headerContent //
+ + System.lineSeparator() + "-----------------------------------------" + System.lineSeparator() //
+ + "Request content:" + System.lineSeparator() + requestContent;
+
+ return new TemplateResolvedDataSetResult(result.getResult(), result.getProperties(), templateResult);
+ }
+ catch (DataSetException e)
+ {
+ throw e;
+ }
+ catch (Throwable t)
+ {
+ throw new DataSetSourceParseException(t);
+ }
+ }
+
+ protected void setHttpHeaders(ClassicHttpRequest request, String headerContent) throws Throwable
+ {
+ if (StringUtil.isEmpty(headerContent))
+ return;
+
+ List headers = toNameValuePairs(headerContent);
+
+ if (headers == NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON)
+ throw new HeaderContentNotNameValueObjArrayJsonException(headerContent);
+
+ for (NameValuePair header : headers)
+ request.setHeader(header.getName(), header.getValue());
+ }
+
+ protected void setHttpEntity(ClassicHttpRequest request, String requestContent) throws Throwable
+ {
+ if (REQUEST_CONTENT_TYPE_FORM_URLENCODED.equals(this.requestContentType))
+ {
+ List params = toNameValuePairs(requestContent);
+
+ if (params == NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON)
+ throw new RequestContentNotNameValueObjArrayJsonException(requestContent);
+
+ request.setEntity(new UrlEncodedFormEntity(params, Charset.forName(this.requestContentCharset)));
+ }
+ else if (REQUEST_CONTENT_TYPE_JSON.equals(this.requestContentType))
+ {
+ ContentType contentType = ContentType.create(ContentType.APPLICATION_JSON.getMimeType(),
+ Charset.forName(this.requestContentCharset));
+ StringEntity entity = new StringEntity(requestContent, contentType);
+ request.setEntity(entity);
+ }
+ else
+ throw new DataSetException("Request content type [" + this.requestContentType + "] is not supported");
+ }
+
+ protected String resolveTemplateUri(Map paramValues) throws Throwable
+ {
+ return resolveAsFmkTemplateIfHasParam(this.uri, paramValues);
+ }
+
+ protected String resolveTemplateHeaderContent(Map paramValues) throws Throwable
+ {
+ return resolveAsFmkTemplateIfHasParam(this.headerContent, paramValues);
+ }
+
+ protected String resolveTemplateRequestContent(Map paramValues) throws Throwable
+ {
+ return resolveAsFmkTemplateIfHasParam(this.requestContent, paramValues);
+ }
+
+ protected ClassicHttpRequest createHttpRequest(String uri) throws Throwable
+ {
+ if (REQUEST_METHOD_GET.equals(this.requestMethod) || StringUtil.isEmpty(this.requestMethod))
+ return new HttpGet(uri);
+ else if (REQUEST_METHOD_POST.equals(this.requestMethod))
+ return new HttpPost(uri);
+ else if (REQUEST_METHOD_PUT.equals(this.requestMethod))
+ return new HttpPut(uri);
+ else if (REQUEST_METHOD_PATCH.equals(this.requestMethod))
+ return new HttpPatch(uri);
+ else if (REQUEST_METHOD_DELETE.equals(this.requestMethod))
+ return new HttpDelete(uri);
+ // else if (REQUEST_METHOD_HEAD.equals(this.httpMethod))
+ // return new HttpHead(uri);
+ // else if (REQUEST_METHOD_OPTIONS.equals(this.httpMethod))
+ // return new HttpOptions(uri);
+ // else if (REQUEST_METHOD_TRACE.equals(this.httpMethod))
+ // return new HttpTrace(uri);
+ else
+ throw new DataSetException("HTTP method [" + this.requestMethod + "] is not supported");
+ }
+
+ /**
+ * 将指定JSON字符串转换为名/值列表。
+ *
+ * @param nameValueObjJsonArray
+ * 允许为{@code null}、{@code ""}
+ * @return 空列表表示无名/值，返回{@code #NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON}表示{@code nameValueObjJsonArray}格式不合法
+ * @throws Throwable
+ */
+ @SuppressWarnings("unchecked")
+ protected List toNameValuePairs(String nameValueObjJsonArray) throws Throwable
+ {
+ if (StringUtil.isEmpty(nameValueObjJsonArray))
+ return Collections.EMPTY_LIST;
+
+ Object jsonObj = getObjectMapperNonStardand().readValue(nameValueObjJsonArray, Object.class);
+
+ if (jsonObj == null)
+ return Collections.EMPTY_LIST;
+
+ if (!(jsonObj instanceof Collection))
+ return NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON;
+
+ Collection collection = (Collection) jsonObj;
+
+ List nameValuePairs = new ArrayList<>(collection.size());
+
+ for (Object ele : collection)
+ {
+ String name = null;
+ String value = null;
+
+ if (ele instanceof Map)
+ {
+ Map eleMap = (Map) ele;
+ Object nameVal = eleMap.get("name");
+ Object valueVal = eleMap.get("value");
+
+ if (nameVal instanceof String)
+ {
+ name = (String) nameVal;
+ if (valueVal != null)
+ value = (valueVal instanceof String ? (String) valueVal : valueVal.toString());
+ }
+ }
+
+ if (name == null)
+ return NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON;
+
+ nameValuePairs.add(new BasicNameValuePair(name, value));
+ }
+
+ return nameValuePairs;
+ }
+
+ protected ObjectMapper getObjectMapperNonStardand()
+ {
+ return JsonSupport.getObjectMapperNonStardand();
+ }
+
+ protected static class JsonResponseHandler implements HttpClientResponseHandler
+ {
+ private List properties;
+
+ private String responseDataJsonPath = "";
+
+ public JsonResponseHandler()
+ {
+ super();
+ }
+
+ public List getProperties()
+ {
+ return properties;
+ }
+
+ /**
+ * 设置数据集属性。
+ *
+ * @param properties
+ * 如果为{@code null}或空，则执行解析
+ */
+ public void setProperties(List properties)
+ {
+ this.properties = properties;
+ }
+
+ public String getResponseDataJsonPath()
+ {
+ return responseDataJsonPath;
+ }
+
+ public void setResponseDataJsonPath(String responseDataJsonPath)
+ {
+ this.responseDataJsonPath = responseDataJsonPath;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public ResolvedDataSetResult handleResponse(ClassicHttpResponse response) throws HttpException, IOException
+ {
+ int code = response.getCode();
+ HttpEntity entity = response.getEntity();
+
+ if (code < 200 || code >= 300)
+ throw new HttpResponseException(code, response.getReasonPhrase());
+
+ Reader reader = null;
+
+ if (entity == null)
+ reader = IOUtil.getReader("");
+ else
+ {
+ Charset contentCharset = resolveCharset(entity, ContentType.APPLICATION_JSON.getCharset());
+ reader = IOUtil.getReader(entity.getContent(), contentCharset);
+ }
+
+ if (this.properties == null || this.properties.isEmpty())
+ {
+ HttpResponseJsonDataSet jsonDataSet = new HttpResponseJsonDataSet(reader);
+ jsonDataSet.setDataJsonPath(this.responseDataJsonPath);
+
+ return jsonDataSet.resolve(Collections.EMPTY_MAP);
+ }
+ else
+ {
+ HttpResponseJsonDataSet jsonDataSet = new HttpResponseJsonDataSet(this.properties, reader);
+ jsonDataSet.setDataJsonPath(this.responseDataJsonPath);
+
+ DataSetResult result = jsonDataSet.getResult(Collections.EMPTY_MAP);
+ return new ResolvedDataSetResult(result, this.properties);
+ }
+ }
+
+ protected Charset resolveCharset(HttpEntity entity, Charset defaultCharset)
+ {
+ Charset contentCharset = null;
+
+ String contentTypeStr = entity.getContentType();
+
+ if (!StringUtil.isEmpty(contentTypeStr))
+ {
+ try
+ {
+ ContentType contentType = ContentType.parse(contentTypeStr);
+ contentCharset = contentType.getCharset();
+ }
+ catch (Throwable t)
+ {
+ LOGGER.warn("Default charset [" + defaultCharset + "] will be used because parse error", t);
+
+ contentCharset = defaultCharset;
+ }
+ }
+
+ return (contentCharset != null ? contentCharset : defaultCharset);
+ }
+ }
+
+ protected static class HttpResponseJsonDataSet extends AbstractJsonDataSet
+ {
+ private Reader responseJsonReader;
+
+ public HttpResponseJsonDataSet(Reader responseJsonReader)
+ {
+ super(HttpResponseJsonDataSet.class.getName(), HttpResponseJsonDataSet.class.getName());
+ this.responseJsonReader = responseJsonReader;
+ }
+
+ public HttpResponseJsonDataSet(List properties, Reader responseJsonReader)
+ {
+ super(HttpResponseJsonDataSet.class.getName(), HttpResponseJsonDataSet.class.getName(), properties);
+ this.responseJsonReader = responseJsonReader;
+ }
+
+ @Override
+ protected TemplateResolvedSource getJsonReader(Map paramValues) throws Throwable
+ {
+ return new TemplateResolvedSource<>(this.responseJsonReader);
+ }
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDataSetSupport.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDataSetSupport.java
deleted file mode 100644
index c2e0ae76..00000000
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDataSetSupport.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2018 datagear.tech. All Rights Reserved.
- */
-
-package org.datagear.analysis.support;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.datagear.analysis.DataSet;
-import org.datagear.analysis.DataSetException;
-import org.datagear.analysis.DataSetProperty;
-import org.datagear.analysis.DataSetResult;
-import org.datagear.util.IOUtil;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.ValueNode;
-
-/**
- * JSON {@linkplain DataSet}支持类。
- *
- * @author datagear@163.com
- *
- */
-public class JsonDataSetSupport extends JsonSupport
-{
- public JsonDataSetSupport()
- {
- super();
- }
-
- /**
- * 解析JSON数据。
- *
- * @param jsonValue
- * @return
- * @throws DataSetSourceParseException
- * @throws DataSetException
- */
- public Object resolveValue(String jsonValue) throws DataSetSourceParseException, DataSetException
- {
- StringReader reader = new StringReader(jsonValue);
- return resolveValue(reader);
- }
-
- /**
- * 解析JSON数据。
- *
- * @param jsonReader
- * @return
- * @throws DataSetSourceParseException
- * @throws DataSetException
- */
- public Object resolveValue(Reader jsonReader) throws DataSetSourceParseException, DataSetException
- {
- try
- {
- return parseNonStardand(jsonReader, Object.class);
- }
- catch (Throwable t)
- {
- throw new DataSetException(t);
- }
- }
-
- /**
- * 解析数据集结果数据。
- *
- * @param jsonValue
- * @return
- * @throws DataSetSourceParseException
- * @throws UnsupportedJsonResultDataException
- * @throws DataSetException
- */
- public Object resolveResultData(String jsonValue)
- throws DataSetSourceParseException, UnsupportedJsonResultDataException, DataSetException
- {
- StringReader reader = new StringReader(jsonValue);
- return resolveResultData(reader);
- }
-
- /**
- * 解析数据集结果数据。
- *
- * @param file
- * @param encoding
- * @return
- * @throws DataSetSourceParseException
- * @throws UnsupportedJsonResultDataException
- * @throws DataSetException
- */
- public Object resolveResultData(File file, String encoding)
- throws DataSetSourceParseException, UnsupportedJsonResultDataException, DataSetException
- {
- Reader reader = null;
-
- try
- {
- reader = IOUtil.getReader(file, encoding);
- return resolveResultData(reader);
- }
- catch (IOException e)
- {
- throw new DataSetException(e);
- }
- finally
- {
- IOUtil.close(reader);
- }
- }
-
- /**
- * 解析数据集结果数据。
- *
- * @param reader
- * @return
- * @throws DataSetSourceParseException
- * @throws UnsupportedJsonResultDataException
- * @throws DataSetException
- */
- public Object resolveResultData(Reader reader)
- throws DataSetSourceParseException, UnsupportedJsonResultDataException, DataSetException
- {
- JsonNode jsonNode = null;
-
- try
- {
- jsonNode = getObjectMapperNonStardand().readTree(reader);
- }
- catch (Throwable t)
- {
- throw new DataSetSourceParseException(t);
- }
-
- if (!isLegalResultDataJsonNode(jsonNode))
- throw new UnsupportedJsonResultDataException("Result data must be object or object array/list");
-
- if (jsonNode == null)
- return null;
-
- Object data = null;
-
- try
- {
- data = getObjectMapperNonStardand().treeToValue(jsonNode, Object.class);
- }
- catch (Throwable t)
- {
- throw new DataSetException(t);
- }
-
- return data;
- }
-
- /**
- * 是否是合法的数据集结果数据{@linkplain JsonNode}。
- *
- * 参考{@linkplain DataSetResult#getData()}说明。
- *
- *
- * @param jsonNode
- * @return
- */
- public boolean isLegalResultDataJsonNode(JsonNode jsonNode)
- {
- if (jsonNode == null || jsonNode.isNull())
- return true;
-
- if (jsonNode instanceof ValueNode)
- return false;
-
- if (jsonNode instanceof ArrayNode)
- {
- ArrayNode arrayNode = (ArrayNode) jsonNode;
-
- for (int i = 0; i < arrayNode.size(); i++)
- {
- JsonNode eleNode = arrayNode.get(i);
-
- if (eleNode == null || eleNode.isNull())
- continue;
-
- if (!(eleNode instanceof ObjectNode))
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * 解析JSON对象的{@linkplain DataSetProperty}。
- *
- * @param resultData
- * JSON对象、JSON对象数组、JSON对象列表
- * @return
- * @throws UnsupportedJsonResultDataException
- */
- @SuppressWarnings("unchecked")
- public List resolveDataSetProperties(Object resultData) throws UnsupportedJsonResultDataException
- {
- if (resultData == null)
- {
- return Collections.EMPTY_LIST;
- }
- else if (resultData instanceof Map)
- {
- return resolveJsonObjDataSetProperties((Map) resultData);
- }
- else if (resultData instanceof List)
- {
- List list = (List) resultData;
-
- if (list.size() == 0)
- return Collections.EMPTY_LIST;
- else
- return resolveJsonObjDataSetProperties((Map) list.get(0));
- }
- else if (resultData instanceof Object[])
- {
- Object[] array = (Object[]) resultData;
-
- if (array.length == 0)
- return Collections.EMPTY_LIST;
- else
- return resolveJsonObjDataSetProperties((Map) array[0]);
- }
- else
- throw new UnsupportedJsonResultDataException("Result data must be object or object array/list");
- }
-
- /**
- * 解析JSON对象的{@linkplain DataSetProperty}。
- *
- * @param jsonObj
- * @return
- */
- public List resolveJsonObjDataSetProperties(Map jsonObj)
- {
- List properties = new ArrayList<>();
-
- if (jsonObj == null)
- {
-
- }
- else
- {
- for (Map.Entry entry : jsonObj.entrySet())
- {
- Object value = entry.getValue();
- String type = DataSetProperty.DataType.resolveDataType(value);
-
- DataSetProperty property = new DataSetProperty(entry.getKey(), type);
-
- // JSON数值只有NUMBER类型
- if (DataSetProperty.DataType.isInteger(property.getType())
- || DataSetProperty.DataType.isDecimal(property.getType()))
- property.setType(DataSetProperty.DataType.NUMBER);
-
- properties.add(property);
- }
- }
-
- return properties;
- }
-}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDirectoryFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDirectoryFileDataSet.java
index f4614ce5..80d14f47 100644
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDirectoryFileDataSet.java
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonDirectoryFileDataSet.java
@@ -18,6 +18,9 @@ import org.datagear.util.FileUtil;
/**
* 目录内JSON文件{@linkplain DataSet}。
+ *
+ * 注意：此类不支持Freemarker模板语言。
+ *
*
* @author datagear@163.com
*
@@ -73,8 +76,7 @@ public class JsonDirectoryFileDataSet extends AbstractJsonFileDataSet
@Override
protected File getJsonFile(Map paramValues) throws DataSetException
{
- String fileName = resolveTemplate(this.fileName, paramValues);
- File jsonFile = FileUtil.getFile(directory, fileName);
+ File jsonFile = FileUtil.getFile(this.directory, this.fileName);
return jsonFile;
}
}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonValueDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonValueDataSet.java
index 089d2451..d43eeaed 100644
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonValueDataSet.java
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/JsonValueDataSet.java
@@ -7,12 +7,13 @@
*/
package org.datagear.analysis.support;
+import java.io.Reader;
import java.util.List;
import java.util.Map;
import org.datagear.analysis.DataSetException;
import org.datagear.analysis.DataSetProperty;
-import org.datagear.analysis.DataSetResult;
+import org.datagear.util.IOUtil;
/**
* JSON字符串值数据集。
@@ -55,25 +56,15 @@ public class JsonValueDataSet extends AbstractJsonDataSet
}
@Override
- public DataSetResult getResult(Map paramValues) throws DataSetException
+ public TemplateResolvedDataSetResult resolve(Map paramValues) throws DataSetException
{
- String json = resolveTemplate(this.value, paramValues);
-
- Object data = getJsonDataSetSupport().resolveResultData(json);
-
- return new DataSetResult(data);
+ return (TemplateResolvedDataSetResult) resolveResult(paramValues, null);
}
@Override
- public TemplateResolvedDataSetResult resolve(Map paramValues) throws DataSetException
+ protected TemplateResolvedSource getJsonReader(Map paramValues) throws Throwable
{
- String json = resolveTemplate(this.value, paramValues);
-
- Object data = getJsonDataSetSupport().resolveResultData(json);
- DataSetResult result = new DataSetResult(data);
-
- List properties = getJsonDataSetSupport().resolveDataSetProperties(result.getData());
-
- return new TemplateResolvedDataSetResult(result, properties, json);
+ String json = resolveAsFmkTemplateIfHasParam(this.value, paramValues);
+ return new TemplateResolvedSource<>(IOUtil.getReader(json), json);
}
}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/NotNameValueObjArrayJsonException.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/NotNameValueObjArrayJsonException.java
new file mode 100644
index 00000000..7b3298d8
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/NotNameValueObjArrayJsonException.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+import org.datagear.analysis.DataSetException;
+
+/**
+ * JSON字符串不是名/值数组格式异常。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class NotNameValueObjArrayJsonException extends DataSetException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String json;
+
+ public NotNameValueObjArrayJsonException(String json)
+ {
+ super("The json must be name/value object array");
+ this.json = json;
+ }
+
+ public NotNameValueObjArrayJsonException(String json, String message)
+ {
+ super(message);
+ this.json = json;
+ }
+
+ public NotNameValueObjArrayJsonException(String json, Throwable cause)
+ {
+ super(cause);
+ this.json = json;
+ }
+
+ public NotNameValueObjArrayJsonException(String json, String message, Throwable cause)
+ {
+ super(message, cause);
+ this.json = json;
+ }
+
+ public String getJson()
+ {
+ return json;
+ }
+
+ protected void setJson(String json)
+ {
+ this.json = json;
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/RangeExpResolver.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/RangeExpResolver.java
new file mode 100644
index 00000000..2d2ed442
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/RangeExpResolver.java
@@ -0,0 +1,465 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.datagear.util.StringUtil;
+
+/**
+ * 范围解析器。
+ *
+ * 此类用于解析诸如{@code "1, 2-3, 6-, -15}之类的范围表达式。
+ *
+ *
+ * @author datagear@163.com
+ *
+ */
+public class RangeExpResolver
+{
+ public static final char RANGE_SPLITTER_CHAR = '-';
+
+ public static final String RANGE_SPLITTER_STRING = "-";
+
+ public static final char RANGE_GROUP_SPLITTER_CHAR = ',';
+
+ public static final String RANGE_GROUP_SPLITTER_STRING = ",";
+
+ private char rangeSplitter = RANGE_SPLITTER_CHAR;
+
+ private char rangeGroupSplitter = RANGE_GROUP_SPLITTER_CHAR;
+
+ public RangeExpResolver()
+ {
+ super();
+ }
+
+ public char getRangeSplitter()
+ {
+ return rangeSplitter;
+ }
+
+ public void setRangeSplitter(char rangeSplitter)
+ {
+ this.rangeSplitter = rangeSplitter;
+ }
+
+ public char getRangeGroupSplitter()
+ {
+ return rangeGroupSplitter;
+ }
+
+ public void setRangeGroupSplitter(char rangeGroupSplitter)
+ {
+ this.rangeGroupSplitter = rangeGroupSplitter;
+ }
+
+ @SuppressWarnings("unchecked")
+ public List resolveIndex(String exp) throws NumberFormatException
+ {
+ List ranges = resolve(exp);
+
+ if (ranges.isEmpty())
+ return Collections.EMPTY_LIST;
+
+ List indexRanges = new ArrayList<>(ranges.size());
+
+ for (Range range : ranges)
+ indexRanges.add(new IndexRange(range));
+
+ return indexRanges;
+ }
+
+ /**
+ * 解析范围表达式组。
+ *
+ * 例如：{@code "1, 2-5, 8-, -15"}
+ *
+ *
+ * @param exp
+ * @return 如果{@code exp}为{@code null}、或{@code ""}，将返回空列表
+ */
+ @SuppressWarnings("unchecked")
+ public List resolve(String exp)
+ {
+ if (exp != null)
+ exp = exp.trim();
+
+ if (exp == null || exp.isEmpty())
+ return Collections.EMPTY_LIST;
+
+ List ranges = new ArrayList<>();
+
+ String[] ss = StringUtil.split(exp, this.rangeGroupSplitter + "", false);
+
+ for (String s : ss)
+ {
+ Range range = resolveSingle(s);
+
+ if (range != null)
+ ranges.add(range);
+ }
+
+ return ranges;
+ }
+
+ public IndexRange resolveSingleIndex(String exp) throws NumberFormatException
+ {
+ Range range = resolveSingle(exp);
+
+ if (range == null)
+ return null;
+
+ return new IndexRange(range);
+ }
+
+ /**
+ * 解析单个范围表达式。
+ *
+ * 例如：{@code "1"}、{@code "4-5"}、{@code "8-"}、{@code "-15"}
+ *
+ *
+ * @param exp
+ * @return 如果{@code exp}为{@code null}、或{@code ""}，将返回{@code null}
+ */
+ public Range resolveSingle(String exp)
+ {
+ if (exp != null)
+ exp = exp.trim();
+
+ if (exp == null || exp.isEmpty())
+ return null;
+
+ String from = "";
+ String to = "";
+
+ int idx = exp.indexOf(this.rangeSplitter);
+ int len = exp.length();
+
+ // 单个值："1"
+ if (idx < 0)
+ {
+ from = exp;
+ to = from;
+ }
+ // 都未指定："-"
+ else if (idx == 0 && len == 1)
+ {
+ from = "";
+ to = "";
+ }
+ // 仅指定截至值："-4"
+ else if (idx == 0)
+ {
+ from = "";
+ to = exp.substring(1);
+ }
+ // 仅指定起始值："4-"
+ else if (idx == len - 1)
+ {
+ from = exp.substring(0, len - 1);
+ to = "";
+ }
+ // 都指定："3-5"
+ else
+ {
+ from = exp.substring(0, idx);
+ to = exp.substring(idx + 1);
+ }
+
+ return new Range(from, to);
+ }
+
+ public static RangeExpResolver valueOf(char rangeSplitter, char rangeGroupSplitter)
+ {
+ RangeExpResolver resolver = new RangeExpResolver();
+ resolver.setRangeSplitter(rangeSplitter);
+ resolver.setRangeGroupSplitter(rangeGroupSplitter);
+
+ return resolver;
+ }
+
+ /**
+ * 范围。
+ *
+ * @author datagear@163.com
+ *
+ */
+ public static class Range implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ /** 起始 */
+ private String from = "";
+
+ /** 截至 */
+ private String to = "";
+
+ public Range()
+ {
+ super();
+ }
+
+ public Range(String from)
+ {
+ super();
+ this.from = from;
+ }
+
+ public Range(String from, String to)
+ {
+ super();
+ this.from = from;
+ this.to = to;
+ }
+
+ public boolean hasFrom()
+ {
+ return (this.from != null && !this.from.isEmpty());
+ }
+
+ public String trimFrom()
+ {
+ if (this.from == null)
+ return "";
+
+ return this.from.trim();
+ }
+
+ public String getFrom()
+ {
+ return from;
+ }
+
+ public void setFrom(String from)
+ {
+ this.from = from;
+ }
+
+ public boolean hasTo()
+ {
+ return (this.to != null && !this.to.isEmpty());
+ }
+
+ public String trimTo()
+ {
+ if (this.to == null)
+ return "";
+
+ return this.to.trim();
+ }
+
+ public String getTo()
+ {
+ return to;
+ }
+
+ public void setTo(String to)
+ {
+ this.to = to;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((from == null) ? 0 : from.hashCode());
+ result = prime * result + ((to == null) ? 0 : to.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ Range other = (Range) obj;
+ if (from == null)
+ {
+ if (other.from != null)
+ return false;
+ }
+ else if (!from.equals(other.from))
+ return false;
+ if (to == null)
+ {
+ if (other.to != null)
+ return false;
+ }
+ else if (!to.equals(other.to))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + " [from=" + from + ", to=" + to + "]";
+ }
+ }
+
+ /**
+ * 索引范围。
+ *
+ * 索引指大于或等于{@code 0}的整数值。
+ *
+ *
+ * @author datagear@163.com
+ *
+ */
+ protected static class IndexRange implements Serializable
+ {
+ private static final long serialVersionUID = 1L;
+
+ /** 起始索引 */
+ private int from = 0;
+
+ /** 截至索引（包含） */
+ private int to = -1;
+
+ public IndexRange()
+ {
+ super();
+ this.from = 0;
+ this.to = -1;
+ }
+
+ public IndexRange(int from)
+ {
+ super();
+ this.from = from;
+ this.to = -1;
+ }
+
+ public IndexRange(int from, int to)
+ {
+ super();
+ this.from = from;
+ this.to = to;
+ }
+
+ public IndexRange(Range range) throws NumberFormatException
+ {
+ super();
+
+ int from = 0;
+ int to = -1;
+
+ String fromStr = range.trimFrom();
+ String toStr = range.trimTo();
+
+ if (!StringUtil.isEmpty(fromStr))
+ from = Integer.parseInt(fromStr);
+
+ if (!StringUtil.isEmpty(toStr))
+ to = Integer.parseInt(toStr);
+
+ this.from = from;
+ this.to = to;
+ }
+
+ public int getFrom()
+ {
+ return from;
+ }
+
+ /**
+ * 设置起始索引。
+ *
+ * @param from
+ * 起始索引，小于{@code 0}表示不限定
+ */
+ public void setFrom(int from)
+ {
+ this.from = from;
+ }
+
+ public int getTo()
+ {
+ return to;
+ }
+
+ /**
+ * 设置截至索引（包含）。
+ *
+ * @param to
+ * 截至索引，小于{@code 0}表示不限定
+ */
+ public void setTo(int to)
+ {
+ this.to = to;
+ }
+
+ /**
+ * 是否包含给定索引数值。
+ *
+ * @param index
+ * @return
+ */
+ public boolean includes(int index)
+ {
+ if (this.from > -1 && index < this.from)
+ return false;
+
+ if (this.to > -1 && index > this.to)
+ return false;
+
+ return true;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + from;
+ result = prime * result + to;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (getClass() != obj.getClass())
+ return false;
+ IndexRange other = (IndexRange) obj;
+ if (from != other.from)
+ return false;
+ if (to != other.to)
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return getClass().getSimpleName() + " [from=" + from + ", to=" + to + "]";
+ }
+
+ public static boolean includes(List indexRanges, int index)
+ {
+ for (int i = 0; i < indexRanges.size(); i++)
+ if (indexRanges.get(i).includes(index))
+ return true;
+
+ return false;
+ }
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/ReadJsonDataPathException.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/ReadJsonDataPathException.java
new file mode 100644
index 00000000..741b7b62
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/ReadJsonDataPathException.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+/**
+ * 读取指定JSON路径的数据异常。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class ReadJsonDataPathException extends DataSetSourceParseException
+{
+ private static final long serialVersionUID = 1L;
+
+ private String dataPath;
+
+ public ReadJsonDataPathException(String dataPath)
+ {
+ super();
+ this.dataPath = dataPath;
+ }
+
+ public ReadJsonDataPathException(String dataPath, String message)
+ {
+ super(message);
+ this.dataPath = dataPath;
+ }
+
+ public ReadJsonDataPathException(String dataPath, Throwable cause)
+ {
+ super(cause);
+ this.dataPath = dataPath;
+ }
+
+ public ReadJsonDataPathException(String dataPath, String message, Throwable cause)
+ {
+ super(message, cause);
+ this.dataPath = dataPath;
+ }
+
+ public String getDataPath()
+ {
+ return dataPath;
+ }
+
+ protected void setDataPath(String dataPath)
+ {
+ this.dataPath = dataPath;
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/RequestContentNotNameValueObjArrayJsonException.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/RequestContentNotNameValueObjArrayJsonException.java
new file mode 100644
index 00000000..e5813096
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/RequestContentNotNameValueObjArrayJsonException.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+/**
+ * {@linkplain HttpDataSet#getRequestContent()}不是名/值对象数组JSON异常。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class RequestContentNotNameValueObjArrayJsonException extends NotNameValueObjArrayJsonException
+{
+ private static final long serialVersionUID = 1L;
+
+ public RequestContentNotNameValueObjArrayJsonException(String json)
+ {
+ super(json);
+ }
+
+ public RequestContentNotNameValueObjArrayJsonException(String json, String message)
+ {
+ super(json, message);
+ }
+
+ public RequestContentNotNameValueObjArrayJsonException(String json, Throwable cause)
+ {
+ super(json, cause);
+ }
+
+ public RequestContentNotNameValueObjArrayJsonException(String json, String message, Throwable cause)
+ {
+ super(json, message, cause);
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleCsvFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleCsvFileDataSet.java
new file mode 100644
index 00000000..9b5ef2f9
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleCsvFileDataSet.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2018 datagear.tech. All Rights Reserved.
+ */
+
+package org.datagear.analysis.support;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetProperty;
+
+/**
+ * 简单CSV文件数据集。
+ *
+ * 注意：此类不支持Freemarker模板语言。
+ *
+ *
+ * @author datagear@163.com
+ *
+ */
+public class SimpleCsvFileDataSet extends AbstractCsvFileDataSet
+{
+ /** CSV文件 */
+ private File file;
+
+ public SimpleCsvFileDataSet()
+ {
+ super();
+ }
+
+ public SimpleCsvFileDataSet(String id, String name, File file)
+ {
+ super(id, name);
+ this.file = file;
+ }
+
+ public SimpleCsvFileDataSet(String id, String name, List properties, File file)
+ {
+ super(id, name, properties);
+ this.file = file;
+ }
+
+ public File getFile()
+ {
+ return file;
+ }
+
+ public void setFile(File file)
+ {
+ this.file = file;
+ }
+
+ @Override
+ protected File getCsvFile(Map paramValues) throws Throwable
+ {
+ return this.file;
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleExcelDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleExcelDataSet.java
new file mode 100644
index 00000000..51660a5b
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleExcelDataSet.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+import java.io.File;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetException;
+import org.datagear.analysis.DataSetProperty;
+
+/**
+ * 简单Excel数据集。
+ *
+ * 注意：此类不支持Freemarker模板语言。
+ *
+ *
+ * @author datagear@163.com
+ *
+ */
+public class SimpleExcelDataSet extends AbstractExcelDataSet
+{
+ /** Excel文件 */
+ private File file;
+
+ public SimpleExcelDataSet()
+ {
+ super();
+ }
+
+ public SimpleExcelDataSet(String id, String name, File file)
+ {
+ super(id, name);
+ this.file = file;
+ }
+
+ public SimpleExcelDataSet(String id, String name, List properties, File file)
+ {
+ super(id, name, properties);
+ this.file = file;
+ }
+
+ @Override
+ protected File getExcelFile(Map paramValues) throws DataSetException
+ {
+ return this.file;
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleJsonFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleJsonFileDataSet.java
index 2770127d..73643a26 100644
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleJsonFileDataSet.java
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleJsonFileDataSet.java
@@ -13,6 +13,9 @@ import org.datagear.analysis.DataSetProperty;
/**
* 简单JSON文件数据集。
+ *
+ * 注意：此类不支持Freemarker模板语言。
+ *
*
* @author datagear@163.com
*
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java
index 812d1f4e..45231616 100644
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java
@@ -9,20 +9,27 @@ package org.datagear.analysis.support;
import java.sql.Connection;
import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.util.Collections;
+import java.sql.Types;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.datagear.analysis.DataSet;
import org.datagear.analysis.DataSetException;
import org.datagear.analysis.DataSetProperty;
+import org.datagear.analysis.DataSetProperty.DataType;
import org.datagear.analysis.DataSetResult;
import org.datagear.analysis.ResolvableDataSet;
import org.datagear.analysis.ResolvedDataSetResult;
+import org.datagear.util.JDBCCompatiblity;
+import org.datagear.util.JdbcSupport;
import org.datagear.util.JdbcUtil;
import org.datagear.util.QueryResultSet;
import org.datagear.util.Sql;
+import org.datagear.util.SqlType;
import org.datagear.util.resource.ConnectionFactory;
/**
@@ -34,9 +41,9 @@ import org.datagear.util.resource.ConnectionFactory;
* @author datagear@163.com
*
*/
-public class SqlDataSet extends AbstractFmkTemplateDataSet implements ResolvableDataSet
+public class SqlDataSet extends AbstractResolvableDataSet implements ResolvableDataSet
{
- protected static final SqlDataSetSupport SQL_DATA_SET_SUPPORT = new SqlDataSetSupport();
+ protected static final JdbcSupport JDBC_SUPPORT = new JdbcSupport();
private ConnectionFactory connectionFactory;
@@ -47,10 +54,9 @@ public class SqlDataSet extends AbstractFmkTemplateDataSet implements Resolvable
super();
}
- @SuppressWarnings("unchecked")
public SqlDataSet(String id, String name, ConnectionFactory connectionFactory, String sql)
{
- super(id, name, Collections.EMPTY_LIST);
+ super(id, name);
this.connectionFactory = connectionFactory;
this.sql = sql;
}
@@ -84,35 +90,16 @@ public class SqlDataSet extends AbstractFmkTemplateDataSet implements Resolvable
}
@Override
- public DataSetResult getResult(Map paramValues) throws DataSetException
+ public TemplateResolvedDataSetResult resolve(Map paramValues) throws DataSetException
{
- List properties = getProperties();
-
- if (properties == null || properties.isEmpty())
- throw new DataSetException("[getProperties()] must not be empty");
-
- ResolvedDataSetResult result = getResolvedDataSetResult(paramValues, properties);
- return result.getResult();
+ return resolveResult(paramValues, null);
}
@Override
- public TemplateResolvedDataSetResult resolve(Map paramValues) throws DataSetException
+ protected TemplateResolvedDataSetResult resolveResult(Map paramValues, List properties)
+ throws DataSetException
{
- return getResolvedDataSetResult(paramValues, null);
- }
-
- /**
- *
- * @param paramValues
- * @param properties
- * 允许为{@code null}，此时会自动解析
- * @return
- * @throws DataSetException
- */
- protected TemplateResolvedDataSetResult getResolvedDataSetResult(Map paramValues,
- List properties) throws DataSetException
- {
- String sql = resolveTemplate(getSql(), paramValues);
+ String sql = resolveAsFmkTemplateIfHasParam(getSql(), paramValues);
Connection cn = null;
@@ -120,32 +107,42 @@ public class SqlDataSet extends AbstractFmkTemplateDataSet implements Resolvable
{
cn = getConnectionFactory().get();
}
- catch (Exception e)
+ catch (Throwable t)
{
JdbcUtil.closeConnection(cn);
- throw new SqlDataSetConnectionException(e);
+ throw new SqlDataSetConnectionException(t);
}
Sql sqlObj = Sql.valueOf(sql);
+ JdbcSupport jdbcSupport = getJdbcSupport();
+
QueryResultSet qrs = null;
try
{
- qrs = getSqlDataSetSupport().executeQuery(cn, sqlObj, ResultSet.TYPE_FORWARD_ONLY);
+ qrs = jdbcSupport.executeQuery(cn, sqlObj, ResultSet.TYPE_FORWARD_ONLY);
+ }
+ catch (Throwable t)
+ {
+ throw new SqlDataSetSqlExecutionException(sql, t);
+ }
+
+ try
+ {
ResultSet rs = qrs.getResultSet();
- if (properties == null || properties.isEmpty())
- properties = getSqlDataSetSupport().resolveDataSetProperties(cn, rs, null);
+ ResolvedDataSetResult result = resolveResult(cn, rs, properties);
- List> data = getSqlDataSetSupport().resolveResultData(cn, rs, properties);
- DataSetResult result = new DataSetResult(data);
-
- return new TemplateResolvedDataSetResult(result, properties, sql);
+ return new TemplateResolvedDataSetResult(result.getResult(), result.getProperties(), sql);
}
- catch (SQLException e)
+ catch (DataSetException e)
{
- throw new SqlDataSetSqlExecutionException(sql, e);
+ throw e;
+ }
+ catch (Throwable t)
+ {
+ throw new DataSetException(t);
}
finally
{
@@ -167,46 +164,163 @@ public class SqlDataSet extends AbstractFmkTemplateDataSet implements Resolvable
}
/**
+ * 解析结果。
*
* @param cn
- * @param sql
+ * @param rs
* @param properties
* 允许为{@code null}，此时会自动解析
* @return
- * @throws DataSetException
+ * @throws Throwable
*/
- protected ResolvedDataSetResult getResolvedDataSetResult(Connection cn, String sql,
- List properties) throws DataSetException
+ protected ResolvedDataSetResult resolveResult(Connection cn, ResultSet rs, List properties)
+ throws Throwable
{
- Sql sqlObj = Sql.valueOf(sql);
+ boolean resolveProperties = (properties == null || properties.isEmpty());
- QueryResultSet qrs = null;
+ List> datas = new ArrayList<>();
- try
+ JdbcSupport jdbcSupport = getJdbcSupport();
+ DataSetPropertyValueConverter converter = createDataSetPropertyValueConverter();
+
+ ResultSetMetaData rsMeta = rs.getMetaData();
+ String[] colNames = jdbcSupport.getColumnNames(rsMeta);
+ SqlType[] sqlTypes = jdbcSupport.getColumnSqlTypes(rsMeta);
+
+ if (resolveProperties)
{
- qrs = getSqlDataSetSupport().executeQuery(cn, sqlObj, ResultSet.TYPE_FORWARD_ONLY);
- ResultSet rs = qrs.getResultSet();
-
- if (properties == null || properties.isEmpty())
- properties = getSqlDataSetSupport().resolveDataSetProperties(cn, rs, null);
-
- List> data = getSqlDataSetSupport().resolveResultData(cn, rs, properties);
- DataSetResult result = new DataSetResult(data);
-
- return new ResolvedDataSetResult(result, properties);
+ properties = new ArrayList<>(colNames.length);
+ for (int i = 0; i < colNames.length; i++)
+ properties.add(new DataSetProperty(colNames[i], toPropertyDataType(sqlTypes[i], colNames[i])));
}
- catch (SQLException e)
+
+ int maxColumnSize = Math.min(colNames.length, properties.size());
+
+ int rowIdx = 0;
+
+ while (rs.next())
{
- throw new SqlDataSetSqlExecutionException(sql, e);
- }
- finally
- {
- QueryResultSet.close(qrs);
+ Map row = new HashMap<>();
+
+ for (int i = 0; i < maxColumnSize; i++)
+ {
+ DataSetProperty property = properties.get(i);
+
+ Object value = jdbcSupport.getColumnValue(cn, rs, colNames[i], sqlTypes[i].getType());
+
+ if (resolveProperties && rowIdx == 0)
+ {
+ @JDBCCompatiblity("某些驱动程序可能存在一种情况，列类型会被toPropertyDataType()解析为DataType.UNKNOWN，但是实际值是允许的，"
+ + "比如PostgreSQL-42.2.5驱动对于[SELECT 'aaa' as NAME]语句，结果的SQL类型是Types.OTHER，但实际值是允许的字符串")
+ boolean resolveTypeByValue = (DataType.UNKNOWN.equals(property.getType()));
+
+ if (resolveTypeByValue)
+ property.setType(resolvePropertyDataType(value));
+ }
+
+ value = convertToPropertyDataType(converter, value, property);
+
+ row.put(property.getName(), value);
+ }
+
+ datas.add(row);
+
+ rowIdx++;
}
+
+ DataSetResult result = new DataSetResult(datas);
+
+ return new ResolvedDataSetResult(result, properties);
}
- protected SqlDataSetSupport getSqlDataSetSupport()
+ /**
+ * 由SQL类型转换为{@linkplain DataSetProperty#getType()}。
+ *
+ * @param sqlType
+ * @param columnName
+ * 允许为{@code null}，列名称
+ * @return
+ * @throws SQLException
+ * @throws SqlDataSetUnsupportedSqlTypeException
+ */
+ protected String toPropertyDataType(SqlType sqlType, String columnName)
+ throws SQLException, SqlDataSetUnsupportedSqlTypeException
{
- return SQL_DATA_SET_SUPPORT;
+ String dataType = null;
+
+ int type = sqlType.getType();
+
+ switch (type)
+ {
+ // 确定不支持的类型
+ case Types.BINARY:
+ case Types.BLOB:
+ case Types.LONGVARBINARY:
+ case Types.VARBINARY:
+ throw new SqlDataSetUnsupportedSqlTypeException(sqlType, columnName);
+
+ case Types.CHAR:
+ case Types.NCHAR:
+ case Types.NVARCHAR:
+ case Types.VARCHAR:
+ {
+ dataType = DataType.STRING;
+ break;
+ }
+
+ case Types.BOOLEAN:
+ {
+ dataType = DataType.BOOLEAN;
+ break;
+ }
+
+ case Types.BIGINT:
+ case Types.BIT:
+ case Types.INTEGER:
+ case Types.SMALLINT:
+ case Types.TINYINT:
+ {
+ dataType = DataType.INTEGER;
+ break;
+ }
+
+ case Types.DECIMAL:
+ case Types.DOUBLE:
+ case Types.FLOAT:
+ case Types.NUMERIC:
+ case Types.REAL:
+ {
+ dataType = DataType.DECIMAL;
+ break;
+ }
+
+ case Types.DATE:
+ {
+ dataType = DataType.DATE;
+ break;
+ }
+
+ case Types.TIME:
+ {
+ dataType = DataType.TIME;
+ break;
+ }
+
+ case Types.TIMESTAMP:
+ {
+ dataType = DataType.TIMESTAMP;
+ break;
+ }
+
+ default:
+ dataType = DataType.UNKNOWN;
+ }
+
+ return dataType;
+ }
+
+ protected JdbcSupport getJdbcSupport()
+ {
+ return JDBC_SUPPORT;
}
}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSetSupport.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSetSupport.java
deleted file mode 100644
index 456e731e..00000000
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSetSupport.java
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 2018 datagear.tech. All Rights Reserved.
- */
-
-/**
- *
- */
-package org.datagear.analysis.support;
-
-import java.sql.Connection;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Types;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.datagear.analysis.DataSetException;
-import org.datagear.analysis.DataSetProperty;
-import org.datagear.analysis.DataSetProperty.DataType;
-import org.datagear.util.JdbcSupport;
-import org.datagear.util.SqlType;
-
-/**
- * SQL数据集支持类。
- *
- * @author datagear@163.com
- *
- */
-public class SqlDataSetSupport extends JdbcSupport
-{
- public SqlDataSetSupport()
- {
- super();
- }
-
- /**
- * 解析结果数据。
- *
- * @param cn
- * @param rs
- * @param properties
- * @return
- * @throws SQLException
- */
- public List> resolveResultData(Connection cn, ResultSet rs, List properties)
- throws SQLException
- {
- List> datas = new ArrayList<>();
-
- ResultSetMetaData rsMeta = rs.getMetaData();
- int[] rsColumns = resolveResultsetColumns(properties, rsMeta);
-
- while (rs.next())
- {
- Map row = new HashMap<>();
-
- for (int i = 0; i < rsColumns.length; i++)
- {
- DataSetProperty property = properties.get(i);
- int rsColumn = rsColumns[i];
-
- Object value = resolvePropertyDataValue(cn, rs, rsColumn, getColumnSqlType(rsMeta, rsColumn),
- property.getType());
-
- row.put(property.getName(), value);
- }
-
- datas.add(row);
- }
-
- return datas;
- }
-
- /**
- * 解析结果集中对应{@linkplain DataSetProperty}的索引数组。
- *
- * @param properties
- * @param rsMeta
- * @return
- * @throws SQLException
- * @throws DataSetException
- */
- public int[] resolveResultsetColumns(List properties, ResultSetMetaData rsMeta)
- throws SQLException, DataSetException
- {
- int[] columns = new int[properties.size()];
-
- int rsColumnCount = rsMeta.getColumnCount();
-
- for (int i = 0; i < columns.length; i++)
- {
- String pname = properties.get(i).getName();
-
- int myIndex = -1;
-
- for (int j = 1; j <= rsColumnCount; j++)
- {
- if (pname.equalsIgnoreCase(getColumnName(rsMeta, j)))
- {
- myIndex = j;
- break;
- }
- }
-
- if (myIndex <= 0)
- throw new DataSetException(
- "Column named '" + pname + "' not found in the " + ResultSet.class.getSimpleName());
-
- columns[i] = myIndex;
- }
-
- return columns;
- }
-
- /**
- * 解析数据值。
- *
- * @param cn
- * @param rs
- * @param column
- * @param sqlType
- * @param dataType
- * @return
- * @throws SQLException
- */
- public Object resolvePropertyDataValue(Connection cn, ResultSet rs, int column, SqlType sqlType, String dataType)
- throws SQLException
- {
- Object value = null;
-
- int type = sqlType.getType();
-
- if (DataType.isString(dataType))
- {
- switch (type)
- {
- case Types.CHAR:
- case Types.NCHAR:
- case Types.NVARCHAR:
- case Types.VARCHAR:
- {
- value = rs.getString(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isBoolean(dataType))
- {
- switch (type)
- {
- case Types.BIT:
- case Types.BIGINT:
- case Types.INTEGER:
- case Types.SMALLINT:
- case Types.TINYINT:
- {
- value = (rs.getInt(column) > 0);
- break;
- }
-
- case Types.BOOLEAN:
- {
- value = rs.getBoolean(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isInteger(dataType))
- {
- switch (type)
- {
- case Types.BIGINT:
- {
- value = rs.getLong(column);
- break;
- }
-
- case Types.BIT:
- case Types.INTEGER:
- case Types.SMALLINT:
- case Types.TINYINT:
- {
- value = rs.getInt(column);
- break;
- }
-
- case Types.DECIMAL:
- case Types.NUMERIC:
- {
- value = rs.getBigDecimal(column).toBigInteger();
- break;
- }
-
- case Types.DOUBLE:
- {
- value = new Double(rs.getDouble(column)).longValue();
- break;
- }
-
- case Types.FLOAT:
- case Types.REAL:
- {
- value = new Float(rs.getFloat(column)).longValue();
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isDecimal(dataType))
- {
- switch (type)
- {
- case Types.BIGINT:
- {
- value = rs.getLong(column);
- break;
- }
-
- case Types.BIT:
- case Types.INTEGER:
- case Types.SMALLINT:
- case Types.TINYINT:
- {
- value = rs.getInt(column);
- break;
- }
-
- case Types.DECIMAL:
- case Types.NUMERIC:
- {
- value = rs.getBigDecimal(column);
- break;
- }
-
- case Types.DOUBLE:
- {
- value = rs.getDouble(column);
- break;
- }
-
- case Types.FLOAT:
- case Types.REAL:
- {
- value = rs.getFloat(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isDate(dataType))
- {
- switch (type)
- {
- case Types.DATE:
- {
- value = rs.getDate(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isTime(dataType))
- {
- switch (type)
- {
- case Types.TIME:
- {
- value = rs.getTime(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else if (DataType.isTimestamp(dataType))
- {
- switch (type)
- {
- case Types.TIMESTAMP:
- {
- value = rs.getTimestamp(column);
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType);
- }
- }
- else
- throw new UnsupportedOperationException();
-
- if (rs.wasNull())
- value = null;
-
- return value;
- }
-
- /**
- * 解析{@linkplain DataSetProperty}列表。
- *
- * @param cn
- * @param rs
- * @param labels
- * {@linkplain DataSetProperty#getLabel()}数组，允许为{@code null}或任意长度的数组
- * @return
- * @throws SQLException
- */
- public List resolveDataSetProperties(Connection cn, ResultSet rs, String[] labels)
- throws SQLException
- {
- ResultSetMetaData metaData = rs.getMetaData();
- int columnCount = metaData.getColumnCount();
-
- List properties = new ArrayList<>(columnCount);
-
- for (int i = 1; i <= columnCount; i++)
- {
- String columnName = getColumnName(metaData, i);
- SqlType sqlType = getColumnSqlType(metaData, i);
-
- String dataType = toPropertyDataType(sqlType, columnName);
-
- DataSetProperty property = createDataSetProperty();
- property.setName(columnName);
- property.setType(dataType);
-
- if (labels != null && labels.length > i - 1)
- property.setLabel(labels[i - 1]);
-
- properties.add(property);
- }
-
- return properties;
- }
-
- /**
- * 由SQL类型转换为{@linkplain DataSetProperty#getType()}。
- *
- * @param sqlType
- * @param columnName
- * 允许为{@code null}，列名称
- * @return
- * @throws SQLException
- */
- public String toPropertyDataType(SqlType sqlType, String columnName) throws SQLException
- {
- String dataType = null;
-
- int type = sqlType.getType();
-
- switch (type)
- {
- case Types.CHAR:
- case Types.NCHAR:
- case Types.NVARCHAR:
- case Types.VARCHAR:
- {
- dataType = DataType.STRING;
- break;
- }
-
- case Types.BOOLEAN:
- {
- dataType = DataType.BOOLEAN;
- break;
- }
-
- case Types.BIGINT:
- case Types.BIT:
- case Types.INTEGER:
- case Types.SMALLINT:
- case Types.TINYINT:
- {
- dataType = DataType.INTEGER;
- break;
- }
-
- case Types.DECIMAL:
- case Types.DOUBLE:
- case Types.FLOAT:
- case Types.NUMERIC:
- case Types.REAL:
- {
- dataType = DataType.DECIMAL;
- break;
- }
-
- case Types.DATE:
- {
- dataType = DataType.DATE;
- break;
- }
-
- case Types.TIME:
- {
- dataType = DataType.TIME;
- break;
- }
-
- case Types.TIMESTAMP:
- {
- dataType = DataType.TIMESTAMP;
- break;
- }
-
- default:
- throw new SqlDataSetUnsupportedSqlTypeException(sqlType, columnName);
- }
-
- return dataType;
- }
-
- protected DataSetProperty createDataSetProperty()
- {
- return new DataSetProperty();
- }
-}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/TemplateResolvedSource.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/TemplateResolvedSource.java
new file mode 100644
index 00000000..53589f53
--- /dev/null
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/TemplateResolvedSource.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2018 datagear.tech. All Rights Reserved.
+ */
+
+package org.datagear.analysis.support;
+
+/**
+ * 模板已解析的源。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class TemplateResolvedSource
+{
+ private T source;
+
+ /** 已解析的模板内容 */
+ private String resolvedTemplate = null;
+
+ public TemplateResolvedSource()
+ {
+ super();
+ }
+
+ public TemplateResolvedSource(T source)
+ {
+ super();
+ this.source = source;
+ }
+
+ public TemplateResolvedSource(T source, String resolvedTemplate)
+ {
+ super();
+ this.source = source;
+ this.resolvedTemplate = resolvedTemplate;
+ }
+
+ public T getSource()
+ {
+ return source;
+ }
+
+ public void setSource(T source)
+ {
+ this.source = source;
+ }
+
+ public boolean hasResolvedTemplate()
+ {
+ return (this.resolvedTemplate != null && !this.resolvedTemplate.isEmpty());
+ }
+
+ public String getResolvedTemplate()
+ {
+ return resolvedTemplate;
+ }
+
+ public void setResolvedTemplate(String resolvedTemplate)
+ {
+ this.resolvedTemplate = resolvedTemplate;
+ }
+}
diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginLoader.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginLoader.java
index a3297310..2fac4c2b 100644
--- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginLoader.java
+++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginLoader.java
@@ -81,7 +81,7 @@ public class HtmlChartPluginLoader
private JsonChartPluginPropertiesResolver jsonChartPluginPropertiesResolver = new JsonChartPluginPropertiesResolver();
/** 文件编码 */
- private String encoding = "UTF-8";
+ private String encoding = IOUtil.CHARSET_UTF_8;
public HtmlChartPluginLoader()
{
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractJsonDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractJsonDataSetTest.java
new file mode 100644
index 00000000..b7ee6ba2
--- /dev/null
+++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractJsonDataSetTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetProperty;
+import org.junit.Test;
+
+/**
+ * {@linkplain AbstractJsonDataSet}单元测试用例。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class AbstractJsonDataSetTest
+{
+ @Test
+ public void resolveTest_dataJsonPath()
+ {
+ String jsonString = "{ path0: { path1: [ { path2: [ { name:'aaa', value: 11, size: 12 } ] } ] } }";
+
+ JsonValueDataSet dataSet = new JsonValueDataSet(JsonValueDataSet.class.getSimpleName(),
+ JsonValueDataSet.class.getSimpleName(), jsonString);
+
+ dataSet.setDataJsonPath("path0.path1[0].path2");
+
+ TemplateResolvedDataSetResult result = dataSet.resolve(Collections.emptyMap());
+ List properties = result.getProperties();
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getResult().getData();
+
+ assertEquals(jsonString, result.getTemplateResult());
+
+ {
+ assertEquals(3, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("value", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("size", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+ }
+
+ {
+ assertEquals(1, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals(12, ((Number) row.get("size")).intValue());
+ }
+ }
+ }
+}
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvDirectoryFileDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvDirectoryFileDataSetTest.java
new file mode 100644
index 00000000..e0623551
--- /dev/null
+++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvDirectoryFileDataSetTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2018 datagear.tech. All Rights Reserved.
+ */
+
+package org.datagear.analysis.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetProperty;
+import org.datagear.analysis.DataSetResult;
+import org.datagear.analysis.ResolvedDataSetResult;
+import org.junit.Test;
+
+/**
+ * {@linkplain CsvDirectoryFileDataSet}单元测试类。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class CsvDirectoryFileDataSetTest
+{
+ private static final File DIRECTORY = new File("src/test/resources/org/datagear/analysis/support/");
+
+ @Test
+ public void getResultTest()
+ {
+ List properties = new ArrayList<>();
+ properties.add(new DataSetProperty("name", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("value", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("尺寸", DataSetProperty.DataType.NUMBER));
+
+ CsvDirectoryFileDataSet dataSet = new CsvDirectoryFileDataSet("a", "a", properties, DIRECTORY,
+ "CsvDirectoryFileDataSetTest-0.csv");
+ dataSet.setNameRow(1);
+
+ @SuppressWarnings("unchecked")
+ DataSetResult result = dataSet.getResult(Collections.EMPTY_MAP);
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getData();
+
+ {
+ assertEquals(3, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals(12, ((Number) row.get("尺寸")).intValue());
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(21, ((Number) row.get("value")).intValue());
+ assertEquals(22, ((Number) row.get("尺寸")).intValue());
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(31, ((Number) row.get("value")).intValue());
+ assertEquals(32, ((Number) row.get("尺寸")).intValue());
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest()
+ {
+ CsvDirectoryFileDataSet dataSet = new CsvDirectoryFileDataSet("a", "a", DIRECTORY,
+ "CsvDirectoryFileDataSetTest-0.csv");
+ dataSet.setNameRow(1);
+
+ @SuppressWarnings("unchecked")
+ ResolvedDataSetResult result = dataSet.resolve(Collections.EMPTY_MAP);
+ List properties = result.getProperties();
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getResult().getData();
+
+ {
+ assertEquals(3, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("value", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("尺寸", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+ }
+
+ {
+ assertEquals(3, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals(12, ((Number) row.get("尺寸")).intValue());
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(21, ((Number) row.get("value")).intValue());
+ assertEquals(22, ((Number) row.get("尺寸")).intValue());
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(31, ((Number) row.get("value")).intValue());
+ assertEquals(32, ((Number) row.get("尺寸")).intValue());
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest_noNameRow()
+ {
+ CsvDirectoryFileDataSet dataSet = new CsvDirectoryFileDataSet("a", "a", DIRECTORY,
+ "CsvDirectoryFileDataSetTest-0.csv");
+
+ @SuppressWarnings("unchecked")
+ ResolvedDataSetResult result = dataSet.resolve(Collections.EMPTY_MAP);
+ List properties = result.getProperties();
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getResult().getData();
+
+ {
+ assertEquals(3, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("1", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("2", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("3", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+ }
+
+ {
+ assertEquals(4, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("name", row.get("1"));
+ assertEquals("value", row.get("2"));
+ assertEquals("尺寸", row.get("3"));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("aaa", row.get("1"));
+ assertEquals("11", row.get("2"));
+ assertEquals("12", row.get("3"));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("bbb", row.get("1"));
+ assertEquals("21", row.get("2"));
+ assertEquals("22", row.get("3"));
+ }
+
+ {
+ Map row = data.get(3);
+
+ assertEquals("ccc", row.get("1"));
+ assertEquals("31", row.get("2"));
+ assertEquals("32", row.get("3"));
+ }
+ }
+ }
+}
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvValueDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvValueDataSetTest.java
new file mode 100644
index 00000000..80b4ec34
--- /dev/null
+++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/CsvValueDataSetTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2018 datagear.tech. All Rights Reserved.
+ */
+
+package org.datagear.analysis.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetParam;
+import org.datagear.analysis.DataSetProperty;
+import org.datagear.analysis.DataSetResult;
+import org.junit.Test;
+
+/**
+ * {@linkplain CsvValueDataSet}单元测试类。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class CsvValueDataSetTest
+{
+ @Test
+ public void getResultTest_hasParam()
+ {
+ List properties = new ArrayList<>();
+ properties.add(new DataSetProperty("name", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("value", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("size", DataSetProperty.DataType.NUMBER));
+
+ List params = new ArrayList();
+ params.add(new DataSetParam("size", DataSetParam.DataType.NUMBER, true));
+
+ CsvValueDataSet dataSet = new CsvValueDataSet("a", "a", properties,
+ "name, value, size \n aaa, 11, ${size}");
+ dataSet.setParams(params);
+ dataSet.setNameRow(1);
+
+ Map paramValues = new HashMap<>();
+ paramValues.put("size", 12);
+
+ DataSetResult result = dataSet.getResult(paramValues);
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getData();
+
+ {
+ assertEquals(1, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals(12, ((Number) row.get("size")).intValue());
+ }
+ }
+ }
+
+ @Test
+ public void getResultTest_hasParam_convertPropertyValue()
+ {
+ List properties = new ArrayList<>();
+ properties.add(new DataSetProperty("name", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("value", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("size", DataSetProperty.DataType.STRING));
+
+ List params = new ArrayList();
+ params.add(new DataSetParam("size", DataSetParam.DataType.NUMBER, true));
+
+ CsvValueDataSet dataSet = new CsvValueDataSet("a", "a", properties,
+ "name, value, size \n aaa, 11, ${size}");
+ dataSet.setParams(params);
+ dataSet.setNameRow(1);
+
+ Map paramValues = new HashMap<>();
+ paramValues.put("size", 12);
+
+ DataSetResult result = dataSet.getResult(paramValues);
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getData();
+
+ {
+ assertEquals(1, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals("12", row.get("size"));
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest_hasParam()
+ {
+ List params = new ArrayList();
+ params.add(new DataSetParam("size", DataSetParam.DataType.NUMBER, true));
+
+ CsvValueDataSet dataSet = new CsvValueDataSet("a", "a",
+ "name, value, size \n aaa, 11, ${size}");
+ dataSet.setParams(params);
+ dataSet.setNameRow(1);
+
+ Map paramValues = new HashMap<>();
+ paramValues.put("size", 12);
+
+ TemplateResolvedDataSetResult result = dataSet.resolve(paramValues);
+ List properties = result.getProperties();
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getResult().getData();
+
+ assertEquals("name, value, size \n aaa, 11, 12", result.getTemplateResult());
+
+ {
+ assertEquals(3, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("value", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("size", property.getName());
+ assertEquals(DataSetProperty.DataType.NUMBER, property.getType());
+ }
+ }
+
+ {
+ assertEquals(1, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(11, ((Number) row.get("value")).intValue());
+ assertEquals(12, ((Number) row.get("size")).intValue());
+ }
+ }
+ }
+}
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/DBTestSupport.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/DBTestSupport.java
deleted file mode 100644
index a61f8c1e..00000000
--- a/datagear-analysis/src/test/java/org/datagear/analysis/support/DBTestSupport.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2018 datagear.org. All Rights Reserved.
- */
-
-package org.datagear.analysis.support;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.Reader;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Properties;
-
-/**
- * 数据库测试支持类。
- *
- * @author datagear@163.com
- *
- */
-public abstract class DBTestSupport
-{
- private static final Properties JDBC_PROPERTIES = new Properties();
-
- static
- {
- File jdbcConfigFile = new File("test/config/jdbc.properties");
- if (!jdbcConfigFile.exists())
- jdbcConfigFile = new File("../test/config/jdbc.properties");
-
- try
- {
- Reader reader = new FileReader(jdbcConfigFile);
- JDBC_PROPERTIES.load(reader);
- reader.close();
- }
- catch (Exception e)
- {
- if (e instanceof RuntimeException)
- throw (RuntimeException) e;
- else
- throw new RuntimeException(e);
- }
- }
-
- protected Connection getConnection() throws SQLException
- {
- return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"),
- JDBC_PROPERTIES.getProperty("jdbc.user"), JDBC_PROPERTIES.getProperty("jdbc.password"));
- }
-
- protected Connection getConnection(Properties properties) throws Exception
- {
- properties.setProperty("user", JDBC_PROPERTIES.getProperty("jdbc.user"));
- properties.setProperty("password", JDBC_PROPERTIES.getProperty("jdbc.password"));
-
- return DriverManager.getConnection(JDBC_PROPERTIES.getProperty("jdbc.url"), properties);
- }
-
- protected void println()
- {
- System.out.println();
- }
-
- protected void println(Object o)
- {
- System.out.println((o == null ? "null" : o.toString()));
- }
-
- protected void print(Object o)
- {
- System.out.print((o == null ? "null" : o.toString()));
- }
-}
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/ExcelDirectoryFileDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/ExcelDirectoryFileDataSetTest.java
new file mode 100644
index 00000000..fc331f7a
--- /dev/null
+++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/ExcelDirectoryFileDataSetTest.java
@@ -0,0 +1,355 @@
+/*
+ * Copyright (c) 2018 datagear.tech. All Rights Reserved.
+ */
+
+/**
+ *
+ */
+package org.datagear.analysis.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.File;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.datagear.analysis.DataSetProperty;
+import org.datagear.analysis.DataSetResult;
+import org.datagear.analysis.ResolvedDataSetResult;
+import org.junit.Test;
+
+/**
+ * {@linkplain ExcelDirectoryFileDataSet}单元测试用例。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class ExcelDirectoryFileDataSetTest
+{
+ private static final File DIRECTORY = new File("src/test/resources/org/datagear/analysis/support/");
+
+ @Test
+ public void getResultTest_xlsx()
+ {
+ List properties = new ArrayList<>();
+ properties.add(new DataSetProperty("name", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("value", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("size", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("date", DataSetProperty.DataType.DATE));
+
+ ExcelDirectoryFileDataSet dataSet = new ExcelDirectoryFileDataSet("a", "a", properties, DIRECTORY,
+ "ExcelDirectoryFileDataSetTest-0.xlsx");
+ dataSet.setNameRow(1);
+
+ @SuppressWarnings("unchecked")
+ DataSetResult result = dataSet.getResult(Collections.EMPTY_MAP);
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getData();
+
+ {
+ assertEquals(3, data.size());
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(15, ((Number) row.get("value")).intValue());
+ assertEquals(16, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-01", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(25, ((Number) row.get("value")).intValue());
+ assertEquals(26, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-02", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(35, ((Number) row.get("value")).intValue());
+ assertEquals(36, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-03", dateFormat.format((Date) row.get("date")));
+ }
+ }
+ }
+
+ @Test
+ public void getResultTest_xlsx_convertPropertyValue()
+ {
+ List properties = new ArrayList<>();
+ properties.add(new DataSetProperty("name", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("value", DataSetProperty.DataType.NUMBER));
+ properties.add(new DataSetProperty("size", DataSetProperty.DataType.STRING));
+ properties.add(new DataSetProperty("date", DataSetProperty.DataType.STRING));
+
+ ExcelDirectoryFileDataSet dataSet = new ExcelDirectoryFileDataSet("a", "a", properties, DIRECTORY,
+ "ExcelDirectoryFileDataSetTest-0.xlsx");
+ dataSet.setNameRow(1);
+
+ @SuppressWarnings("unchecked")
+ DataSetResult result = dataSet.getResult(Collections.EMPTY_MAP);
+ @SuppressWarnings("unchecked")
+ List> data = (List>) result.getData();
+
+ {
+ assertEquals(3, data.size());
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(15, ((Number) row.get("value")).intValue());
+ assertEquals("16", row.get("size"));
+ assertEquals("2020-08-01", row.get("date"));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(25, ((Number) row.get("value")).intValue());
+ assertEquals("26", row.get("size"));
+ assertEquals("2020-08-02", row.get("date"));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(35, ((Number) row.get("value")).intValue());
+ assertEquals("36", row.get("size"));
+ assertEquals("2020-08-03", row.get("date"));
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest_xlsx()
+ {
+ ExcelDirectoryFileDataSet dataSet = new ExcelDirectoryFileDataSet("a", "a", DIRECTORY,
+ "ExcelDirectoryFileDataSetTest-0.xlsx");
+ dataSet.setNameRow(1);
+
+ ResolvedDataSetResult resolvedResult = dataSet.resolve(new HashMap<>());
+
+ @SuppressWarnings("unchecked")
+ List> data = (List>) resolvedResult.getResult().getData();
+ List properties = resolvedResult.getProperties();
+
+ {
+ assertEquals(4, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("value", property.getName());
+ assertEquals(DataSetProperty.DataType.DECIMAL, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("size", property.getName());
+ assertEquals(DataSetProperty.DataType.DECIMAL, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(3);
+ assertEquals("date", property.getName());
+ assertEquals(DataSetProperty.DataType.DATE, property.getType());
+ }
+ }
+
+ {
+ assertEquals(3, data.size());
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(15, ((Number) row.get("value")).intValue());
+ assertEquals(16, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-01", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(25, ((Number) row.get("value")).intValue());
+ assertEquals(26, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-02", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(35, ((Number) row.get("value")).intValue());
+ assertEquals(36, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-03", dateFormat.format((Date) row.get("date")));
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest_xls()
+ {
+ ExcelDirectoryFileDataSet dataSet = new ExcelDirectoryFileDataSet("a", "a", DIRECTORY,
+ "ExcelDirectoryFileDataSetTest-1.xls");
+ dataSet.setNameRow(1);
+
+ ResolvedDataSetResult resolvedResult = dataSet.resolve(new HashMap<>());
+
+ @SuppressWarnings("unchecked")
+ List> data = (List>) resolvedResult.getResult().getData();
+ List properties = resolvedResult.getProperties();
+
+ {
+ assertEquals(4, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("value", property.getName());
+ assertEquals(DataSetProperty.DataType.DECIMAL, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("size", property.getName());
+ assertEquals(DataSetProperty.DataType.DECIMAL, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(3);
+ assertEquals("date", property.getName());
+ assertEquals(DataSetProperty.DataType.DATE, property.getType());
+ }
+ }
+
+ {
+ assertEquals(3, data.size());
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(15, ((Number) row.get("value")).intValue());
+ assertEquals(16, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-01", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(25, ((Number) row.get("value")).intValue());
+ assertEquals(26, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-02", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(35, ((Number) row.get("value")).intValue());
+ assertEquals(36, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-03", dateFormat.format((Date) row.get("date")));
+ }
+ }
+ }
+
+ @Test
+ public void resolveTest_dataRowColumnExp()
+ {
+ ExcelDirectoryFileDataSet dataSet = new ExcelDirectoryFileDataSet("a", "a", DIRECTORY,
+ "ExcelDirectoryFileDataSetTest-0.xlsx");
+ dataSet.setNameRow(1);
+ dataSet.setDataRowExp("2,3-");
+ dataSet.setDataColumnExp("A,C-");
+
+ ResolvedDataSetResult resolvedResult = dataSet.resolve(new HashMap<>());
+
+ @SuppressWarnings("unchecked")
+ List> data = (List>) resolvedResult.getResult().getData();
+ List properties = resolvedResult.getProperties();
+
+ {
+ assertEquals(3, properties.size());
+
+ {
+ DataSetProperty property = properties.get(0);
+ assertEquals("name", property.getName());
+ assertEquals(DataSetProperty.DataType.STRING, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(1);
+ assertEquals("size", property.getName());
+ assertEquals(DataSetProperty.DataType.DECIMAL, property.getType());
+ }
+
+ {
+ DataSetProperty property = properties.get(2);
+ assertEquals("date", property.getName());
+ assertEquals(DataSetProperty.DataType.DATE, property.getType());
+ }
+ }
+
+ {
+ assertEquals(3, data.size());
+
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+ {
+ Map row = data.get(0);
+
+ assertEquals("aaa", row.get("name"));
+ assertEquals(16, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-01", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(1);
+
+ assertEquals("bbb", row.get("name"));
+ assertEquals(26, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-02", dateFormat.format((Date) row.get("date")));
+ }
+
+ {
+ Map row = data.get(2);
+
+ assertEquals("ccc", row.get("name"));
+ assertEquals(36, ((Number) row.get("size")).intValue());
+ assertEquals("2020-08-03", dateFormat.format((Date) row.get("date")));
+ }
+ }
+ }
+}
diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/HttpDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/HttpDataSetTest.java
new file mode 100644
index 00000000..d9d427ed
--- /dev/null
+++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/HttpDataSetTest.java
@@ -0,0 +1,496 @@
+/*
+ * Copyright 2018 datagear.tech. All Rights Reserved.
+ */
+
+package org.datagear.analysis.support;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClients;
+import org.apache.hc.core5.http.ClassicHttpRequest;
+import org.apache.hc.core5.http.ClassicHttpResponse;
+import org.apache.hc.core5.http.ContentType;
+import org.apache.hc.core5.http.Header;
+import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpException;
+import org.apache.hc.core5.http.impl.bootstrap.HttpServer;
+import org.apache.hc.core5.http.impl.bootstrap.ServerBootstrap;
+import org.apache.hc.core5.http.io.HttpRequestHandler;
+import org.apache.hc.core5.http.io.entity.StringEntity;
+import org.apache.hc.core5.http.protocol.HttpContext;
+import org.datagear.analysis.DataSetParam;
+import org.datagear.analysis.DataSetProperty;
+import org.datagear.util.IOUtil;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * {@linkplain HttpDataSet}单元测试用例。
+ *
+ * @author datagear@163.com
+ *
+ */
+public class HttpDataSetTest
+{
+ protected static final int PORT = 50402;
+
+ protected static final String SERVER = "http://localhost:" + PORT;
+
+ protected static final String PARAM_NAME_0 = "param0";
+
+ protected static final String PARAM_NAME_1 = "param1";
+
+ protected static HttpServer server;
+
+ protected static CloseableHttpClient httpClient;
+
+ @BeforeClass
+ public static void initTestHttpServer() throws Throwable
+ {
+ server = ServerBootstrap.bootstrap().setListenerPort(PORT)
+ //
+ .register("/testSimple", new HttpRequestHandler()
+ {
+ @Override
+ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
+ throws HttpException, IOException
+ {
+ StringEntity responseEntity = new StringEntity(
+ "[{name: 'aaa', value: 11}, {name: '名称b', value: 22}]", ContentType.APPLICATION_JSON);
+ response.setEntity(responseEntity);
+ }
+ })
+ //
+ .register("/testParam", new HttpRequestHandler()
+ {
+ @Override
+ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
+ throws HttpException, IOException
+ {
+ Map params = parseRequestParams(request);
+ String p0 = params.get(PARAM_NAME_0);
+ String p1 = params.get(PARAM_NAME_1);
+
+ StringEntity responseEntity = new StringEntity("[{name: '" + PARAM_NAME_0 + "', value: '" + p0
+ + "'}, {name: '" + PARAM_NAME_1 + "', value: '" + p1 + "'}]",
+ ContentType.APPLICATION_JSON);
+ response.setEntity(responseEntity);
+ }
+ })
+ //
+ .register("/testJson", new HttpRequestHandler()
+ {
+ @Override
+ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
+ throws HttpException, IOException
+ {
+ String reqJson = getRequestStringContent(request);
+
+ StringEntity responseEntity = new StringEntity(reqJson, ContentType.APPLICATION_JSON);
+ response.setEntity(responseEntity);
+ }
+ })
+ //
+ .register("/testHeader", new HttpRequestHandler()
+ {
+ @Override
+ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
+ throws HttpException, IOException
+ {
+ Header h0 = request.getHeader(PARAM_NAME_0);
+ Header h1 = request.getHeader(PARAM_NAME_1);
+
+ StringEntity responseEntity = new StringEntity(
+ "[{name: '" + PARAM_NAME_0 + "', value: '" + h0.getValue() + "'}, {name: '"
+ + PARAM_NAME_1 + "', value: '" + h1.getValue() + "'}]",
+ ContentType.APPLICATION_JSON);
+ response.setEntity(responseEntity);
+ }
+ })
+ //
+ .register("/testResponseJsonPath", new HttpRequestHandler()
+ {
+ @Override
+ public void handle(ClassicHttpRequest request, ClassicHttpResponse response, HttpContext context)
+ throws HttpException, IOException
+ {
+ StringEntity responseEntity = new StringEntity(
+ "{ path0: { path1: [ { path2: [{name: 'aaa', value: 11}, {name: '名称b', value: 22}] } ] } }",
+ ContentType.APPLICATION_JSON);
+ response.setEntity(responseEntity);
+ }
+ })
+ //
+ .create();
+
+ server.start();
+
+ httpClient = HttpClients.createDefault();
+ }
+
+ @AfterClass
+ public static void closeHttpServer() throws Throwable
+ {
+ server.close();
+ httpClient.close();
+ }
+
+ @Test
+ public void resolveTest_onlyUri() throws Throwable
+ {
+ List params = Arrays.asList(new DataSetParam("param", DataSetParam.DataType.NUMBER, true));
+
+ HttpDataSet dataSet = new HttpDataSet(HttpDataSet.class.getName(), HttpDataSet.class.getName(), httpClient,
+ SERVER + "/testSimple?param=${param}");
+
+ dataSet.setParams(params);
+
+ Map