Skip to content

Commit

Permalink
[Feature][DynamicForm] Add seatunnel dynamicform module (apache#49)
Browse files Browse the repository at this point in the history
  • Loading branch information
@EricJoy2048
EricJoy2048 committed Jul 17, 2023
1 parent 1c63f34 commit e0cbd4a
Show file tree
Hide file tree
Showing 30 changed files with 1,832 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
cache: 'maven'
- name: Install
run: >-
./mvnw -B -q install -DskipTests
./mvnw -B -q install -DskipTests -P release
-D"maven.test.skip"=true
-D"maven.javadoc.skip"=true
-D"checkstyle.skip"=true
Expand Down
148 changes: 145 additions & 3 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@
<skipUT>false</skipUT>

<!-- dependency -->
<seatunnel-common.version>2.1.3</seatunnel-common.version>
<commons.logging.version>1.2</commons.logging.version>
<slf4j.version>1.7.25</slf4j.version>
<jackson.version>2.12.7.1</jackson.version>
Expand All @@ -113,14 +112,157 @@
<checker.qual.version>3.10.0</checker.qual.version>
<log4j-core.version>2.17.1</log4j-core.version>
<awaitility.version>4.2.0</awaitility.version>
<seatunnel-framework.version>2.3.1</seatunnel-framework.version>
</properties>

<dependencyManagement>
<dependencies>
<!-- seatunnel main repository dependency -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-common</artifactId>
<version>${seatunnel-common.version}</version>
<version>${seatunnel-framework.version}</version>
<exclusions>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-1.2-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-core</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-jackson</artifactId>
<version>${seatunnel-framework.version}</version>
<classifier>optional</classifier>
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-properties</artifactId>
</exclusion>
<exclusion>
<artifactId>slf4j-log4j12</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-1.2-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-core</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-api</artifactId>
<version>${seatunnel-framework.version}</version>
<exclusions>
<exclusion>
<artifactId>jcl-over-slf4j</artifactId>
<groupId>org.slf4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-1.2-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-api</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-core</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
<exclusion>
<artifactId>log4j-slf4j-impl</artifactId>
<groupId>org.apache.logging.log4j</groupId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-engine-client</artifactId>
<version>${seatunnel-framework.version}</version>
</dependency>

<dependency>
<groupId>com.google.auto.service</groupId>
<artifactId>auto-service</artifactId>
<version>${auto-service.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-plugin-discovery</artifactId>
<version>${seatunnel-framework.version}</version>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-transforms-v2</artifactId>
<version>${seatunnel-framework.version}</version>
</dependency>

<!-- seatunnel connector test -->
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-common</artifactId>
<version>${seatunnel-framework.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-console</artifactId>
<version>${seatunnel-framework.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-fake</artifactId>
<version>${seatunnel-framework.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>connector-jdbc</artifactId>
<version>${seatunnel-framework.version}</version>
<scope>test</scope>
</dependency>

<dependency>
Expand Down Expand Up @@ -153,7 +295,7 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
Expand Down
1 change: 1 addition & 0 deletions seatunnel-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<packaging>pom</packaging>
<modules>
<module>seatunnel-app</module>
<module>seatunnel-dynamicform</module>
<module>seatunnel-spi</module>
<module>seatunnel-scheduler</module>
<module>seatunnel-server-common</module>
Expand Down
4 changes: 4 additions & 0 deletions seatunnel-server/seatunnel-app/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@
<artifactId>spring-context</artifactId>
<groupId>org.springframework</groupId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</exclusion>
</exclusions>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion seatunnel-server/seatunnel-app/src/main/resources/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ds:
default: gaojun
api:
token: 296fecc6e5f78e6a5aa39106707476fe
prefix: http://127.0.0.1:12345/dolphinscheduler
prefix: http://localhost:12345/dolphinscheduler

jwt:
expireTime: 86400
Expand Down
9 changes: 8 additions & 1 deletion ...r/seatunnel-app/src/test/java/org/apache/seatunnel/app/controller/UserControllerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import org.apache.seatunnel.app.domain.response.user.AddUserRes;
import org.apache.seatunnel.common.utils.JsonUtils;

import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.seatunnel.shade.com.fasterxml.jackson.core.type.TypeReference;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
Expand All @@ -38,6 +39,8 @@
import org.springframework.test.web.servlet.MvcResult;
import org.springframework.test.web.servlet.result.MockMvcResultHandlers;

import java.lang.reflect.Type;

@Disabled("todo:this test is not working, waiting fix")
public class UserControllerTest extends WebMvcApplicationTest {

Expand All @@ -59,6 +62,10 @@ public void testAdd() throws Exception {
.andReturn();
String result = mvcResult.getResponse().getContentAsString();
Result<AddUserRes> data = JsonUtils.parseObject(result, new TypeReference<Result<AddUserRes>>() {
@Override
public Type getType() {
return super.getType();
}
});
Assertions.assertTrue(data.isSuccess());
Assertions.assertNotNull(data.getData());
Expand Down
57 changes: 57 additions & 0 deletions seatunnel-server/seatunnel-dynamicform/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>seatunnel-server</artifactId>
<groupId>org.apache.seatunnel</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>

<artifactId>seatunnel-dynamicform</artifactId>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-common</artifactId>
</dependency>
<dependency>
<groupId>org.apache.seatunnel</groupId>
<artifactId>seatunnel-jackson</artifactId>
<classifier>optional</classifier>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit e0cbd4a

Please sign in to comment.