From aff81fb518d16236adf7583d3c60484c2ffe5930 Mon Sep 17 00:00:00 2001 From: datagear Date: Wed, 26 Aug 2020 19:27:49 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E9=99=A4DataSetResultTransformer?= =?UTF-8?q?=E7=B1=BB=E8=AE=BE=E8=AE=A1=EF=BC=8C=E5=AE=83=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=86DataSet=E6=A6=82=E5=BF=B5=E7=9A=84=E5=A4=8D=E6=9D=82?= =?UTF-8?q?=E6=80=A7=EF=BC=8C=E5=90=8E=E7=BB=AD=E5=86=8D=E8=80=83=E8=99=91?= =?UTF-8?q?=E9=87=87=E7=94=A8=E7=BB=84=E5=90=88=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E6=9D=A5=E5=AE=9E=E7=8E=B0=E7=9B=B8=E5=90=8C?= =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../support/AbstractJsonFileDataSet.java | 4 +- .../support/AbstractJsonSourceDataSet.java | 79 ------------------- .../DataSetResultTransformException.java | 41 ---------- .../support/DataSetResultTransformer.java | 33 -------- 4 files changed, 2 insertions(+), 155 deletions(-) delete mode 100644 datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonSourceDataSet.java delete mode 100644 datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformException.java delete mode 100644 datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformer.java diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonFileDataSet.java index 4740ef24..4ebb34c8 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonFileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonFileDataSet.java @@ -21,7 +21,7 @@ import org.datagear.analysis.DataSetResult; * @author datagear@163.com * */ -public abstract class AbstractJsonFileDataSet extends AbstractJsonSourceDataSet +public abstract class AbstractJsonFileDataSet extends AbstractJsonDataSet { public static final String DEFAULT_ENCODING = "UTF-8"; @@ -54,7 +54,7 @@ public abstract class AbstractJsonFileDataSet extends AbstractJsonSourceDataSet } @Override - protected DataSetResult getOrginalResult(Map paramValues) throws DataSetException + public DataSetResult getResult(Map paramValues) throws DataSetException { File jsonFile = getJsonFile(paramValues); Object data = getJsonDataSetSupport().resolveResultData(jsonFile, getEncoding()); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonSourceDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonSourceDataSet.java deleted file mode 100644 index 0cfc4198..00000000 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonSourceDataSet.java +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright (c) 2018 datagear.tech. All Rights Reserved. - */ - -/** - * - */ -package org.datagear.analysis.support; - -import java.util.List; -import java.util.Map; - -import org.datagear.analysis.DataSetException; -import org.datagear.analysis.DataSetProperty; -import org.datagear.analysis.DataSetResult; - -/** - * 抽象JSON源数据集。 - *

- * JSON源数据集的一个特点是：源数据是无法编辑的，因此需要定义{@linkplain DataSetResultTransformer}逻辑。 - *

- * - * @author datagear@163.com - * - */ -public abstract class AbstractJsonSourceDataSet extends AbstractJsonDataSet -{ - private DataSetResultTransformer dataSetResultTransformer; - - public AbstractJsonSourceDataSet() - { - super(); - } - - public AbstractJsonSourceDataSet(String id, String name) - { - super(id, name); - } - - public AbstractJsonSourceDataSet(String id, String name, List properties) - { - super(id, name, properties); - } - - /** - * 获取{@linkplain DataSetResultTransformer}。 - * - * @return 可能为{@code null} - */ - public DataSetResultTransformer getDataSetResultTransformer() - { - return dataSetResultTransformer; - } - - public void setDataSetResultTransformer(DataSetResultTransformer dataSetResultTransformer) - { - this.dataSetResultTransformer = dataSetResultTransformer; - } - - @Override - public DataSetResult getResult(Map paramValues) throws DataSetException - { - DataSetResult result = getOrginalResult(paramValues); - - if (this.dataSetResultTransformer == null) - return result; - - return this.dataSetResultTransformer.transform(result); - } - - /** - * 获取原始的{@linkplain DataSetResult}。 - * - * @param paramValues - * @return - * @throws DataSetException - */ - protected abstract DataSetResult getOrginalResult(Map paramValues) throws DataSetException; -} diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformException.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformException.java deleted file mode 100644 index b10570a6..00000000 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformException.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2018 datagear.tech. All Rights Reserved. - */ - -/** - * - */ -package org.datagear.analysis.support; - -import org.datagear.analysis.DataSetException; - -/** - * {@linkplain DataSetResultTransformer}转换异常。 - * - * @author datagear@163.com - * - */ -public class DataSetResultTransformException extends DataSetException -{ - private static final long serialVersionUID = 1L; - - public DataSetResultTransformException() - { - super(); - } - - public DataSetResultTransformException(String message) - { - super(message); - } - - public DataSetResultTransformException(Throwable cause) - { - super(cause); - } - - public DataSetResultTransformException(String message, Throwable cause) - { - super(message, cause); - } -} diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformer.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformer.java deleted file mode 100644 index ad7124b8..00000000 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/DataSetResultTransformer.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (c) 2018 datagear.tech. All Rights Reserved. - */ - -/** - * - */ -package org.datagear.analysis.support; - -import org.datagear.analysis.DataSet; -import org.datagear.analysis.DataSetResult; - -/** - * {@linkplain DataSetResult}转换器。 - *

- * 某些类型的{@linkplain DataSet}是从不可控制的数据源中读取数据的（比如API调用、JSON文件、CSV文件）， - * 此类即为这些场景提供支持，使{@linkplain DataSet}支持对数据源的数据进行转换。 - *

- * - * @author datagear@163.com - * - */ -public interface DataSetResultTransformer -{ - /** - * 转换为新的{@linkplain DataSetResult}。 - * - * @param orginalResult - * @return 已转换的{@linkplain DataSetResult} - * @throws DataSetResultTransformException - */ - DataSetResult transform(DataSetResult orginalResult) throws DataSetResultTransformException; -}