Skip to content

Commit 280d72e

Browse files
linghengqianlinghengqian
committed
Remove use of org.testcontainers.utility.DockerImageName 
1 parent 261825e commit 280d72e

File tree

17 files changed

+23
-46
lines changed

17 files changed

+23
-46
lines changed

‎doc/CONTRIBUTING.md

+3
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,6 @@ echo "test" | gpg --clearsign
9090
```
9191

9292
Log in to https://central.sonatype.com/ and manually approve the publication.
93+
94+
Then, set a new git tag for the specific git commit,
95+
and write the new version information at https://github.com/linghengqian/hive-server2-jdbc-driver/releases with the git tag.

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/AcidTableTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class AcidTableTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/InformationSchemaTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.testcontainers.containers.GenericContainer;
2222
import org.testcontainers.junit.jupiter.Container;
2323
import org.testcontainers.junit.jupiter.Testcontainers;
24-
import org.testcontainers.utility.DockerImageName;
2524

2625
import java.io.IOException;
2726
import java.sql.*;
@@ -41,7 +40,7 @@
4140
@Testcontainers
4241
public class InformationSchemaTest {
4342
@Container
44-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
43+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4544
.withEnv("SERVICE_NAME", "hiveserver2")
4645
.withExposedPorts(10000);
4746

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/StandaloneMetastoreTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.testcontainers.containers.Network;
2525
import org.testcontainers.junit.jupiter.Container;
2626
import org.testcontainers.junit.jupiter.Testcontainers;
27-
import org.testcontainers.utility.DockerImageName;
2827

2928
import java.sql.Connection;
3029
import java.sql.ResultSet;
@@ -44,14 +43,14 @@ public class StandaloneMetastoreTest {
4443
private static final Network NETWORK = Network.newNetwork();
4544

4645
@Container
47-
public static final GenericContainer<?> HMS_CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
46+
public static final GenericContainer<?> HMS_CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4847
.withEnv("SERVICE_NAME", "metastore")
4948
.withNetwork(NETWORK)
5049
.withNetworkAliases("metastore")
5150
.withExposedPorts(9083);
5251

5352
@Container
54-
public static final GenericContainer<?> HS2_CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
53+
public static final GenericContainer<?> HS2_CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
5554
.withEnv("SERVICE_NAME", "hiveserver2")
5655
.withEnv("SERVICE_OPTS", "-Dhive.metastore.uris=thrift://metastore:9083")
5756
.withNetwork(NETWORK)

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/ThinTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.testcontainers.containers.GenericContainer;
2323
import org.testcontainers.junit.jupiter.Container;
2424
import org.testcontainers.junit.jupiter.Testcontainers;
25-
import org.testcontainers.utility.DockerImageName;
2625

2726
import java.sql.Connection;
2827
import java.sql.ResultSet;
@@ -40,7 +39,7 @@
4039
public class ThinTest {
4140

4241
@Container
43-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
42+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4443
.withEnv("SERVICE_NAME", "hiveserver2")
4544
.withExposedPorts(10000);
4645

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/ZookeeperServiceDiscoveryTest.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.sql.*;
3636
import java.time.Duration;
3737
import java.util.List;
38-
import java.util.Properties;
3938

4039
import static org.awaitility.Awaitility.await;
4140
import static org.hamcrest.MatcherAssert.assertThat;
@@ -115,11 +114,6 @@ private static void extracted(DataSource dataSource) throws SQLException {
115114
}
116115
}
117116

118-
private Connection openConnection() throws SQLException {
119-
Properties props = new Properties();
120-
return DriverManager.getConnection(jdbcUrlPrefix + jdbcUrlSuffix, props);
121-
}
122-
123117
private DataSource createDataSource() {
124118
extracted(HIVE_SERVER2_1_CONTAINER.getMappedPort(RANDOM_PORT_FIRST));
125119
HikariConfig config = new HikariConfig();
@@ -136,11 +130,11 @@ private void extracted(final int hiveServer2Port) {
136130
client.start();
137131
List<String> children = client.getChildren().forPath("/hiveserver2");
138132
assertThat(children.size(), is(1));
139-
return children.get(0).contains(":" + hiveServer2Port + ";version=");
133+
return children.get(0).startsWith("serverUri=0.0.0.0:" + hiveServer2Port + ";version=4.0.1;sequence=");
140134
}
141135
});
142136
await().atMost(Duration.ofMinutes(1L)).ignoreExceptions().until(() -> {
143-
openConnection().close();
137+
DriverManager.getConnection(jdbcUrlPrefix + jdbcUrlSuffix).close();
144138
return true;
145139
});
146140
}

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/iceberg/AvroTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class AvroTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/iceberg/OrcTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class OrcTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-thin/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/thin/iceberg/ParquetTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class ParquetTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/AcidTableTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class AcidTableTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/InformationSchemaTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.testcontainers.containers.GenericContainer;
2222
import org.testcontainers.junit.jupiter.Container;
2323
import org.testcontainers.junit.jupiter.Testcontainers;
24-
import org.testcontainers.utility.DockerImageName;
2524

2625
import java.io.IOException;
2726
import java.sql.*;
@@ -41,7 +40,7 @@
4140
@Testcontainers
4241
public class InformationSchemaTest {
4342
@Container
44-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
43+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4544
.withEnv("SERVICE_NAME", "hiveserver2")
4645
.withExposedPorts(10000);
4746

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/StandaloneMetastoreTest.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.testcontainers.containers.Network;
2525
import org.testcontainers.junit.jupiter.Container;
2626
import org.testcontainers.junit.jupiter.Testcontainers;
27-
import org.testcontainers.utility.DockerImageName;
2827

2928
import java.sql.Connection;
3029
import java.sql.ResultSet;
@@ -44,14 +43,14 @@ public class StandaloneMetastoreTest {
4443
private static final Network NETWORK = Network.newNetwork();
4544

4645
@Container
47-
public static final GenericContainer<?> HMS_CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
46+
public static final GenericContainer<?> HMS_CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4847
.withEnv("SERVICE_NAME", "metastore")
4948
.withNetwork(NETWORK)
5049
.withNetworkAliases("metastore")
5150
.withExposedPorts(9083);
5251

5352
@Container
54-
public static final GenericContainer<?> HS2_CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
53+
public static final GenericContainer<?> HS2_CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
5554
.withEnv("SERVICE_NAME", "hiveserver2")
5655
.withEnv("SERVICE_OPTS", "-Dhive.metastore.uris=thrift://metastore:9083")
5756
.withNetwork(NETWORK)

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/UberTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.testcontainers.containers.GenericContainer;
2323
import org.testcontainers.junit.jupiter.Container;
2424
import org.testcontainers.junit.jupiter.Testcontainers;
25-
import org.testcontainers.utility.DockerImageName;
2625

2726
import java.sql.Connection;
2827
import java.sql.ResultSet;
@@ -40,7 +39,7 @@
4039
public class UberTest {
4140

4241
@Container
43-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
42+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
4443
.withEnv("SERVICE_NAME", "hiveserver2")
4544
.withExposedPorts(10000);
4645

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/ZookeeperServiceDiscoveryTest.java

+2-8
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import java.sql.*;
3636
import java.time.Duration;
3737
import java.util.List;
38-
import java.util.Properties;
3938

4039
import static org.awaitility.Awaitility.await;
4140
import static org.hamcrest.MatcherAssert.assertThat;
@@ -115,11 +114,6 @@ private static void extracted(DataSource dataSource) throws SQLException {
115114
}
116115
}
117116

118-
private Connection openConnection() throws SQLException {
119-
Properties props = new Properties();
120-
return DriverManager.getConnection(jdbcUrlPrefix + jdbcUrlSuffix, props);
121-
}
122-
123117
private DataSource createDataSource() {
124118
extracted(HIVE_SERVER2_1_CONTAINER.getMappedPort(RANDOM_PORT_FIRST));
125119
HikariConfig config = new HikariConfig();
@@ -136,11 +130,11 @@ private void extracted(final int hiveServer2Port) {
136130
client.start();
137131
List<String> children = client.getChildren().forPath("/hiveserver2");
138132
assertThat(children.size(), is(1));
139-
return children.get(0).contains(":" + hiveServer2Port + ";version=");
133+
return children.get(0).startsWith("serverUri=0.0.0.0:" + hiveServer2Port + ";version=4.0.1;sequence=");
140134
}
141135
});
142136
await().atMost(Duration.ofMinutes(1L)).ignoreExceptions().until(() -> {
143-
openConnection().close();
137+
DriverManager.getConnection(jdbcUrlPrefix + jdbcUrlSuffix).close();
144138
return true;
145139
});
146140
}

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/iceberg/AvroTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class AvroTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/iceberg/OrcTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class OrcTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

‎hive-server2-jdbc-driver-uber/src/test/java/io/github/linghengqian/hive/server2/jdbc/driver/uber/iceberg/ParquetTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.testcontainers.containers.GenericContainer;
2121
import org.testcontainers.junit.jupiter.Container;
2222
import org.testcontainers.junit.jupiter.Testcontainers;
23-
import org.testcontainers.utility.DockerImageName;
2423

2524
import java.sql.*;
2625
import java.time.Duration;
@@ -34,7 +33,7 @@
3433
@Testcontainers
3534
public class ParquetTest {
3635
@Container
37-
public static final GenericContainer<?> CONTAINER = new GenericContainer<>(DockerImageName.parse("apache/hive:4.0.1"))
36+
public static final GenericContainer<?> CONTAINER = new GenericContainer<>("apache/hive:4.0.1")
3837
.withEnv("SERVICE_NAME", "hiveserver2")
3938
.withExposedPorts(10000);
4039

0 commit comments

Comments
 (0)