Skip to content

Commit c3160d7

Browse files
authored
Replace deprecated methods (#95)
1 parent 469cf22 commit c3160d7

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

src/main/java/io/opentracing/contrib/jdbc/TracingDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public Connection connect(String url, Properties info) throws SQLException {
170170
final Driver wrappedDriver = findDriver(url);
171171

172172
final Tracer currentTracer = getTracer();
173-
final ConnectionInfo connectionInfo = URLParser.parser(url);
173+
final ConnectionInfo connectionInfo = URLParser.parse(url);
174174
final Span span = buildSpan("AcquireConnection", "", connectionInfo, withActiveSpanOnly,
175175
Collections.<String>emptySet(), currentTracer);
176176
final Connection connection;

src/test/java/io/opentracing/contrib/jdbc/parser/URLParserTest.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testParseMysqlURLWithoutExplicitDBOrQueryString() {
5555
@Test
5656
public void testParseMysqlJDBCURLWithHostAndPort() {
5757
ConnectionInfo connectionInfo = URLParser
58-
.parser("jdbc:mysql//primaryhost:3307/test?profileSQL=true");
58+
.parse("jdbc:mysql//primaryhost:3307/test?profileSQL=true");
5959
assertEquals(MYSQL, connectionInfo.getDbType());
6060
assertEquals("test", connectionInfo.getDbInstance());
6161
assertEquals("primaryhost:3307", connectionInfo.getDbPeer());
@@ -65,7 +65,7 @@ public void testParseMysqlJDBCURLWithHostAndPort() {
6565
@Test
6666
public void testParseMysqlJDBCURLWithMultiHost() {
6767
ConnectionInfo connectionInfo = URLParser
68-
.parser("jdbc:mysql//primaryhost:3307,secondaryhost1,secondaryhost2/test?profileSQL=true");
68+
.parse("jdbc:mysql//primaryhost:3307,secondaryhost1,secondaryhost2/test?profileSQL=true");
6969
assertEquals(MYSQL, connectionInfo.getDbType());
7070
assertEquals("test", connectionInfo.getDbInstance());
7171
assertEquals("primaryhost:3307,secondaryhost1:3306,secondaryhost2:3306",
@@ -77,7 +77,7 @@ public void testParseMysqlJDBCURLWithMultiHost() {
7777
@Test
7878
public void testParseMysqlJDBCURLWithConnectorJs() {
7979
ConnectionInfo connectionInfo = URLParser
80-
.parser("jdbc:mysql:replication://master,slave1,slave2,slave3/test");
80+
.parse("jdbc:mysql:replication://master,slave1,slave2,slave3/test");
8181
assertEquals(MYSQL, connectionInfo.getDbType());
8282
assertEquals("test", connectionInfo.getDbInstance());
8383
assertEquals("master:3306,slave1:3306,slave2:3306,slave3:3306", connectionInfo.getDbPeer());
@@ -135,7 +135,7 @@ public void testParseOracleTNSNameWithMultiAddress() {
135135
@Test
136136
public void testParseOracleJDBCURLWithUserNameAndPassword() {
137137
ConnectionInfo connectionInfo = URLParser
138-
.parser("jdbc:oracle:thin:scott/tiger@myhost:1521:orcl");
138+
.parse("jdbc:oracle:thin:scott/tiger@myhost:1521:orcl");
139139
assertEquals(ORACLE, connectionInfo.getDbType());
140140
assertEquals("orcl", connectionInfo.getDbInstance());
141141
assertEquals("myhost:1521", connectionInfo.getDbPeer());
@@ -145,7 +145,7 @@ public void testParseOracleJDBCURLWithUserNameAndPassword() {
145145
@Test
146146
public void testParseOracleJDBCURLWithSID() {
147147
ConnectionInfo connectionInfo = URLParser
148-
.parser("jdbc:oracle:thin:@orcl");
148+
.parse("jdbc:oracle:thin:@orcl");
149149
assertEquals(ORACLE, connectionInfo.getDbType());
150150
assertEquals("orcl", connectionInfo.getDbInstance());
151151
assertEquals("orcl:1521", connectionInfo.getDbPeer());
@@ -234,7 +234,7 @@ public void testParsePostgresqlJDBCURLWithIpv6HostAndPort() {
234234
@Test
235235
public void testParsePostgresqlJDBCURLWithHostAndPort() {
236236
ConnectionInfo connectionInfo = URLParser
237-
.parser("jdbc:postgresql//primaryhost:3307/test?profileSQL=true");
237+
.parse("jdbc:postgresql//primaryhost:3307/test?profileSQL=true");
238238
assertEquals(POSTGRESQL, connectionInfo.getDbType());
239239
assertEquals("test", connectionInfo.getDbInstance());
240240
assertEquals("primaryhost:3307", connectionInfo.getDbPeer());
@@ -256,7 +256,7 @@ public void testParsePostgresqlJDBCURLWithMultiHost() {
256256
@Test
257257
public void testParsePostgresqlJDBCURLWithConnectorJs() {
258258
ConnectionInfo connectionInfo = URLParser
259-
.parser("jdbc:postgresql:replication://master,slave1,slave2,slave3/test");
259+
.parse("jdbc:postgresql:replication://master,slave1,slave2,slave3/test");
260260
assertEquals(POSTGRESQL, connectionInfo.getDbType());
261261
assertEquals("test", connectionInfo.getDbInstance());
262262
assertEquals("master:5432,slave1:5432,slave2:5432,slave3:5432", connectionInfo.getDbPeer());
@@ -267,14 +267,14 @@ public void testParsePostgresqlJDBCURLWithConnectorJs() {
267267
@Test
268268
public void testNoParserFound() {
269269
ConnectionInfo connectionInfo = URLParser
270-
.parser("jdbc:unknown_type//primaryhost?profileSQL=true");
270+
.parse("jdbc:unknown_type//primaryhost?profileSQL=true");
271271
assertEquals(ConnectionInfo.UNKNOWN_CONNECTION_INFO, connectionInfo);
272272
}
273273

274274
@Test
275275
public void testParseMariadbJDBCURLWithConnectorJs() {
276276
ConnectionInfo connectionInfo = URLParser
277-
.parser("jdbc:mariadb://mdb.host:33/mdbdb?user=mdbuser&password=PW");
277+
.parse("jdbc:mariadb://mdb.host:33/mdbdb?user=mdbuser&password=PW");
278278
assertEquals(MARIADB, connectionInfo.getDbType());
279279
assertEquals("mdbdb", connectionInfo.getDbInstance());
280280
assertEquals("mdb.host:33", connectionInfo.getDbPeer());
@@ -284,7 +284,7 @@ public void testParseMariadbJDBCURLWithConnectorJs() {
284284
@Test
285285
public void testParseMariadbJDBCURLWithAurora() {
286286
ConnectionInfo connectionInfo = URLParser
287-
.parser("jdbc:mariadb:aurora://mdb.host/mdbdb");
287+
.parse("jdbc:mariadb:aurora://mdb.host/mdbdb");
288288
assertEquals(MARIADB, connectionInfo.getDbType());
289289
assertEquals("mdbdb", connectionInfo.getDbInstance());
290290
assertEquals("mdb.host:3306", connectionInfo.getDbPeer());

0 commit comments

Comments
 (0)