Skip to content

Commit 22dee7c

Browse files
alex268alex268
authored
Merge pull request #18 from alex268/update_examples
Update examples
2 parents 58b76eb + d14b6cd commit 22dee7c

File tree

13 files changed

+179
-130
lines changed

13 files changed

+179
-130
lines changed

‎auth/access_token_credentials/src/main/java/tech/ydb/example/Main.java

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package tech.ydb.example;
22

3-
import java.util.concurrent.CompletableFuture;
43

54
import tech.ydb.auth.AuthProvider;
65
import tech.ydb.auth.TokenAuthProvider;
7-
import tech.ydb.core.Result;
86
import tech.ydb.core.grpc.GrpcTransport;
97
import tech.ydb.table.SessionRetryContext;
108
import tech.ydb.table.TableClient;
9+
import tech.ydb.table.query.DataQueryResult;
1110
import tech.ydb.table.result.ResultSetReader;
1211
import tech.ydb.table.transaction.TxControl;
1312

@@ -25,23 +24,20 @@ public static void main(String[] args) {
2524
// Access token credentials
2625
AuthProvider authProvider = new TokenAuthProvider(accessToken);
2726

28-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
29-
.withAuthProvider(authProvider) // Or this method could not be called at all
27+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
28+
.withAuthProvider(authProvider)
3029
.build()) {
31-
try ( TableClient tableClient = TableClient
32-
.newClient(transport)
33-
.build()) {
30+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3431
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3532

36-
retryCtx.supplyResult(session -> {
37-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
38-
.join().getValue().getResultSet(0);
33+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
34+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
35+
).join().getValue();
3936

40-
rsReader.next();
37+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
38+
while (rsReader.next()) {
4139
System.out.println(rsReader.getColumn(0).getInt32());
42-
43-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
44-
}).join();
40+
}
4541
}
4642
}
4743
}

‎auth/anonymous_credentials/src/main/java/tech/ydb/example/Main.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package tech.ydb.example;
22

3-
import java.util.concurrent.CompletableFuture;
43

54
import tech.ydb.auth.AuthProvider;
65
import tech.ydb.auth.NopAuthProvider;
7-
import tech.ydb.core.Result;
86
import tech.ydb.core.grpc.GrpcTransport;
97
import tech.ydb.table.SessionRetryContext;
108
import tech.ydb.table.TableClient;
9+
import tech.ydb.table.query.DataQueryResult;
1110
import tech.ydb.table.result.ResultSetReader;
1211
import tech.ydb.table.transaction.TxControl;
1312

@@ -22,24 +21,20 @@ public static void main(String[] args) {
2221
// Anonymous credentials
2322
AuthProvider authProvider = NopAuthProvider.INSTANCE;
2423

25-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
26-
.withAuthProvider(authProvider) // Or this method could not be called at all
24+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
25+
.withAuthProvider(authProvider)
2726
.build()) {
28-
try ( TableClient tableClient = TableClient
29-
.newClient(transport)
30-
.build()) {
31-
27+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3228
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3329

34-
retryCtx.supplyResult(session -> {
35-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
36-
.join().getValue().getResultSet(0);
30+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
31+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
32+
).join().getValue();
3733

38-
rsReader.next();
34+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
35+
while (rsReader.next()) {
3936
System.out.println(rsReader.getColumn(0).getInt32());
40-
41-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
42-
}).join();
37+
}
4338
}
4439
}
4540
}

‎auth/environ/src/main/java/tech/ydb/example/Main.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package tech.ydb.example;
22

3-
import java.util.concurrent.CompletableFuture;
43

54
import tech.ydb.auth.AuthProvider;
65
import tech.ydb.auth.iam.CloudAuthHelper;
7-
import tech.ydb.core.Result;
86
import tech.ydb.core.grpc.GrpcTransport;
97
import tech.ydb.table.SessionRetryContext;
108
import tech.ydb.table.TableClient;
9+
import tech.ydb.table.query.DataQueryResult;
1110
import tech.ydb.table.result.ResultSetReader;
1211
import tech.ydb.table.transaction.TxControl;
1312

@@ -22,24 +21,20 @@ public static void main(String[] args) {
2221
// Construct authProvider from environment variables
2322
AuthProvider authProvider = CloudAuthHelper.getAuthProviderFromEnviron();
2423

25-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
26-
.withAuthProvider(authProvider) // Or this method could not be called at all
24+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
25+
.withAuthProvider(authProvider)
2726
.build()) {
28-
try ( TableClient tableClient = TableClient
29-
.newClient(transport)
30-
.build()) {
31-
27+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3228
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3329

34-
retryCtx.supplyResult(session -> {
35-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
36-
.join().getValue().getResultSet(0);
30+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
31+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
32+
).join().getValue();
3733

38-
rsReader.next();
34+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
35+
while (rsReader.next()) {
3936
System.out.println(rsReader.getColumn(0).getInt32());
40-
41-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
42-
}).join();
37+
}
4338
}
4439
}
4540
}

‎auth/metadata_credentials/src/main/java/tech/ydb/example/Main.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package tech.ydb.example;
22

3-
import java.util.concurrent.CompletableFuture;
43

54
import tech.ydb.auth.AuthProvider;
65
import tech.ydb.auth.iam.CloudAuthHelper;
7-
import tech.ydb.core.Result;
86
import tech.ydb.core.grpc.GrpcTransport;
97
import tech.ydb.table.SessionRetryContext;
108
import tech.ydb.table.TableClient;
9+
import tech.ydb.table.query.DataQueryResult;
1110
import tech.ydb.table.result.ResultSetReader;
1211
import tech.ydb.table.transaction.TxControl;
1312

@@ -23,24 +22,20 @@ public static void main(String[] args) {
2322
// Use metadata credentials
2423
AuthProvider authProvider = CloudAuthHelper.getMetadataAuthProvider();
2524

26-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
27-
.withAuthProvider(authProvider) // Or this method could not be called at all
25+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
26+
.withAuthProvider(authProvider)
2827
.build()) {
29-
try ( TableClient tableClient = TableClient
30-
.newClient(transport)
31-
.build()) {
32-
28+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3329
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3430

35-
retryCtx.supplyResult(session -> {
36-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
37-
.join().getValue().getResultSet(0);
31+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
32+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
33+
).join().getValue();
3834

39-
rsReader.next();
35+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
36+
while (rsReader.next()) {
4037
System.out.println(rsReader.getColumn(0).getInt32());
41-
42-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
43-
}).join();
38+
}
4439
}
4540
}
4641
}

‎auth/service_account_credentials/src/main/java/tech/ydb/example/Main.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
package tech.ydb.example;
22

3-
import java.util.concurrent.CompletableFuture;
43

54
import tech.ydb.auth.AuthProvider;
65
import tech.ydb.auth.iam.CloudAuthHelper;
7-
import tech.ydb.core.Result;
86
import tech.ydb.core.grpc.GrpcTransport;
97
import tech.ydb.table.SessionRetryContext;
108
import tech.ydb.table.TableClient;
9+
import tech.ydb.table.query.DataQueryResult;
1110
import tech.ydb.table.result.ResultSetReader;
1211
import tech.ydb.table.transaction.TxControl;
1312

@@ -23,24 +22,20 @@ public static void main(String[] args) {
2322

2423
AuthProvider authProvider = CloudAuthHelper.getServiceAccountFileAuthProvider(saKeyFile);
2524

26-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
27-
.withAuthProvider(authProvider) // Or this method could not be called at all
25+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
26+
.withAuthProvider(authProvider)
2827
.build()) {
29-
try ( TableClient tableClient = TableClient
30-
.newClient(transport)
31-
.build()) {
32-
28+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3329
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3430

35-
retryCtx.supplyResult(session -> {
36-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
37-
.join().getValue().getResultSet(0);
31+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
32+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
33+
).join().getValue();
3834

39-
rsReader.next();
35+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
36+
while (rsReader.next()) {
4037
System.out.println(rsReader.getColumn(0).getInt32());
41-
42-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
43-
}).join();
38+
}
4439
}
4540
}
4641
}

‎auth/static_credentials/src/main/java/tech/ydb/example/Main.java

+10-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11

22
package tech.ydb.example;
33

4-
import java.util.concurrent.CompletableFuture;
5-
6-
import tech.ydb.core.Result;
74
import tech.ydb.core.auth.StaticCredentials;
85
import tech.ydb.core.grpc.GrpcTransport;
96
import tech.ydb.table.SessionRetryContext;
107
import tech.ydb.table.TableClient;
8+
import tech.ydb.table.query.DataQueryResult;
119
import tech.ydb.table.result.ResultSetReader;
1210
import tech.ydb.table.transaction.TxControl;
1311

@@ -29,23 +27,20 @@ public static void main(String[] args) {
2927
// Use credentials auth provider with username and password
3028
StaticCredentials authProvider = new StaticCredentials(username, password);
3129

32-
try ( GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
33-
.withAuthProvider(authProvider) // Or this method could not be called at all
30+
try (GrpcTransport transport = GrpcTransport.forConnectionString(connectionString)
31+
.withAuthProvider(authProvider)
3432
.build()) {
35-
try ( TableClient tableClient = TableClient
36-
.newClient(transport)
37-
.build()) {
33+
try (TableClient tableClient = TableClient.newClient(transport).build()) {
3834
SessionRetryContext retryCtx = SessionRetryContext.create(tableClient).build();
3935

40-
retryCtx.supplyResult(session -> {
41-
ResultSetReader rsReader = session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
42-
.join().getValue().getResultSet(0);
36+
DataQueryResult dataQueryResult = retryCtx.supplyResult(
37+
session -> session.executeDataQuery("SELECT 1;", TxControl.serializableRw())
38+
).join().getValue();
4339

44-
rsReader.next();
40+
ResultSetReader rsReader = dataQueryResult.getResultSet(0);
41+
while (rsReader.next()) {
4542
System.out.println(rsReader.getColumn(0).getInt32());
46-
47-
return CompletableFuture.completedFuture(Result.success(Boolean.TRUE));
48-
}).join();
43+
}
4944
}
5045
}
5146
}

‎basic_example/pom.xml

+18-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@
3030
<groupId>org.apache.logging.log4j</groupId>
3131
<artifactId>log4j-slf4j-impl</artifactId>
3232
</dependency>
33+
34+
<dependency>
35+
<groupId>tech.ydb.test</groupId>
36+
<artifactId>ydb-junit5-support</artifactId>
37+
<scope>test</scope>
38+
</dependency>
3339
</dependencies>
3440

3541
<build>
@@ -52,7 +58,18 @@
5258
<mainClass>tech.ydb.example.App</mainClass>
5359
</manifest>
5460
</archive>
55-
</configuration>
61+
</configuration>
62+
</plugin>
63+
64+
<plugin>
65+
<groupId>org.apache.maven.plugins</groupId>
66+
<artifactId>maven-surefire-plugin</artifactId>
67+
<configuration>
68+
<environmentVariables>
69+
<TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
70+
<YDB_ANONYMOUS_CREDENTIALS>1</YDB_ANONYMOUS_CREDENTIALS>
71+
</environmentVariables>
72+
</configuration>
5673
</plugin>
5774
</plugins>
5875
</build>

‎basic_example/src/main/java/tech/ydb/example/App.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public final class App implements Runnable, AutoCloseable {
4141
private final String database;
4242
private final SessionRetryContext retryCtx;
4343

44-
private App(String connectionString) {
44+
App(String connectionString) {
4545
this.transport = GrpcTransport.forConnectionString(connectionString)
4646
.withAuthProvider(CloudAuthHelper.getAuthProviderFromEnviron())
4747
.build();

‎basic_example/src/main/resources/log4j2.xml

+9-18
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,21 @@
22
<Configuration status="WARN" shutdownHook="disable">
33
<Appenders>
44
<Console name="Console" target="SYSTEM_OUT">
5-
<PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1} - %msg%n"/>
5+
<PatternLayout pattern="[%level] %d{HH:mm:ss.SSS} %logger - %msg%n"/>
66
</Console>
77
</Appenders>
88

99
<Loggers>
10-
<Logger name="io.netty" level="warn" additivity="false">
11-
<AppenderRef ref="Console"/>
12-
</Logger>
13-
<Logger name="io.grpc.netty" level="warn" additivity="false">
14-
<AppenderRef ref="Console"/>
15-
</Logger>
16-
<Logger name="tech.ydb.core.grpc" level="info" additivity="false">
17-
<AppenderRef ref="Console"/>
18-
</Logger>
19-
<Logger name="tech.ydb.table" level="info" additivity="false">
20-
<AppenderRef ref="Console"/>
21-
</Logger>
22-
<Logger name="tech.ydb.table.SessionRetryContext" level="info" additivity="false">
23-
<AppenderRef ref="Console"/>
24-
</Logger>
25-
<Logger name="tech.ydb.table.Session" level="info" additivity="false">
10+
<!-- https://www.testcontainers.org/supported_docker_environment/logging_config/ -->
11+
<Logger name="org.testcontainers" level="warn" />
12+
<Logger name="com.github.dockerjava" level="warn"/>
13+
<Logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="off"/>
14+
15+
<Logger name="io.grpc" level="warn" additivity="false">
2616
<AppenderRef ref="Console"/>
2717
</Logger>
28-
<Logger name="tech.ydb.topic" level="info" additivity="false">
18+
19+
<Logger name="tech.ydb" level="info" additivity="false">
2920
<AppenderRef ref="Console"/>
3021
</Logger>
3122

0 commit comments

Comments
 (0)