Browse Source

clone问题

master 2.0.3
richie 4 years ago
parent
commit
36333811f3
  1. 3
      plugin.xml
  2. 6
      src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java

3
plugin.xml

@ -3,12 +3,13 @@
<id>com.fr.plugin.db.es.v10</id> <id>com.fr.plugin.db.es.v10</id>
<name><![CDATA[Elasticsearch数据集]]></name> <name><![CDATA[Elasticsearch数据集]]></name>
<active>yes</active> <active>yes</active>
<version>2.0.2</version> <version>2.0.3</version>
<env-version>10.0</env-version> <env-version>10.0</env-version>
<jartime>2019-10-25</jartime> <jartime>2019-10-25</jartime>
<vendor>fanruan.richie</vendor> <vendor>fanruan.richie</vendor>
<description><![CDATA[Elasticsearch数据查询。]]></description> <description><![CDATA[Elasticsearch数据查询。]]></description>
<change-notes><![CDATA[ <change-notes><![CDATA[
[2021-01-14]修复配置文件克隆不完整的问题。<br/>
[2021-01-14]修改链表的生成方式,解决配置无法被克隆的问题。<br/> [2021-01-14]修改链表的生成方式,解决配置无法被克隆的问题。<br/>
[2020-11-04]修复取消预览时连接没有被关闭的问。<br/> [2020-11-04]修复取消预览时连接没有被关闭的问。<br/>
[2020-11-03]支持通过https协议连接服务器。<br/> [2020-11-03]支持通过https协议连接服务器。<br/>

6
src/main/java/com/fr/plugin/db/es/fun/ElasticsearchTableData.java

@ -279,6 +279,7 @@ public class ElasticsearchTableData extends BaseTableData {
cloned.query = (Conf<String>) query.clone(); cloned.query = (Conf<String>) query.clone();
cloned.queryType = (Conf<String>) queryType.clone(); cloned.queryType = (Conf<String>) queryType.clone();
cloned.script = (Conf<String>) script.clone(); cloned.script = (Conf<String>) script.clone();
cloned.configAttribute = (Conf<ConfigAttribute>) configAttribute.clone();
return cloned; return cloned;
} }
@ -293,11 +294,12 @@ public class ElasticsearchTableData extends BaseTableData {
&& AssistKit.equals(paraType, ((ElasticsearchTableData) obj).paraType) && AssistKit.equals(paraType, ((ElasticsearchTableData) obj).paraType)
&& AssistKit.equals(query, ((ElasticsearchTableData) obj).query) && AssistKit.equals(query, ((ElasticsearchTableData) obj).query)
&& AssistKit.equals(script, ((ElasticsearchTableData) obj).script); && AssistKit.equals(script, ((ElasticsearchTableData) obj).script)
&& AssistKit.equals(configAttribute, ((ElasticsearchTableData) obj).configAttribute);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get()); return AssistKit.hashCode(database.get(), endPoint.get(), converterType.get(), paraType.get(), query.get(), script.get(), converterType.hashCode());
} }
} }

Loading…
Cancel
Save