[incubator-seatunnel] branch dev updated: [Improve][E2E] Add a 'nonNull' check to avoid npe when executing 'tearDown'. (#3967)

[liugddx]

This is an automated email from the ASF dual-hosted git repository.

liugddx 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 f4e81a3bb [Improve][E2E] Add a 'nonNull' check to avoid npe when 
executing 'tearDown'. (#3967)
f4e81a3bb is described below

commit f4e81a3bbee4af3b2c33d5e842605e50c1fe7b49
Author: FlechazoW <35768015+flecha...@users.noreply.github.com>
AuthorDate: Tue Jan 17 13:42:27 2023 +0800

    [Improve][E2E] Add a 'nonNull' check to avoid npe when executing 
'tearDown'. (#3967)
---
 .../e2e/connector/elasticsearch/ElasticsearchIT.java       |  5 ++++-
 .../seatunnel/e2e/connector/influxdb/InfluxdbIT.java       |  4 +++-
 .../org/apache/seatunnel/e2e/connector/redis/RedisIT.java  | 14 ++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
index 1427eaaea..dfbf86ac2 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-elasticsearch-e2e/src/test/java/org/apache/seatunnel/e2e/connector/elasticsearch/ElasticsearchIT.java
@@ -49,6 +49,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -168,7 +169,9 @@ public class ElasticsearchIT extends TestSuiteBase 
implements TestResource {
     @AfterEach
     @Override
     public void tearDown() {
-        esRestClient.close();
+        if (Objects.nonNull(esRestClient)) {
+            esRestClient.close();
+        }
         container.close();
     }
 }
diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-influxdb-e2e/src/test/java/org/apache/seatunnel/e2e/connector/influxdb/InfluxdbIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-influxdb-e2e/src/test/java/org/apache/seatunnel/e2e/connector/influxdb/InfluxdbIT.java
index 20cc6dce0..fced1bb5f 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-influxdb-e2e/src/test/java/org/apache/seatunnel/e2e/connector/influxdb/InfluxdbIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-influxdb-e2e/src/test/java/org/apache/seatunnel/e2e/connector/influxdb/InfluxdbIT.java
@@ -165,7 +165,9 @@ public class InfluxdbIT extends TestSuiteBase implements 
TestResource {
     @AfterAll
     @Override
     public void tearDown() throws Exception {
-        influxDB.close();
+        if (Objects.nonNull(influxDB)) {
+            influxDB.close();
+        }
         influxdbContainer.stop();
     }
 
diff --git 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/java/org/apache/seatunnel/e2e/connector/redis/RedisIT.java
 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/java/org/apache/seatunnel/e2e/connector/redis/RedisIT.java
index 2e0cb83b6..b0eb7ba14 100644
--- 
a/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/java/org/apache/seatunnel/e2e/connector/redis/RedisIT.java
+++ 
b/seatunnel-e2e/seatunnel-connector-v2-e2e/connector-redis-e2e/src/test/java/org/apache/seatunnel/e2e/connector/redis/RedisIT.java
@@ -53,6 +53,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Stream;
 
 import scala.Tuple2;
@@ -72,7 +73,7 @@ public class RedisIT extends TestSuiteBase implements 
TestResource {
 
     @BeforeAll
     @Override
-    public void startUp() throws Exception {
+    public void startUp() {
         this.redisContainer = new 
GenericContainer<>(DockerImageName.parse(IMAGE))
             .withNetwork(NETWORK)
             .withNetworkAliases(HOST)
@@ -167,9 +168,14 @@ public class RedisIT extends TestSuiteBase implements 
TestResource {
 
     @AfterAll
     @Override
-    public void tearDown() throws Exception {
-        jedis.close();
-        redisContainer.close();
+    public void tearDown() {
+        if (Objects.nonNull(jedis)) {
+            jedis.close();
+        }
+
+        if (Objects.nonNull(redisContainer)) {
+            redisContainer.close();
+        }
     }
 
     @TestTemplate