This is an automated email from the ASF dual-hosted git repository.
gaojun2048 pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new a86c9d90f [Improve][Connector-V2][My Hours]Add http method enum &&
Improve My Hours connector option rule (#3390)
a86c9d90f is described below
commit a86c9d90f7b6ef309510142562801ecc9b4a69f0
Author: TaoZex <[email protected]>
AuthorDate: Tue Nov 15 10:25:20 2022 +0800
[Improve][Connector-V2][My Hours]Add http method enum && Improve My Hours
connector option rule (#3390)
* [Improve][Connector-V2][My Hours]Improve My Hours connector option rule
* [Improve][Connector-V2][My Hours]Add http method enum
* [Improve][Connector-V2][My Hours]update code format
* [Improve][Connector-V2][My Hours]update enum class name
* [Improve][Connector-V2][My Hours]update enum class use enumType
---
.../seatunnel/http/config/HttpConfig.java | 7 ++--
.../seatunnel/http/config/HttpParameter.java | 7 ++--
.../seatunnel/http/config/HttpRequestMethod.java | 39 ++++++++++++++++++++++
.../seatunnel/http/source/HttpSourceFactory.java | 3 +-
.../seatunnel/http/source/HttpSourceReader.java | 2 +-
.../myhours/source/MyHoursSourceFactory.java | 11 ++++++
6 files changed, 60 insertions(+), 9 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpConfig.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpConfig.java
index b7df0a25d..b56f72505 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpConfig.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpConfig.java
@@ -23,7 +23,6 @@ import org.apache.seatunnel.api.configuration.Options;
import java.util.Map;
public class HttpConfig {
- public static final String METHOD_DEFAULT_VALUE = "GET";
public static final String DEFAULT_FORMAT = "json";
public static final int DEFAULT_RETRY_BACKOFF_MULTIPLIER_MS = 100;
public static final int DEFAULT_RETRY_BACKOFF_MAX_MS = 10000;
@@ -31,9 +30,9 @@ public class HttpConfig {
.stringType()
.noDefaultValue()
.withDescription("Http request url");
- public static final Option<String> METHOD = Options.key("method")
- .stringType()
- .defaultValue(METHOD_DEFAULT_VALUE)
+ public static final Option<HttpRequestMethod> METHOD =
Options.key("method")
+ .enumType(HttpRequestMethod.class)
+ .defaultValue(HttpRequestMethod.GET)
.withDescription("Http request method");
public static final Option<Map<String, String>> HEADERS =
Options.key("headers")
.mapType()
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpParameter.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpParameter.java
index 8db67572d..2fdd2db41 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpParameter.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpParameter.java
@@ -29,7 +29,7 @@ import java.util.stream.Collectors;
@SuppressWarnings("MagicNumber")
public class HttpParameter implements Serializable {
protected String url;
- protected String method;
+ protected HttpRequestMethod method;
protected Map<String, String> headers;
protected Map<String, String> params;
protected String body;
@@ -43,9 +43,10 @@ public class HttpParameter implements Serializable {
this.setUrl(pluginConfig.getString(HttpConfig.URL.key()));
// set method
if (pluginConfig.hasPath(HttpConfig.METHOD.key())) {
- this.setMethod(pluginConfig.getString(HttpConfig.METHOD.key()));
+ HttpRequestMethod httpRequestMethod =
HttpRequestMethod.valueOf(pluginConfig.getString(HttpConfig.METHOD.key()).toUpperCase());
+ this.setMethod(httpRequestMethod);
} else {
- this.setMethod(HttpConfig.METHOD_DEFAULT_VALUE);
+ this.setMethod(HttpConfig.METHOD.defaultValue());
}
// set headers
if (pluginConfig.hasPath(HttpConfig.HEADERS.key())) {
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpRequestMethod.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpRequestMethod.java
new file mode 100644
index 000000000..b157b664e
--- /dev/null
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/config/HttpRequestMethod.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.seatunnel.connectors.seatunnel.http.config;
+
+public enum HttpRequestMethod {
+ GET("get"),
+
+ POST("post");
+
+ private String method;
+
+ HttpRequestMethod(String method) {
+ this.method = method;
+ }
+
+ public String getMethod() {
+ return method;
+ }
+
+ @Override
+ public String toString() {
+ return method;
+ }
+}
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceFactory.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceFactory.java
index 7adb9ab61..5b7eb0c6f 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceFactory.java
@@ -23,6 +23,7 @@ import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
import org.apache.seatunnel.connectors.seatunnel.http.config.HttpConfig;
+import org.apache.seatunnel.connectors.seatunnel.http.config.HttpRequestMethod;
import com.google.auto.service.AutoService;
@@ -41,7 +42,7 @@ public class HttpSourceFactory implements TableSourceFactory {
.optional(HttpConfig.METHOD)
.optional(HttpConfig.HEADERS)
.optional(HttpConfig.PARAMS)
- .conditional(Condition.of(HttpConfig.METHOD, "post"),
HttpConfig.BODY)
+ .conditional(Condition.of(HttpConfig.METHOD,
HttpRequestMethod.POST), HttpConfig.BODY)
.conditional(Condition.of(HttpConfig.FORMAT, "json"),
SeaTunnelSchema.SCHEMA)
.optional(HttpConfig.FORMAT)
.optional(HttpConfig.POLL_INTERVAL_MILLS)
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceReader.java
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceReader.java
index 5bacae516..c36f526fa 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceReader.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-base/src/main/java/org/apache/seatunnel/connectors/seatunnel/http/source/HttpSourceReader.java
@@ -61,7 +61,7 @@ public class HttpSourceReader extends
AbstractSingleSplitReader<SeaTunnelRow> {
@Override
public void pollNext(Collector<SeaTunnelRow> output) throws Exception {
try {
- HttpResponse response =
httpClient.execute(this.httpParameter.getUrl(), this.httpParameter.getMethod(),
this.httpParameter.getHeaders(), this.httpParameter.getParams(),
this.httpParameter.getBody());
+ HttpResponse response =
httpClient.execute(this.httpParameter.getUrl(),
this.httpParameter.getMethod().getMethod(), this.httpParameter.getHeaders(),
this.httpParameter.getParams(), this.httpParameter.getBody());
if (HttpResponse.STATUS_OK == response.getCode()) {
String content = response.getContent();
if (!Strings.isNullOrEmpty(content)) {
diff --git
a/seatunnel-connectors-v2/connector-http/connector-http-myhours/src/main/java/org/apache/seatunnel/connectors/seatunnel/myhours/source/MyHoursSourceFactory.java
b/seatunnel-connectors-v2/connector-http/connector-http-myhours/src/main/java/org/apache/seatunnel/connectors/seatunnel/myhours/source/MyHoursSourceFactory.java
index 09df13ad3..514f7bb9b 100644
---
a/seatunnel-connectors-v2/connector-http/connector-http-myhours/src/main/java/org/apache/seatunnel/connectors/seatunnel/myhours/source/MyHoursSourceFactory.java
+++
b/seatunnel-connectors-v2/connector-http/connector-http-myhours/src/main/java/org/apache/seatunnel/connectors/seatunnel/myhours/source/MyHoursSourceFactory.java
@@ -17,9 +17,13 @@
package org.apache.seatunnel.connectors.seatunnel.myhours.source;
+import org.apache.seatunnel.api.configuration.util.Condition;
import org.apache.seatunnel.api.configuration.util.OptionRule;
import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
+import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;
+import org.apache.seatunnel.connectors.seatunnel.http.config.HttpConfig;
+import org.apache.seatunnel.connectors.seatunnel.http.config.HttpRequestMethod;
import
org.apache.seatunnel.connectors.seatunnel.myhours.source.config.MyHoursSourceConfig;
import com.google.auto.service.AutoService;
@@ -37,6 +41,13 @@ public class MyHoursSourceFactory implements
TableSourceFactory {
.required(MyHoursSourceConfig.URL)
.required(MyHoursSourceConfig.EMAIL)
.required(MyHoursSourceConfig.PASSWORD)
+ .optional(MyHoursSourceConfig.METHOD)
+ .optional(MyHoursSourceConfig.HEADERS)
+ .optional(MyHoursSourceConfig.PARAMS)
+ .conditional(Condition.of(HttpConfig.METHOD,
HttpRequestMethod.POST), MyHoursSourceConfig.BODY)
+ .conditional(Condition.of(HttpConfig.FORMAT, "json"),
SeaTunnelSchema.SCHEMA)
+ .optional(MyHoursSourceConfig.FORMAT)
+ .optional(MyHoursSourceConfig.POLL_INTERVAL_MILLS)
.optional(MyHoursSourceConfig.RETRY)
.optional(MyHoursSourceConfig.RETRY_BACKOFF_MAX_MS)
.optional(MyHoursSourceConfig.RETRY_BACKOFF_MULTIPLIER_MS)
