diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/AbstractDataNameType.java b/datagear-analysis/src/main/java/org/datagear/analysis/AbstractDataNameType.java index 4e1a30f0..b1fa6dc6 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/AbstractDataNameType.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/AbstractDataNameType.java @@ -7,14 +7,18 @@ package org.datagear.analysis; +import java.io.Serializable; + /** * 抽象{@linkplain DataNameType}。 * * @author datagear@163.com * */ -public abstract class AbstractDataNameType implements DataNameType +public abstract class AbstractDataNameType implements DataNameType, Serializable { + private static final long serialVersionUID = 1L; + /** 名称 */ private String name; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/Chart.java b/datagear-analysis/src/main/java/org/datagear/analysis/Chart.java index bb662792..0ae083db 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/Chart.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/Chart.java @@ -15,9 +15,11 @@ package org.datagear.analysis; */ public class Chart extends ChartDefinition { + private static final long serialVersionUID = 1L; + private ChartPlugin plugin; - private RenderContext renderContext; + private transient RenderContext renderContext; public Chart() { diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/ChartDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/ChartDataSet.java index adf8069e..8fa915f6 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/ChartDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/ChartDataSet.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.Collections; import java.util.Map; import java.util.Set; @@ -20,8 +21,10 @@ import java.util.Set; * @author datagear@163.com * */ -public class ChartDataSet +public class ChartDataSet implements Serializable { + private static final long serialVersionUID = 1L; + /** 数据集 */ private DataSet dataSet; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/ChartDefinition.java b/datagear-analysis/src/main/java/org/datagear/analysis/ChartDefinition.java index c6eccd01..41f82343 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/ChartDefinition.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/ChartDefinition.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -19,8 +20,10 @@ import java.util.Map; * @author datagear@163.com * */ -public class ChartDefinition extends AbstractIdentifiable implements ResultDataFormatAware +public class ChartDefinition extends AbstractIdentifiable implements ResultDataFormatAware, Serializable { + private static final long serialVersionUID = 1L; + public static final String PROPERTY_ID = "id"; public static final String PROPERTY_NAME = "name"; public static final String PROPERTY_CHART_DATASETS = "chartDataSets"; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/ChartPlugin.java b/datagear-analysis/src/main/java/org/datagear/analysis/ChartPlugin.java index d77c09d6..3422ebe6 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/ChartPlugin.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/ChartPlugin.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.List; import java.util.Map; @@ -19,7 +20,7 @@ import org.datagear.util.i18n.Labeled; * @author datagear@163.com * */ -public interface ChartPlugin extends Identifiable, Labeled +public interface ChartPlugin extends Identifiable, Labeled, Serializable { String PROPERTY_ID = "id"; String PROPERTY_NAME_LABEL = Labeled.PROPERTY_NAME_LABEL; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/ChartQuery.java b/datagear-analysis/src/main/java/org/datagear/analysis/ChartQuery.java index bdf17940..62448e7f 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/ChartQuery.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/ChartQuery.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.Collections; import java.util.List; @@ -16,8 +17,10 @@ import java.util.List; * @author datagear@163.com * */ -public class ChartQuery implements ResultDataFormatAware +public class ChartQuery implements ResultDataFormatAware, Serializable { + private static final long serialVersionUID = 1L; + private List dataSetQueries = Collections.emptyList(); /** 图表结果数格式 */ diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/Dashboard.java b/datagear-analysis/src/main/java/org/datagear/analysis/Dashboard.java index 19672387..10abccb2 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/Dashboard.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/Dashboard.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -17,14 +18,16 @@ import java.util.Map; * @author datagear@163.com * */ -public class Dashboard extends AbstractIdentifiable +public class Dashboard extends AbstractIdentifiable implements Serializable { + private static final long serialVersionUID = 1L; + public static final String PROPERTY_ID = "id"; public static final String PROPERTY_RENDER_CONTEXT = "renderContext"; public static final String PROPERTY_WIDGET = "widget"; public static final String PROPERTY_CHARTS = "charts"; - private RenderContext renderContext; + private transient RenderContext renderContext; private DashboardWidget widget; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DashboardQuery.java b/datagear-analysis/src/main/java/org/datagear/analysis/DashboardQuery.java index 4c522621..49186194 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DashboardQuery.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DashboardQuery.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.Collections; import java.util.Map; @@ -16,8 +17,10 @@ import java.util.Map; * @author datagear@163.com * */ -public class DashboardQuery implements ResultDataFormatAware +public class DashboardQuery implements ResultDataFormatAware, Serializable { + private static final long serialVersionUID = 1L; + /** 图表ID-查询映射表 */ private Map chartQueries = Collections.emptyMap(); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DashboardWidget.java b/datagear-analysis/src/main/java/org/datagear/analysis/DashboardWidget.java index 4c11d660..d2be46c6 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DashboardWidget.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DashboardWidget.java @@ -7,6 +7,8 @@ package org.datagear.analysis; +import java.io.Serializable; + /** * 看板部件。 *

@@ -16,7 +18,7 @@ package org.datagear.analysis; * @author datagear@163.com * */ -public interface DashboardWidget extends Identifiable +public interface DashboardWidget extends Identifiable, Serializable { /** * 渲染{@linkplain Dashboard}。 diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java index 1eecf637..4b6b7c58 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.List; /** @@ -15,7 +16,7 @@ import java.util.List; * @author datagear@163.com * */ -public interface DataSet extends Identifiable +public interface DataSet extends Identifiable, Serializable { /** * 获取名称。 diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DataSetParam.java b/datagear-analysis/src/main/java/org/datagear/analysis/DataSetParam.java index 9ea8ce2f..cb9da9a8 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DataSetParam.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DataSetParam.java @@ -18,6 +18,8 @@ package org.datagear.analysis; */ public class DataSetParam extends AbstractDataNameType { + private static final long serialVersionUID = 1L; + /** 是否必须 */ private boolean required; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DataSetQuery.java b/datagear-analysis/src/main/java/org/datagear/analysis/DataSetQuery.java index 05c829a5..3ccd72dc 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DataSetQuery.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DataSetQuery.java @@ -7,6 +7,7 @@ package org.datagear.analysis; +import java.io.Serializable; import java.util.Collections; import java.util.Map; @@ -19,8 +20,10 @@ import java.util.Map; * @author datagear@163.com * */ -public class DataSetQuery implements ResultDataFormatAware +public class DataSetQuery implements ResultDataFormatAware, Serializable { + private static final long serialVersionUID = 1L; + /** 参数值映射表 */ private Map paramValues = Collections.emptyMap(); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/Icon.java b/datagear-analysis/src/main/java/org/datagear/analysis/Icon.java index a33b2a77..debfef69 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/Icon.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/Icon.java @@ -9,6 +9,7 @@ package org.datagear.analysis; import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; /** * 图标。 @@ -16,7 +17,7 @@ import java.io.InputStream; * @author datagear@163.com * */ -public interface Icon +public interface Icon extends Serializable { /** * 获取图标类型：{@code png}、{@code jpeg}等，未知则返回空字符串。 diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/TemplateDashboardWidget.java b/datagear-analysis/src/main/java/org/datagear/analysis/TemplateDashboardWidget.java index 14c02cc2..6ad6295d 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/TemplateDashboardWidget.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/TemplateDashboardWidget.java @@ -25,6 +25,8 @@ import org.datagear.util.StringUtil; */ public abstract class TemplateDashboardWidget extends AbstractIdentifiable implements DashboardWidget { + private static final long serialVersionUID = 1L; + public static final String DEFAULT_TEMPLATE_ENCODING = "UTF-8"; private String[] templates; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractChartPlugin.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractChartPlugin.java index 6561380c..8b238669 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractChartPlugin.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractChartPlugin.java @@ -26,6 +26,8 @@ import org.datagear.util.i18n.Label; */ public abstract class AbstractChartPlugin extends AbstractIdentifiable implements ChartPlugin { + private static final long serialVersionUID = 1L; + private Label nameLabel; private Label descLabel; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvDataSet.java index d0d687e5..4c2e8a7f 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvDataSet.java @@ -34,6 +34,8 @@ import org.datagear.util.IOUtil; */ public abstract class AbstractCsvDataSet extends AbstractResolvableDataSet implements ResolvableDataSet { + private static final long serialVersionUID = 1L; + public static final DataSetFmkTemplateResolver CSV_TEMPLATE_RESOLVER = new DataSetFmkTemplateResolver( CsvOutputFormat.INSTANCE); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvFileDataSet.java index f497b9eb..5ff70c15 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvFileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractCsvFileDataSet.java @@ -26,6 +26,8 @@ import org.datagear.util.IOUtil; */ public abstract class AbstractCsvFileDataSet extends AbstractCsvDataSet { + private static final long serialVersionUID = 1L; + /** 文件编码 */ private String encoding = IOUtil.CHARSET_UTF_8; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java index eefaa3af..88ec2d15 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java @@ -33,6 +33,8 @@ import org.datagear.analysis.ResultDataFormat; */ public abstract class AbstractDataSet extends AbstractIdentifiable implements DataSet { + private static final long serialVersionUID = 1L; + public static final DataSetFmkTemplateResolver GENERAL_TEMPLATE_RESOLVER = new DataSetFmkTemplateResolver(); private String name; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractExcelDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractExcelDataSet.java index 6d6b1f49..b1c28ffe 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractExcelDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractExcelDataSet.java @@ -58,6 +58,8 @@ import org.slf4j.LoggerFactory; */ public abstract class AbstractExcelDataSet extends AbstractResolvableDataSet implements ResolvableDataSet { + private static final long serialVersionUID = 1L; + protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractExcelDataSet.class); public static final String EXTENSION_XLSX = "xlsx"; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonDataSet.java index 23d4b984..819c8ce8 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractJsonDataSet.java @@ -42,6 +42,8 @@ import com.jayway.jsonpath.spi.mapper.JacksonMappingProvider; */ public abstract class AbstractJsonDataSet extends AbstractResolvableDataSet implements ResolvableDataSet { + private static final long serialVersionUID = 1L; + public static final DataSetFmkTemplateResolver JSON_TEMPLATE_RESOLVER = new DataSetFmkTemplateResolver( JsonOutputFormat.INSTANCE); 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 484a28d6..50ed4fe1 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 @@ -26,6 +26,8 @@ import org.datagear.util.IOUtil; */ public abstract class AbstractJsonFileDataSet extends AbstractJsonDataSet { + private static final long serialVersionUID = 1L; + /** 文件编码 */ private String encoding = IOUtil.CHARSET_UTF_8; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractResolvableDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractResolvableDataSet.java index 69aea4a3..cde6b4f1 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractResolvableDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractResolvableDataSet.java @@ -26,6 +26,8 @@ import org.datagear.analysis.ResolvedDataSetResult; */ public abstract class AbstractResolvableDataSet extends AbstractDataSet implements ResolvableDataSet { + private static final long serialVersionUID = 1L; + public AbstractResolvableDataSet() { super(); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/BytesIcon.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/BytesIcon.java index 68f681b4..5e89fcc0 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/BytesIcon.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/BytesIcon.java @@ -25,6 +25,8 @@ import org.datagear.util.IOUtil; */ public class BytesIcon implements Icon { + private static final long serialVersionUID = 1L; + private String type; private byte[] bytes; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/ChartWidget.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/ChartWidget.java index 24fecdec..0a023091 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/ChartWidget.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/ChartWidget.java @@ -7,6 +7,7 @@ package org.datagear.analysis.support; +import java.io.Serializable; import java.util.HashMap; import java.util.Map; @@ -28,8 +29,10 @@ import org.datagear.util.IDUtil; * @author datagear@163.com * */ -public class ChartWidget extends ChartDefinition +public class ChartWidget extends ChartDefinition implements Serializable { + private static final long serialVersionUID = 1L; + /** 图表部件渲染时的部件信息属性名 */ public static final String ATTR_CHART_WIDGET = "chartWidget"; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvDirectoryFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvDirectoryFileDataSet.java index 0685ed66..36f5ebe7 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvDirectoryFileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvDirectoryFileDataSet.java @@ -26,6 +26,8 @@ import org.datagear.util.FileUtil; */ public class CsvDirectoryFileDataSet extends AbstractCsvFileDataSet { + private static final long serialVersionUID = 1L; + /** CSV文件所在的目录 */ private File directory; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvValueDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvValueDataSet.java index 3d550aca..d48ff9be 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvValueDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/CsvValueDataSet.java @@ -26,6 +26,8 @@ import org.datagear.util.IOUtil; */ public class CsvValueDataSet extends AbstractCsvDataSet { + private static final long serialVersionUID = 1L; + /** CSV字符串 */ private String value; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/ExcelDirectoryFileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/ExcelDirectoryFileDataSet.java index 7902ec53..d46d15a0 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/ExcelDirectoryFileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/ExcelDirectoryFileDataSet.java @@ -27,6 +27,8 @@ import org.datagear.util.FileUtil; */ public class ExcelDirectoryFileDataSet extends AbstractExcelDataSet { + private static final long serialVersionUID = 1L; + /** Excel文件所在的目录 */ private File directory; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/HttpDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/HttpDataSet.java index 78533861..fbe3d405 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/HttpDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/HttpDataSet.java @@ -56,6 +56,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; */ public class HttpDataSet extends AbstractResolvableDataSet { + private static final long serialVersionUID = 1L; + protected static final Logger LOGGER = LoggerFactory.getLogger(HttpDataSet.class); public static final String REQUEST_METHOD_GET = "GET"; @@ -91,7 +93,7 @@ public class HttpDataSet extends AbstractResolvableDataSet protected static final List NOT_NAME_VALUE_PAIR_OBJ_ARRAY_JSON = new ArrayList<>(0); /** HTTP客户端 */ - private HttpClient httpClient; + private transient HttpClient httpClient; /** HTTP请求地址 */ private String uri; @@ -625,7 +627,9 @@ public class HttpDataSet extends AbstractResolvableDataSet protected static class HttpResponseJsonDataSet extends AbstractJsonDataSet { - private Reader responseJsonReader; + private static final long serialVersionUID = 1L; + + private transient Reader responseJsonReader; public HttpResponseJsonDataSet(Reader responseJsonReader) { 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 72568c92..aa872cbb 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 @@ -27,6 +27,8 @@ import org.datagear.util.FileUtil; */ public class JsonDirectoryFileDataSet extends AbstractJsonFileDataSet { + private static final long serialVersionUID = 1L; + /** JSON文件所在的目录 */ private File directory; 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 6baab765..b8407acb 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 @@ -26,6 +26,8 @@ import org.datagear.util.IOUtil; */ public class JsonValueDataSet extends AbstractJsonDataSet { + private static final long serialVersionUID = 1L; + private String value; public JsonValueDataSet() diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/ProfileDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/ProfileDataSet.java index bf181b10..a9bd2fc5 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/ProfileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/ProfileDataSet.java @@ -26,6 +26,8 @@ import org.datagear.analysis.DataSetResult; */ public class ProfileDataSet extends AbstractDataSet { + private static final long serialVersionUID = 1L; + public ProfileDataSet() { } 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 index 352aa3f2..90bb5c85 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleCsvFileDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleCsvFileDataSet.java @@ -24,6 +24,8 @@ import org.datagear.analysis.DataSetQuery; */ public class SimpleCsvFileDataSet extends AbstractCsvFileDataSet { + private static final long serialVersionUID = 1L; + /** CSV文件 */ private File 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 index 39d5a522..3e10125f 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleExcelDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleExcelDataSet.java @@ -25,6 +25,8 @@ import org.datagear.analysis.DataSetQuery; */ public class SimpleExcelDataSet extends AbstractExcelDataSet { + private static final long serialVersionUID = 1L; + /** Excel文件 */ private File 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 a88bb0ac..5f50ea2b 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 @@ -25,6 +25,8 @@ import org.datagear.analysis.DataSetQuery; */ public class SimpleJsonFileDataSet extends AbstractJsonFileDataSet { + private static final long serialVersionUID = 1L; + /** JSON文件 */ private File file; 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 3e1ea2e8..6417a5a0 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 @@ -47,6 +47,8 @@ import org.slf4j.LoggerFactory; */ public class SqlDataSet extends AbstractResolvableDataSet implements ResolvableDataSet { + private static final long serialVersionUID = 1L; + private static final Logger LOGGER = LoggerFactory.getLogger(SqlDataSet.class); public static final DataSetFmkTemplateResolver SQL_TEMPLATE_RESOLVER = new DataSetFmkTemplateResolver( diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AbstractHtmlScriptObjectWriter.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AbstractHtmlScriptObjectWriter.java index c5577401..22b42d96 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AbstractHtmlScriptObjectWriter.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AbstractHtmlScriptObjectWriter.java @@ -170,6 +170,8 @@ public abstract class AbstractHtmlScriptObjectWriter protected static class RefHtmlChartPlugin extends HtmlChartPlugin implements JsonRefObject { + private static final long serialVersionUID = 1L; + private String refName; public RefHtmlChartPlugin(String refName) diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AttributeValueHtmlChartPlugin.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AttributeValueHtmlChartPlugin.java index 5caf32ee..12442464 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AttributeValueHtmlChartPlugin.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/AttributeValueHtmlChartPlugin.java @@ -22,6 +22,8 @@ import org.datagear.util.i18n.Label; */ public class AttributeValueHtmlChartPlugin extends HtmlChartPlugin { + private static final long serialVersionUID = 1L; + private String chartAttributeName; public AttributeValueHtmlChartPlugin() diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChart.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChart.java index b1f8e8d0..d5fce66c 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChart.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChart.java @@ -21,6 +21,8 @@ import org.datagear.analysis.RenderContext; */ public class HtmlChart extends Chart { + private static final long serialVersionUID = 1L; + /** 图表的HTML元素ID */ private String elementId; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPlugin.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPlugin.java index aca4ad41..ae71cb4b 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPlugin.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPlugin.java @@ -58,6 +58,8 @@ import org.datagear.util.i18n.Label; */ public class HtmlChartPlugin extends AbstractChartPlugin { + private static final long serialVersionUID = 1L; + public static final String PROPERTY_CHART_RENDERER = "chartRenderer"; /** HTML换行符 */ diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginScriptObjectWriter.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginScriptObjectWriter.java index c3181c97..28d267e9 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginScriptObjectWriter.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartPluginScriptObjectWriter.java @@ -100,6 +100,8 @@ public class HtmlChartPluginScriptObjectWriter extends AbstractHtmlScriptObjectW */ protected static class HtmlChartPluginJson extends AbstractChartPlugin { + private static final long serialVersionUID = 1L; + public HtmlChartPluginJson(HtmlChartPlugin plugin) { super(plugin.getId(), plugin.getNameLabel()); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java index a0af58c6..c7cd3e57 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java @@ -104,6 +104,8 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter */ protected static class HtmlChartJson extends HtmlChart { + private static final long serialVersionUID = 1L; + public HtmlChartJson(HtmlChart htmlChart, String renderContextVarName, String pluginVarName) { super(htmlChart); @@ -121,6 +123,8 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter */ protected static class ChartDataSetJson extends ChartDataSet { + private static final long serialVersionUID = 1L; + public ChartDataSetJson(ChartDataSet chartDataSet) { super(new DataSetJson(chartDataSet.getDataSet())); @@ -159,6 +163,8 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter */ protected static class DataSetJson extends AbstractDataSet { + private static final long serialVersionUID = 1L; + public DataSetJson(DataSet dataSet) { super(dataSet.getId(), dataSet.getName(), dataSet.getProperties()); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartWidget.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartWidget.java index 756b1c8b..cf55526f 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartWidget.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartWidget.java @@ -28,6 +28,8 @@ import org.datagear.analysis.support.html.HtmlChartRenderAttr.HtmlChartRenderOpt */ public class HtmlChartWidget extends ChartWidget { + private static final long serialVersionUID = 1L; + public HtmlChartWidget() { super(); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboard.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboard.java index e6f2d863..f77eebff 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboard.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboard.java @@ -19,6 +19,8 @@ import org.datagear.analysis.TemplateDashboard; */ public class HtmlTplDashboard extends TemplateDashboard { + private static final long serialVersionUID = 1L; + /** 看板JS对象变量名 */ private String varName; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardScriptObjectWriter.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardScriptObjectWriter.java index ba2b96e8..0ce93fb7 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardScriptObjectWriter.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardScriptObjectWriter.java @@ -71,6 +71,8 @@ public class HtmlTplDashboardScriptObjectWriter extends AbstractHtmlScriptObject */ protected static class HtmlTplDashboardJson extends HtmlTplDashboard { + private static final long serialVersionUID = 1L; + @SuppressWarnings("unchecked") public HtmlTplDashboardJson(HtmlTplDashboard dashboard, String renderContextVarName) { @@ -89,6 +91,8 @@ public class HtmlTplDashboardScriptObjectWriter extends AbstractHtmlScriptObject */ protected static class TemplateDashboardWidgetJson extends HtmlTplDashboardWidget { + private static final long serialVersionUID = 1L; + public TemplateDashboardWidgetJson(HtmlTplDashboardWidget dashboardWidget) { super(dashboardWidget.getId(), dashboardWidget.getTemplates(), null); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardWidget.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardWidget.java index 7054f385..bd2d7cac 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardWidget.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlTplDashboardWidget.java @@ -28,7 +28,9 @@ import org.datagear.analysis.support.html.HtmlTplDashboardRenderAttr.WebContext; */ public class HtmlTplDashboardWidget extends TemplateDashboardWidget { - private HtmlTplDashboardWidgetRenderer renderer; + private static final long serialVersionUID = 1L; + + private transient HtmlTplDashboardWidgetRenderer renderer; public HtmlTplDashboardWidget() { diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/JsChartRenderer.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/JsChartRenderer.java index 9cc78493..58bff128 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/JsChartRenderer.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/JsChartRenderer.java @@ -9,6 +9,7 @@ package org.datagear.analysis.support.html; import java.io.IOException; import java.io.Reader; +import java.io.Serializable; /** * JS图表渲染器。 @@ -34,7 +35,7 @@ import java.io.Reader; * @author datagear@163.com * */ -public interface JsChartRenderer +public interface JsChartRenderer extends Serializable { /** JS图表渲染器的渲染函数名 */ public static final String RENDER_FUNCTION_NAME = "render"; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/SimpleHtmlTplDashboardImport.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/SimpleHtmlTplDashboardImport.java index 0da8b3b2..1145b52b 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/SimpleHtmlTplDashboardImport.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/SimpleHtmlTplDashboardImport.java @@ -7,6 +7,7 @@ package org.datagear.analysis.support.html; +import java.io.Serializable; import java.util.Collections; import java.util.List; @@ -16,8 +17,10 @@ import java.util.List; * @author datagear@163.com * */ -public class SimpleHtmlTplDashboardImport implements HtmlTplDashboardImport +public class SimpleHtmlTplDashboardImport implements HtmlTplDashboardImport, Serializable { + private static final long serialVersionUID = 1L; + private List importItems = Collections.emptyList(); public SimpleHtmlTplDashboardImport() diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/StringJsChartRenderer.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/StringJsChartRenderer.java index b274c035..791ece8d 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/StringJsChartRenderer.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/StringJsChartRenderer.java @@ -9,7 +9,6 @@ package org.datagear.analysis.support.html; import java.io.IOException; import java.io.Reader; -import java.io.Serializable; import java.io.StringReader; /** @@ -18,7 +17,7 @@ import java.io.StringReader; * @author datagear@163.com * */ -public class StringJsChartRenderer implements JsChartRenderer, Serializable +public class StringJsChartRenderer implements JsChartRenderer { private static final long serialVersionUID = 1L; diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractDataSetTest.java index 3d506d66..dda591eb 100644 --- a/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractDataSetTest.java +++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractDataSetTest.java @@ -309,6 +309,8 @@ public class AbstractDataSetTest private static class TestAbstractDataSet extends AbstractDataSet { + private static final long serialVersionUID = 1L; + @Override public DataSetResult getResult(DataSetQuery query) throws DataSetException { diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractResolvableDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractResolvableDataSetTest.java index faf57e67..3022cce3 100644 --- a/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractResolvableDataSetTest.java +++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/AbstractResolvableDataSetTest.java @@ -81,6 +81,8 @@ public class AbstractResolvableDataSetTest private static class TestAbstractResolvableDataSet extends AbstractResolvableDataSet { + private static final long serialVersionUID = 1L; + @Override protected ResolvedDataSetResult resolveResult(DataSetQuery query, List properties, boolean resolveProperties) throws DataSetException diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.java index ba6540d2..a70a6cd8 100644 --- a/datagear-analysis/src/test/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.java +++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/JsonChartPluginPropertiesResolverTest.java @@ -169,6 +169,8 @@ public class JsonChartPluginPropertiesResolverTest private static class TestChartPlugin extends AbstractChartPlugin { + private static final long serialVersionUID = 1L; + public TestChartPlugin() { super(); diff --git a/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java b/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java index 32d6d6a4..bcc2df48 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/ChartDataSetVO.java @@ -22,6 +22,8 @@ import com.fasterxml.jackson.annotation.JsonIgnore; */ public class ChartDataSetVO extends ChartDataSet implements CloneableEntity { + private static final long serialVersionUID = 1L; + public ChartDataSetVO() { super(); diff --git a/datagear-management/src/main/java/org/datagear/management/domain/CloneableEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/CloneableEntity.java index 5521cd92..cd95e232 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/CloneableEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/CloneableEntity.java @@ -9,6 +9,9 @@ package org.datagear.management.domain; /** * 可克隆实体。 + *

+ * 此接口主要为无序列化缓存（比如进程内缓存）提供支持：先克隆实体再存入缓存，从缓存中取出实体后，先克隆再返回，避免实体被修改，导致缓存混乱。 + *

* * @author datagear@163.com * @@ -20,9 +23,11 @@ public interface CloneableEntity extends Cloneable *

* 实现方法应遵循如下克隆规则： *

- *

- * 如果属性值是实体对象，则应仅克隆引用；否则，应对属性值进行深度克隆。 - *

+ * * * @return */ diff --git a/datagear-management/src/main/java/org/datagear/management/domain/SchemaConnectionFactory.java b/datagear-management/src/main/java/org/datagear/management/domain/SchemaConnectionFactory.java index e7d70dbe..e57e5abd 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/SchemaConnectionFactory.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/SchemaConnectionFactory.java @@ -7,6 +7,7 @@ package org.datagear.management.domain; +import java.io.Serializable; import java.sql.Connection; import org.datagear.connection.ConnectionSource; @@ -20,9 +21,11 @@ import org.datagear.util.resource.ConnectionFactory; * @author datagear@163.com * */ -public class SchemaConnectionFactory extends SchemaConnectionSupport implements ConnectionFactory +public class SchemaConnectionFactory extends SchemaConnectionSupport implements ConnectionFactory, Serializable { - private ConnectionSource connectionSource; + private static final long serialVersionUID = 1L; + + private transient ConnectionSource connectionSource; private Schema schema; diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java index fd66050a..9f765311 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/AbstractMybatisEntityService.java @@ -135,6 +135,12 @@ public abstract class AbstractMybatisEntityService> ext /** * 获取实体。 + *

+ * 此方法先从缓存中获取实体，如果没有，则调用{@linkplain #getByIdFromDB(Object, Map)}从底层数据库获取。 + *

+ *

+ * 注意：在调用此方法获取实体后，应重新设置其引用的实体对象属性值，以保证它们是最新的。 + *

* * @param id * @param params @@ -227,7 +233,7 @@ public abstract class AbstractMybatisEntityService> ext /** * 是否开启缓存。 *

- * 子类应注意是否需要重写{@linkplain #cacheCloneValue(Entity)}方法。 + * 子类应注意是否需要重写{@linkplain #cacheCloneEntity(Entity)}方法。 *

* * @return @@ -238,9 +244,12 @@ public abstract class AbstractMybatisEntityService> ext } /** - * 拷贝缓存值。 + * 克隆缓存实体。 *

- * 当从缓存中取出对象时{@linkplain #cacheGet(Object)}、将对象放入缓存时{@linkplain #cachePut(Object, Entity)}，进行拷贝。 + * 参考{@linkplain #cacheGet(Object)}、{@linkplain #cachePut(Object, Entity)}、{@linkplain #cachePutQueryResult(List)}。 + *

+ *

+ * 对于无序列化缓存（比如进程内缓存），应遵循{@linkplain CloneableEntity#clone()}规则；对于序列化缓存，则可直接返回原实体。 *

*

* 此方法默认是现是：如果{@code value}是{@linkplain CloneableEntity}，则返回{@linkplain CloneableEntity#clone()}，否则，返回原对象。 @@ -250,7 +259,7 @@ public abstract class AbstractMybatisEntityService> ext * @return */ @SuppressWarnings("unchecked") - protected T cacheCloneValue(T value) + protected T cacheCloneEntity(T value) { if (value instanceof CloneableEntity) return (T) ((CloneableEntity) value).clone(); @@ -269,6 +278,15 @@ public abstract class AbstractMybatisEntityService> ext return id; } + /** + * 从缓存中读取实体。 + *

+ * 此方法将使用{@linkplain #cacheCloneEntity(Entity)}返回克隆后的实体对象。 + *

+ * + * @param id + * @return + */ protected ValueWrapper cacheGet(ID id) { if (!cacheEnabled()) @@ -283,22 +301,39 @@ public abstract class AbstractMybatisEntityService> ext T value = (T) valueWrapper.get(); if (value != null) - value = cacheCloneValue(value); + value = cacheCloneEntity(value); return new SimpleValueWrapper(value); } + /** + * 将实体存入缓存。 + *

+ * 此方法将使用{@linkplain #cacheCloneEntity(Entity)}缓存克隆后的实体对象。 + *

+ * + * @param id + * @param value + */ protected void cachePut(ID id, T value) { if (!cacheEnabled()) return; if (value != null) - value = cacheCloneValue(value); + value = cacheCloneEntity(value); cachePut(getCache(), toCacheKey(id), value); } + /** + * 将实体存入缓存。 + *

+ * 此方法将使用{@linkplain #cacheCloneEntity(Entity)}缓存克隆后的实体对象。 + *

+ * + * @param values + */ protected void cachePutQueryResult(List values) { if (!cacheEnabled()) @@ -312,7 +347,7 @@ public abstract class AbstractMybatisEntityService> ext if (value != null) { - value = cacheCloneValue(value); + value = cacheCloneEntity(value); cachePut(getCache(), toCacheKey(value.getId()), value); } } diff --git a/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java b/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java index d4fe03bb..8021b4d4 100644 --- a/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java +++ b/datagear-management/src/main/java/org/datagear/management/service/impl/HtmlChartWidgetEntityServiceImpl.java @@ -564,6 +564,8 @@ public class HtmlChartWidgetEntityServiceImpl protected static class IdDataSet extends AbstractIdentifiable implements DataSet { + private static final long serialVersionUID = 1L; + public IdDataSet() { super(); diff --git a/datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java b/datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java index 27e916df..8ea11e1a 100644 --- a/datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java +++ b/datagear-web/src/main/java/org/datagear/web/controller/AbstractChartPluginAwareController.java @@ -293,6 +293,8 @@ public class AbstractChartPluginAwareController extends AbstractDataAnalysisCont */ public static class ChartDataSetViewObj extends ChartDataSet { + private static final long serialVersionUID = 1L; + public ChartDataSetViewObj() { super();