This is an automated email from the ASF dual-hosted git repository.
technoboy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere-elasticjob.git
The following commit(s) were added to refs/heads/master by this push:
new 93c221e Revise connectTimeoutMillisecond and readTimeoutMillisecond
with end of s (#1632)
93c221e is described below
commit 93c221ef72c33c13be70bf42a880822c310232d4
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Oct 21 23:18:29 2020 +0800
Revise connectTimeoutMillisecond and readTimeoutMillisecond with end of s
(#1632)
* Revise connectTimeoutMillisecond and readTimeoutMillisecond with end of s
* For checkstyle
* Fix compile error
---
.../built-in-strategy/error-handler.cn.md | 24 +++++++++----------
.../built-in-strategy/error-handler.en.md | 24 +++++++++----------
.../cloud/scheduler/util/HttpClientUtils.java | 27 +++++++++++-----------
.../handler/dingtalk/DingtalkConfiguration.java | 4 ++--
.../handler/dingtalk/DingtalkJobErrorHandler.java | 9 ++++----
.../dingtalk/DingtalkPropertiesConstants.java | 8 +++----
.../dingtalk/DingtalkJobErrorHandlerTest.java | 8 +++----
.../error/handler/wechat/WechatConfiguration.java | 4 ++--
.../handler/wechat/WechatJobErrorHandler.java | 8 +++----
.../handler/wechat/WechatPropertiesConstants.java | 8 +++----
.../handler/wechat/WechatJobErrorHandlerTest.java | 4 ++--
.../job/parser/JobBeanDefinitionParser.java | 2 +-
.../resources/META-INF/application-context.xml | 8 +++----
13 files changed, 70 insertions(+), 68 deletions(-)
diff --git
a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
index f2bc0e1..192f2e4 100644
---
a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
+++
b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.cn.md
@@ -81,11 +81,11 @@ Maven 坐标：
可配置属性：
-| 属性名 | 说明 | 是否必填
| 默认值 |
-| -------------------------------- |:-----------------------------------
|:--------- |:--------- |
-| wechat.webhook | 企业微信机器人的 webhook 地址 | 是 |
- |
-| wechat.connectTimeoutMillisecond | 与企业微信服务器建立连接的超时时间 | 否 | 3000
毫秒 |
-| wechat.readTimeoutMillisecond | 从企业微信服务器读取到可用资源的超时时间 | 否 | 5000
毫秒 |
+| 属性名 | 说明 | 是否必填
| 默认值 |
+| --------------------------------- |:-----------------------------------
|:--------- |:--------- |
+| wechat.webhook | 企业微信机器人的 webhook 地址 | 是
| - |
+| wechat.connectTimeoutMilliseconds | 与企业微信服务器建立连接的超时时间 | 否 |
3000 毫秒 |
+| wechat.readTimeoutMilliseconds | 从企业微信服务器读取到可用资源的超时时间 | 否 | 5000
毫秒 |
## 钉钉通知策略
@@ -107,10 +107,10 @@ Maven 坐标：
可配置属性：
-| 属性名 | 说明 | 是否必填 |
默认值 |
-| ----------------------------------
|:----------------------------------|:------- |:-------- |
-| dingtalk.webhook | 钉钉机器人的 webhook 地址 | 是 |
- |
-| dingtalk.keyword | 自定义关键词 | 否
| null |
-| dingtalk.secret | 签名的密钥 | 否
| null |
-| dingtalk.connectTimeoutMillisecond | 与钉钉服务器建立连接的超时时间 | 否 | 3000
毫秒 |
-| dingtalk.readTimeoutMillisecond | 从钉钉服务器读取到可用资源的超时时间 | 否 | 5000 毫秒
|
+| 属性名 | 说明 | 是否必填 |
默认值 |
+| -----------------------------------
|:----------------------------------|:------- |:-------- |
+| dingtalk.webhook | 钉钉机器人的 webhook 地址 | 是
| - |
+| dingtalk.keyword | 自定义关键词 | 否
| null |
+| dingtalk.secret | 签名的密钥 | 否
| null |
+| dingtalk.connectTimeoutMilliseconds | 与钉钉服务器建立连接的超时时间 | 否 | 3000
毫秒 |
+| dingtalk.readTimeoutMilliseconds | 从钉钉服务器读取到可用资源的超时时间 | 否 | 5000
毫秒 |
diff --git
a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
index 50943e9..f10b525 100644
---
a/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
+++
b/docs/content/user-manual/elasticjob-lite/configuration/built-in-strategy/error-handler.en.md
@@ -81,11 +81,11 @@ Maven POM:
Configuration:
-| Name | Description
| Required | Default Value |
-| --------------------------------
|:-------------------------------------------------------------------------
|:-------- |:----------------- |
-| wechat.webhook | The webhook address of the wechat robot
| Yes | - |
-| wechat.connectTimeoutMillisecond | The timeout period for establishing a
connection with the wechat server | No | 3000 milliseconds |
-| wechat.readTimeoutMillisecond | The timeout period for reading available
resources from the wechat server | No | 5000 milliseconds |
+| Name | Description
| Required | Default Value |
+| ---------------------------------
|:-------------------------------------------------------------------------
|:-------- |:----------------- |
+| wechat.webhook | The webhook address of the wechat robot
| Yes | - |
+| wechat.connectTimeoutMilliseconds | The timeout period for establishing a
connection with the wechat server | No | 3000 milliseconds |
+| wechat.readTimeoutMilliseconds | The timeout period for reading available
resources from the wechat server | No | 5000 milliseconds |
## Dingtalk Notification Strategy
@@ -107,10 +107,10 @@ Maven POM:
Configuration:
-| Name | Description
| Required | Default Value |
-| ----------------------------------
|:---------------------------------------------------------------------------
|:-------- |:----------------- |
-| dingtalk.webhook | The webhook address of the dingtalk
robot | Yes | - |
-| dingtalk.keyword | Custom keywords
| No | null |
-| dingtalk.secret | Secret for dingtalk robot
| No | null |
-| dingtalk.connectTimeoutMillisecond | The timeout period for establishing a
connection with the dingtalk server | No | 3000 milliseconds |
-| dingtalk.readTimeoutMillisecond | The timeout period for reading
available resources from the dingtalk server | No | 5000 milliseconds |
+| Name | Description
| Required | Default Value |
+| -----------------------------------
|:---------------------------------------------------------------------------
|:-------- |:----------------- |
+| dingtalk.webhook | The webhook address of the dingtalk
robot | Yes | - |
+| dingtalk.keyword | Custom keywords
| No | null |
+| dingtalk.secret | Secret for dingtalk robot
| No | null |
+| dingtalk.connectTimeoutMilliseconds | The timeout period for establishing a
connection with the dingtalk server | No | 3000 milliseconds |
+| dingtalk.readTimeoutMilliseconds | The timeout period for reading
available resources from the dingtalk server | No | 5000 milliseconds |
diff --git
a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/HttpClientUtils.java
b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/HttpClientUtils.java
index 89d4393..d48c824 100644
---
a/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/HttpClientUtils.java
+++
b/elasticjob-cloud/elasticjob-cloud-scheduler/src/main/java/org/apache/shardingsphere/elasticjob/cloud/scheduler/util/HttpClientUtils.java
@@ -17,6 +17,12 @@
package org.apache.shardingsphere.elasticjob.cloud.scheduler.util;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import
org.apache.shardingsphere.elasticjob.cloud.scheduler.exception.HttpClientException;
+
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.HttpURLConnection;
@@ -25,11 +31,6 @@ import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Iterator;
import java.util.List;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import
org.apache.shardingsphere.elasticjob.cloud.scheduler.exception.HttpClientException;
/**
* Http client utils.
@@ -53,18 +54,18 @@ public final class HttpClientUtils {
* @param url url
* @param paramValues param values
* @param encoding encoding
- * @param readTimeoutMillisecond read timeout millisecond
+ * @param readTimeoutMilliseconds read timeout milliseconds
* @return http result
*/
- public static HttpResult httpGet(final String url, final List<String>
paramValues, final String encoding, final long readTimeoutMillisecond) {
+ public static HttpResult httpGet(final String url, final List<String>
paramValues, final String encoding, final long readTimeoutMilliseconds) {
HttpURLConnection connection = null;
try {
String encodedContent = encodingParams(paramValues, encoding);
String urlWithParam = url + (null == encodedContent ? "" : ("?" +
encodedContent));
connection = (HttpURLConnection) new
URL(urlWithParam).openConnection();
connection.setRequestMethod("GET");
- connection.setConnectTimeout((int) readTimeoutMillisecond);
- connection.setReadTimeout((int) readTimeoutMillisecond);
+ connection.setConnectTimeout((int) readTimeoutMilliseconds);
+ connection.setReadTimeout((int) readTimeoutMilliseconds);
connection.connect();
String response;
if (HttpURLConnection.HTTP_OK == connection.getResponseCode()) {
@@ -113,16 +114,16 @@ public final class HttpClientUtils {
* @param url url
* @param paramValues param values
* @param encoding encoding
- * @param readTimeoutMillisecond read timeout millisecond
+ * @param readTimeoutMilliseconds read timeout milliseconds
* @return http result
*/
- public static HttpResult httpPost(final String url, final List<String>
paramValues, final String encoding, final long readTimeoutMillisecond) {
+ public static HttpResult httpPost(final String url, final List<String>
paramValues, final String encoding, final long readTimeoutMilliseconds) {
HttpURLConnection connection = null;
try {
connection = (HttpURLConnection) new URL(url).openConnection();
connection.setRequestMethod("POST");
- connection.setConnectTimeout((int) readTimeoutMillisecond);
- connection.setReadTimeout((int) readTimeoutMillisecond);
+ connection.setConnectTimeout((int) readTimeoutMilliseconds);
+ connection.setReadTimeout((int) readTimeoutMilliseconds);
connection.setDoOutput(true);
connection.setDoInput(true);
connection.getOutputStream().write(encodingParams(paramValues,
encoding).getBytes(StandardCharsets.UTF_8));
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
index be30415..073d231 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkConfiguration.java
@@ -34,7 +34,7 @@ public final class DingtalkConfiguration implements
ErrorHandlerConfiguration {
private final String secret;
- private final int connectTimeoutMillisecond;
+ private final int connectTimeoutMilliseconds;
- private final int readTimeoutMillisecond;
+ private final int readTimeoutMilliseconds;
}
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
index 4575dbe..dae1fa6 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandler.java
@@ -96,14 +96,15 @@ public final class DingtalkJobErrorHandler implements
JobErrorHandler {
String webhook =
props.getProperty(DingtalkPropertiesConstants.WEBHOOK);
String keyword =
props.getProperty(DingtalkPropertiesConstants.KEYWORD);
String secret = props.getProperty(DingtalkPropertiesConstants.SECRET);
- int connectTimeoutMillisecond =
Integer.parseInt(props.getProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECOND,
DingtalkPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECOND));
- int readTimeoutMillisecond =
Integer.parseInt(props.getProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECOND,
DingtalkPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECOND));
- return new DingtalkConfiguration(webhook, keyword, secret,
connectTimeoutMillisecond, readTimeoutMillisecond);
+ int connectTimeoutMilliseconds = Integer.parseInt(
+
props.getProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
DingtalkPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECONDS));
+ int readTimeoutMilliseconds =
Integer.parseInt(props.getProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
DingtalkPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECONDS));
+ return new DingtalkConfiguration(webhook, keyword, secret,
connectTimeoutMilliseconds, readTimeoutMilliseconds);
}
private HttpPost createHTTPPostMethod(final String jobName, final
Throwable cause, final DingtalkConfiguration config) {
HttpPost result = new HttpPost(getURL(config));
- RequestConfig requestConfig =
RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMillisecond()).setSocketTimeout(config.getReadTimeoutMillisecond()).build();
+ RequestConfig requestConfig =
RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMilliseconds()).setSocketTimeout(config.getReadTimeoutMilliseconds()).build();
result.setConfig(requestConfig);
StringEntity entity = new
StringEntity(getJsonParameter(getErrorMessage(jobName, config, cause)),
StandardCharsets.UTF_8);
entity.setContentEncoding(StandardCharsets.UTF_8.name());
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java
index c5f6c67..bc0557e 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkPropertiesConstants.java
@@ -22,9 +22,9 @@ package
org.apache.shardingsphere.elasticjob.error.handler.dingtalk;
*/
public final class DingtalkPropertiesConstants {
- public static final String DEFAULT_CONNECT_TIMEOUT_MILLISECOND = "3000";
+ public static final String DEFAULT_CONNECT_TIMEOUT_MILLISECONDS = "3000";
- public static final String DEFAULT_READ_TIMEOUT_MILLISECOND = "5000";
+ public static final String DEFAULT_READ_TIMEOUT_MILLISECONDS = "5000";
private static final String PREFIX = "dingtalk.";
@@ -34,7 +34,7 @@ public final class DingtalkPropertiesConstants {
public static final String SECRET = PREFIX + "secret";
- public static final String CONNECT_TIMEOUT_MILLISECOND = PREFIX +
"connectTimeoutMillisecond";
+ public static final String CONNECT_TIMEOUT_MILLISECONDS = PREFIX +
"connectTimeoutMilliseconds";
- public static final String READ_TIMEOUT_MILLISECOND = PREFIX +
"readTimeoutMillisecond";
+ public static final String READ_TIMEOUT_MILLISECONDS = PREFIX +
"readTimeoutMilliseconds";
}
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
index 853bc12..a889f0f 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-dingtalk/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/dingtalk/DingtalkJobErrorHandlerTest.java
@@ -130,8 +130,8 @@ public final class DingtalkJobErrorHandlerTest {
result.setProperty(DingtalkPropertiesConstants.WEBHOOK, webhook);
result.setProperty(DingtalkPropertiesConstants.KEYWORD,
"mocked_keyword");
result.setProperty(DingtalkPropertiesConstants.SECRET,
"mocked_secret");
-
result.setProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECOND,
"4000");
-
result.setProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECOND,
"6000");
+
result.setProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
"4000");
+
result.setProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
"6000");
return result;
}
@@ -139,8 +139,8 @@ public final class DingtalkJobErrorHandlerTest {
Properties result = new Properties();
result.setProperty(DingtalkPropertiesConstants.WEBHOOK, webhook);
result.setProperty(DingtalkPropertiesConstants.KEYWORD,
"mocked_keyword");
-
result.setProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECOND,
"4000");
-
result.setProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECOND,
"6000");
+
result.setProperty(DingtalkPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
"4000");
+
result.setProperty(DingtalkPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
"6000");
return result;
}
}
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
index f6e844e..0e4c4eb 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatConfiguration.java
@@ -30,7 +30,7 @@ public final class WechatConfiguration implements
ErrorHandlerConfiguration {
private final String webhook;
- private final int connectTimeoutMillisecond;
+ private final int connectTimeoutMilliseconds;
- private final int readTimeoutMillisecond;
+ private final int readTimeoutMilliseconds;
}
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
index 9340cff..4d9264f 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandler.java
@@ -86,14 +86,14 @@ public final class WechatJobErrorHandler implements
JobErrorHandler {
private WechatConfiguration createConfiguration(final Properties props) {
String webhook = props.getProperty(WechatPropertiesConstants.WEBHOOK);
- int connectTimeoutMillisecond =
Integer.parseInt(props.getProperty(WechatPropertiesConstants.CONNECT_TIMEOUT_MILLISECOND,
WechatPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECOND));
- int readTimeoutMillisecond =
Integer.parseInt(props.getProperty(WechatPropertiesConstants.READ_TIMEOUT_MILLISECOND,
WechatPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECOND));
- return new WechatConfiguration(webhook, connectTimeoutMillisecond,
readTimeoutMillisecond);
+ int connectTimeoutMilliseconds =
Integer.parseInt(props.getProperty(WechatPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
WechatPropertiesConstants.DEFAULT_CONNECT_TIMEOUT_MILLISECONDS));
+ int readTimeoutMilliseconds =
Integer.parseInt(props.getProperty(WechatPropertiesConstants.READ_TIMEOUT_MILLISECONDS,
WechatPropertiesConstants.DEFAULT_READ_TIMEOUT_MILLISECONDS));
+ return new WechatConfiguration(webhook, connectTimeoutMilliseconds,
readTimeoutMilliseconds);
}
private HttpPost createHTTPPostMethod(final String jobName, final
Throwable cause, final WechatConfiguration config) {
HttpPost result = new HttpPost(config.getWebhook());
- RequestConfig requestConfig =
RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMillisecond()).setSocketTimeout(config.getReadTimeoutMillisecond()).build();
+ RequestConfig requestConfig =
RequestConfig.custom().setConnectTimeout(config.getConnectTimeoutMilliseconds()).setSocketTimeout(config.getReadTimeoutMilliseconds()).build();
result.setConfig(requestConfig);
StringEntity entity = new
StringEntity(getJsonParameter(getErrorMessage(jobName, cause)),
StandardCharsets.UTF_8);
entity.setContentEncoding(StandardCharsets.UTF_8.name());
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatPropertiesConstants.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatPropertiesConstants.java
index 82fbce7..9e7db5e 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatPropertiesConstants.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/main/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatPropertiesConstants.java
@@ -22,15 +22,15 @@ package
org.apache.shardingsphere.elasticjob.error.handler.wechat;
*/
public final class WechatPropertiesConstants {
- public static final String DEFAULT_CONNECT_TIMEOUT_MILLISECOND = "3000";
+ public static final String DEFAULT_CONNECT_TIMEOUT_MILLISECONDS = "3000";
- public static final String DEFAULT_READ_TIMEOUT_MILLISECOND = "5000";
+ public static final String DEFAULT_READ_TIMEOUT_MILLISECONDS = "5000";
private static final String PREFIX = "wechat.";
public static final String WEBHOOK = PREFIX + "webhook";
- public static final String CONNECT_TIMEOUT_MILLISECOND = PREFIX +
"connectTimeoutMillisecond";
+ public static final String CONNECT_TIMEOUT_MILLISECONDS = PREFIX +
"connectTimeoutMilliseconds";
- public static final String READ_TIMEOUT_MILLISECOND = PREFIX +
"readTimeoutMillisecond";
+ public static final String READ_TIMEOUT_MILLISECONDS = PREFIX +
"readTimeoutMilliseconds";
}
diff --git
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
index 2bc2354..6c5b1f8 100644
---
a/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
+++
b/elasticjob-error-handler/elasticjob-error-handler-type/elasticjob-error-handler-wechat/src/test/java/org/apache/shardingsphere/elasticjob/error/handler/wechat/WechatJobErrorHandlerTest.java
@@ -119,8 +119,8 @@ public final class WechatJobErrorHandlerTest {
private Properties createConfigurationProperties(final String webhook) {
Properties result = new Properties();
result.setProperty(WechatPropertiesConstants.WEBHOOK, webhook);
-
result.setProperty(WechatPropertiesConstants.CONNECT_TIMEOUT_MILLISECOND,
"1000");
- result.setProperty(WechatPropertiesConstants.READ_TIMEOUT_MILLISECOND,
"2000");
+
result.setProperty(WechatPropertiesConstants.CONNECT_TIMEOUT_MILLISECONDS,
"1000");
+
result.setProperty(WechatPropertiesConstants.READ_TIMEOUT_MILLISECONDS, "2000");
return result;
}
}
diff --git
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/parser/JobBeanDefinitionParser.java
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/parser/JobBeanDefinitionParser.java
index d1b691a..c97dce6 100644
---
a/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/parser/JobBeanDefinitionParser.java
+++
b/elasticjob-lite/elasticjob-lite-spring/elasticjob-lite-spring-namespace/src/main/java/org/apache/shardingsphere/elasticjob/lite/spring/namespace/job/parser/JobBeanDefinitionParser.java
@@ -82,7 +82,7 @@ public final class JobBeanDefinitionParser extends
AbstractBeanDefinitionParser
} else {
result.addConstructorArgValue(Arrays.asList(element.getAttribute(JobBeanDefinitionTag.JOB_LISTENER_TYPES_ATTRIBUTE).split(",")));
}
- result.addConstructorArgValue(parseExtraConfigs(new
String[]{JobBeanDefinitionTag.TRACING_REF_ATTRIBUTE,
JobBeanDefinitionTag.ERROR_HANDLER_CONFIG_REF_ATTRIBUTE},
+ result.addConstructorArgValue(parseExtraConfigs(new
String[]{JobBeanDefinitionTag.TRACING_REF_ATTRIBUTE},
element, parserContext));
result.addConstructorArgValue(element.getAttribute(JobBeanDefinitionTag.DESCRIPTION_ATTRIBUTE));
result.addConstructorArgValue(parsePropsElement(element,
parserContext));
diff --git
a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
index 7798d9f..aa9e720 100644
---
a/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
+++
b/examples/elasticjob-example-lite-spring/src/main/resources/META-INF/application-context.xml
@@ -114,8 +114,8 @@
<!-- <prop
key="dingtalk.webhook">https://oapi.dingtalk.com/robot/send?access_token=token</prop>-->
<!-- <prop key="dingtalk.keyword">keyword</prop>-->
<!-- <prop key="dingtalk.secret">secret</prop>-->
-<!-- <prop key="dingtalk.connectTimeoutMillisecond">3000</prop>-->
-<!-- <prop key="dingtalk.readTimeoutMillisecond">5000</prop>-->
+<!-- <prop key="dingtalk.connectTimeoutMilliseconds">3000</prop>-->
+<!-- <prop key="dingtalk.readTimeoutMilliseconds">5000</prop>-->
<!-- </props>-->
<!-- </elasticjob:job>-->
@@ -133,8 +133,8 @@
<!-- disabled="${occurErrorNoticeWechatJob.disabled}"
overwrite="${occurErrorNoticeWechatJob.overwrite}">-->
<!-- <props>-->
<!-- <prop
key="wechat.webhook">https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=key</prop>-->
-<!-- <prop key="wechat.connectTimeoutMillisecond">3000</prop>-->
-<!-- <prop key="wechat.readTimeoutMillisecond">5000</prop>-->
+<!-- <prop key="wechat.connectTimeoutMilliseconds">3000</prop>-->
+<!-- <prop key="wechat.readTimeoutMilliseconds">5000</prop>-->
<!-- </props>-->
<!-- </elasticjob:job>-->
</beans>
